make splom marker.cmin / marker.cmax 'style' editType

Author: etpinard

src/traces/splom/attributes.js

@@ -18,6 +18,23 @@ var extendFlat = require('../../lib/extend').extendFlat;
 var scatterMarkerAttrs = scatterAttrs.marker;
 var scatterMarkerLineAttrs = scatterMarkerAttrs.line;
 
+var markerAttrs = extendFlat(colorAttrs('marker'), {
+    symbol: scatterMarkerAttrs.symbol,
+    size: extendFlat({}, scatterMarkerAttrs.size, {editType: 'markerSize'}),
+    sizeref: scatterMarkerAttrs.sizeref,
+    sizemin: scatterMarkerAttrs.sizemin,
+    sizemode: scatterMarkerAttrs.sizemode,
+    opacity: scatterMarkerAttrs.opacity,
+    colorbar: scatterMarkerAttrs.colorbar,
+    line: extendFlat({}, colorAttrs('marker.line'), {
+        width: scatterMarkerLineAttrs.width,
+        editType: 'calc'
+    }),
+    editType: 'calc'
+});
+
+markerAttrs.color.editType = markerAttrs.cmin.editType = markerAttrs.cmax.editType = 'style';
+
 function makeAxesValObject(axLetter) {
     return {
         valType: 'info_array',
@@ -105,20 +122,7 @@ module.exports = {
         ].join(' ')
     }),
 
-    marker: extendFlat({}, colorAttrs('marker'), {
-        symbol: scatterMarkerAttrs.symbol,
-        size: extendFlat({}, scatterMarkerAttrs.size, {editType: 'markerSize'}),
-        sizeref: scatterMarkerAttrs.sizeref,
-        sizemin: scatterMarkerAttrs.sizemin,
-        sizemode: scatterMarkerAttrs.sizemode,
-        opacity: scatterMarkerAttrs.opacity,
-        colorbar: scatterMarkerAttrs.colorbar,
-        line: extendFlat({}, colorAttrs('marker.line'), {
-            width: scatterMarkerLineAttrs.width,
-            editType: 'calc'
-        }),
-        editType: 'calc'
-    }),
+    marker: markerAttrs,
 
     xaxes: makeAxesValObject('x'),
     yaxes: makeAxesValObject('y'),

test/jasmine/tests/splom_test.js

@@ -1158,6 +1158,31 @@ describe('Test splom update switchboard:', function() {
             expect(toPlainArray(scene.matrixOptions.colors[2]))
                 .toBeCloseToArray([0, 0, 1, 1], 1, msg + '- 2');
 
+            return Plotly.restyle(gd, {
+                'marker.cmin': -3,
+                'marker.cmax': 3,
+                'marker.color': [[1, 2, 3]]
+            });
+        })
+        .then(function() {
+            var msg = 'after colorscale marker.color restyle';
+
+            assertSpies(msg, [
+                ['supplyDefaults', 1],
+                ['doCalcdata', 0],
+                ['doTicks', 0],
+                ['clear', 1],
+                ['update', 1],
+                ['draw', 1]
+            ]);
+
+            expect(toPlainArray(scene.matrixOptions.colors[0]))
+                .toBeCloseToArray([0.890, 0.6, 0.4078, 1], 1, msg + '- 0');
+            expect(toPlainArray(scene.matrixOptions.colors[1]))
+                .toBeCloseToArray([0.81176, 0.3333, 0.2431, 1], 1, msg + '- 1');
+            expect(toPlainArray(scene.matrixOptions.colors[2]))
+                .toBeCloseToArray([0.6980, 0.0392, 0.1098, 1], 1, msg + '- 2');
+
             return Plotly.restyle(gd, 'marker.size', 20);
         })
         .then(function() {