Merge branch 'splom-feature' into splom-zoom-perf

Author: etpinard

src/components/legend/style.js

@@ -83,7 +83,7 @@ module.exports = function style(s, gd) {
     function stylePoints(d) {
         var d0 = d[0],
             trace = d0.trace,
-            showMarkers = subTypes.hasMarkers(trace) || trace.type === 'splom',
+            showMarkers = subTypes.hasMarkers(trace),
             showText = subTypes.hasText(trace),
             showLines = subTypes.hasLines(trace);
 

src/traces/scatter/subtypes.js

@@ -18,8 +18,11 @@ module.exports = {
     },
 
     hasMarkers: function(trace) {
-        return trace.visible && trace.mode &&
-            trace.mode.indexOf('markers') !== -1;
+        return trace.visible && (
+            (trace.mode && trace.mode.indexOf('markers') !== -1) ||
+            // until splom implement 'mode'
+            trace.type === 'splom'
+        );
     },
 
     hasText: function(trace) {

src/traces/splom/attributes.js

@@ -116,10 +116,12 @@ module.exports = {
     },
 
     selected: {
-        marker: scatterGlAttrs.selected.marker
+        marker: scatterGlAttrs.selected.marker,
+        editType: 'calc'
     },
     unselected: {
-        marker: scatterGlAttrs.unselected.marker
+        marker: scatterGlAttrs.unselected.marker,
+        editType: 'calc'
     },
 
     opacity: scatterGlAttrs.opacity

src/traces/splom/index.js

@@ -43,12 +43,8 @@ function calc(gd, trace) {
         }
     }
 
-    // add 'mode' to splom trace object to reuse scatter markers logic,
-    // but do not mutate fullData items!
-    var scatterTrace = Lib.extendFlat({}, trace, {mode: 'markers'});
-
-    calcColorscales(scatterTrace);
-    Lib.extendFlat(opts, convertMarkerStyle(scatterTrace));
+    calcColorscales(trace);
+    Lib.extendFlat(opts, convertMarkerStyle(trace));
 
     var visibleLength = matrixData.length;
     var hasTooManyPoints = (visibleLength * commonLength) > TOO_MANY_POINTS;
@@ -69,10 +65,10 @@ function calc(gd, trace) {
             if(hasTooManyPoints) {
                 ppad = 2 * (opts.sizeAvg || Math.max(opts.size, 3));
             } else {
-                ppad = calcMarkerSize(scatterTrace, commonLength);
+                ppad = calcMarkerSize(trace, commonLength);
             }
 
-            calcAxisExpansion(gd, scatterTrace, xa, ya, matrixData[k], matrixData[k], ppad);
+            calcAxisExpansion(gd, trace, xa, ya, matrixData[k], matrixData[k], ppad);
             k++;
         }
     }

test/jasmine/tests/plot_api_test.js

@@ -2862,6 +2862,7 @@ describe('Test plot api', function() {
             ['range_selector_style', require('@mocks/range_selector_style.json')],
             ['range_slider_multiple', require('@mocks/range_slider_multiple.json')],
             ['sankey_energy', require('@mocks/sankey_energy.json')],
+            ['splom_iris', require('@mocks/splom_iris.json')],
             ['table_wrapped_birds', require('@mocks/table_wrapped_birds.json')],
             ['ternary_fill', require('@mocks/ternary_fill.json')],
             ['text_chart_arrays', require('@mocks/text_chart_arrays.json')],