Skip to content

Commit 40fa0e9

Browse files
committed
Merge branch 'master' into fix0548-surface-contour-all-points
2 parents d04101f + f0a6128 commit 40fa0e9

File tree

398 files changed

+323381
-15146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

398 files changed

+323381
-15146
lines changed

.circleci/config.yml

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,10 @@ jobs:
1414
working_directory: ~/plotly.js
1515
steps:
1616
- checkout
17-
- restore_cache:
18-
keys:
19-
- v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
20-
- v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
2117
- run:
2218
name: Install dependencies
2319
command: |
24-
npm install
20+
npm ci
2521
- run:
2622
name: List dependency versions
2723
command: |
@@ -33,26 +29,21 @@ jobs:
3329
command: |
3430
npm run pretest
3531
npm run cibuild
36-
- save_cache:
37-
paths:
38-
- node_modules
39-
key: v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
32+
- run:
33+
command: rm -rf .git
4034
- persist_to_workspace:
41-
root: .
35+
root: /home/circleci
4236
paths:
43-
- node_modules
44-
- build
45-
- dist
37+
- plotly.js
4638

4739
test-jasmine:
4840
docker:
4941
# need '-browsers' version to test in real (xvfb-wrapped) browsers
5042
- image: circleci/node:10.9.0-browsers
5143
working_directory: ~/plotly.js
5244
steps:
53-
- checkout
5445
- attach_workspace:
55-
at: ~/plotly.js
46+
at: ~/
5647
- run:
5748
name: Run jasmine tests (batch 1)
5849
command: ./.circleci/test.sh jasmine
@@ -63,21 +54,31 @@ jobs:
6354
- image: circleci/node:10.9.0-browsers
6455
working_directory: ~/plotly.js
6556
steps:
66-
- checkout
6757
- attach_workspace:
68-
at: ~/plotly.js
58+
at: ~/
6959
- run:
7060
name: Run jasmine tests (batch 2)
7161
command: ./.circleci/test.sh jasmine2
7262

63+
test-jasmine3:
64+
docker:
65+
# need '-browsers' version to test in real (xvfb-wrapped) browsers
66+
- image: circleci/node:10.9.0-browsers
67+
working_directory: ~/plotly.js
68+
steps:
69+
- attach_workspace:
70+
at: ~/
71+
- run:
72+
name: Run jasmine tests (batch 3)
73+
command: ./.circleci/test.sh jasmine3
74+
7375
test-image:
7476
docker:
7577
- image: plotly/testbed:latest
7678
working_directory: /var/www/streambed/image_server/plotly.js/
7779
steps:
78-
- checkout
7980
- attach_workspace:
80-
at: /var/www/streambed/image_server/plotly.js/
81+
at: /var/www/streambed/image_server/
8182
- run:
8283
name: Run and setup container
8384
command: |
@@ -95,9 +96,8 @@ jobs:
9596
- image: plotly/testbed:latest
9697
working_directory: /var/www/streambed/image_server/plotly.js/
9798
steps:
98-
- checkout
9999
- attach_workspace:
100-
at: /var/www/streambed/image_server/plotly.js/
100+
at: /var/www/streambed/image_server/
101101
- run:
102102
name: Run and setup container
103103
command: |
@@ -115,9 +115,8 @@ jobs:
115115
- image: circleci/node:10.9.0
116116
working_directory: ~/plotly.js
117117
steps:
118-
- checkout
119118
- attach_workspace:
120-
at: ~/plotly.js
119+
at: ~/
121120
- run:
122121
name: Run syntax tests
123122
command: ./.circleci/test.sh syntax
@@ -127,28 +126,31 @@ jobs:
127126
- image: circleci/node:10.9.0
128127
working_directory: ~/plotly.js
129128
steps:
130-
- checkout
131129
- attach_workspace:
132-
at: ~/plotly.js
130+
at: ~/
133131
- run:
134-
name: Update plot-schema.json
135-
command: node tasks/bundle_plot_schema.js
132+
name: Build dist/
133+
command: npm run build
136134
- store_artifacts:
137-
path: build/plotly.js
138-
destination: /plotly.js
139-
- store_artifacts:
140-
path: dist/plotly.min.js
141-
destination: /plotly.min.js
135+
path: dist
136+
destination: dist
137+
- run:
138+
name: Pack tarball
139+
command: |
140+
npm pack
141+
version=$(node -e "console.log(require('./package.json').version)")
142+
mv plotly.js-$version.tgz plotly.js.tgz
142143
- store_artifacts:
143-
path: dist/plot-schema.json
144-
destination: /plot-schema.json
144+
path: plotly.js.tgz
145+
destination: /plotly.js.tgz
145146
- run:
146147
name: Show URLs to build files
147148
command: |
148149
PROJECT_NUM=45646037
149-
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/plotly.js
150-
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/plotly.min.js
151-
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/plot-schema.json
150+
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/plotly.js.tgz
151+
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plotly.js
152+
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plotly.min.js
153+
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plot-schema.json
152154
153155
workflows:
154156
version: 2
@@ -161,6 +163,9 @@ workflows:
161163
- test-jasmine2:
162164
requires:
163165
- build
166+
- test-jasmine3:
167+
requires:
168+
- build
164169
- test-image:
165170
requires:
166171
- build

.circleci/test.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ case $1 in
4545
set_tz
4646

4747
npm run test-jasmine -- --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
48-
retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI
4948
npm run test-bundle || EXIT_STATE=$?
5049

5150
exit $EXIT_STATE
@@ -63,6 +62,18 @@ case $1 in
6362
exit $EXIT_STATE
6463
;;
6564

65+
jasmine3)
66+
set_tz
67+
68+
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky))
69+
70+
for s in ${SHARDS[@]}; do
71+
retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI
72+
done
73+
74+
exit $EXIT_STATE
75+
;;
76+
6677
image)
6778
npm run test-image || EXIT_STATE=$?
6879
exit $EXIT_STATE

CHANGELOG.md

Lines changed: 124 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,130 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
1010
where X.Y.Z is the semver of most recent plotly.js release.
1111

1212

13-
## [1.44.4] -- 2019-01-22
13+
## [1.45.3] -- 2019-03-19
14+
15+
### Fixed
16+
- Fix legend click dispatch on legend item symbols (bug introduced in 1.44.0) [#3635]
17+
- Fix overlapping of "very close" hover labels [#3645]
18+
- Fix `hovermode` default logic for stacked `scatter` traces [#3646]
19+
- Fix `glPixelRatio` handling in `surface` contour lines [#3641]
20+
- Fix `gl2d` subplot zoombox appearance (bug introduced in 1.32.0) [#3647]
21+
- Fix axis label updates on `gl2d` subplots on scroll (bug introduced in 1.32.0) [#3647]
22+
- Fix `dragmode` relayout calls on `gl2d` subplots [#3647]
23+
- Improve info about `<extra>` in `hovertemplate` description [#3623]
24+
25+
26+
## [1.45.2] -- 2019-03-07
27+
28+
### Fixed
29+
- Fix webpack builds that include `sankey` by upgrading d3-sankey-circular to 0.33.0 (bug introduced in 1.45.0) [#3611]
30+
31+
## [1.45.1] -- 2019-03-05
32+
33+
### Fixed
34+
- Fix axis automargin pushes for rotated tick labels [#3605]
35+
- Fix automargin logic on (very) small graphs [#3605]
36+
- Fix locales support in `hovertemplate` strings [#3586]
37+
- Fix gl3d reset camera buttons for scenes with orthographic projection [#3597]
38+
- Fix typed array support for `parcoords` dimensions values and `line.color` [#3598]
39+
- Fix `cone` rendering on some older browsers [#3591]
40+
- Fix `lightposition` behavior for `cone` traces [#3591]
41+
- Fix `lightposition` behavior for `streamtube` trace [#3593]
42+
- Remove unused files from `gl-cone3d` dependency [#3591]
43+
- Remove unused files from `gl-streamtube3d` dependency [#3593]
44+
45+
46+
## [1.45.0] -- 2019-02-26
47+
48+
### Added
49+
- Add support for circular networks in `sankey` traces [#3406, #3535, #3564]
50+
- Add matching axes behavior to cartesian axes via new axis attribute and
51+
new splom attribute dimensions attribute `matches` [#3506, #3565]
52+
- Add attributes `alignmentgroup` and `offsetgroup` to `bar`, `histogram`, `box`
53+
and `violin` traces to make cross-trace positioning easier [#3529]
54+
- Add support for orthographic projections in gl3d subplots via new attribute
55+
`scene.camera.projection.type` [#3550]
56+
- Add `cmid` and `zmid` colorscale attributes to pick the middle of the color
57+
range during the auto-colorscale computations [#3549]
58+
- Add support for `sankey` grouping via new attribute `groups` [#3556]
59+
- Add support for `sankey` concentration `colorscales` [#3501]
60+
- Add support for `hovertemplate` for all `gl3d` traces, `contour`,
61+
`heatmap`, `histogram*`, `parcats`, `scattercarpet` and `splom` traces [#3530]
62+
- Add `hovertext` attribute to all traces that support hover 'text',
63+
for consistency with traces that already have an `hovertext` attribute [#3553]
64+
- Add support for layout `meta` templating in trace `name`,
65+
`rangeselector`, `updatemenus` and `sliders` labels as well as
66+
within `hovertemplate` [#3548]
67+
- Add support for `opacity` to `isosurface` traces [#3545]
68+
- Add `mapbox.layers` attributes: `minzoom`, `maxzoom`, `line.dash` and `symbol.placement` [#3399]
69+
70+
### Changed
71+
- More consistency pass down WebGL pixel ratio to gl3d renderers,
72+
this leads to better axis line and error bar rendering on some hardwares [#3573]
73+
- Performance boost for `isosurface` trace generation [#3521]
74+
- Export template string regex of `Lib` [#3548]
75+
- Do no cluster points in `scattergl` trace with less than 1e5 data pts,
76+
this fixes reported "missing data points" scenarios [#3578]
77+
78+
### Fixed
79+
- Fix selection outline clearing during cartesian axis-range relayout calls
80+
(bug introduced in 1.42.0) [#3577]
81+
- Fix modebar interactions on graphs with `scatter3d` traces with
82+
marker colorscales (bug introduced in 1.44.0) [#3554]
83+
- Fix axis `automargin` for superimposed subplots (bug introduced in 1.44.3) [#3566]
84+
- Fix polar angular tick labels placement [#3538]
85+
- Fix `scattergl` updates after selections for trace with on-graph text [#3575]
86+
- Fix `responsive: true` config option for graph with WebGL traces [#3500]
87+
- Fix `modebar.bgcolor` for vertical modebars with wrapped buttons [#3500]
88+
- Fix `ohlc` and `candlestick` auto-range computations [#3544]
89+
90+
91+
## [1.44.4] -- 2019-02-12
92+
93+
### Fixed
94+
- Fix `Plotly.react` used with `uirevision` when removing traces [#3527]
95+
- Fix `scattergl` update calls that change the number of on-graph text elements [#3536]
96+
- Fix annotations SVG errors on trace-less subplots [#3534]
97+
- Fix `ohlc` and `candlestick` hover on blank coordinates (bug introduced in 1.43.2) [#3537]
98+
99+
100+
## [1.44.3] -- 2019-02-06
101+
102+
### Fixed
103+
- Fix axis `automargin` push offset which resulted in clipped
104+
tick labels in some scenarios [#3510]
105+
- Fix handling of alpha channel in marker, line and error bar `rgba`
106+
coloring in `scatter3d` traces [#3496]
107+
- Fix subplots with multiple `carpet` traces each with a `scattercarpet`
108+
trace on top of them [#3512]
109+
- Fix MathJax placement in ternary `aaxis` titles [#3513]
110+
111+
112+
## [1.44.2] -- 2019-02-04
113+
114+
### Fixed
115+
- Fix vertical modebars in IE11 [@3491]
116+
- Fix `hovertemplate` for traces with blank `name` [#3480]
117+
- Fix 3D grid lines and tick labels colored by rgba color
118+
with full transparency [#3494]
119+
- Fix white highlights rendering problems for `mesh3d` trace on
120+
some devices (bug introduced in 1.44.0) [#3483]
121+
- Fix `fill.color` description for `table` traces [#3481]
122+
123+
124+
## [1.44.1] -- 2019-01-24
125+
126+
### Fixed
127+
- Fix `mesh3d` rendering on (some) mobile devices (bug introduced in 1.44.0) [#3463]
128+
- Fix scene camera update when changing to `turntable` mode when `up.z` is zero
129+
(bug introduced in 1.43.0) [#3465, #3475]
130+
- Fix `react` when cartesian axis `scaleanchor` patterns change [#3461]
131+
- Fix "days" entries in polish (`pl`) locales [#3464]
132+
- Remove inner function declarations in our `vectorize-text` that caused
133+
bundling errors for some (bug introduced in 1.43.0) [#3474]
134+
135+
136+
## [1.44.0] -- 2019-01-22
14137

15138
### Added
16139
- Add `isosurface` gl3d trace type [#3438]

build/plotcss.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ var rules = {
3131
"X .cursor-n-resize": "cursor:n-resize;",
3232
"X .cursor-ne-resize": "cursor:ne-resize;",
3333
"X .cursor-grab": "cursor:-webkit-grab;cursor:grab;",
34-
"X .modebar": "position:absolute;top:2px;right:2px;z-index:1001;",
34+
"X .modebar": "position:absolute;top:2px;right:2px;",
3535
"X .ease-bg": "-webkit-transition:background-color 0.3s ease 0s;-moz-transition:background-color 0.3s ease 0s;-ms-transition:background-color 0.3s ease 0s;-o-transition:background-color 0.3s ease 0s;transition:background-color 0.3s ease 0s;",
3636
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity 0.3s ease 0s;-moz-transition:opacity 0.3s ease 0s;-ms-transition:opacity 0.3s ease 0s;-o-transition:opacity 0.3s ease 0s;transition:opacity 0.3s ease 0s;",
3737
"X:hover .modebar--hover .modebar-group": "opacity:1;",
38-
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;margin-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
38+
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;padding-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
3939
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;",
4040
"X .modebar-btn svg": "position:relative;top:2px;",
4141
"X .modebar.vertical": "display:flex;flex-direction:column;flex-wrap:wrap;align-content:flex-end;max-height:100%;",
4242
"X .modebar.vertical svg": "top:-1px;",
43-
"X .modebar.vertical .modebar-group": "display:block;float:none;margin-left:0px;margin-bottom:8px;",
43+
"X .modebar.vertical .modebar-group": "display:block;float:none;padding-left:0px;padding-bottom:8px;",
4444
"X .modebar.vertical .modebar-group .modebar-btn": "display:block;text-align:center;",
4545
"X [data-title]:before,X [data-title]:after": "position:absolute;-webkit-transform:translate3d(0, 0, 0);-moz-transform:translate3d(0, 0, 0);-ms-transform:translate3d(0, 0, 0);-o-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0);display:none;opacity:0;z-index:1001;pointer-events:none;top:110%;right:50%;",
4646
"X [data-title]:hover:before,X [data-title]:hover:after": "display:block;opacity:1;",

0 commit comments

Comments
 (0)