🔪 splom 'mode' (for now)

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),
+            showMarkers = subTypes.hasMarkers(trace) || trace.type === 'splom',
             showText = subTypes.hasText(trace),
             showLines = subTypes.hasLines(trace);
 

src/traces/splom/attributes.js

@@ -68,14 +68,11 @@ module.exports = {
         editType: 'calc+clearAxisTypes'
     },
 
-    mode: scatterGlAttrs.mode,
-    text: scatterGlAttrs.text,
+    // mode: {}, (only 'markers' for now)
 
+    text: scatterGlAttrs.text,
     marker: scatterGlAttrs.marker,
 
-    line: scatterGlAttrs.line,
-    connectgaps: scatterGlAttrs.connectgaps,
-
     xaxes: makeAxesValObject('x'),
     yaxes: makeAxesValObject('y'),
 
@@ -118,8 +115,12 @@ module.exports = {
         ].join(' ')
     },
 
-    selected: scatterGlAttrs.selected,
-    unselected: scatterGlAttrs.unselected,
+    selected: {
+        marker: scatterGlAttrs.selected.marker
+    },
+    unselected: {
+        marker: scatterGlAttrs.unselected.marker
+    },
 
     opacity: scatterGlAttrs.opacity
 };

src/traces/splom/defaults.js

@@ -13,8 +13,6 @@ var Lib = require('../../lib');
 var attributes = require('./attributes');
 var subTypes = require('../scatter/subtypes');
 var handleMarkerDefaults = require('../scatter/marker_defaults');
-var handleLineDefaults = require('../scatter/line_defaults');
-var PTS_LINESONLY = require('../scatter/constants').PTS_LINESONLY;
 var OPEN_RE = /-open/;
 
 module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
@@ -28,24 +26,13 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         return;
     }
 
-    coerce('mode', traceOut._commonLength < PTS_LINESONLY ? 'lines+markers' : 'lines');
     coerce('text');
 
-    // TODO just markers for now
-    traceOut.mode = 'markers';
+    handleMarkerDefaults(traceIn, traceOut, defaultColor, layout, coerce);
 
-    if(subTypes.hasLines(traceOut)) {
-        handleLineDefaults(traceIn, traceOut, defaultColor, layout, coerce);
-        coerce('connectgaps');
-    }
-
-    if(subTypes.hasMarkers(traceOut)) {
-        handleMarkerDefaults(traceIn, traceOut, defaultColor, layout, coerce);
-
-        var isOpen = OPEN_RE.test(traceOut.marker.symbol);
-        var isBubble = subTypes.isBubble(traceOut);
-        coerce('marker.line.width', isOpen || isBubble ? 1 : 0);
-    }
+    var isOpen = OPEN_RE.test(traceOut.marker.symbol);
+    var isBubble = subTypes.isBubble(traceOut);
+    coerce('marker.line.width', isOpen || isBubble ? 1 : 0);
 
     // TODO if all 3 below are false,
     // should we set `visible: false` and exit early?

src/traces/splom/index.js

@@ -43,8 +43,12 @@ function calc(gd, trace) {
         }
     }
 
-    calcColorscales(trace);
-    Lib.extendFlat(opts, convertMarkerStyle(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));
 
     var visibleLength = matrixData.length;
     var hasTooManyPoints = (visibleLength * commonLength) > TOO_MANY_POINTS;
@@ -65,9 +69,10 @@ function calc(gd, trace) {
             if(hasTooManyPoints) {
                 ppad = 2 * (opts.sizeAvg || Math.max(opts.size, 3));
             } else {
-                ppad = calcMarkerSize(trace, commonLength);
+                ppad = calcMarkerSize(scatterTrace, commonLength);
             }
-            calcAxisExpansion(gd, trace, xa, ya, matrixData[k], matrixData[k], ppad);
+
+            calcAxisExpansion(gd, scatterTrace, xa, ya, matrixData[k], matrixData[k], ppad);
             k++;
         }
     }