mv 'selectedpoints' & 'selectedids' to global trace attrs/defaults

etpinard · etpinard · commit 3ef323f5f2ee · 2017-11-02T15:51:30.000-04:00
- and coerce if module's `selectPoints` method exists
- don't dive into `selectedpoints` array (leave that for calc, later).
diff --git a/src/plots/attributes.js b/src/plots/attributes.js
@@ -94,6 +94,35 @@ module.exports = {
             'DOM elements'
         ].join(' ')
     },
+
+    // N.B. these cannot be 'data_array' as they do not have the same length as
+    // other data arrays and arrayOk attributes in general
+    //
+    // TODO maybe add another valType:
+    // https://github.com/plotly/plotly.js/issues/1894
+    selectedpoints: {
+        valType: 'any',
+        role: 'info',
+        editType: 'calc',
+        description: [
+            'Array containing integer indices of selected points.',
+            'Has an effect only for traces that support selections.',
+            'Note that an empty array means an empty selection where the `unselected`',
+            'are turned on for all points, whereas, any other non-array values means no',
+            'selection all where the `selected` and `unselected` styles have no effect.'
+        ].join(' ')
+    },
+    selectedids: {
+        valType: 'any',
+        role: 'info',
+        editType: 'calc',
+        description: [
+            'Array containing `ids` of selected points.',
+            'Has an effect only for traces that support selections.',
+            '...'
+        ].join(' ')
+    },
+
     hoverinfo: {
         valType: 'flaglist',
         role: 'info',
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -1022,6 +1022,11 @@ plots.supplyTraceDefaults = function(traceIn, traceOutIndex, layout, traceInInde
             traceOut.visible = !!traceOut.visible;
         }
 
+        if(_module && _module.selectPoints) {
+            coerce('selectedpoints');
+            coerce('selectedids');
+        }
+
         plots.supplyTransformDefaults(traceIn, traceOut, layout);
     }
 
diff --git a/src/traces/scatter/attributes.js b/src/traces/scatter/attributes.js
@@ -433,18 +433,6 @@ module.exports = {
             },
             editType: 'style'
         },
-    selectedpoints: {
-        valType: 'any',
-        role: 'info',
-        editType: 'calc',
-        description: 'Array containing integer indices of selected points.',
-    },
-    selectedids: {
-        valType: 'any',
-        role: 'info',
-        editType: 'calc',
-        description: 'Array containing `ids` of selected points.',
-    },
         editType: 'style'
     },
 
diff --git a/src/traces/scatter/defaults.js b/src/traces/scatter/defaults.js
@@ -21,8 +21,6 @@ var handleLineShapeDefaults = require('./line_shape_defaults');
 var handleTextDefaults = require('./text_defaults');
 var handleFillColorDefaults = require('./fillcolor_defaults');
 var errorBarsSupplyDefaults = require('../../components/errorbars/defaults');
-var handleInteractionDefaults = require('./interaction_defaults');
-
 
 module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     function coerce(attr, dflt) {
@@ -41,8 +39,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('hovertext');
     coerce('mode', defaultMode);
 
-    handleInteractionDefaults(traceIn, traceOut, coerce);
-
     if(subTypes.hasLines(traceOut)) {
         handleLineDefaults(traceIn, traceOut, defaultColor, layout, coerce);
         handleLineShapeDefaults(traceIn, traceOut, coerce);
diff --git a/src/traces/scatter/interaction_defaults.js b/src/traces/scatter/interaction_defaults.js

Original file line number	Diff line number	Diff line change
`@@ -1022,6 +1022,11 @@ plots.supplyTraceDefaults = function(traceIn, traceOutIndex, layout, traceInInde`
`1022`	`1022`	`traceOut.visible = !!traceOut.visible;`
`1023`	`1023`	`}`
`1024`	`1024`
	`1025`	`+ if(_module && _module.selectPoints) {`
	`1026`	`+ coerce('selectedpoints');`
	`1027`	`+ coerce('selectedids');`
	`1028`	`+ }`
	`1029`	`+`
`1025`	`1030`	`plots.supplyTransformDefaults(traceIn, traceOut, layout);`
`1026`	`1031`	`}`
`1027`	`1032`