From 476c8b7dbe9ad986a000b74889cc0c63bbcf0497 Mon Sep 17 00:00:00 2001
From: Ricky Reusser <rsreusser@gmail.com>
Date: Wed, 28 Jun 2017 12:33:22 -0400
Subject: [PATCH 1/8] Add failing test for groupby colors

---
 test/jasmine/tests/transform_groupby_test.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/jasmine/tests/transform_groupby_test.js b/test/jasmine/tests/transform_groupby_test.js
index 049a2856b5f..7361cb438da 100644
--- a/test/jasmine/tests/transform_groupby_test.js
+++ b/test/jasmine/tests/transform_groupby_test.js
@@ -63,6 +63,23 @@ describe('groupby', function() {
             });
         });
 
+        it('varies the color for each expanded trace', function () {
+            var uniqueColors = {};
+            var dataOut = [];
+            var dataIn = [{
+                y: [1, 2, 3],
+                transforms: [{type: 'groupby', groups: ['a', 'b', 'c']}]
+            }];
+
+            Plots.supplyDataDefaults(dataIn, dataOut, {}, {});
+
+            for (var i = 0; i < dataOut.length; i++) {
+                uniqueColors[dataOut[i].marker.color] = true;
+            }
+
+            expect(Object.keys(uniqueColors).length).toEqual(3);
+        });
+
         it('Accepts deprecated object notation for styles', function(done) {
             var oldStyleMockData = [{
                 mode: 'markers',

From 4398bd71440e243d643691b7502ee163e02ab905 Mon Sep 17 00:00:00 2001
From: Ricky Reusser <rsreusser@gmail.com>
Date: Fri, 30 Jun 2017 11:10:54 -0400
Subject: [PATCH 2/8] Clear expanded trace colors between supplydefault passes

---
 src/components/colorscale/color_attributes.js |   3 +-
 src/plots/plots.js                            |  35 ++++++++++++++++++
 src/traces/scatter/attributes.js              |   4 +-
 test/image/baselines/groupby_coloring.png     | Bin 0 -> 24939 bytes
 test/image/mocks/groupby_coloring.json        |  23 ++++++++++++
 .../tests/transform_expanded_trace_test.js    |  30 +++++++++++++++
 test/jasmine/tests/transform_groupby_test.js  |  17 ---------
 7 files changed, 93 insertions(+), 19 deletions(-)
 create mode 100644 test/image/baselines/groupby_coloring.png
 create mode 100644 test/image/mocks/groupby_coloring.json
 create mode 100644 test/jasmine/tests/transform_expanded_trace_test.js

diff --git a/src/components/colorscale/color_attributes.js b/src/components/colorscale/color_attributes.js
index 9c8f6cdb065..557715374ef 100644
--- a/src/components/colorscale/color_attributes.js
+++ b/src/components/colorscale/color_attributes.js
@@ -23,7 +23,8 @@ module.exports = function makeColorScaleAttributes(context) {
                 ' or an array of numbers that are mapped to the colorscale',
                 ' relative to the max and min values of the array or relative to',
                 ' `cmin` and `cmax` if set.'
-            ].join('')
+            ].join(''),
+            useExpandedTraceDefaultColor: true
         },
         colorscale: extendDeep({}, colorScaleAttributes.colorscale, {
             description: [
diff --git a/src/plots/plots.js b/src/plots/plots.js
index 38416678886..f63f20c2d3a 100644
--- a/src/plots/plots.js
+++ b/src/plots/plots.js
@@ -659,6 +659,39 @@ plots.linkSubplots = function(newFullData, newFullLayout, oldFullData, oldFullLa
     }
 };
 
+// This function clears defaults between the first and second pass of
+// supplyDefaults. It exists because otherwise null attributes are
+// supplyDefault'd and inherited as *colors* instead of an actual null
+// attribute which needs to be supplydefaulted by the individual
+// expanded traces.
+plots.clearExpandedTraceDefaultColors = function(expandedTraces) {
+    var colorAttrs, path, trace, i, j;
+
+    // A better check *might* be to explicitly check for a groupby transform
+    if(expandedTraces.length <= 1) return;
+
+    function locateExpandedTraceAttrs(attr, attrName, attrs, level) {
+        path[level] = attrName;
+        path.length = level + 1;
+        if(attr.useExpandedTraceDefaultColor) {
+            colorAttrs.push(path.join('.'));
+        }
+    }
+
+    for(i = 0; i < expandedTraces.length; i++) {
+        trace = expandedTraces[i];
+        colorAttrs = [];
+        path = [];
+
+        PlotSchema.crawl(trace._module.attributes, locateExpandedTraceAttrs);
+
+        for(j = 0; j < colorAttrs.length; j++) {
+            Lib.nestedProperty(trace, colorAttrs[j]).set(null);
+        }
+    }
+};
+
+
 plots.supplyDataDefaults = function(dataIn, dataOut, layout, fullLayout) {
     var i, fullTrace, trace;
     var modules = fullLayout._modules = [],
@@ -693,6 +726,8 @@ plots.supplyDataDefaults = function(dataIn, dataOut, layout, fullLayout) {
         if(fullTrace.transforms && fullTrace.transforms.length) {
             var expandedTraces = applyTransforms(fullTrace, dataOut, layout, fullLayout);
 
+            plots.clearExpandedTraceDefaultColors(expandedTraces);
+
             for(var j = 0; j < expandedTraces.length; j++) {
                 var expandedTrace = expandedTraces[j],
                     fullExpandedTrace = plots.supplyTraceDefaults(expandedTrace, cnt, fullLayout, i);
diff --git a/src/traces/scatter/attributes.js b/src/traces/scatter/attributes.js
index 726bb94bfef..52325bb8d20 100644
--- a/src/traces/scatter/attributes.js
+++ b/src/traces/scatter/attributes.js
@@ -124,7 +124,8 @@ module.exports = {
         color: {
             valType: 'color',
             role: 'style',
-            description: 'Sets the line color.'
+            description: 'Sets the line color.',
+            useExpandedTraceDefaultColor: true
         },
         width: {
             valType: 'number',
@@ -203,6 +204,7 @@ module.exports = {
     fillcolor: {
         valType: 'color',
         role: 'style',
+        useExpandedTraceDefaultColor: true,
         description: [
             'Sets the fill color.',
             'Defaults to a half-transparent variant of the line color,',
diff --git a/test/image/baselines/groupby_coloring.png b/test/image/baselines/groupby_coloring.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f9e9be9455219e6e9c4aaa2feef24cae0defd1a
GIT binary patch
literal 24939
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
T6Z|6zET?tPp3FOO<?jCn8sEyn

literal 0
HcmV?d00001

diff --git a/test/image/mocks/groupby_coloring.json b/test/image/mocks/groupby_coloring.json
new file mode 100644
index 00000000000..0081ff1a349
--- /dev/null
+++ b/test/image/mocks/groupby_coloring.json
@@ -0,0 +1,23 @@
+{
+  "data": [{
+    "x": [2, 3, 4, 5, 6, 7],
+    "y": [3, 2, 4, 3, 5, 4],
+    "transforms": [{
+      "type": "groupby",
+      "groups": ["c", "b", "d", "c", "e", "d"]
+    }]
+  }, {
+    "x": [2, 3, 4, 5, 6, 7],
+    "y": [9, 8, 10, 9, 11, 10],
+    "marker": {
+      "symbol": "square"
+    },
+    "transforms": [{
+      "type": "groupby",
+      "groups": ["c", "b", "d", "c", "e", "d"]
+    }]
+  }],
+  "layout": {
+    "title": "Groupby expanded trace coloring"
+  }
+}
diff --git a/test/jasmine/tests/transform_expanded_trace_test.js b/test/jasmine/tests/transform_expanded_trace_test.js
new file mode 100644
index 00000000000..3e0ea0fc930
--- /dev/null
+++ b/test/jasmine/tests/transform_expanded_trace_test.js
@@ -0,0 +1,30 @@
+var Plots = require('@src/plots/plots');
+
+describe('groupby', function() {
+    it('varies the color for each expanded trace', function() {
+        var uniqueColors = {};
+        var dataOut = [];
+        var dataIn = [{
+            y: [1, 2, 3],
+            transforms: [
+                {type: 'filter', operation: '<', value: 4},
+                {type: 'groupby', groups: ['a', 'b', 'c']}
+            ]
+        }, {
+            y: [4, 5, 6],
+            transforms: [
+                {type: 'filter', operation: '<', value: 4},
+                {type: 'groupby', groups: ['a', 'b', 'b']}
+            ]
+        }];
+
+        Plots.supplyDataDefaults(dataIn, dataOut, {}, {});
+
+        for(var i = 0; i < dataOut.length; i++) {
+            uniqueColors[dataOut[i].marker.color] = true;
+        }
+
+        // Confirm that five total colors exist:
+        expect(Object.keys(uniqueColors).length).toEqual(5);
+    });
+});
diff --git a/test/jasmine/tests/transform_groupby_test.js b/test/jasmine/tests/transform_groupby_test.js
index 7361cb438da..049a2856b5f 100644
--- a/test/jasmine/tests/transform_groupby_test.js
+++ b/test/jasmine/tests/transform_groupby_test.js
@@ -63,23 +63,6 @@ describe('groupby', function() {
             });
         });
 
-        it('varies the color for each expanded trace', function () {
-            var uniqueColors = {};
-            var dataOut = [];
-            var dataIn = [{
-                y: [1, 2, 3],
-                transforms: [{type: 'groupby', groups: ['a', 'b', 'c']}]
-            }];
-
-            Plots.supplyDataDefaults(dataIn, dataOut, {}, {});
-
-            for (var i = 0; i < dataOut.length; i++) {
-                uniqueColors[dataOut[i].marker.color] = true;
-            }
-
-            expect(Object.keys(uniqueColors).length).toEqual(3);
-        });
-
         it('Accepts deprecated object notation for styles', function(done) {
             var oldStyleMockData = [{
                 mode: 'markers',

From 808e35bab3a5952f8b56a0deabde755739283005 Mon Sep 17 00:00:00 2001
From: Ricky Reusser <rsreusser@gmail.com>
Date: Fri, 30 Jun 2017 11:28:12 -0400
Subject: [PATCH 3/8] Add failsafe for clearExpandedTraceDefaultColors

---
 src/plots/plots.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plots/plots.js b/src/plots/plots.js
index f63f20c2d3a..b9a2ae85940 100644
--- a/src/plots/plots.js
+++ b/src/plots/plots.js
@@ -683,6 +683,8 @@ plots.clearExpandedTraceDefaultColors = function(expandedTraces) {
         colorAttrs = [];
         path = [];
 
+        if (!trace || !trace._module) continue;
+
         PlotSchema.crawl(trace._module.attributes, locateExpandedTraceAttrs);
 
         for(j = 0; j < colorAttrs.length; j++) {

From 0877f4840512507e2edde66f06d9bd13c14c985f Mon Sep 17 00:00:00 2001
From: Ricky Reusser <rsreusser@gmail.com>
Date: Fri, 30 Jun 2017 11:42:09 -0400
Subject: [PATCH 4/8] Sigh linter

---
 src/plots/plots.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plots/plots.js b/src/plots/plots.js
index b9a2ae85940..ec47e792d6e 100644
--- a/src/plots/plots.js
+++ b/src/plots/plots.js
@@ -683,7 +683,7 @@ plots.clearExpandedTraceDefaultColors = function(expandedTraces) {
         colorAttrs = [];
         path = [];
 
-        if (!trace || !trace._module) continue;
+        if(!trace || !trace._module) continue;
 
         PlotSchema.crawl(trace._module.attributes, locateExpandedTraceAttrs);
 

From 5f346e4d676c8015026d6bdcf5b0ce49962b33f2 Mon Sep 17 00:00:00 2001
From: Ricky Reusser <rsreusser@gmail.com>
Date: Mon, 3 Jul 2017 10:16:02 -0500
Subject: [PATCH 5/8] Call clearTraceDefaultColors from groupby

---
 src/plots/plots.js                           | 41 +++++++++++---------
 src/transforms/groupby.js                    |  3 ++
 test/jasmine/tests/plotschema_test.js        |  2 +-
 test/jasmine/tests/transform_groupby_test.js | 30 ++++++++++++++
 4 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/plots/plots.js b/src/plots/plots.js
index ec47e792d6e..2b6c5e0d85f 100644
--- a/src/plots/plots.js
+++ b/src/plots/plots.js
@@ -664,13 +664,12 @@ plots.linkSubplots = function(newFullData, newFullLayout, oldFullData, oldFullLa
 // supplyDefault'd and inherited as *colors* instead of an actual null
 // attribute which needs to be supplydefaulted by the individual
 // expanded traces.
-plots.clearExpandedTraceDefaultColors = function(expandedTraces) {
-    var colorAttrs, path, trace, i, j;
+plots.clearTraceDefaultColors = function(trace) {
+    var colorAttrs, path, i;
 
-    // A better check *might* be to explicitly check for a groupby transform
-    if(expandedTraces.length <= 1) return;
-
-    function locateExpandedTraceAttrs(attr, attrName, attrs, level) {
+    // This uses weird closure state in order to satisfy the linter rule
+    // that we can't create functions in a loop.
+    function locateColorAttrs(attr, attrName, attrs, level) {
         path[level] = attrName;
         path.length = level + 1;
         if(attr.useExpandedTraceDefaultColor) {
@@ -678,17 +677,25 @@ plots.clearExpandedTraceDefaultColors = function(expandedTraces) {
         }
     }
 
-    for(i = 0; i < expandedTraces.length; i++) {
-        trace = expandedTraces[i];
-        colorAttrs = [];
-        path = [];
+    path = [];
 
-        if(!trace || !trace._module) continue;
+    // Get the cached colorAttrs:
+    colorAttrs = trace._module._colorAttrs;
 
-        PlotSchema.crawl(trace._module.attributes, locateExpandedTraceAttrs);
+    // Or else compute and cache the colorAttrs on the module:
+    if(!colorAttrs) {
+        trace._module._colorAttrs = colorAttrs = [];
+        PlotSchema.crawl(
+            trace._module.attributes,
+            locateColorAttrs
+        );
+    }
 
-        for(j = 0; j < colorAttrs.length; j++) {
-            Lib.nestedProperty(trace, colorAttrs[j]).set(null);
+    for(i = 0; i < colorAttrs.length; i++) {
+        var origprop = Lib.nestedProperty(trace, '_input.' + colorAttrs[i]);
+
+        if(!origprop.get()) {
+            Lib.nestedProperty(trace, colorAttrs[i]).set(null);
         }
     }
 };
@@ -728,11 +735,9 @@ plots.supplyDataDefaults = function(dataIn, dataOut, layout, fullLayout) {
         if(fullTrace.transforms && fullTrace.transforms.length) {
             var expandedTraces = applyTransforms(fullTrace, dataOut, layout, fullLayout);
 
-            plots.clearExpandedTraceDefaultColors(expandedTraces);
-
             for(var j = 0; j < expandedTraces.length; j++) {
-                var expandedTrace = expandedTraces[j],
-                    fullExpandedTrace = plots.supplyTraceDefaults(expandedTrace, cnt, fullLayout, i);
+                var expandedTrace = expandedTraces[j];
+                var fullExpandedTrace = plots.supplyTraceDefaults(expandedTrace, cnt, fullLayout, i);
 
                 // mutate uid here using parent uid and expanded index
                 // to promote consistency between update calls
diff --git a/src/transforms/groupby.js b/src/transforms/groupby.js
index ef1b78426b1..1e72fdd084d 100644
--- a/src/transforms/groupby.js
+++ b/src/transforms/groupby.js
@@ -10,6 +10,7 @@
 
 var Lib = require('../lib');
 var PlotSchema = require('../plot_api/plot_schema');
+var Plots = require('../plots/plots');
 
 exports.moduleType = 'transform';
 
@@ -172,6 +173,8 @@ function transformOne(trace, state) {
 
         newTrace.name = groupName;
 
+        Plots.clearTraceDefaultColors(newTrace);
+
         // there's no need to coerce styleLookup[groupName] here
         // as another round of supplyDefaults is done on the transformed traces
         newTrace = Lib.extendDeepNoArrays(newTrace, styleLookup[groupName] || {});
diff --git a/test/jasmine/tests/plotschema_test.js b/test/jasmine/tests/plotschema_test.js
index eba5226cf31..e2adec25359 100644
--- a/test/jasmine/tests/plotschema_test.js
+++ b/test/jasmine/tests/plotschema_test.js
@@ -76,7 +76,7 @@ describe('plot schema', function() {
                     var valObject = valObjects[attr.valType],
                         opts = valObject.requiredOpts
                             .concat(valObject.otherOpts)
-                            .concat(['valType', 'description', 'role', 'editType']);
+                            .concat(['valType', 'description', 'role', 'editType', 'useExpandedTraceDefaultColor']);
 
                     Object.keys(attr).forEach(function(key) {
                         expect(opts.indexOf(key) !== -1).toBe(true, key, attr);
diff --git a/test/jasmine/tests/transform_groupby_test.js b/test/jasmine/tests/transform_groupby_test.js
index 049a2856b5f..443ef77cf79 100644
--- a/test/jasmine/tests/transform_groupby_test.js
+++ b/test/jasmine/tests/transform_groupby_test.js
@@ -1,4 +1,5 @@
 var Plotly = require('@lib/index');
+var Plots = require('@src/plots/plots');
 var Lib = require('@src/lib');
 
 var createGraphDiv = require('../assets/create_graph_div');
@@ -236,9 +237,38 @@ describe('groupby', function() {
                 done();
             });
         });
+    });
+
+    describe('many-to-many transforms', function() {
+        it('varies the color for each expanded trace', function() {
+            var uniqueColors = {};
+            var dataOut = [];
+            var dataIn = [{
+                y: [1, 2, 3],
+                transforms: [
+                    {type: 'filter', operation: '<', value: 4},
+                    {type: 'groupby', groups: ['a', 'b', 'c']}
+                ]
+            }, {
+                y: [4, 5, 6],
+                transforms: [
+                    {type: 'filter', operation: '<', value: 4},
+                    {type: 'groupby', groups: ['a', 'b', 'b']}
+                ]
+            }];
 
+            Plots.supplyDataDefaults(dataIn, dataOut, {}, {});
+
+            for(var i = 0; i < dataOut.length; i++) {
+                uniqueColors[dataOut[i].marker.color] = true;
+            }
+
+            // Confirm that five total colors exist:
+            expect(Object.keys(uniqueColors).length).toEqual(5);
+        });
     });
 
+
     // these tests can be shortened, once the meaning of edge cases gets clarified
     describe('symmetry/degeneracy testing of one-to-many transforms on arbitrary arrays where there is no grouping (implicit 1):', function() {
         'use strict';

From c8a26077ddeab6d5a3636dfab916f4db6340968c Mon Sep 17 00:00:00 2001
From: Ricky Reusser <rsreusser@gmail.com>
Date: Mon, 3 Jul 2017 10:22:41 -0500
Subject: [PATCH 6/8] Reorganize clearExpandedTraceDefaultColors code

---
 src/plots/plots.js                            | 15 ++++++----
 src/transforms/groupby.js                     |  2 +-
 .../tests/transform_expanded_trace_test.js    | 30 -------------------
 test/jasmine/tests/transform_groupby_test.js  | 28 +++++++++++++++++
 4 files changed, 38 insertions(+), 37 deletions(-)
 delete mode 100644 test/jasmine/tests/transform_expanded_trace_test.js

diff --git a/src/plots/plots.js b/src/plots/plots.js
index 2b6c5e0d85f..31358fe8b4b 100644
--- a/src/plots/plots.js
+++ b/src/plots/plots.js
@@ -659,12 +659,15 @@ plots.linkSubplots = function(newFullData, newFullLayout, oldFullData, oldFullLa
     }
 };
 
-// This function clears defaults between the first and second pass of
-// supplyDefaults. It exists because otherwise null attributes are
-// supplyDefault'd and inherited as *colors* instead of an actual null
-// attribute which needs to be supplydefaulted by the individual
-// expanded traces.
-plots.clearTraceDefaultColors = function(trace) {
+// This function clears any attributes with useExpandedTraceDefaultColor
+// set to true in the plot schema. This is needed because groupby (which
+// is the only transform for which this currently applies) supplies parent
+// trace defaults, then expanded trace defaults. The result is that `null`
+// colors are default-supplied and inherited as a color instead of a null.
+// The result is that expanded trace default colors have no effect, with
+// the final result that groups are indistinguishable. This function clears
+// those colors so that individual groupby groups get unique colors.
+plots.clearExpandedTraceDefaultColors = function(trace) {
     var colorAttrs, path, i;
 
     // This uses weird closure state in order to satisfy the linter rule
diff --git a/src/transforms/groupby.js b/src/transforms/groupby.js
index 1e72fdd084d..6590c428c26 100644
--- a/src/transforms/groupby.js
+++ b/src/transforms/groupby.js
@@ -173,7 +173,7 @@ function transformOne(trace, state) {
 
         newTrace.name = groupName;
 
-        Plots.clearTraceDefaultColors(newTrace);
+        Plots.clearExpandedTraceDefaultColors(newTrace);
 
         // there's no need to coerce styleLookup[groupName] here
         // as another round of supplyDefaults is done on the transformed traces
diff --git a/test/jasmine/tests/transform_expanded_trace_test.js b/test/jasmine/tests/transform_expanded_trace_test.js
deleted file mode 100644
index 3e0ea0fc930..00000000000
--- a/test/jasmine/tests/transform_expanded_trace_test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var Plots = require('@src/plots/plots');
-
-describe('groupby', function() {
-    it('varies the color for each expanded trace', function() {
-        var uniqueColors = {};
-        var dataOut = [];
-        var dataIn = [{
-            y: [1, 2, 3],
-            transforms: [
-                {type: 'filter', operation: '<', value: 4},
-                {type: 'groupby', groups: ['a', 'b', 'c']}
-            ]
-        }, {
-            y: [4, 5, 6],
-            transforms: [
-                {type: 'filter', operation: '<', value: 4},
-                {type: 'groupby', groups: ['a', 'b', 'b']}
-            ]
-        }];
-
-        Plots.supplyDataDefaults(dataIn, dataOut, {}, {});
-
-        for(var i = 0; i < dataOut.length; i++) {
-            uniqueColors[dataOut[i].marker.color] = true;
-        }
-
-        // Confirm that five total colors exist:
-        expect(Object.keys(uniqueColors).length).toEqual(5);
-    });
-});
diff --git a/test/jasmine/tests/transform_groupby_test.js b/test/jasmine/tests/transform_groupby_test.js
index 443ef77cf79..94b3539ee5c 100644
--- a/test/jasmine/tests/transform_groupby_test.js
+++ b/test/jasmine/tests/transform_groupby_test.js
@@ -692,6 +692,34 @@ describe('groupby', function() {
         it('passes with no groups', test(mockData0));
         it('passes with empty groups', test(mockData1));
         it('passes with falsey groups', test(mockData2));
+    });
+
+    describe('expanded trace coloring', function() {
+        it('assigns unique colors to each group', function() {
+            var uniqueColors = {};
+            var dataOut = [];
+            var dataIn = [{
+                y: [1, 2, 3],
+                transforms: [
+                    {type: 'filter', operation: '<', value: 4},
+                    {type: 'groupby', groups: ['a', 'b', 'c']}
+                ]
+            }, {
+                y: [4, 5, 6],
+                transforms: [
+                    {type: 'filter', operation: '<', value: 4},
+                    {type: 'groupby', groups: ['a', 'b', 'b']}
+                ]
+            }];
 
+            Plots.supplyDataDefaults(dataIn, dataOut, {}, {});
+
+            for(var i = 0; i < dataOut.length; i++) {
+                uniqueColors[dataOut[i].marker.color] = true;
+            }
+
+            // Confirm that five total colors exist:
+            expect(Object.keys(uniqueColors).length).toEqual(5);
+        });
     });
 });

From 2ceac06180bff32e886aad7f6ffc24afbcfcf211 Mon Sep 17 00:00:00 2001
From: Ricky Reusser <rsreusser@gmail.com>
Date: Thu, 6 Jul 2017 11:35:54 -0500
Subject: [PATCH 7/8] Make jasmine test more specific; remove mock

---
 test/image/baselines/groupby_coloring.png    | Bin 24939 -> 0 bytes
 test/image/mocks/groupby_coloring.json       |  23 -------------------
 test/jasmine/tests/transform_groupby_test.js |  13 +++++++----
 3 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 test/image/baselines/groupby_coloring.png
 delete mode 100644 test/image/mocks/groupby_coloring.json

diff --git a/test/image/baselines/groupby_coloring.png b/test/image/baselines/groupby_coloring.png
deleted file mode 100644
index 5f9e9be9455219e6e9c4aaa2feef24cae0defd1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24939
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
T6Z|6zET?tPp3FOO<?jCn8sEyn

diff --git a/test/image/mocks/groupby_coloring.json b/test/image/mocks/groupby_coloring.json
deleted file mode 100644
index 0081ff1a349..00000000000
--- a/test/image/mocks/groupby_coloring.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "data": [{
-    "x": [2, 3, 4, 5, 6, 7],
-    "y": [3, 2, 4, 3, 5, 4],
-    "transforms": [{
-      "type": "groupby",
-      "groups": ["c", "b", "d", "c", "e", "d"]
-    }]
-  }, {
-    "x": [2, 3, 4, 5, 6, 7],
-    "y": [9, 8, 10, 9, 11, 10],
-    "marker": {
-      "symbol": "square"
-    },
-    "transforms": [{
-      "type": "groupby",
-      "groups": ["c", "b", "d", "c", "e", "d"]
-    }]
-  }],
-  "layout": {
-    "title": "Groupby expanded trace coloring"
-  }
-}
diff --git a/test/jasmine/tests/transform_groupby_test.js b/test/jasmine/tests/transform_groupby_test.js
index 94b3539ee5c..734622c0984 100644
--- a/test/jasmine/tests/transform_groupby_test.js
+++ b/test/jasmine/tests/transform_groupby_test.js
@@ -696,7 +696,7 @@ describe('groupby', function() {
 
     describe('expanded trace coloring', function() {
         it('assigns unique colors to each group', function() {
-            var uniqueColors = {};
+            var colors = [];
             var dataOut = [];
             var dataIn = [{
                 y: [1, 2, 3],
@@ -715,11 +715,16 @@ describe('groupby', function() {
             Plots.supplyDataDefaults(dataIn, dataOut, {}, {});
 
             for(var i = 0; i < dataOut.length; i++) {
-                uniqueColors[dataOut[i].marker.color] = true;
+                colors.push(dataOut[i].marker.color);
             }
 
-            // Confirm that five total colors exist:
-            expect(Object.keys(uniqueColors).length).toEqual(5);
+            expect(colors).toEqual([
+                '#1f77b4',
+                '#ff7f0e',
+                '#2ca02c',
+                '#d62728',
+                '#9467bd'
+            ]);
         });
     });
 });

From 25c2951bbf4d4391ac0791f9e9bb3f247d856a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Etienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Fri, 7 Jul 2017 17:33:38 -0400
Subject: [PATCH 8/8] replace `useExpandedTraceDefaultColor` with smarter DRYer
 logic

- now, Plots.clearExpandedTraceDefaultColors clears any trace
  attributes with valType: color and no set dflt.
---
 src/components/colorscale/color_attributes.js | 3 +--
 src/plots/plots.js                            | 6 +++---
 src/traces/scatter/attributes.js              | 4 +---
 test/jasmine/tests/plotschema_test.js         | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/colorscale/color_attributes.js b/src/components/colorscale/color_attributes.js
index 557715374ef..9c8f6cdb065 100644
--- a/src/components/colorscale/color_attributes.js
+++ b/src/components/colorscale/color_attributes.js
@@ -23,8 +23,7 @@ module.exports = function makeColorScaleAttributes(context) {
                 ' or an array of numbers that are mapped to the colorscale',
                 ' relative to the max and min values of the array or relative to',
                 ' `cmin` and `cmax` if set.'
-            ].join(''),
-            useExpandedTraceDefaultColor: true
+            ].join('')
         },
         colorscale: extendDeep({}, colorScaleAttributes.colorscale, {
             description: [
diff --git a/src/plots/plots.js b/src/plots/plots.js
index 31358fe8b4b..510b1752550 100644
--- a/src/plots/plots.js
+++ b/src/plots/plots.js
@@ -659,8 +659,8 @@ plots.linkSubplots = function(newFullData, newFullLayout, oldFullData, oldFullLa
     }
 };
 
-// This function clears any attributes with useExpandedTraceDefaultColor
-// set to true in the plot schema. This is needed because groupby (which
+// This function clears any trace attributes with valType: color and
+// no set dflt filed in the plot schema. This is needed because groupby (which
 // is the only transform for which this currently applies) supplies parent
 // trace defaults, then expanded trace defaults. The result is that `null`
 // colors are default-supplied and inherited as a color instead of a null.
@@ -675,7 +675,7 @@ plots.clearExpandedTraceDefaultColors = function(trace) {
     function locateColorAttrs(attr, attrName, attrs, level) {
         path[level] = attrName;
         path.length = level + 1;
-        if(attr.useExpandedTraceDefaultColor) {
+        if(attr.valType === 'color' && attr.dflt === undefined) {
             colorAttrs.push(path.join('.'));
         }
     }
diff --git a/src/traces/scatter/attributes.js b/src/traces/scatter/attributes.js
index 52325bb8d20..726bb94bfef 100644
--- a/src/traces/scatter/attributes.js
+++ b/src/traces/scatter/attributes.js
@@ -124,8 +124,7 @@ module.exports = {
         color: {
             valType: 'color',
             role: 'style',
-            description: 'Sets the line color.',
-            useExpandedTraceDefaultColor: true
+            description: 'Sets the line color.'
         },
         width: {
             valType: 'number',
@@ -204,7 +203,6 @@ module.exports = {
     fillcolor: {
         valType: 'color',
         role: 'style',
-        useExpandedTraceDefaultColor: true,
         description: [
             'Sets the fill color.',
             'Defaults to a half-transparent variant of the line color,',
diff --git a/test/jasmine/tests/plotschema_test.js b/test/jasmine/tests/plotschema_test.js
index e2adec25359..eba5226cf31 100644
--- a/test/jasmine/tests/plotschema_test.js
+++ b/test/jasmine/tests/plotschema_test.js
@@ -76,7 +76,7 @@ describe('plot schema', function() {
                     var valObject = valObjects[attr.valType],
                         opts = valObject.requiredOpts
                             .concat(valObject.otherOpts)
-                            .concat(['valType', 'description', 'role', 'editType', 'useExpandedTraceDefaultColor']);
+                            .concat(['valType', 'description', 'role', 'editType']);
 
                     Object.keys(attr).forEach(function(key) {
                         expect(opts.indexOf(key) !== -1).toBe(true, key, attr);