persistent selection for 'scattercarpet' and 'scatteternary'

etpinard · etpinard · commit ec0578bfc4fa · 2017-11-02T16:20:33.000-04:00
- ... by simply propagation 'scatter' logic.
diff --git a/src/traces/scattercarpet/attributes.js b/src/traces/scattercarpet/attributes.js
@@ -110,6 +110,10 @@ module.exports = {
 
     textfont: scatterAttrs.textfont,
     textposition: scatterAttrs.textposition,
+
+    selected: scatterAttrs.selected,
+    unselected: scatterAttrs.unselected,
+
     hoverinfo: extendFlat({}, plotAttrs.hoverinfo, {
         flags: ['a', 'b', 'text', 'name']
     }),
diff --git a/src/traces/scattercarpet/calc.js b/src/traces/scattercarpet/calc.js
@@ -16,6 +16,7 @@ var Axes = require('../../plots/cartesian/axes');
 var subTypes = require('../scatter/subtypes');
 var calcColorscale = require('../scatter/colorscale_calc');
 var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
+var calcSelection = require('../scatter/calc_selection');
 var lookupCarpet = require('../carpet/lookup_carpetid');
 
 module.exports = function calc(gd, trace) {
@@ -67,8 +68,8 @@ module.exports = function calc(gd, trace) {
     }
 
     calcColorscale(trace);
-
     arraysToCalcdata(cd, trace);
+    calcSelection(cd, trace);
 
     return cd;
 };
diff --git a/src/traces/scattercarpet/style.js b/src/traces/scattercarpet/style.js
@@ -9,19 +9,19 @@
 
 'use strict';
 
-var scatterStyle = require('../scatter/style');
-
-
-module.exports = function style(gd) {
-    var modules = gd._fullLayout._modules;
+var scatterStyle = require('../scatter/style').style;
 
+module.exports = function style(gd, cd) {
     // we're just going to call scatter style... if we already
     // called it, don't need to redo.
     // Later though we may want differences, or we may make style
     // more specific in its scope, then we can remove this.
-    for(var i = 0; i < modules.length; i++) {
-        if(modules[i].name === 'scatter') return;
+    if(!cd) {
+        var modules = gd._fullLayout._modules;
+        for(var i = 0; i < modules.length; i++) {
+            if(modules[i].name === 'scatter') return;
+        }
     }
 
-    scatterStyle(gd);
+    scatterStyle(gd, cd);
 };
diff --git a/src/traces/scatterternary/attributes.js b/src/traces/scatterternary/attributes.js
@@ -139,6 +139,10 @@ module.exports = {
 
     textfont: scatterAttrs.textfont,
     textposition: scatterAttrs.textposition,
+
+    selected: scatterAttrs.selected,
+    unselected: scatterAttrs.unselected,
+
     hoverinfo: extendFlat({}, plotAttrs.hoverinfo, {
         flags: ['a', 'b', 'c', 'text', 'name']
     }),
diff --git a/src/traces/scatterternary/calc.js b/src/traces/scatterternary/calc.js
@@ -16,11 +16,11 @@ var Axes = require('../../plots/cartesian/axes');
 var subTypes = require('../scatter/subtypes');
 var calcColorscale = require('../scatter/colorscale_calc');
 var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
+var calcSelection = require('../scatter/calc_selection');
 
 var dataArrays = ['a', 'b', 'c'];
 var arraysToFill = {a: ['b', 'c'], b: ['a', 'c'], c: ['a', 'b']};
 
-
 module.exports = function calc(gd, trace) {
     var ternary = gd._fullLayout[trace.subplot],
         displaySum = ternary.sum,
@@ -90,6 +90,7 @@ module.exports = function calc(gd, trace) {
 
     calcColorscale(trace);
     arraysToCalcdata(cd, trace);
+    calcSelection(cd, trace);
 
     return cd;
 };
diff --git a/src/traces/scatterternary/style.js b/src/traces/scatterternary/style.js
@@ -9,19 +9,19 @@
 
 'use strict';
 
-var scatterStyle = require('../scatter/style');
-
-
-module.exports = function style(gd) {
-    var modules = gd._fullLayout._modules;
+var scatterStyle = require('../scatter/style').style;
 
+module.exports = function style(gd, cd) {
     // we're just going to call scatter style... if we already
     // called it, don't need to redo.
     // Later though we may want differences, or we may make style
     // more specific in its scope, then we can remove this.
-    for(var i = 0; i < modules.length; i++) {
-        if(modules[i].name === 'scatter') return;
+    if(!cd) {
+        var modules = gd._fullLayout._modules;
+        for(var i = 0; i < modules.length; i++) {
+            if(modules[i].name === 'scatter') return;
+        }
     }
 
-    scatterStyle(gd);
+    scatterStyle(gd, cd);
 };
