Skip to content

Commit c491b11

Browse files
committed
Merge remote-tracking branch 'origin/master' into finalist-cluster-scattermapbox
2 parents 846cde9 + 73e05ce commit c491b11

File tree

425 files changed

+1009543
-841618
lines changed

Some content is hidden

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

425 files changed

+1009543
-841618
lines changed

.circleci/config.yml

Lines changed: 101 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,23 @@ orbs:
1010
# https://hub.docker.com/r/cimg/node/tags/
1111

1212
jobs:
13-
install-and-cibuild:
13+
install-and-cibuild-node12: # cibuild using node 12 & npm 6
14+
docker:
15+
- image: cimg/node:12.22.7
16+
working_directory: ~/plotly.js
17+
steps:
18+
- checkout
19+
- run:
20+
name: Set up build environment
21+
command: .circleci/env_build.sh
22+
- run:
23+
name: Pretest
24+
command: npm run pretest
25+
- run:
26+
name: CI-Build
27+
command: npm run cibuild
28+
29+
install-and-cibuild: # main cibuild using node 16 & npm 7
1430
docker:
1531
- image: cimg/node:16.8.0
1632
working_directory: ~/plotly.js
@@ -73,7 +89,7 @@ jobs:
7389
environment:
7490
# Alaska time (arbitrary timezone to test date logic)
7591
TZ: "America/Anchorage"
76-
parallelism: 8
92+
parallelism: 12
7793
working_directory: ~/plotly.js
7894
steps:
7995
- browser-tools/install-browser-tools: &browser-versions
@@ -163,6 +179,61 @@ jobs:
163179
name: Test MathJax on firefox-81
164180
command: .circleci/test.sh mathjax-firefox
165181

182+
mathjax-firefox82:
183+
docker:
184+
# need '-browsers' version to test in real (xvfb-wrapped) browsers
185+
- image: cimg/node:16.8.0-browsers
186+
environment:
187+
# Alaska time (arbitrary timezone to test date logic)
188+
TZ: "America/Anchorage"
189+
working_directory: ~/plotly.js
190+
steps:
191+
- browser-tools/install-browser-tools: &browser-versions
192+
firefox-version: '82.0'
193+
install-chrome: false
194+
install-chromedriver: false
195+
- attach_workspace:
196+
at: ~/
197+
- run:
198+
name: Test MathJax on firefox-82
199+
command: .circleci/test.sh mathjax-firefox82+
200+
201+
mathjax-firefoxLatest:
202+
docker:
203+
# need '-browsers' version to test in real (xvfb-wrapped) browsers
204+
- image: cimg/node:16.8.0-browsers
205+
environment:
206+
# Alaska time (arbitrary timezone to test date logic)
207+
TZ: "America/Anchorage"
208+
working_directory: ~/plotly.js
209+
steps:
210+
- browser-tools/install-browser-tools: &browser-versions
211+
install-chrome: false
212+
install-chromedriver: false
213+
- attach_workspace:
214+
at: ~/
215+
- run:
216+
name: Test MathJax on firefox-latest
217+
command: .circleci/test.sh mathjax-firefox82+
218+
219+
make-baselines-mathjax3:
220+
docker:
221+
- image: circleci/python:3.8.9
222+
working_directory: ~/plotly.js
223+
steps:
224+
- attach_workspace:
225+
at: ~/
226+
- run:
227+
name: Install kaleido, plotly.io and required fonts
228+
command: .circleci/env_image.sh
229+
- run:
230+
name: Create mathjax v3 png files
231+
command: .circleci/test.sh make-baselines-mathjax3
232+
- persist_to_workspace:
233+
root: ~/
234+
paths:
235+
- plotly.js
236+
166237
make-baselines:
167238
parallelism: 4
168239
docker:
@@ -196,6 +267,20 @@ jobs:
196267
path: build
197268
destination: /
198269

270+
test-baselines-mathjax3:
271+
docker:
272+
- image: circleci/node:16.8.0
273+
working_directory: ~/plotly.js
274+
steps:
275+
- attach_workspace:
276+
at: ~/
277+
- run:
278+
name: Compare pixels of mathjax v3 baselines
279+
command: .circleci/test.sh test-image-mathjax3
280+
- store_artifacts:
281+
path: build
282+
destination: /
283+
199284
make-exports:
200285
docker:
201286
- image: circleci/python:3.8.9
@@ -333,6 +418,8 @@ workflows:
333418
version: 2
334419
build-and-test:
335420
jobs:
421+
- install-and-cibuild-node12
422+
336423
- install-and-cibuild
337424
- timezone-jasmine:
338425
requires:
@@ -343,6 +430,12 @@ workflows:
343430
- mathjax-firefox81:
344431
requires:
345432
- install-and-cibuild
433+
- mathjax-firefox82:
434+
requires:
435+
- install-and-cibuild
436+
- mathjax-firefoxLatest:
437+
requires:
438+
- install-and-cibuild
346439
- no-gl-jasmine:
347440
requires:
348441
- install-and-cibuild
@@ -352,6 +445,12 @@ workflows:
352445
- flaky-no-gl-jasmine:
353446
requires:
354447
- install-and-cibuild
448+
- make-baselines-mathjax3:
449+
requires:
450+
- install-and-cibuild
451+
- test-baselines-mathjax3:
452+
requires:
453+
- make-baselines-mathjax3
355454
- make-baselines:
356455
requires:
357456
- install-and-cibuild

.circleci/env_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ sudo python3 .circleci/download_google_fonts.py && \
55
sudo cp -r .circleci/fonts/ /usr/share/ && \
66
sudo fc-cache -f && \
77
# install kaleido & plotly
8-
sudo python3 -m pip install kaleido==0.2.1 plotly==5.2.1 --progress-bar off
8+
sudo python3 -m pip install kaleido==0.2.1 plotly==5.5.0 --progress-bar off

.circleci/test.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,19 @@ case $1 in
7474
exit $EXIT_STATE
7575
;;
7676

77+
mathjax-firefox82+)
78+
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --skip-tags=noFF82 --nowatch &&
79+
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --skip-tags=noFF82 --nowatch &&
80+
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --mathjax3 --nowatch &&
81+
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --nowatch || EXIT_STATE=$?
82+
exit $EXIT_STATE
83+
;;
84+
85+
make-baselines-mathjax3)
86+
python3 test/image/make_baseline.py mathjax3 legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax || EXIT_STATE=$?
87+
exit $EXIT_STATE
88+
;;
89+
7790
make-baselines)
7891
SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | sed 's/\.json$//1' | circleci tests split)
7992
python3 test/image/make_baseline.py $SUITE || EXIT_STATE=$?
@@ -85,6 +98,11 @@ case $1 in
8598
exit $EXIT_STATE
8699
;;
87100

101+
test-image-mathjax3)
102+
node test/image/compare_pixels_test.js mathjax3 || { tar -cvf build/baselines.tar build/test_images/*.png ; exit 1 ; } || EXIT_STATE=$?
103+
exit $EXIT_STATE
104+
;;
105+
88106
source-syntax)
89107
npm run lint || EXIT_STATE=$?
90108
npm run test-syntax || EXIT_STATE=$?

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
stackgl_modules
12
node_modules
23
dist
34
build

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ build/*
22
!build/plotcss.js
33
!build/README.md
44

5+
stackgl_modules/node_modules
6+
57
devtools
68
test
9+
draftlogs
710
dist/extras
811

912
circle.yml

CHANGELOG.md

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,163 @@ To see all merged commits on the master branch that will be part of the next plo
99

1010
where X.Y.Z is the semver of most recent plotly.js release.
1111

12+
## [2.12.0] -- 2022-05-02
13+
14+
### Added
15+
- Add `griddash` axis property to cartesian, polar, smith, ternary and geo subplots and add `griddash` and `minorgriddash` to `carpet` trace [[6144](https://github.com/plotly/plotly.js/pull/6144)], with thanks to @njwhite for the contribution!
16+
- Implement various options to position and style `minor` ticks and grid lines on cartesian axis types including
17+
`minor.tickmode`, `minor.tickvals`, `minor.tickcolor`, `minor.ticklen`, `minor.tickwidth`, `minor.dtick`, `minor.tick0`, `minor.nticks`, `minor.ticks`,
18+
`minor.showgrid`, `minor.gridcolor`, `minor.griddash` and `minor.gridwidth` [[6166](https://github.com/plotly/plotly.js/pull/6166)]
19+
20+
### Changed
21+
- Use the "willReadFrequently" 2d context creation attribute to optimize readback performance [[#6084](https://github.com/plotly/plotly.js/pull/6084)],
22+
with thanks to @junov for the contribution!
23+
24+
### Fixed
25+
- avoid drawing blank tick labels on cartesian axes [[#6163](https://github.com/plotly/plotly.js/pull/6163)]
26+
27+
28+
## [2.11.1] -- 2022-03-15
29+
30+
### Fixed
31+
- Regenerate functions of regl-based traces in the "strict" bundle [[#6141](https://github.com/plotly/plotly.js/pull/6141)]
32+
33+
34+
## [2.11.0] -- 2022-03-11
35+
36+
### Added
37+
- Add a CSP complaint variation of regl-based traces i.e. `parcoords`, `splom`, `scattergl`, `scatterpolargl` to the "strict" bundle [[#6083](https://github.com/plotly/plotly.js/pull/6083)]
38+
- Add `scattersmith` trace to the "strict" bundle [[#6135](https://github.com/plotly/plotly.js/pull/6135)]
39+
40+
41+
## [2.10.1] -- 2022-03-08
42+
43+
### Fixed
44+
- Fix `mesh3d` generation when `alphahull` is a positive number (regression introduced in 2.5.1) [[#6133](https://github.com/plotly/plotly.js/pull/6133)]
45+
46+
47+
## [2.10.0] -- 2022-03-04
48+
49+
### Added
50+
- Add support to use version 3 of MathJax and add `typesetMath` attribute to config [[#6073](https://github.com/plotly/plotly.js/pull/6073)],
51+
with thanks to [Equinor](https://www.equinor.com) for sponsoring the related development!
52+
- Add `fillpattern` options to `scatter` trace [[#6101](https://github.com/plotly/plotly.js/pull/6101)],
53+
with thanks to @s417-lama for the contribution!
54+
55+
56+
## [2.9.0] -- 2022-02-04
57+
58+
### Added
59+
- Implement `ticklabelstep` to reduce labels on 2D axes and colorbars [[#6088](https://github.com/plotly/plotly.js/pull/6088)],
60+
this feature was anonymously sponsored: thank you to our sponsor!
61+
62+
### Changed
63+
- Display the version of plotly.js when hovering over the modebar [[#6077](https://github.com/plotly/plotly.js/pull/6077)]
64+
- Various dependency updates as listed under [the v2.9.0 milestone](https://github.com/plotly/plotly.js/milestone/69?closed=1)
65+
66+
### Fixed
67+
- Fix vertical spacing of legend items in horizontal mode [[#6094](https://github.com/plotly/plotly.js/pull/6094)]
68+
69+
70+
## [2.8.3] -- 2021-12-20
71+
72+
### Fixed
73+
- Correct formatted x/y `texttempate` for `histogram` trace [[#6070](https://github.com/plotly/plotly.js/pull/6070)]
74+
75+
76+
## [2.8.2] -- 2021-12-20
77+
78+
### Fixed
79+
- Fix missing x/y `texttemplate` for `histogram`, `bar`, `funnel` and `waterfall` traces [[#6069](https://github.com/plotly/plotly.js/pull/6069)]
80+
81+
82+
## [2.8.1] -- 2021-12-15
83+
84+
### Fixed
85+
- Do not exceed layout font size when `textfont` is set to "auto" for `heatmap`, `histogram2d`, `contour` and
86+
`histogram2dcontour` traces [[#6061](https://github.com/plotly/plotly.js/pull/6061)]
87+
88+
89+
## [2.8.0] -- 2021-12-10
90+
91+
### Added
92+
- Introduce horizontal colorbars [[#6024](https://github.com/plotly/plotly.js/pull/6024)]
93+
- Implement `legend.grouptitlefont` and `hoverlabel.grouptitlefont` [[#6040](https://github.com/plotly/plotly.js/pull/6040)]
94+
- Add `texttemplate` and `textfont` to `heatmap` and `histogram2d` traces as well as
95+
`histogram2dcontour` and `contour` traces when `coloring` is set "heatmap" [[#6028](https://github.com/plotly/plotly.js/pull/6028)]
96+
97+
### Fixed
98+
- Fix to discard negative values from `pie` chart post-aggregation instead of during summation [[#6051](https://github.com/plotly/plotly.js/pull/6051)],
99+
with thanks to @destiny-wu for the contribution!
100+
101+
102+
## [2.7.0] -- 2021-12-02
103+
104+
### Added
105+
- Add `texttemplate`, `textposition`, `textfont`, `textangle`,
106+
`outsidetextfont`, `insidetextfont`, `insidetextanchor`,
107+
`constraintext` and `cliponaxis` to `histogram` trace [[#6038](https://github.com/plotly/plotly.js/pull/6038)]
108+
109+
### Changed
110+
- Bump `probe-image-size` module to v7.2.2 [[#6036](https://github.com/plotly/plotly.js/pull/6036)]
111+
112+
### Fixed
113+
- Fix mapbox derived coordinate for Retina displays [[#6039](https://github.com/plotly/plotly.js/pull/6039)]
114+
- Fix interaction between `uirevision` and `autorange`. Because we push `autorange` and `range` back into `layout`,
115+
there can be times it looks like we're applying GUI-driven changes on top of explicit autorange and other times
116+
it's an implicit autorange, even though the user's intent was always implicit. This fix treats them as equivalent. [[#6046](https://github.com/plotly/plotly.js/pull/6046)]
117+
118+
119+
## [2.6.4] -- 2021-11-26
120+
121+
### Fixed
122+
- Avoid bar with text to jump when selected [[#6043](https://github.com/plotly/plotly.js/pull/6043)]
123+
124+
125+
## [2.6.3] -- 2021-11-12
126+
127+
### Fixed
128+
- Fix hover events in Shadow DOM [[#6021](https://github.com/plotly/plotly.js/pull/6021)],
129+
with thanks to @SabineWren for the contribution!
130+
131+
132+
## [2.6.2] -- 2021-11-05
133+
134+
### Fixed
135+
- Fix loading issue in [orca](https://github.com/plotly/orca) (regression introduced in 2.6.0) [[#6011](https://github.com/plotly/plotly.js/pull/6011)]
136+
137+
138+
## [2.6.1] -- 2021-11-03
139+
140+
### Fixed
141+
- Fix to avoid including local stackgl_modules/node_modules in the package (regression introduced in 2.6.0) [[#6008](https://github.com/plotly/plotly.js/pull/6008)]
142+
143+
144+
## [2.6.0] -- 2021-10-29
145+
146+
### Added
147+
- Add `smith` subplots and the `scattersmith` trace type for displaying Smith charts [[#5956](https://github.com/plotly/plotly.js/pull/5956), [#5992](https://github.com/plotly/plotly.js/pull/5992)],
148+
with thanks to Kitware and @waxlamp for kicking off this effort.
149+
150+
### Changed
151+
- Improve drawing the contour lines in non-linear space e.g. on log axes [[#5985](https://github.com/plotly/plotly.js/pull/5985)], with thanks to @andrew-matteson for the contribution!
152+
- Bump eslint to v8 release candidate including fixes for `no-new-func` test [[#5969](https://github.com/plotly/plotly.js/pull/5969)]
153+
154+
### Fixed
155+
- Fix `npm install` problem for `npm v6` users (regression introduced in 2.5.0) [[#6004](https://github.com/plotly/plotly.js/pull/6004)]
156+
- Fix unhover event data for gl3d subplots [[#5954](https://github.com/plotly/plotly.js/pull/5954)],
157+
with thanks to @dwoznicki for the contribution!
158+
- Fix scatter3d opacity restyle bug [[#5958](https://github.com/plotly/plotly.js/pull/5958)],
159+
with thanks to @dwoznicki for the contribution!
160+
- Skip `"hoverinfo": "none"` trace display for hover modes [[#5854](https://github.com/plotly/plotly.js/pull/5854)],
161+
with thanks to @Domino987 for the contribution!
162+
- Display prefix and suffix of invisible polar axes in hover [[#5964](https://github.com/plotly/plotly.js/pull/5964)]
163+
- Reduce calls to `getBoundingClientRect` in `convertToTspans` [[#5976](https://github.com/plotly/plotly.js/pull/5976)]
164+
- Avoid wrapping legend items if already on the first column [[#5996](https://github.com/plotly/plotly.js/pull/5996)]
165+
- Fix horizontal alignment of colorbar in editable mode when `xanchor` is set to "center" [[#6002](https://github.com/plotly/plotly.js/pull/6002)]
166+
- Fix to improve rendering of graphs with Mathjax on Firefox v82 and higher [[#5993](https://github.com/plotly/plotly.js/pull/5993)]
167+
168+
12169
## [2.5.1] -- 2021-09-16
13170

14171
### Fixed

0 commit comments

Comments
 (0)