Merge remote-tracking branch 'origin/master' into finalist-cluster-scattermapbox

Author: archmoj

devtools/test_dashboard/devtools.js

@@ -6,8 +6,6 @@ var Fuse = require('fuse.js/dist/fuse.common.js');
 var mocks = require('../../build/test_dashboard_mocks.json');
 var credentials = require('../../build/credentials.json');
 var Lib = require('@src/lib');
-var d3 = require('../../test/strict-d3');
-var d3Json = d3.json;
 
 require('./perf');
 
@@ -60,23 +58,23 @@ var Tabs = {
     plotMock: function(mockName, id) {
         var mockURL = '/test/image/mocks/' + mockName + '.json';
 
-        d3Json(mockURL, function(err, fig) {
-            Plotly.newPlot(Tabs.fresh(id), fig);
-
-            console.warn('Plotting:', mockURL);
-        });
-    },
-
-    getMock: function(mockName, callback) {
-        var mockURL = '/test/image/mocks/' + mockName + '.json';
-
-        d3Json(mockURL, function(err, fig) {
-            if(typeof callback !== 'function') {
-                window.mock = fig;
-            } else {
-                callback(err, fig);
+        console.warn('Plotting:', mockURL);
+
+        var request = new XMLHttpRequest();
+        request.open('GET', mockURL, true);
+        request.responseType = '';
+        request.send();
+
+        request.onreadystatechange = function() {
+            if(this.readyState === 4) {
+                if(this.status === 200) {
+                    var fig = JSON.parse(this.responseText);
+                    Plotly.newPlot(Tabs.fresh(id), fig);
+                } else {
+                    console.error(this.statusText);
+                }
             }
-        });
+        };
     },
 
     // Save a png snapshot and display it below the plot
@@ -152,7 +150,6 @@ var Tabs = {
 // Bind things to the window
 window.Tabs = Tabs;
 window.Lib = Lib;
-window.d3 = d3;
 window.onload = handleOnLoad;
 setInterval(function() {
     window.gd = Tabs.getGraph() || Tabs.fresh();

draftlogs/5832_change.md

@@ -0,0 +1 @@
+ - Simplify devtool by relying on `XMLHttpRequest` instead of `d3.json` [[#5832](https://github.com/plotly/plotly.js/pull/5832)]

draftlogs/5836_fix.md

@@ -0,0 +1 @@
+ - Fix `scatter` and `scattergl` hover on axes with period and adjust the unified hover position in respect to mean [[#5836](https://github.com/plotly/plotly.js/pull/5836)]

draftlogs/5838_fix.md

@@ -0,0 +1,2 @@
+ - Fix unknown filename when exporting charts using new versions of Safari [[#5609](https://github.com/plotly/plotly.js/pull/5609), [5838](https://github.com/plotly/plotly.js/pull/5838)],
+ with thanks to @rlreamy for the contribution!

package-lock.json

@@ -24,14 +24,15 @@
     "custom-bundle": "node tasks/custom_bundle.js",
     "bundle": "node tasks/bundle.js",
     "extra-bundles": "node tasks/extra_bundles.js",
+    "locales": "node tasks/locales.js",
     "schema": "node tasks/schema.js",
     "stats": "node tasks/stats.js",
     "find-strings": "node tasks/find_locale_strings.js",
     "preprocess": "node tasks/preprocess.js",
     "use-draftlogs": "node tasks/use_draftlogs.js",
     "empty-draftlogs": "node tasks/empty_draftlogs.js",
     "empty-dist": "node tasks/empty_dist.js",
-    "build": "npm run empty-dist && npm run preprocess && npm run find-strings && npm run bundle && npm run extra-bundles && npm run schema dist && npm run stats",
+    "build": "npm run empty-dist && npm run preprocess && npm run find-strings && npm run bundle && npm run extra-bundles basic && npm run extra-bundles cartesian && npm run extra-bundles geo && npm run extra-bundles gl2d && npm run extra-bundles gl3d && npm run extra-bundles mapbox && npm run extra-bundles finance && npm run extra-bundles strict && npm run locales && npm run schema dist && npm run stats",
     "cibuild": "npm run empty-dist && npm run preprocess && node tasks/cibundle.js",
     "watch": "node tasks/watch.js",
     "lint": "eslint --version && eslint .",
@@ -149,19 +150,19 @@
     "deep-equal": "^2.0.5",
     "derequire": "^2.1.1",
     "ecstatic": "^4.1.4",
-    "eslint": "^7.28.0",
+    "eslint": "^7.31.0",
     "espree": "^7.3.1",
     "extra-iterable": "^2.5.22",
     "falafel": "^2.2.4",
     "fs-extra": "^10.0.0",
     "fuse.js": "^6.4.6",
-    "glob": "^7.1.6",
+    "glob": "^7.1.7",
     "gzip-size": "^6.0.0",
     "into-stream": "^6.0.0",
     "jasmine-core": "^3.5.0",
     "jsdom": "^16.6.0",
     "karma": "^6.3.4",
-    "karma-browserify": "^8.0.0",
+    "karma-browserify": "^8.1.0",
     "karma-chrome-launcher": "^3.1.0",
     "karma-firefox-launcher": "^2.1.1",
     "karma-ie-launcher": "^1.0.0",
@@ -176,14 +177,14 @@
     "minify-stream": "^2.1.0",
     "mkdirp": "^1.0.4",
     "npm-link-check": "^4.0.0",
-    "open": "^8.2.0",
+    "open": "^8.2.1",
     "pixelmatch": "^5.2.1",
     "prepend-file": "^2.0.0",
     "prettysize": "^2.0.0",
     "read-last-lines": "^1.8.0",
     "run-series": "^1.1.9",
     "sane-topojson": "^4.0.0",
-    "sass": "^1.35.1",
+    "sass": "^1.35.2",
     "through2": "^4.0.2",
     "true-case-path": "^2.2.1",
     "watchify": "^4.0.0"

package.json

@@ -1072,8 +1072,11 @@ function createHoverText(hoverData, opts, gd) {
 
         // Position the hover
         var winningPoint = hoverData[0];
-        var ly = (winningPoint.y0 + winningPoint.y1) / 2;
-        var lx = (winningPoint.x0 + winningPoint.x1) / 2;
+        var ly = axLetter === 'y' ?
+            (winningPoint.y0 + winningPoint.y1) / 2 : Lib.mean(hoverData.map(function(c) {return (c.y0 + c.y1) / 2;}));
+        var lx = axLetter === 'x' ?
+            (winningPoint.x0 + winningPoint.x1) / 2 : Lib.mean(hoverData.map(function(c) {return (c.x0 + c.x1) / 2;}));
+
         var legendContainer = container.select('g.legend');
         var tbb = legendContainer.node().getBoundingClientRect();
         lx += xa._offset;

src/components/fx/hover.js

@@ -23,13 +23,6 @@ function fileSaver(url, name, format) {
         var blob;
         var objectUrl;
 
-        // Safari doesn't allow downloading of blob urls
-        if(Lib.isSafari()) {
-            var prefix = format === 'svg' ? ',' : ';base64,';
-            helpers.octetStream(prefix + encodeURIComponent(url));
-            return resolve(name);
-        }
-
         // IE 10+ (native saveAs)
         if(Lib.isIE()) {
             // At this point we are only dealing with a decoded SVG as
@@ -56,6 +49,13 @@ function fileSaver(url, name, format) {
             return resolve(name);
         }
 
+        // Older versions of Safari did not allow downloading of blob urls
+        if(Lib.isSafari()) {
+            var prefix = format === 'svg' ? ',' : ';base64,';
+            helpers.octetStream(prefix + encodeURIComponent(url));
+            return resolve(name);
+        }
+
         reject(new Error('download error'));
     });
 

src/snapshot/filesaver.js

@@ -51,23 +51,13 @@ function calc(gd, trace) {
         calcAxisExpansion(gd, trace, xa, ya, x, y, ppad);
     }
 
-    var hasPeriodX = !!trace.xperiodalignment;
-    var hasPeriodY = !!trace.yperiodalignment;
-
     for(i = 0; i < serieslen; i++) {
         var cdi = cd[i] = {};
         var xValid = isNumeric(x[i]);
         var yValid = isNumeric(y[i]);
         if(xValid && yValid) {
             cdi[xAttr] = x[i];
             cdi[yAttr] = y[i];
-
-            if(hasPeriodX) {
-                cdi.orig_x = origX[i]; // used by hover
-            }
-            if(hasPeriodY) {
-                cdi.orig_y = origY[i]; // used by hover
-            }
         } else if(stackGroupOpts && (isV ? xValid : yValid)) {
             // if we're stacking we need to hold on to all valid positions
             // even with invalid sizes