Merge remote-tracking branch 'origin/master' into cam/5192/add-min-max-scale-limits

camdecoster · camdecoster · commit 0a1f133d3189 · 2025-07-23T11:21:05.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,17 @@ 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.
 
+
+## [3.0.2] -- 2025-07-22
+
+### Fixed
+ - Fix installing dependencies in node v22 [[#7381](https://github.com/plotly/plotly.js/pull/7381)], with thanks to @chaigh-uk for the contribution!
+ - Fix Persian calendar leap year [[#7456](https://github.com/plotly/plotly.js/pull/7456)]
+ - Fix scroll wheel zoom for geo subplots in Safari [#7474](https://github.com/plotly/plotly.js/pull/7474)
+ - Add method to check for WebKit WebView user agent string [[#7479](https://github.com/plotly/plotly.js/pull/7479)]
+ - Fix edit colorbar title [7487](https://github.com/plotly/plotly.js/pull/7487)
+
+
 ## [3.1.0-rc.0] -- 2025-07-15
 
 ### Added
@@ -19,7 +30,7 @@ where X.Y.Z is the semver of most recent plotly.js release.
  with thanks to @my-tien for the contribution!
 
 ### Changed
- - Switch to United Nations (coastlines, countries, land, ocean) + Natural Earth (lakes, rivers, subunits) geodata for building topojson used in geo plot
+ - Switch to United Nations (coastlines, countries, land, ocean) + Natural Earth (lakes, rivers, subunits) geodata for building topojson used in geo plot [[#7393](https://github.com/plotly/plotly.js/pull/7393)]
  - Make 'png' all caps [[#7400](https://github.com/plotly/plotly.js/pull/7400)]
 
 ### Fixed
diff --git a/draftlogs/7470_fix.md b/draftlogs/7470_fix.md
@@ -0,0 +1,2 @@
+- Fix editable shapes (regression introduced in 2.34.0) [[#7470](https://github.com/plotly/plotly.js/pull/7470)],
+  with thanks to @my-tien for the contribution!
diff --git a/draftlogs/7479_fix.md b/draftlogs/7479_fix.md
@@ -0,0 +1 @@
+- Add method to check for WebKit WebView user agent string [[#7479](https://github.com/plotly/plotly.js/pull/7479)]
diff --git a/draftlogs/7481_change.md b/draftlogs/7481_change.md
@@ -0,0 +1 @@
+- Refactor files related to UN topojson [[#7481](https://github.com/plotly/plotly.js/pull/7481)]
diff --git a/draftlogs/7487_fix.md b/draftlogs/7487_fix.md
@@ -0,0 +1 @@
+ - Fix edit colorbar title [7487](https://github.com/plotly/plotly.js/pull/7487)
diff --git a/src/assets/geo_assets.js b/src/assets/geo_assets.js
@@ -1,22 +1,21 @@
 'use strict';
 
-// TODO: Remove comments from Antarctica, Oceania during new maps release PR
 const topojson = {
   africa_110m: require('../../dist/topojson/africa_110m.json'),
-  // antarctica_110m: require('../../dist/topojson/antarctica_110m.json'),
+  antarctica_110m: require('../../dist/topojson/antarctica_110m.json'),
   asia_110m: require('../../dist/topojson/asia_110m.json'),
   europe_110m: require('../../dist/topojson/europe_110m.json'),
   'north-america_110m': require('../../dist/topojson/north-america_110m.json'),
-  // oceania_110m: require('../../dist/topojson/oceania_110m.json'),
+  oceania_110m: require('../../dist/topojson/oceania_110m.json'),
   'south-america_110m': require('../../dist/topojson/south-america_110m.json'),
   usa_110m: require('../../dist/topojson/usa_110m.json'),
   world_110m: require('../../dist/topojson/world_110m.json'),
   africa_50m: require('../../dist/topojson/africa_50m.json'),
-  // antarctica_50m: require('../../dist/topojson/antarctica_50m.json'),
+  antarctica_50m: require('../../dist/topojson/antarctica_50m.json'),
   asia_50m: require('../../dist/topojson/asia_50m.json'),
   europe_50m: require('../../dist/topojson/europe_50m.json'),
   'north-america_50m': require('../../dist/topojson/north-america_50m.json'),
-  // oceania_50m: require('../../dist/topojson/oceania_50m.json'),
+  oceania_50m: require('../../dist/topojson/oceania_50m.json'),
   'south-america_50m': require('../../dist/topojson/south-america_50m.json'),
   usa_50m: require('../../dist/topojson/usa_50m.json'),
   world_50m: require('../../dist/topojson/world_50m.json'),
diff --git a/src/components/shapes/draw_newshape/newshapes.js b/src/components/shapes/draw_newshape/newshapes.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var axis_ids = require('../../../plots/cartesian/axis_ids');
+
 var dragHelpers = require('../../dragelement/helpers');
 var drawMode = dragHelpers.drawMode;
 var openMode = dragHelpers.openMode;
@@ -84,10 +86,23 @@ function newShapes(outlines, dragOptions) {
                 case 'line':
                 case 'rect':
                 case 'circle':
-                    modifyItem('x0', afterEdit.x0 - (beforeEdit.x0shift || 0));
-                    modifyItem('x1', afterEdit.x1 - (beforeEdit.x1shift || 0));
-                    modifyItem('y0', afterEdit.y0 - (beforeEdit.y0shift || 0));
-                    modifyItem('y1', afterEdit.y1 - (beforeEdit.y1shift || 0));
+
+                    var xaxis = axis_ids.getFromId(gd, beforeEdit.xref);
+                    if (beforeEdit.xref.charAt(0) === 'x' && xaxis.type.includes('category')) {
+                        modifyItem('x0', afterEdit.x0 - (beforeEdit.x0shift || 0));
+                        modifyItem('x1', afterEdit.x1 - (beforeEdit.x1shift || 0));
+                    } else {
+                        modifyItem('x0', afterEdit.x0);
+                        modifyItem('x1', afterEdit.x1);
+                    }
+                    var yaxis = axis_ids.getFromId(gd, beforeEdit.yref);
+                    if (beforeEdit.yref.charAt(0) === 'y' && yaxis.type.includes('category')) {
+                        modifyItem('y0', afterEdit.y0 - (beforeEdit.y0shift || 0));
+                        modifyItem('y1', afterEdit.y1 - (beforeEdit.y1shift || 0));
+                    } else {
+                        modifyItem('y0', afterEdit.y0);
+                        modifyItem('y1', afterEdit.y1);
+                    }
                     break;
 
                 case 'path':
diff --git a/src/components/titles/index.js b/src/components/titles/index.js
@@ -22,7 +22,7 @@ var SUBTITLE_PADDING_EM = 1.6;
  * @param {DOM element} gd - the graphDiv
  * @param {string} titleClass - the css class of this title
  * @param {object} options - how and what to draw
- *      propContainer - the layout object containing the `title` attribute that 
+ *      propContainer - the layout object containing the `title` attribute that
  *          applies to this title
  *      propName - the full name of the title property (for Plotly.relayout)
  *      [traceIndex] - include only if this property applies to one trace
@@ -102,7 +102,7 @@ function draw(gd, titleClass, options) {
     var editAttr;
     if(prop === 'title.text') editAttr = 'titleText';
     else if(prop.indexOf('axis') !== -1) editAttr = 'axisTitleText';
-    else if(prop.indexOf('colorbar' !== -1)) editAttr = 'colorbarTitleText';
+    else if(prop.indexOf('colorbar') !== -1) editAttr = 'colorbarTitleText';
     var editable = gd._context.edits[editAttr];
 
     function matchesPlaceholder(text, placeholder) {
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -765,6 +765,12 @@ lib.isIOS = function() {
     return IS_IOS_REGEX.test(window.navigator.userAgent);
 };
 
+// The WKWebView user agent string doesn't include 'Safari', so we need a separate test
+// for a UA string like this:
+// Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)
+const IS_MAC_WKWEBVIEW_REGEX = /Macintosh.+AppleWebKit.+Gecko\)$/;
+lib.isMacWKWebView = () => IS_MAC_WKWEBVIEW_REGEX.test(window.navigator.userAgent);
+
 var FIREFOX_VERSION_REGEX = /Firefox\/(\d+)\.\d+/;
 lib.getFirefoxVersion = function() {
     var match = FIREFOX_VERSION_REGEX.exec(window.navigator.userAgent);
diff --git a/src/lib/supports_pixelated_image.js b/src/lib/supports_pixelated_image.js
@@ -19,7 +19,7 @@ function supportsPixelatedImage() {
     _supportsPixelated = false;
 
     // @see https://github.com/plotly/plotly.js/issues/6604
-    var unsupportedBrowser = Lib.isSafari() || Lib.isIOS();
+    var unsupportedBrowser = Lib.isSafari() || Lib.isMacWKWebView() || Lib.isIOS();
 
     if(window.navigator.userAgent && !unsupportedBrowser) {
         var declarations = Array.from(constants.CSS_DECLARATIONS).reverse();
diff --git a/tasks/cdn_publish.sh b/tasks/cdn_publish.sh
@@ -29,13 +29,11 @@ for path in `ls $dist/plotly*`; do
 done
 
 # copy topojson files over to the sync folder
-# NOTE: Temporarily adding the suffix '_un' to avoid overwriting the old topojson
-# which some old plots might depend on
-for filepath in $dist/topojson/*.json; do
-    f=${filepath##*/}
-    f=${f%.*}
-    cp $filepath "$sync/${f%.*}_un.json"
-done
+# NOTE: Temporarily syncing topojson to 'un' folder to avoid overwriting the old topojson
+# which some old plots might depend on. These can be accessed by setting 'topojsonURL' to
+# 'https://cdn.plot.ly/un/' in the Plotly config.
+mkdir $sync/un
+cp $dist/topojson/* $sync/un
 
 # list folder and files
 echo $sync
diff --git a/test/jasmine/karma.conf.js b/test/jasmine/karma.conf.js
@@ -192,7 +192,7 @@ func.defaultConfig = {
     // N.B. the rest of this field is filled below
     files: [
         pathToCustomMatchers,
-        // available to fetch from /base/node_modules/mathjax-v2/
+        // available to fetch from /base/node_modules/@plotly/mathjax-v2/
         // more info: http://karma-runner.github.io/3.0/config/files.html
         {pattern: pathToMathJax2 + '/**', included: false, watched: false, served: true},
         {pattern: pathToMathJax3 + '/**', included: false, watched: false, served: true},
diff --git a/test/jasmine/tests/draw_newshape_test.js b/test/jasmine/tests/draw_newshape_test.js
diff --git a/test/jasmine/tests/lib_test.js b/test/jasmine/tests/lib_test.js
diff --git a/topojson/bin/process_geodata.mjs b/topojson/bin/process_geodata.mjs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+- Fix editable shapes (regression introduced in 2.34.0) [[#7470](https://github.com/plotly/plotly.js/pull/7470)],`
	`2`	`+ with thanks to @my-tien for the contribution!`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+- Add method to check for WebKit WebView user agent string [[#7479](https://github.com/plotly/plotly.js/pull/7479)]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+- Refactor files related to UN topojson [[#7481](https://github.com/plotly/plotly.js/pull/7481)]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ - Fix edit colorbar title [7487](https://github.com/plotly/plotly.js/pull/7487)`