Skip to content

Commit 3644568

Browse files
Merge pull request #3659 from plotly/pjs2.11.1
update Plotly.js to 2.11.1
2 parents 2c91604 + 27a473e commit 3644568

26 files changed

+1067
-25
lines changed

Diff for: packages/javascript/jupyterlab-plotly/package-lock.json

+19-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: packages/javascript/jupyterlab-plotly/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@lumino/messaging": "^1.2.3",
6666
"@lumino/widgets": "^1.8.1",
6767
"lodash": "^4.17.4",
68-
"plotly.js": "^2.9.0"
68+
"plotly.js": "^2.11.1"
6969
},
7070
"jupyterlab": {
7171
"extension": "lib/jupyterlab-plugin",

Diff for: packages/python/plotly/codegen/resources/plot-schema.json

+98
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,11 @@
365365
"noBlank": true,
366366
"valType": "string"
367367
},
368+
"typesetMath": {
369+
"description": "Determines whether math should be typeset or not, when MathJax (either v2 or v3) is present on the page.",
370+
"dflt": true,
371+
"valType": "boolean"
372+
},
368373
"watermark": {
369374
"description": "watermark the images with the company's logo",
370375
"dflt": false,
@@ -42269,6 +42274,99 @@
4226942274
"editType": "style",
4227042275
"valType": "color"
4227142276
},
42277+
"fillpattern": {
42278+
"bgcolor": {
42279+
"arrayOk": true,
42280+
"description": "When there is no colorscale sets the color of background pattern fill. Defaults to a `marker.color` background when `fillmode` is *overlay*. Otherwise, defaults to a transparent background.",
42281+
"editType": "style",
42282+
"valType": "color"
42283+
},
42284+
"bgcolorsrc": {
42285+
"description": "Sets the source reference on Chart Studio Cloud for `bgcolor`.",
42286+
"editType": "none",
42287+
"valType": "string"
42288+
},
42289+
"description": "Sets the pattern within the marker.",
42290+
"editType": "style",
42291+
"fgcolor": {
42292+
"arrayOk": true,
42293+
"description": "When there is no colorscale sets the color of foreground pattern fill. Defaults to a `marker.color` background when `fillmode` is *replace*. Otherwise, defaults to dark grey or white to increase contrast with the `bgcolor`.",
42294+
"editType": "style",
42295+
"valType": "color"
42296+
},
42297+
"fgcolorsrc": {
42298+
"description": "Sets the source reference on Chart Studio Cloud for `fgcolor`.",
42299+
"editType": "none",
42300+
"valType": "string"
42301+
},
42302+
"fgopacity": {
42303+
"description": "Sets the opacity of the foreground pattern fill. Defaults to a 0.5 when `fillmode` is *overlay*. Otherwise, defaults to 1.",
42304+
"editType": "style",
42305+
"max": 1,
42306+
"min": 0,
42307+
"valType": "number"
42308+
},
42309+
"fillmode": {
42310+
"description": "Determines whether `marker.color` should be used as a default to `bgcolor` or a `fgcolor`.",
42311+
"dflt": "replace",
42312+
"editType": "style",
42313+
"valType": "enumerated",
42314+
"values": [
42315+
"replace",
42316+
"overlay"
42317+
]
42318+
},
42319+
"role": "object",
42320+
"shape": {
42321+
"arrayOk": true,
42322+
"description": "Sets the shape of the pattern fill. By default, no pattern is used for filling the area.",
42323+
"dflt": "",
42324+
"editType": "style",
42325+
"valType": "enumerated",
42326+
"values": [
42327+
"",
42328+
"/",
42329+
"\\",
42330+
"x",
42331+
"-",
42332+
"|",
42333+
"+",
42334+
"."
42335+
]
42336+
},
42337+
"shapesrc": {
42338+
"description": "Sets the source reference on Chart Studio Cloud for `shape`.",
42339+
"editType": "none",
42340+
"valType": "string"
42341+
},
42342+
"size": {
42343+
"arrayOk": true,
42344+
"description": "Sets the size of unit squares of the pattern fill in pixels, which corresponds to the interval of repetition of the pattern.",
42345+
"dflt": 8,
42346+
"editType": "style",
42347+
"min": 0,
42348+
"valType": "number"
42349+
},
42350+
"sizesrc": {
42351+
"description": "Sets the source reference on Chart Studio Cloud for `size`.",
42352+
"editType": "none",
42353+
"valType": "string"
42354+
},
42355+
"solidity": {
42356+
"arrayOk": true,
42357+
"description": "Sets the solidity of the pattern fill. Solidity is roughly the fraction of the area filled by the pattern. Solidity of 0 shows only the background color without pattern and solidty of 1 shows only the foreground color without pattern.",
42358+
"dflt": 0.3,
42359+
"editType": "style",
42360+
"max": 1,
42361+
"min": 0,
42362+
"valType": "number"
42363+
},
42364+
"soliditysrc": {
42365+
"description": "Sets the source reference on Chart Studio Cloud for `solidity`.",
42366+
"editType": "none",
42367+
"valType": "string"
42368+
}
42369+
},
4227242370
"groupnorm": {
4227342371
"description": "Only relevant when `stackgroup` is used, and only the first `groupnorm` found in the `stackgroup` will be used - including if `visible` is *legendonly* but not if it is `false`. Sets the normalization for the sum of this `stackgroup`. With *fraction*, the value of each trace at each location is divided by the sum of all trace values at that location. *percent* is the same but multiplied by 100 to show percentages. If there are multiple subplots, or multiple `stackgroup`s on one subplot, each will be normalized within its own set.",
4227442372
"dflt": "",

Diff for: packages/python/plotly/plotly/graph_objs/_figure.py

+4
Original file line numberDiff line numberDiff line change
@@ -12053,6 +12053,7 @@ def add_scatter(
1205312053
error_y=None,
1205412054
fill=None,
1205512055
fillcolor=None,
12056+
fillpattern=None,
1205612057
groupnorm=None,
1205712058
hoverinfo=None,
1205812059
hoverinfosrc=None,
@@ -12181,6 +12182,8 @@ def add_scatter(
1218112182
Sets the fill color. Defaults to a half-transparent
1218212183
variant of the line color, marker color, or marker line
1218312184
color, whichever is available.
12185+
fillpattern
12186+
Sets the pattern within the marker.
1218412187
groupnorm
1218512188
Only relevant when `stackgroup` is used, and only the
1218612189
first `groupnorm` found in the `stackgroup` will be
@@ -12549,6 +12552,7 @@ def add_scatter(
1254912552
error_y=error_y,
1255012553
fill=fill,
1255112554
fillcolor=fillcolor,
12555+
fillpattern=fillpattern,
1255212556
groupnorm=groupnorm,
1255312557
hoverinfo=hoverinfo,
1255412558
hoverinfosrc=hoverinfosrc,

Diff for: packages/python/plotly/plotly/graph_objs/_figurewidget.py

+4
Original file line numberDiff line numberDiff line change
@@ -12053,6 +12053,7 @@ def add_scatter(
1205312053
error_y=None,
1205412054
fill=None,
1205512055
fillcolor=None,
12056+
fillpattern=None,
1205612057
groupnorm=None,
1205712058
hoverinfo=None,
1205812059
hoverinfosrc=None,
@@ -12181,6 +12182,8 @@ def add_scatter(
1218112182
Sets the fill color. Defaults to a half-transparent
1218212183
variant of the line color, marker color, or marker line
1218312184
color, whichever is available.
12185+
fillpattern
12186+
Sets the pattern within the marker.
1218412187
groupnorm
1218512188
Only relevant when `stackgroup` is used, and only the
1218612189
first `groupnorm` found in the `stackgroup` will be
@@ -12549,6 +12552,7 @@ def add_scatter(
1254912552
error_y=error_y,
1255012553
fill=fill,
1255112554
fillcolor=fillcolor,
12555+
fillpattern=fillpattern,
1255212556
groupnorm=groupnorm,
1255312557
hoverinfo=hoverinfo,
1255412558
hoverinfosrc=hoverinfosrc,

Diff for: packages/python/plotly/plotly/graph_objs/_scatter.py

+84
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class Scatter(_BaseTraceType):
1919
"error_y",
2020
"fill",
2121
"fillcolor",
22+
"fillpattern",
2223
"groupnorm",
2324
"hoverinfo",
2425
"hoverinfosrc",
@@ -468,6 +469,80 @@ def fillcolor(self):
468469
def fillcolor(self, val):
469470
self["fillcolor"] = val
470471

472+
# fillpattern
473+
# -----------
474+
@property
475+
def fillpattern(self):
476+
"""
477+
Sets the pattern within the marker.
478+
479+
The 'fillpattern' property is an instance of Fillpattern
480+
that may be specified as:
481+
- An instance of :class:`plotly.graph_objs.scatter.Fillpattern`
482+
- A dict of string/value properties that will be passed
483+
to the Fillpattern constructor
484+
485+
Supported dict properties:
486+
487+
bgcolor
488+
When there is no colorscale sets the color of
489+
background pattern fill. Defaults to a
490+
`marker.color` background when `fillmode` is
491+
"overlay". Otherwise, defaults to a transparent
492+
background.
493+
bgcolorsrc
494+
Sets the source reference on Chart Studio Cloud
495+
for `bgcolor`.
496+
fgcolor
497+
When there is no colorscale sets the color of
498+
foreground pattern fill. Defaults to a
499+
`marker.color` background when `fillmode` is
500+
"replace". Otherwise, defaults to dark grey or
501+
white to increase contrast with the `bgcolor`.
502+
fgcolorsrc
503+
Sets the source reference on Chart Studio Cloud
504+
for `fgcolor`.
505+
fgopacity
506+
Sets the opacity of the foreground pattern
507+
fill. Defaults to a 0.5 when `fillmode` is
508+
"overlay". Otherwise, defaults to 1.
509+
fillmode
510+
Determines whether `marker.color` should be
511+
used as a default to `bgcolor` or a `fgcolor`.
512+
shape
513+
Sets the shape of the pattern fill. By default,
514+
no pattern is used for filling the area.
515+
shapesrc
516+
Sets the source reference on Chart Studio Cloud
517+
for `shape`.
518+
size
519+
Sets the size of unit squares of the pattern
520+
fill in pixels, which corresponds to the
521+
interval of repetition of the pattern.
522+
sizesrc
523+
Sets the source reference on Chart Studio Cloud
524+
for `size`.
525+
solidity
526+
Sets the solidity of the pattern fill. Solidity
527+
is roughly the fraction of the area filled by
528+
the pattern. Solidity of 0 shows only the
529+
background color without pattern and solidty of
530+
1 shows only the foreground color without
531+
pattern.
532+
soliditysrc
533+
Sets the source reference on Chart Studio Cloud
534+
for `solidity`.
535+
536+
Returns
537+
-------
538+
plotly.graph_objs.scatter.Fillpattern
539+
"""
540+
return self["fillpattern"]
541+
542+
@fillpattern.setter
543+
def fillpattern(self, val):
544+
self["fillpattern"] = val
545+
471546
# groupnorm
472547
# ---------
473548
@property
@@ -2169,6 +2244,8 @@ def _prop_descriptions(self):
21692244
Sets the fill color. Defaults to a half-transparent
21702245
variant of the line color, marker color, or marker line
21712246
color, whichever is available.
2247+
fillpattern
2248+
Sets the pattern within the marker.
21722249
groupnorm
21732250
Only relevant when `stackgroup` is used, and only the
21742251
first `groupnorm` found in the `stackgroup` will be
@@ -2514,6 +2591,7 @@ def __init__(
25142591
error_y=None,
25152592
fill=None,
25162593
fillcolor=None,
2594+
fillpattern=None,
25172595
groupnorm=None,
25182596
hoverinfo=None,
25192597
hoverinfosrc=None,
@@ -2642,6 +2720,8 @@ def __init__(
26422720
Sets the fill color. Defaults to a half-transparent
26432721
variant of the line color, marker color, or marker line
26442722
color, whichever is available.
2723+
fillpattern
2724+
Sets the pattern within the marker.
26452725
groupnorm
26462726
Only relevant when `stackgroup` is used, and only the
26472727
first `groupnorm` found in the `stackgroup` will be
@@ -3046,6 +3126,10 @@ def __init__(
30463126
_v = fillcolor if fillcolor is not None else _v
30473127
if _v is not None:
30483128
self["fillcolor"] = _v
3129+
_v = arg.pop("fillpattern", None)
3130+
_v = fillpattern if fillpattern is not None else _v
3131+
if _v is not None:
3132+
self["fillpattern"] = _v
30493133
_v = arg.pop("groupnorm", None)
30503134
_v = groupnorm if groupnorm is not None else _v
30513135
if _v is not None:

Diff for: packages/python/plotly/plotly/graph_objs/scatter/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
if sys.version_info < (3, 7):
44
from ._error_x import ErrorX
55
from ._error_y import ErrorY
6+
from ._fillpattern import Fillpattern
67
from ._hoverlabel import Hoverlabel
78
from ._legendgrouptitle import Legendgrouptitle
89
from ._line import Line
@@ -25,6 +26,7 @@
2526
[
2627
"._error_x.ErrorX",
2728
"._error_y.ErrorY",
29+
"._fillpattern.Fillpattern",
2830
"._hoverlabel.Hoverlabel",
2931
"._legendgrouptitle.Legendgrouptitle",
3032
"._line.Line",

0 commit comments

Comments
 (0)