Merge remote-tracking branch 'origin/master' into handle-coded-typed-arrays

Author: archmoj

.circleci/config.yml

@@ -122,6 +122,26 @@ jobs:
           name: Run jasmine tests (part B)
           command: .circleci/test.sh webgl-jasmine
 
+  virtual-webgl-jasmine:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: cimg/node:16.17.1-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
+    parallelism: 8
+    working_directory: ~/plotly.js
+    steps:
+      - browser-tools/install-browser-tools: &browser-versions
+          chrome-version: 110.0.5481.100
+          install-firefox: false
+          install-geckodriver: false
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Run jasmine tests (part B)
+          command: .circleci/test.sh virtual-webgl-jasmine
+
   flaky-no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
@@ -216,6 +236,25 @@ jobs:
           name: Test MathJax on firefox-latest
           command: .circleci/test.sh mathjax-firefox82+
 
+  make-baselines-virtual-webgl:
+    parallelism: 2
+    docker:
+      - image: circleci/python:3.8.9
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Install kaleido, plotly.io and required fonts
+          command: .circleci/env_image.sh
+      - run:
+          name: Create png files using virtual-webgl & WebGL v1
+          command: .circleci/test.sh make-baselines-virtual-webgl
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - plotly.js
+
   make-baselines-mathjax3:
     docker:
       - image: circleci/python:3.8.9
@@ -286,6 +325,20 @@ jobs:
           path: build
           destination: /
 
+  test-baselines-virtual-webgl:
+    docker:
+      - image: circleci/node:16.9.0
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Compare pixels
+          command: .circleci/test.sh test-image-virtual-webgl ; find build -maxdepth 1 -type f -delete
+      - store_artifacts:
+          path: build
+          destination: /
+
   test-baselines-b64:
     docker:
       - image: circleci/node:16.9.0
@@ -474,9 +527,18 @@ workflows:
       - webgl-jasmine:
           requires:
             - install-and-cibuild
+      - virtual-webgl-jasmine:
+          requires:
+            - install-and-cibuild
       - flaky-no-gl-jasmine:
           requires:
             - install-and-cibuild
+      - make-baselines-virtual-webgl:
+          requires:
+            - install-and-cibuild
+      - test-baselines-virtual-webgl:
+          requires:
+            - make-baselines-virtual-webgl
       - make-baselines-mathjax3:
           requires:
             - install-and-cibuild

.circleci/test.sh

@@ -53,6 +53,16 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
+    virtual-webgl-jasmine)
+        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
+        for s in ${SHARDS[@]}; do
+            MAX_AUTO_RETRY=2
+            retry ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --virtualWebgl --tags=gl --skip-tags=noCI,noVirtualWebgl --doNotFailOnEmptyTestSuite -- "$s"
+        done
+
+        exit $EXIT_STATE
+        ;;
+
     flaky-no-gl-jasmine)
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
 
@@ -82,6 +92,15 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
+    make-baselines-virtual-webgl)
+        SUITE=$({\
+                  find $ROOT/test/image/mocks/gl*     -type f -printf "%f\n"; \
+                  find $ROOT/test/image/mocks/mapbox* -type f -printf "%f\n"; \
+                } | sed 's/\.json$//1' | circleci tests split)
+        python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
     make-baselines-mathjax3)
         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=$?
         exit $EXIT_STATE
@@ -109,6 +128,11 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
+    test-image-virtual-webgl)
+        node test/image/compare_pixels_test.js virtual-webgl || { tar -cvf build/baselines.tar build/test_images/*.png ; exit 1 ; } || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
     source-syntax)
         npm run lint        || EXIT_STATE=$?
         npm run test-syntax || EXIT_STATE=$?

CHANGELOG.md

@@ -9,6 +9,15 @@ To see all merged commits on the master branch that will be part of the next plo
 
 where X.Y.Z is the semver of most recent plotly.js release.
 
+## [2.27.1] -- 2023-11-08
+
+### Changed
+ - Adjust stamen styles to point to `stadiamaps.com`, the users may also need to provide their own API_KEY via `config.mapboxAccessToken` [[#6776](https://github.com/plotly/plotly.js/pull/6776), [#6778](https://github.com/plotly/plotly.js/pull/6778)]
+
+### Fixed
+ - Fix handling multi-line text in title `automargin` [[#6758](https://github.com/plotly/plotly.js/pull/6758)]
+
+
 ## [2.27.0] -- 2023-10-20
 
 ### Added

README.md

@@ -55,7 +55,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
 
 ```html
 <head>
-    <script src="https://cdn.plot.ly/plotly-2.27.0.min.js" charset="utf-8"></script>
+    <script src="https://cdn.plot.ly/plotly-2.27.1.min.js" charset="utf-8"></script>
 </head>
 <body>
     <div id="gd"></div>
@@ -72,7 +72,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
 Alternatively you may consider using [native ES6 import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) in the script tag.
 ```html
 <script type="module">
-    import "https://cdn.plot.ly/plotly-2.27.0.min.js"
+    import "https://cdn.plot.ly/plotly-2.27.1.min.js"
     Plotly.newPlot("gd", [{ y: [1, 2, 3] }])
 </script>
 ```
@@ -82,7 +82,7 @@ Fastly supports Plotly.js with free CDN service. Read more at <https://www.fastl
 ### Un-minified versions are also available on CDN
 While non-minified source files may contain characters outside UTF-8, it is recommended that you specify the `charset` when loading those bundles.
 ```html
-<script src="https://cdn.plot.ly/plotly-2.27.0.js" charset="utf-8"></script>
+<script src="https://cdn.plot.ly/plotly-2.27.1.js" charset="utf-8"></script>
 ```
 
 > Please note that as of v2 the "plotly-latest" outputs (e.g. https://cdn.plot.ly/plotly-latest.min.js) will no longer be updated on the CDN, and will stay at the last v1 patch v1.58.5. Therefore, to use the CDN with plotly.js v2 and higher, you must specify an exact plotly.js version.

dist/README.md

@@ -46,9 +46,9 @@ The main plotly.js bundles weight in at:
 | 8.2 MB | 3.4 MB | 1 MB | 8.4 MB |
 
 #### CDN links
-> https://cdn.plot.ly/plotly-2.27.0.js
+> https://cdn.plot.ly/plotly-2.27.1.js
 
-> https://cdn.plot.ly/plotly-2.27.0.min.js
+> https://cdn.plot.ly/plotly-2.27.1.min.js
 
 
 #### npm packages
@@ -91,12 +91,12 @@ The `basic` partial bundle contains trace modules `bar`, `pie` and `scatter`.
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 2.6 MB | 975 kB | 326.1 kB |
+| 2.6 MB | 975.2 kB | 326.2 kB |
 
 #### CDN links
-> https://cdn.plot.ly/plotly-basic-2.27.0.js
+> https://cdn.plot.ly/plotly-basic-2.27.1.js
 
-> https://cdn.plot.ly/plotly-basic-2.27.0.min.js
+> https://cdn.plot.ly/plotly-basic-2.27.1.min.js
 
 
 #### npm packages
@@ -114,12 +114,12 @@ The `cartesian` partial bundle contains trace modules `bar`, `box`, `contour`, `
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 3.3 MB | 1.2 MB | 412.4 kB |
+| 3.3 MB | 1.2 MB | 412.5 kB |
 
 #### CDN links
-> https://cdn.plot.ly/plotly-cartesian-2.27.0.js
+> https://cdn.plot.ly/plotly-cartesian-2.27.1.js
 
-> https://cdn.plot.ly/plotly-cartesian-2.27.0.min.js
+> https://cdn.plot.ly/plotly-cartesian-2.27.1.min.js
 
 
 #### npm packages
@@ -137,12 +137,12 @@ The `geo` partial bundle contains trace modules `choropleth`, `scatter` and `sca
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 3.1 MB | 1.1 MB | 370.1 kB |
+| 3.1 MB | 1.1 MB | 370.2 kB |
 
 #### CDN links
-> https://cdn.plot.ly/plotly-geo-2.27.0.js
+> https://cdn.plot.ly/plotly-geo-2.27.1.js
 
-> https://cdn.plot.ly/plotly-geo-2.27.0.min.js
+> https://cdn.plot.ly/plotly-geo-2.27.1.min.js
 
 
 #### npm packages
@@ -160,12 +160,12 @@ The `gl3d` partial bundle contains trace modules `cone`, `isosurface`, `mesh3d`,
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 3.6 MB | 1.5 MB | 490.7 kB |
+| 3.6 MB | 1.5 MB | 490.8 kB |
 
 #### CDN links
-> https://cdn.plot.ly/plotly-gl3d-2.27.0.js
+> https://cdn.plot.ly/plotly-gl3d-2.27.1.js
 
-> https://cdn.plot.ly/plotly-gl3d-2.27.0.min.js
+> https://cdn.plot.ly/plotly-gl3d-2.27.1.min.js
 
 
 #### npm packages
@@ -183,12 +183,12 @@ The `gl2d` partial bundle contains trace modules `heatmapgl`, `parcoords`, `poin
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 4.4 MB | 1.8 MB | 596.5 kB |
+| 4.4 MB | 1.8 MB | 596.6 kB |
 
 #### CDN links
-> https://cdn.plot.ly/plotly-gl2d-2.27.0.js
+> https://cdn.plot.ly/plotly-gl2d-2.27.1.js
 
-> https://cdn.plot.ly/plotly-gl2d-2.27.0.min.js
+> https://cdn.plot.ly/plotly-gl2d-2.27.1.min.js
 
 
 #### npm packages
@@ -206,12 +206,12 @@ The `mapbox` partial bundle contains trace modules `choroplethmapbox`, `densitym
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 4.4 MB | 1.7 MB | 527.3 kB |
+| 4.4 MB | 1.7 MB | 527.4 kB |
 
 #### CDN links
-> https://cdn.plot.ly/plotly-mapbox-2.27.0.js
+> https://cdn.plot.ly/plotly-mapbox-2.27.1.js
 
-> https://cdn.plot.ly/plotly-mapbox-2.27.0.min.js
+> https://cdn.plot.ly/plotly-mapbox-2.27.1.min.js
 
 
 #### npm packages
@@ -229,12 +229,12 @@ The `finance` partial bundle contains trace modules `bar`, `candlestick`, `funne
 
 | Raw size | Minified size | Minified + gzip size |
 |------|-----------------|------------------------|
-| 2.8 MB | 1 MB | 354.8 kB |
+| 2.8 MB | 1 MB | 354.9 kB |
 
 #### CDN links
-> https://cdn.plot.ly/plotly-finance-2.27.0.js
+> https://cdn.plot.ly/plotly-finance-2.27.1.js
 
-> https://cdn.plot.ly/plotly-finance-2.27.0.min.js
+> https://cdn.plot.ly/plotly-finance-2.27.1.min.js
 
 
 #### npm packages
@@ -255,9 +255,9 @@ The `strict` partial bundle contains trace modules `bar`, `barpolar`, `box`, `ca
 | 8.6 MB | 3.7 MB | 1.1 MB |
 
 #### CDN links
-> https://cdn.plot.ly/plotly-strict-2.27.0.js
+> https://cdn.plot.ly/plotly-strict-2.27.1.js
 
-> https://cdn.plot.ly/plotly-strict-2.27.0.min.js
+> https://cdn.plot.ly/plotly-strict-2.27.1.min.js
 
 
 #### npm packages

dist/plotly-basic.js

@@ -1,5 +1,5 @@
 /**
-* plotly.js (basic) v2.27.0
+* plotly.js (basic) v2.27.1
 * Copyright 2012-2023, Plotly, Inc.
 * All rights reserved.
 * Licensed under the MIT license
@@ -35180,6 +35180,17 @@ exports.drawMainTitle = function (gd) {
         'text-anchor': textAnchor,
         dy: getMainTitleDyAdj(title.yanchor)
       }).call(svgTextUtils.positionText, x, y);
+      var extraLines = (title.text.match(svgTextUtils.BR_TAG_ALL) || []).length;
+      if (extraLines) {
+        var delta = alignmentConstants.LINE_SPACING * extraLines + alignmentConstants.MID_SHIFT;
+        if (title.y === 0) {
+          delta = -delta;
+        }
+        titleObj.selectAll('.line').each(function () {
+          var newDy = +this.getAttribute('dy').slice(0, -2) - delta + 'em';
+          this.setAttribute('dy', newDy);
+        });
+      }
     }
   }
 };
@@ -60645,7 +60656,7 @@ function getSortFunc(opts, d2c) {
 
 
 // package version injected by `npm run preprocess`
-exports.version = '2.27.0';
+exports.version = '2.27.1';
 
 /***/ }),
 

dist/plotly-basic.min.js

@@ -1,5 +1,5 @@
 /**
-* plotly.js (cartesian) v2.27.0
+* plotly.js (cartesian) v2.27.1
 * Copyright 2012-2023, Plotly, Inc.
 * All rights reserved.
 * Licensed under the MIT license
@@ -35338,6 +35338,17 @@ exports.drawMainTitle = function (gd) {
         'text-anchor': textAnchor,
         dy: getMainTitleDyAdj(title.yanchor)
       }).call(svgTextUtils.positionText, x, y);
+      var extraLines = (title.text.match(svgTextUtils.BR_TAG_ALL) || []).length;
+      if (extraLines) {
+        var delta = alignmentConstants.LINE_SPACING * extraLines + alignmentConstants.MID_SHIFT;
+        if (title.y === 0) {
+          delta = -delta;
+        }
+        titleObj.selectAll('.line').each(function () {
+          var newDy = +this.getAttribute('dy').slice(0, -2) - delta + 'em';
+          this.setAttribute('dy', newDy);
+        });
+      }
     }
   }
 };
@@ -71089,7 +71100,7 @@ function getSortFunc(opts, d2c) {
 
 
 // package version injected by `npm run preprocess`
-exports.version = '2.27.0';
+exports.version = '2.27.1';
 
 /***/ }),
 
@@ -91218,6 +91229,7 @@ process.umask = function() { return 0; };
 /***/ 71665:
 /***/ (function(module, exports, __webpack_require__) {
 
+/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 /* eslint-disable node/no-deprecated-api */
 var buffer = __webpack_require__(12856)
 var Buffer = buffer.Buffer