fix and 🔒 selections + array textfont.color

plotly · etpinard · Jul 5, 2018 · Jun 14, 2018 · Jun 15, 2018 · Jun 15, 2018
commit 52614d1a0b26ed65a679c60a9c47a2e46c81e12c
diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js
@@ -921,20 +921,24 @@ function styleTextSelection(cd) {
     var selOpts = scene.textSelectedOptions[index] || {};
     var unselOpts = scene.textUnselectedOptions[index] || {};
     var opts = Lib.extendFlat({}, baseOpts);
-    var i;
+    var i, j;
 
     if(els && unels) {
         var stc = selOpts.color;
         var utc = unselOpts.color;
         var base = baseOpts.color;
+        var hasArrayBase = Array.isArray(base);
         opts.color = new Array(stash.count);
 
         for(i = 0; i < els.length; i++) {
-            opts.color[els[i]] = stc || base;
+            j = els[i];
+            opts.color[j] = stc || hasArrayBase ? base[j] : base;
         }
         for(i = 0; i < unels.length; i++) {
-            opts.color[unels[i]] = utc ? utc :
-                stc ? base : Color.addOpacity(base, DESELECTDIM);
+            j = unels[i];
+            var basej = hasArrayBase ? base[j] : base;
+            opts.color[j] = utc ? utc :
+                stc ? basej : Color.addOpacity(basej, DESELECTDIM);
         }
     }
 

diff --git a/test/jasmine/tests/gl2d_click_test.js b/test/jasmine/tests/gl2d_click_test.js
@@ -795,4 +795,63 @@ describe('@noCI @gl Test gl2d lasso/select:', function() {
         .catch(failTest)
         .then(done);
     });
+
+    it('should work on gl text charts with array textfont.color', function(done) {
+        var fig = Lib.extendDeep({}, require('@mocks/gl2d_text_chart_arrays.json'));
+        fig.layout.dragmode = 'select';
+        fig.layout.margin = {t: 0, b: 0, l: 0, r: 0};
+        fig.layout.height = 500;
+        fig.layout.width = 500;
+        gd = createGraphDiv();
+
+        function _assertGlTextOpts(msg, exp) {
+            var scene = gd.calcdata[0][0].t._scene;
+            scene.glText.forEach(function(opts, i) {
+                expect(Array.from(opts.color))
+                    .toBeCloseToArray(exp.rgba[i], 2, 'item ' + i + ' - ' + msg);
+            });
+        }
+
+        Plotly.plot(gd, fig)
+        .then(delay(100))
+        .then(function() {
+            _assertGlTextOpts('base', {
+                rgba: [
+                    [
+                        255, 0, 0, 255,
+                        0, 0, 255, 255,
+                        0, 128, 0, 255
+                    ],
+                    [
+                        0, 0, 0, 255,
+                        211, 211, 210, 255,
+                        237, 97, 0, 255
+                    ]
+                ]
+            });
+        })
+        .then(function() { return select([[100, 10], [250, 100]]); })
+        .then(function(eventData) {
+            assertEventData(eventData, {
+                points: [{x: 1, y: 2}]
+            });
+            _assertGlTextOpts('after selection', {
+                rgba: [
+                    [
+                        255, 0, 0, 51,
+                        0, 0, 255, 51,
+                        0, 128, 0, 51
+                    ],
+                    [
+                        0, 0, 0, 51,
+                        // this is the selected pt!
+                        211, 211, 210, 255,
+                        237, 97, 0, 51
+                    ]
+                ]
+            });
+        })
+        .catch(failTest)
+        .then(done);
+    });
 });