aj-proof [un]selected logic

Author: etpinard

src/components/drawing/index.js

@@ -442,21 +442,25 @@ drawing.selectedPointStyle = function(s, trace) {
     var mo = marker.opacity;
     var smo = selectedMarker.opacity;
     var usmo = unselectedMarker.opacity;
+    var smoIsDefined = smo !== undefined;
+    var usmoIsDefined = usmo !== undefined;
 
     s.each(function(d) {
         var pt = d3.select(this);
+        var dmo = d.mo;
+        var dmoIsDefined = dmo !== undefined;
         var mo2;
 
-        if(d.mo + 1 || smo || usmo) {
+        if(dmoIsDefined || smoIsDefined || usmoIsDefined) {
             if(d.selected) {
-                if(smo + 1) mo2 = smo;
+                if(smoIsDefined) mo2 = smo;
             } else {
-                if(usmo + 1) mo2 = usmo;
-                else mo2 = DESELECTDIM * ((d.mo + 1) ? d.mo : mo);
+                if(usmoIsDefined) mo2 = usmo;
+                else mo2 = DESELECTDIM * (dmoIsDefined ? dmo : mo);
             }
         }
 
-        if(mo2 + 1) pt.style('opacity', mo2);
+        if(mo2 !== undefined) pt.style('opacity', mo2);
     });
 
     var smc = selectedMarker.color;
@@ -479,18 +483,20 @@ drawing.selectedPointStyle = function(s, trace) {
 
     var sms = selectedMarker.size;
     var usms = unselectedMarker.size;
+    var smsIsDefined = sms !== undefined;
+    var usmsIsDefined = usms !== undefined;
 
-    if(Registry.traceIs(trace, 'symbols') && (sms + 1 || usms + 1)) {
+    if(Registry.traceIs(trace, 'symbols') && (smsIsDefined || usmsIsDefined)) {
         s.each(function(d) {
             var pt = d3.select(this);
             var mrc = d.mrc;
             var mx = d.mx || marker.symbol || 0;
             var mrc2;
 
             if(d.selected) {
-                mrc2 = (sms + 1) ? sms / 2 : mrc;
+                mrc2 = (smsIsDefined) ? sms / 2 : mrc;
             } else {
-                mrc2 = (usms + 1) ? usms / 2 : mrc;
+                mrc2 = (usmsIsDefined) ? usms / 2 : mrc;
             }
 
             pt.attr('d', makePointPath(drawing.symbolNumber(mx), mrc2));

src/lib/coerce.js

@@ -382,6 +382,9 @@ exports.coerceHoverinfo = function(traceIn, traceOut, layoutOut) {
  *  default selection behavior while allowing to be overtaken by any other
  *  [un]selected attribute.
  *
+ *  N.B. This must be called *after* coercing all the other [un]selected attrs,
+ *  to give the intended result.
+ *
  * @param {object} traceOut : fullData item
  * @param {function} coerce : lib.coerce wrapper with implied first three arguments
  */

test/jasmine/tests/scatter_test.js

@@ -864,6 +864,34 @@ describe('Test Scatter.style', function() {
                 'selected pt 1 w/ set selected.marker.opacity'
             );
         })
+        .then(function() {
+            return check(
+                {selectedpoints: [[1, 2]]},
+                [[0.12, 1, 1], [0.1, 1, 1]],
+                'selected pt 1-2 w/ set selected.marker.opacity'
+            );
+        })
+        .then(function() {
+            return check(
+                {selectedpoints: [[2]]},
+                [[0.12, 0.12, 1], [0.1, 0.1, 1]],
+                'selected pt 2 w/ set selected.marker.opacity'
+            );
+        })
+        .then(function() {
+            return check(
+                {selectedpoints: null},
+                [[0.6, 0.6, 0.6], [0.5, 0.5, 0.5]],
+                'no selected pts w/ set selected.marker.opacity'
+            );
+        })
+        .then(function() {
+            return check(
+                {selectedpoints: [[1]]},
+                [[0.12, 1, 0.12], [0.1, 1, 0.1]],
+                'selected pt 1 w/o [un]selected setting (take 2)'
+            );
+        })
         .then(function() {
             return check(
                 {'unselected.marker.opacity': 0},
@@ -930,6 +958,27 @@ describe('Test Scatter.style', function() {
                 'selected pts 0-2 w/o [un]selected setting [should NOT change opacity]'
             );
         })
+        .then(function() {
+            return check(
+                {selectedpoints: [[1, 2]]},
+                [[b, y, y], [r, y, y]],
+                'selected pt 1-2 w/ set selected.marker.color'
+            );
+        })
+        .then(function() {
+            return check(
+                {selectedpoints: null},
+                [[b, b, b], [r, g, b]],
+                'no selected pts w/ set selected.marker.color'
+            );
+        })
+        .then(function() {
+            return check(
+                {selectedpoints: [[0, 2]]},
+                [[y, b, y], [y, g, y]],
+                'selected pts 0-2 w/ set selected.marker.color (take 2)'
+            );
+        })
         .then(function() {
             return check(
                 {'unselected.marker.color': c},