rename [un]selectedOptions -> marker{Unselected|Selected}Options

... so that they don't conflict with text [un]selection options.

Author: etpinard

src/traces/scattergl/convert.js

@@ -35,12 +35,12 @@ function convertStyle(gd, trace) {
     var opts = {
         text: undefined,
         marker: undefined,
+        markerSel: undefined,
+        markerUnsel: undefined,
         line: undefined,
         fill: undefined,
         errorX: undefined,
         errorY: undefined,
-        selected: undefined,
-        unselected: undefined
     };
 
     if(trace.visible !== true) return opts;
@@ -51,14 +51,14 @@ function convertStyle(gd, trace) {
 
     if(subTypes.hasMarkers(trace)) {
         opts.marker = convertMarkerStyle(trace);
-        opts.selected = convertMarkerSelection(trace, trace.selected);
-        opts.unselected = convertMarkerSelection(trace, trace.unselected);
+        opts.markerSel = convertMarkerSelection(trace, trace.selected);
+        opts.markerUnsel = convertMarkerSelection(trace, trace.unselected);
 
         if(!trace.unselected && Array.isArray(trace.marker.opacity)) {
             var mo = trace.marker.opacity;
-            opts.unselected.opacity = new Array(mo.length);
+            opts.markerUnsel.opacity = new Array(mo.length);
             for(i = 0; i < mo.length; i++) {
-                opts.unselected.opacity[i] = DESELECTDIM * mo[i];
+                opts.markerUnsel.opacity[i] = DESELECTDIM * mo[i];
             }
         }
     }
@@ -360,13 +360,30 @@ function convertMarkerSelection(trace, target) {
     if(target.marker && target.marker.symbol) {
         optsOut = convertMarkerStyle(Lib.extendFlat({}, optsIn, target.marker));
     } else if(target.marker) {
-        if(target.marker.size) optsOut.sizes = target.marker.size / 2;
+        if(target.marker.size) optsOut.size = target.marker.size / 2;
         if(target.marker.color) optsOut.colors = target.marker.color;
         if(target.marker.opacity !== undefined) optsOut.opacity = target.marker.opacity;
     }
 
+    return optsOut;
+}
+
+function convertTextSelection(trace, target) {
+    var optsOut = {};
+
+    if(!target) return optsOut;
+
     if(target.textfont) {
-        optsOut.textfont = convertTextfont(trace, target.textfont);
+        var optsIn = {
+            opacity: 1,
+            text: trace.text,
+            textposition: trace.textposition,
+            textfont: trace.textfont
+        };
+        if(target.textfont) {
+            Lib.extendFlat({}, optsIn.textfont, target.textfont);
+        }
+        optsOut = convertTextStyle(optsIn);
     }
 
     return optsOut;

src/traces/scattergl/index.js

@@ -115,8 +115,8 @@ function calc(gd, trace) {
     scene.errorYOptions.push(opts.errorY);
     scene.fillOptions.push(opts.fill);
     scene.markerOptions.push(opts.marker);
-    scene.selectedOptions.push(opts.selected);
-    scene.unselectedOptions.push(opts.unselected);
+    scene.markerSelectedOptions.push(opts.markerSel);
+    scene.markerUnselectedOptions.push(opts.markerUnsel);
     scene.textOptions.push(opts.text);
     scene.count++;
 
@@ -177,8 +177,8 @@ function sceneUpdate(gd, subplot) {
         lineOptions: [],
         fillOptions: [],
         markerOptions: [],
-        selectedOptions: [],
-        unselectedOptions: [],
+        markerSelectedOptions: [],
+        markerUnselectedOptions: [],
         errorXOptions: [],
         errorYOptions: [],
         textOptions: []
@@ -318,8 +318,8 @@ function sceneUpdate(gd, subplot) {
             scene.lineOptions = null;
             scene.fillOptions = null;
             scene.markerOptions = null;
-            scene.selectedOptions = null;
-            scene.unselectedOptions = null;
+            scene.markerSelectedOptions = null;
+            scene.markerUnselectedOptions = null;
             scene.errorXOptions = null;
             scene.errorYOptions = null;
             scene.selectBatch = null;
@@ -579,14 +579,14 @@ function plot(gd, subplot, cdata) {
 
         if(scene.scatter2d && scene.selectBatch && scene.selectBatch.length) {
             // update only traces with selection
-            scene.scatter2d.update(scene.unselectedOptions.map(function(opts, i) {
+            scene.scatter2d.update(scene.markerUnselectedOptions.map(function(opts, i) {
                 return scene.selectBatch[i] ? opts : null;
             }));
         }
 
         if(scene.select2d) {
             scene.select2d.update(scene.markerOptions);
-            scene.select2d.update(scene.selectedOptions);
+            scene.select2d.update(scene.markerSelectedOptions);
         }
     }
 
@@ -851,7 +851,7 @@ function selectPoints(searchInfo, polygon) {
         }
         // we should turn scatter2d into unselected once we have any points selected
         if(hasMarkers) {
-            scene.scatter2d.update(scene.unselectedOptions);
+            scene.scatter2d.update(scene.markerUnselectedOptions);
         }
     }
 

src/traces/scatterpolargl/index.js

@@ -117,7 +117,7 @@ function plot(container, subplot, cdata) {
 
         // bring positions to selected/unselected options
         if(subTypes.hasMarkers(trace)) {
-            options.selected.positions = options.unselected.positions = options.marker.positions;
+            options.markerSel.positions = options.markerUnsel.positions = options.marker.positions;
         }
 
         // save scene options batch
@@ -126,8 +126,8 @@ function plot(container, subplot, cdata) {
         scene.errorYOptions.push(options.errorY);
         scene.fillOptions.push(options.fill);
         scene.markerOptions.push(options.marker);
-        scene.selectedOptions.push(options.selected);
-        scene.unselectedOptions.push(options.unselected);
+        scene.markerSelectedOptions.push(options.markerSel);
+        scene.markerUnselectedOptions.push(options.markerUnsel);
         scene.count = cdata.length;
 
         // stash scene ref