selections in plots

Author: archmoj

src/plots/cartesian/axes.js

@@ -213,6 +213,7 @@ axes.redrawComponents = function(gd, axIds) {
     _redrawOneComp('annotations', 'drawOne', '_annIndices');
     _redrawOneComp('shapes', 'drawOne', '_shapeIndices');
     _redrawOneComp('images', 'draw', '_imgIndices', true);
+    _redrawOneComp('selections', 'drawOne', '_selectionIndices');
 };
 
 var getDataConversions = axes.getDataConversions = function(gd, trace, target, targetArray) {

src/plots/cartesian/dragbox.js

@@ -26,9 +26,9 @@ var redrawReglTraces = require('../../plot_api/subroutines').redrawReglTraces;
 var Plots = require('../plots');
 
 var getFromId = require('./axis_ids').getFromId;
-var prepSelect = require('../../components/selections/select').prepSelect;
-var clearSelect = require('../../components/selections/select').clearSelect;
-var selectOnClick = require('../../components/selections/select').selectOnClick;
+var prepSelect = require('../../components/selections').prepSelect;
+var clearSelect = require('../../components/selections').clearSelect;
+var selectOnClick = require('../../components/selections').selectOnClick;
 var scaleZoom = require('./scale_zoom');
 
 var constants = require('./constants');
@@ -231,9 +231,6 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
                     updateSubplots([0, 0, pw, ph]);
                     dragOptions.moveFn(dragDataNow.dx, dragDataNow.dy);
                 }
-
-                // TODO should we try to "re-select" under select/lasso modes?
-                // probably best to wait for https://github.com/plotly/plotly.js/issues/1851
             }
         };
     };

src/plots/cartesian/layout_defaults.js

@@ -146,6 +146,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         axLayoutOut._traceIndices = traces.map(function(t) { return t._expandedIndex; });
         axLayoutOut._annIndices = [];
         axLayoutOut._shapeIndices = [];
+        axLayoutOut._selectionIndices = [];
         axLayoutOut._imgIndices = [];
         axLayoutOut._subplotsWith = [];
         axLayoutOut._counterAxes = [];

src/plots/geo/geo.js

@@ -18,9 +18,9 @@ var Plots = require('../plots');
 var Axes = require('../cartesian/axes');
 var getAutoRange = require('../cartesian/autorange').getAutoRange;
 var dragElement = require('../../components/dragelement');
-var prepSelect = require('../../components/selections/select').prepSelect;
-var clearSelect = require('../../components/selections/select').clearSelect;
-var selectOnClick = require('../../components/selections/select').selectOnClick;
+var prepSelect = require('../../components/selections').prepSelect;
+var clearSelect = require('../../components/selections').clearSelect;
+var selectOnClick = require('../../components/selections').selectOnClick;
 
 var createGeoZoom = require('./zoom');
 var constants = require('./constants');

src/plots/layout_attributes.js

@@ -4,6 +4,7 @@ var fontAttrs = require('./font_attributes');
 var animationAttrs = require('./animation_attributes');
 var colorAttrs = require('../components/color/attributes');
 var drawNewShapeAttrs = require('../components/shapes/draw_newshape/attributes');
+var drawNewSelectionAttrs = require('../components/selections/draw_newselection/attributes');
 var padAttrs = require('./pad_attributes');
 var extendFlat = require('../lib/extend').extendFlat;
 
@@ -393,6 +394,9 @@ module.exports = {
     newshape: drawNewShapeAttrs.newshape,
     activeshape: drawNewShapeAttrs.activeshape,
 
+    newselection: drawNewSelectionAttrs.newselection,
+    activeselection: drawNewSelectionAttrs.activeselection,
+
     meta: {
         valType: 'any',
         arrayOk: true,

src/plots/mapbox/mapbox.js

@@ -14,10 +14,10 @@ var rectMode = dragHelpers.rectMode;
 var drawMode = dragHelpers.drawMode;
 var selectMode = dragHelpers.selectMode;
 
-var prepSelect = require('../../components/selections/select').prepSelect;
-var clearSelect = require('../../components/selections/select').clearSelect;
-var clearSelectionsCache = require('../../components/selections/select').clearSelectionsCache;
-var selectOnClick = require('../../components/selections/select').selectOnClick;
+var prepSelect = require('../../components/selections').prepSelect;
+var clearSelect = require('../../components/selections').clearSelect;
+var clearSelectionsCache = require('../../components/selections').clearSelectionsCache;
+var selectOnClick = require('../../components/selections').selectOnClick;
 
 var constants = require('./constants');
 var createMapboxLayer = require('./layers');

src/plots/plots.js

@@ -1539,6 +1539,11 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
         'supplyDrawNewShapeDefaults'
     )(layoutIn, layoutOut, coerce);
 
+    Registry.getComponentMethod(
+        'selections',
+        'supplyDrawNewSelectionDefaults'
+    )(layoutIn, layoutOut, coerce);
+
     coerce('meta');
 
     // do not include defaults in fullLayout when users do not set transition
@@ -2901,6 +2906,7 @@ function _transition(gd, transitionOpts, opts) {
         interruptPreviousTransitions,
         opts.prepareFn,
         plots.rehover,
+        plots.reselect,
         executeTransitions
     ];
 
@@ -3357,6 +3363,10 @@ plots.redrag = function(gd) {
     }
 };
 
+plots.reselect = function(gd) {
+    Registry.getComponentMethod('selections', 'reselect')(gd);
+};
+
 plots.generalUpdatePerTraceModule = function(gd, subplot, subplotCalcData, subplotLayout) {
     var traceHashOld = subplot.traceHash;
     var traceHash = {};

src/plots/polar/polar.js

@@ -18,9 +18,9 @@ var dragBox = require('../cartesian/dragbox');
 var dragElement = require('../../components/dragelement');
 var Fx = require('../../components/fx');
 var Titles = require('../../components/titles');
-var prepSelect = require('../../components/selections/select').prepSelect;
-var selectOnClick = require('../../components/selections/select').selectOnClick;
-var clearSelect = require('../../components/selections/select').clearSelect;
+var prepSelect = require('../../components/selections').prepSelect;
+var selectOnClick = require('../../components/selections').selectOnClick;
+var clearSelect = require('../../components/selections').clearSelect;
 var setCursor = require('../../lib/setcursor');
 var clearGlCanvases = require('../../lib/clear_gl_canvases');
 var redrawReglTraces = require('../../plot_api/subroutines').redrawReglTraces;

src/plots/ternary/ternary.js

@@ -19,10 +19,10 @@ var dragHelpers = require('../../components/dragelement/helpers');
 var freeMode = dragHelpers.freeMode;
 var rectMode = dragHelpers.rectMode;
 var Titles = require('../../components/titles');
-var prepSelect = require('../../components/selections/select').prepSelect;
-var selectOnClick = require('../../components/selections/select').selectOnClick;
-var clearSelect = require('../../components/selections/select').clearSelect;
-var clearSelectionsCache = require('../../components/selections/select').clearSelectionsCache;
+var prepSelect = require('../../components/selections').prepSelect;
+var selectOnClick = require('../../components/selections').selectOnClick;
+var clearSelect = require('../../components/selections').clearSelect;
+var clearSelectionsCache = require('../../components/selections').clearSelectionsCache;
 var constants = require('../cartesian/constants');
 
 function Ternary(options, fullLayout) {

src/traces/sankey/base_plot.js

@@ -7,7 +7,7 @@ var fxAttrs = require('../../components/fx/layout_attributes');
 
 var setCursor = require('../../lib/setcursor');
 var dragElement = require('../../components/dragelement');
-var prepSelect = require('../../components/selections/select').prepSelect;
+var prepSelect = require('../../components/selections').prepSelect;
 var Lib = require('../../lib');
 var Registry = require('../../registry');