plotly.js 2.13.0 → 2.13.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plotly.js",
-  "version": "2.13.0",
+  "version": "2.13.3",
   "description": "The open source javascript graphing library that powers plotly",
   "license": "MIT",
   "main": "./lib/index.js",

package/src/components/selections/select.js

@@ -50,7 +50,14 @@ var p2r = helpers.p2r;
 var axValue = helpers.axValue;
 var getTransform = helpers.getTransform;
 
+function hasSubplot(dragOptions) {
+    // N.B. subplot may be falsy e.g zero sankey index!
+    return dragOptions.subplot !== undefined;
+}
+
 function prepSelect(evt, startX, startY, dragOptions, mode) {
+    var isCartesian = !hasSubplot(dragOptions);
+
     var isFreeMode = freeMode(mode);
     var isRectMode = rectMode(mode);
     var isOpenMode = openMode(mode);
@@ -64,7 +71,7 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
     var gd = dragOptions.gd;
     var fullLayout = gd._fullLayout;
     var immediateSelect = isSelectMode && fullLayout.newselection.mode === 'immediate' &&
-        !dragOptions.subplot; // N.B. only cartesian subplots have persistent selection
+        isCartesian; // N.B. only cartesian subplots have persistent selection
 
     var zoomLayer = fullLayout._zoomlayer;
     var dragBBox = dragOptions.element.getBoundingClientRect();
@@ -112,9 +119,9 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
             opacity: isDrawMode ? newStyle.opacity / 2 : 1,
             fill: (isDrawMode && !isOpenMode) ? newStyle.fillcolor : 'none',
             stroke: newStyle.line.color || (
-                dragOptions.subplot !== undefined ?
-                    '#7f7f7f' : // non-cartesian subplot
-                    Color.contrast(gd._fullLayout.plot_bgcolor) // cartesian subplot
+                isCartesian ?
+                    Color.contrast(gd._fullLayout.plot_bgcolor) :
+                    '#7f7f7f' // non-cartesian subplot
             ),
             'stroke-dasharray': dashStyle(newStyle.line.dash, newStyle.line.width),
             'stroke-width': newStyle.line.width + 'px',
@@ -145,6 +152,8 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
 
     if(immediateSelect && !evt.shiftKey) {
         dragOptions._clearSubplotSelections = function() {
+            if(!isCartesian) return;
+
             var xRef = xAxis._id;
             var yRef = yAxis._id;
             deselectSubplot(gd, xRef, yRef, searchTraces);
@@ -165,6 +174,8 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
             }
 
             if(selectionErased) {
+                gd._fullLayout._noEmitSelectedAtStart = true;
+
                 Registry.call('_guiRelayout', gd, {
                     selections: list
                 });
@@ -306,10 +317,10 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
         displayOutlines(convertPoly(mergedPolygons, isOpenMode), outlines, dragOptions);
 
         if(isSelectMode) {
-            var _res = reselect(gd);
+            var _res = reselect(gd, false);
             var extraPoints = _res.eventData ? _res.eventData.points.slice() : [];
 
-            _res = reselect(gd, selectionTesters, searchTraces, dragOptions);
+            _res = reselect(gd, false, selectionTesters, searchTraces, dragOptions);
             selectionTesters = _res.selectionTesters;
             eventData = _res.eventData;
 
@@ -403,9 +414,13 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
                             }
                         }
 
-                        Registry.call('_guiRelayout', gd, {
-                            selections: subSelections
-                        });
+                        if(subSelections.length < allSelections.length) {
+                            gd._fullLayout._noEmitSelectedAtStart = true;
+
+                            Registry.call('_guiRelayout', gd, {
+                                selections: subSelections
+                            });
+                        }
                     }
                 }
             } else {
@@ -451,8 +466,9 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
                 dragOptions.doneFnCompleted(selection);
             }
 
-            eventData.selections = gd.layout.selections;
-            emitSelected(gd, eventData);
+            if(isSelectMode) {
+                emitSelected(gd, eventData);
+            }
         }).catch(Lib.error);
     };
 }
@@ -530,7 +546,6 @@ function selectOnClick(evt, gd, xAxes, yAxes, subplot, dragOptions, polygonOutli
             }
 
             if(sendEvents) {
-                eventData.selections = gd.layout.selections;
                 emitSelected(gd, eventData);
             }
         }
@@ -675,15 +690,23 @@ function coerceSelectionsCache(evt, gd, dragOptions) {
     }
 }
 
+function hasActiveShape(gd) {
+    return gd._fullLayout._activeShapeIndex >= 0;
+}
+
+function hasActiveSelection(gd) {
+    return gd._fullLayout._activeSelectionIndex >= 0;
+}
+
 function clearSelectionsCache(dragOptions, immediateSelect) {
     var dragmode = dragOptions.dragmode;
     var plotinfo = dragOptions.plotinfo;
 
     var gd = dragOptions.gd;
-    if(gd._fullLayout._activeShapeIndex >= 0) {
+    if(hasActiveShape(gd)) {
         gd._fullLayout._deactivateShape(gd);
     }
-    if(gd._fullLayout._activeSelectionIndex >= 0) {
+    if(hasActiveSelection(gd)) {
         gd._fullLayout._deactivateSelection(gd);
     }
 
@@ -711,11 +734,13 @@ function clearSelectionsCache(dragOptions, immediateSelect) {
             var selections;
             if(
                 isSelectMode &&
-                !dragOptions.subplot // only allow cartesian - no mapbox for now
+                !hasSubplot(dragOptions) // only allow cartesian - no mapbox for now
             ) {
                 selections = newSelections(outlines, dragOptions);
             }
             if(selections) {
+                gd._fullLayout._noEmitSelectedAtStart = true;
+
                 Registry.call('_guiRelayout', gd, {
                     selections: selections
                 }).then(function() {
@@ -750,7 +775,10 @@ function determineSearchTraces(gd, xAxes, yAxes, subplot) {
 
         if(trace.visible !== true || !trace._module || !trace._module.selectPoints) continue;
 
-        if(subplot && (trace.subplot === subplot || trace.geo === subplot)) {
+        if(
+            hasSubplot({subplot: subplot}) &&
+            (trace.subplot === subplot || trace.geo === subplot)
+        ) {
             searchTraces.push(createSearchInfo(trace._module, cd, xAxes[0], yAxes[0]));
         } else if(trace.type === 'splom') {
             // FIXME: make sure we don't have more than single axis for splom
@@ -1050,7 +1078,7 @@ function _doSelect(selectionTesters, searchTraces) {
     return allSelections;
 }
 
-function reselect(gd, selectionTesters, searchTraces, dragOptions) {
+function reselect(gd, mayEmitSelected, selectionTesters, searchTraces, dragOptions) {
     var hadSearchTraces = !!searchTraces;
     var plotinfo, xRef, yRef;
     if(dragOptions) {
@@ -1173,15 +1201,15 @@ function reselect(gd, selectionTesters, searchTraces, dragOptions) {
     updateSelectedState(gd, allSearchTraces, eventData);
 
     var clickmode = fullLayout.clickmode;
-    var sendEvents = clickmode.indexOf('event') > -1;
+    var sendEvents = clickmode.indexOf('event') > -1 && mayEmitSelected;
 
     if(
         !plotinfo && // get called from plot_api & plots
-        fullLayout._reselect
+        mayEmitSelected
     ) {
-        if(sendEvents) {
-            var activePolygons = getLayoutPolygons(gd, true);
+        var activePolygons = getLayoutPolygons(gd, true);
 
+        if(activePolygons.length) {
             var xref = activePolygons[0].xref;
             var yref = activePolygons[0].yref;
             if(xref && yref) {
@@ -1194,9 +1222,12 @@ function reselect(gd, selectionTesters, searchTraces, dragOptions) {
 
                 fillRangeItems(eventData, poly);
             }
+        }
 
-            eventData.selections = gd.layout.selections;
-            emitSelected(gd, eventData);
+        if(gd._fullLayout._noEmitSelectedAtStart) {
+            gd._fullLayout._noEmitSelectedAtStart = false;
+        } else {
+            if(sendEvents) emitSelected(gd, eventData);
         }
 
         fullLayout._reselect = false;
@@ -1216,10 +1247,9 @@ function reselect(gd, selectionTesters, searchTraces, dragOptions) {
 
         if(sendEvents) {
             if(eventData.points.length) {
-                eventData.selections = gd.layout.selections;
                 emitSelected(gd, eventData);
             } else {
-                gd.emit('plotly_deselect', null);
+                emitDeselect(gd);
             }
         }
 
@@ -1511,6 +1541,10 @@ function emitSelecting(gd, eventData) {
 }
 
 function emitSelected(gd, eventData) {
+    if(eventData) {
+        eventData.selections = (gd.layout || {}).selections || [];
+    }
+
     gd.emit('plotly_selected', eventData);
 }
 

package/src/plots/plots.js

@@ -3364,7 +3364,16 @@ plots.redrag = function(gd) {
 };
 
 plots.reselect = function(gd) {
-    Registry.getComponentMethod('selections', 'reselect')(gd);
+    var fullLayout = gd._fullLayout;
+
+    var A = (gd.layout || {}).selections;
+    var B = fullLayout._previousSelections;
+    fullLayout._previousSelections = A;
+
+    var mayEmitSelected = fullLayout._reselect ||
+        JSON.stringify(A) !== JSON.stringify(B);
+
+    Registry.getComponentMethod('selections', 'reselect')(gd, mayEmitSelected);
 };
 
 plots.generalUpdatePerTraceModule = function(gd, subplot, subplotCalcData, subplotLayout) {

package/src/traces/sankey/base_plot.js

@@ -48,6 +48,7 @@ function subplotUpdateFx(gd, index) {
     var dragMode = fullLayout.dragmode;
     var cursor = fullLayout.dragmode === 'pan' ? 'move' : 'crosshair';
     var bgRect = trace._bgRect;
+    if(!bgRect) return;
 
     if(dragMode === 'pan' || dragMode === 'zoom') return;
 

package/src/version.js

@@ -1,4 +1,4 @@
 'use strict';
 
 // package version injected by `npm run preprocess`
-exports.version = '2.13.0';
+exports.version = '2.13.3';