From 6b1b9405637793cb44e63e91929ef2a96c3abc3d Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Tue, 20 Nov 2018 15:36:10 -0500
Subject: [PATCH 01/15] initial implementation of `layout.colorscale`

---
 src/components/colorscale/calc.js     |  6 +--
 src/components/colorscale/defaults.js |  9 +++-
 src/plots/layout_attributes.js        | 23 +++++++++
 src/plots/plots.js                    |  3 ++
 test/jasmine/tests/colorscale_test.js | 73 +++++++++++++++++++++++++++
 5 files changed, 109 insertions(+), 5 deletions(-)

diff --git a/src/components/colorscale/calc.js b/src/components/colorscale/calc.js
index b609b38d5da..b2af670db47 100644
--- a/src/components/colorscale/calc.js
+++ b/src/components/colorscale/calc.js
@@ -84,9 +84,9 @@ module.exports = function calc(trace, vals, containerStr, cLetter) {
     doUpdate(autoAttr, (auto !== false || (min === undefined && max === undefined)));
 
     if(container.autocolorscale) {
-        if(min * max < 0) scl = scales.RdBu;
-        else if(min >= 0) scl = scales.Reds;
-        else scl = scales.Blues;
+        if(min * max < 0) scl = container.diverging || scales.RdBu;
+        else if(min >= 0) scl = container.sequential || scales.Reds;
+        else scl = container.sequentialminus || scales.Blues;
 
         // reversescale is handled at the containerOut level
         doUpdate('colorscale', scl, container.reversescale ? flipScale(scl) : scl);
diff --git a/src/components/colorscale/defaults.js b/src/components/colorscale/defaults.js
index 459fe1bb4dc..f66c22306c3 100644
--- a/src/components/colorscale/defaults.js
+++ b/src/components/colorscale/defaults.js
@@ -18,7 +18,6 @@ var colorbarDefaults = require('../colorbar/defaults');
 var isValidScale = require('./is_valid_scale');
 var flipScale = require('./flip_scale');
 
-
 module.exports = function colorScaleDefaults(traceIn, traceOut, layout, coerce, opts) {
     var prefix = opts.prefix,
         cLetter = opts.cLetter,
@@ -43,7 +42,13 @@ module.exports = function colorScaleDefaults(traceIn, traceOut, layout, coerce,
     var autoColorscaleDflt;
     if(sclIn !== undefined) autoColorscaleDflt = !isValidScale(sclIn);
     coerce(prefix + 'autocolorscale', autoColorscaleDflt);
-    var sclOut = coerce(prefix + 'colorscale');
+
+    var layoutColorscale = layout.colorscale || {};
+    containerOut.diverging = layoutColorscale.diverging;
+    containerOut.sequential = layoutColorscale.sequential;
+    containerOut.sequentialminus = layoutColorscale.sequentialminus;
+    var dfltScl = containerOut.diverging;
+    var sclOut = coerce(prefix + 'colorscale', dfltScl);
 
     // reversescale is handled at the containerOut level
     var reverseScale = coerce(prefix + 'reversescale');
diff --git a/src/plots/layout_attributes.js b/src/plots/layout_attributes.js
index 103a0b234f7..9ad9d4aa3b5 100644
--- a/src/plots/layout_attributes.js
+++ b/src/plots/layout_attributes.js
@@ -188,6 +188,29 @@ module.exports = {
         editType: 'calc',
         description: 'Sets the default trace colors.'
     },
+    colorscale: {
+        sequential: {
+            valType: 'colorscale',
+            dflt: false,
+            role: 'style',
+            editType: 'calc',
+            description: 'Sets the default sequential colorscale for positive values.'
+        },
+        sequentialminus: {
+            valType: 'colorscale',
+            dflt: false,
+            role: 'style',
+            editType: 'calc',
+            description: 'Sets the default sequential colorscale for negative values.'
+        },
+        diverging: {
+            valType: 'colorscale',
+            dflt: false,
+            role: 'style',
+            editType: 'calc',
+            description: 'Sets the default diverging colorscale.'
+        }
+    },
     datarevision: {
         valType: 'any',
         role: 'info',
diff --git a/src/plots/plots.js b/src/plots/plots.js
index 7d8947ff6b9..e348af40881 100644
--- a/src/plots/plots.js
+++ b/src/plots/plots.js
@@ -1362,6 +1362,9 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
     coerce('hidesources');
 
     coerce('colorway');
+    coerce('colorscale.sequential');
+    coerce('colorscale.sequentialminus');
+    coerce('colorscale.diverging');
 
     coerce('datarevision');
 
diff --git a/test/jasmine/tests/colorscale_test.js b/test/jasmine/tests/colorscale_test.js
index 2bfa115a75a..154cb2f471d 100644
--- a/test/jasmine/tests/colorscale_test.js
+++ b/test/jasmine/tests/colorscale_test.js
@@ -296,6 +296,41 @@ describe('Test colorscale:', function() {
             handleDefaults(traceIn, traceOut, layout, coerce, opts);
             expect(traceOut.showscale).toBe(false);
         });
+
+        it('should use global colorscale.diverging if no colorscale is specified', function() {
+            traceIn = {
+                zmin: -10,
+                zmax: 10
+            };
+            var divergingScale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
+            var layout2 = {
+                colorscale: {
+                    diverging: divergingScale
+                },
+                _dfltTitle: {colorbar: 'cb'}
+            };
+            handleDefaults(traceIn, traceOut, layout2, coerce, opts);
+            expect(traceOut.colorscale).toBe(divergingScale);
+        });
+
+        it('should not use layout colorscale.diverging if colorscale is specified', function() {
+            var divergingScale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
+            var traceColorscale = [[0, 'rgb(128,128,128)'], [1, 'rgb(255,255,255)']];
+            traceIn = {
+                zmin: -10,
+                zmax: 10,
+                colorscale: traceColorscale
+            };
+
+            var layout2 = {
+                colorscale: {
+                    diverging: divergingScale
+                },
+                _dfltTitle: {colorbar: 'cb'}
+            };
+            handleDefaults(traceIn, traceOut, layout2, coerce, opts);
+            expect(traceOut.colorscale).toBe(traceColorscale);
+        });
     });
 
     describe('handleDefaults (scatter-like version)', function() {
@@ -348,6 +383,41 @@ describe('Test colorscale:', function() {
             handleDefaults(traceIn, traceOut, layout, coerce, opts);
             expect(traceOut.marker.showscale).toBe(true);
         });
+
+        it('should use layout colorscale.diverging if no colorscale is specified', function() {
+            traceIn = {
+                zmin: -10,
+                zmax: 10
+            };
+            var divergingScale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
+            var layout2 = {
+                colorscale: {
+                    diverging: divergingScale
+                },
+                _dfltTitle: {colorbar: 'cb'}
+            };
+            handleDefaults(traceIn, traceOut, layout2, coerce, opts);
+            expect(traceOut.marker.colorscale).toBe(divergingScale);
+        });
+
+        it('should not use layout colorscale.diverging if colorscale is specified', function() {
+            var divergingScale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
+            var traceColorscale = [[0, 'rgb(128,128,128)'], [1, 'rgb(255,255,255)']];
+            traceIn = {
+                marker: {
+                    colorscale: traceColorscale
+                }
+            };
+
+            var layout2 = {
+                colorscale: {
+                    diverging: divergingScale
+                },
+                _dfltTitle: {colorbar: 'cb'}
+            };
+            handleDefaults(traceIn, traceOut, layout2, coerce, opts);
+            expect(traceOut.marker.colorscale).toBe(traceColorscale);
+        });
     });
 
     describe('calc', function() {
@@ -366,6 +436,7 @@ describe('Test colorscale:', function() {
                 autocolorscale: true,
                 _input: {autocolorscale: true}
             };
+
             z = [[0, -1.5], [-2, -10]];
             calcColorscale(trace, z, '', 'z');
             expect(trace.autocolorscale).toBe(true);
@@ -376,6 +447,8 @@ describe('Test colorscale:', function() {
             trace = {
                 type: 'heatmap',
                 z: [[0, -1.5], [-2, -10]],
+                zmin: -10,
+                zmax: 0,
                 autocolorscale: true,
                 _input: {}
             };

From 0e98c5b0898b2ca4c8f7709be7512527da6c1246 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Tue, 20 Nov 2018 16:23:29 -0500
Subject: [PATCH 02/15] fix editType

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

diff --git a/src/plots/layout_attributes.js b/src/plots/layout_attributes.js
index 9ad9d4aa3b5..3fff07b0e5c 100644
--- a/src/plots/layout_attributes.js
+++ b/src/plots/layout_attributes.js
@@ -189,6 +189,7 @@ module.exports = {
         description: 'Sets the default trace colors.'
     },
     colorscale: {
+        editType: 'calc',
         sequential: {
             valType: 'colorscale',
             dflt: false,

From 6e61f3bb52934c16b063619b67ca8ed183f02ec4 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Tue, 20 Nov 2018 16:32:37 -0500
Subject: [PATCH 03/15] fix parcoords, fix default colorscale

---
 src/components/colorscale/defaults.js | 4 +++-
 test/jasmine/tests/parcoords_test.js  | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/colorscale/defaults.js b/src/components/colorscale/defaults.js
index f66c22306c3..361ce48d56b 100644
--- a/src/components/colorscale/defaults.js
+++ b/src/components/colorscale/defaults.js
@@ -48,7 +48,9 @@ module.exports = function colorScaleDefaults(traceIn, traceOut, layout, coerce,
     containerOut.sequential = layoutColorscale.sequential;
     containerOut.sequentialminus = layoutColorscale.sequentialminus;
     var dfltScl = containerOut.diverging;
-    var sclOut = coerce(prefix + 'colorscale', dfltScl);
+    var sclOut;
+    if(dfltScl) sclOut = coerce(prefix + 'colorscale', dfltScl);
+    else sclOut = coerce(prefix + 'colorscale');
 
     // reversescale is handled at the containerOut level
     var reverseScale = coerce(prefix + 'reversescale');
diff --git a/test/jasmine/tests/parcoords_test.js b/test/jasmine/tests/parcoords_test.js
index 3a8313c1d65..b568c9d2921 100644
--- a/test/jasmine/tests/parcoords_test.js
+++ b/test/jasmine/tests/parcoords_test.js
@@ -141,7 +141,10 @@ describe('parcoords initialization tests', function() {
                 cauto: true,
                 autocolorscale: false,
                 reversescale: false,
-                showscale: false
+                showscale: false,
+                diverging: undefined,
+                sequential: undefined,
+                sequentialminus: undefined
             });
         });
 
@@ -278,6 +281,9 @@ describe('parcoords initialization tests', function() {
                 ]
             }));
 
+            delete(fullTrace.line.diverging);
+            delete(fullTrace.line.sequential);
+            delete(fullTrace.line.sequentialminus);
             expect(fullTrace.line).toEqual({
                 color: [35, 63, 21, 42],
                 colorscale: attributes.line.colorscale.dflt,

From f5bcb715fb489392d9af1609364baa7fc796d041 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Tue, 20 Nov 2018 17:12:13 -0500
Subject: [PATCH 04/15] do not coerce layout.colorscale if not specified

---
 src/plots/plots.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plots/plots.js b/src/plots/plots.js
index e348af40881..593141879c8 100644
--- a/src/plots/plots.js
+++ b/src/plots/plots.js
@@ -1362,9 +1362,11 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
     coerce('hidesources');
 
     coerce('colorway');
-    coerce('colorscale.sequential');
-    coerce('colorscale.sequentialminus');
-    coerce('colorscale.diverging');
+    if(layoutIn.colorscale) {
+        if(layoutIn.colorscale.sequential) coerce('colorscale.sequential');
+        if(layoutIn.colorscale.sequentialminus) coerce('colorscale.sequentialminus');
+        if(layoutIn.colorscale.diverging) coerce('colorscale.diverging');
+    }
 
     coerce('datarevision');
 

From a299ce025c678a7eb80c6110fdb53bb321559d59 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Wed, 21 Nov 2018 12:52:43 -0500
Subject: [PATCH 05/15] move layout colorscale attributes into its own file

---
 src/components/colorscale/index.js            |  2 +
 .../colorscale/layout_attributes.js           | 37 +++++++++++++++++++
 src/plots/layout_attributes.js                | 26 +------------
 3 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 src/components/colorscale/layout_attributes.js

diff --git a/src/components/colorscale/index.js b/src/components/colorscale/index.js
index 33b0019df61..e974e488232 100644
--- a/src/components/colorscale/index.js
+++ b/src/components/colorscale/index.js
@@ -15,6 +15,8 @@ exports.defaultScale = require('./default_scale');
 
 exports.attributes = require('./attributes');
 
+exports.layoutAttributes = require('./layout_attributes');
+
 exports.handleDefaults = require('./defaults');
 
 exports.calc = require('./calc');
diff --git a/src/components/colorscale/layout_attributes.js b/src/components/colorscale/layout_attributes.js
new file mode 100644
index 00000000000..45167ab7a37
--- /dev/null
+++ b/src/components/colorscale/layout_attributes.js
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2012-2018, Plotly, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+'use strict';
+
+var scales = require('./scales');
+
+module.exports = {
+    editType: 'calc',
+    sequential: {
+        valType: 'colorscale',
+        dflt: scales.Reds,
+        role: 'style',
+        editType: 'calc',
+        description: 'Sets the default sequential colorscale for positive values.'
+    },
+    sequentialminus: {
+        valType: 'colorscale',
+        dflt: scales.Blues,
+        role: 'style',
+        editType: 'calc',
+        description: 'Sets the default sequential colorscale for negative values.'
+    },
+    diverging: {
+        valType: 'colorscale',
+        dflt: scales.RdBu,
+        role: 'style',
+        editType: 'calc',
+        description: 'Sets the default diverging colorscale.'
+    }
+};
diff --git a/src/plots/layout_attributes.js b/src/plots/layout_attributes.js
index 3fff07b0e5c..d8428800dba 100644
--- a/src/plots/layout_attributes.js
+++ b/src/plots/layout_attributes.js
@@ -10,6 +10,7 @@
 
 var fontAttrs = require('./font_attributes');
 var colorAttrs = require('../components/color/attributes');
+var colorscaleAttrs = require('../components/colorscale/layout_attributes');
 
 var globalFont = fontAttrs({
     editType: 'calc',
@@ -188,30 +189,7 @@ module.exports = {
         editType: 'calc',
         description: 'Sets the default trace colors.'
     },
-    colorscale: {
-        editType: 'calc',
-        sequential: {
-            valType: 'colorscale',
-            dflt: false,
-            role: 'style',
-            editType: 'calc',
-            description: 'Sets the default sequential colorscale for positive values.'
-        },
-        sequentialminus: {
-            valType: 'colorscale',
-            dflt: false,
-            role: 'style',
-            editType: 'calc',
-            description: 'Sets the default sequential colorscale for negative values.'
-        },
-        diverging: {
-            valType: 'colorscale',
-            dflt: false,
-            role: 'style',
-            editType: 'calc',
-            description: 'Sets the default diverging colorscale.'
-        }
-    },
+    colorscale: colorscaleAttrs,
     datarevision: {
         valType: 'any',
         role: 'info',

From 2a20414d113c59d22ed992a3ffe1f018850ca9a2 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Wed, 21 Nov 2018 14:10:45 -0500
Subject: [PATCH 06/15] update description for layout.colorscale attributes

---
 .../colorscale/layout_attributes.js           | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/colorscale/layout_attributes.js b/src/components/colorscale/layout_attributes.js
index 45167ab7a37..96ce49a4682 100644
--- a/src/components/colorscale/layout_attributes.js
+++ b/src/components/colorscale/layout_attributes.js
@@ -11,27 +11,37 @@
 
 var scales = require('./scales');
 
+var msg = 'Note that `autocolorscale` must be true for this attribute to work.';
 module.exports = {
     editType: 'calc',
     sequential: {
         valType: 'colorscale',
-        dflt: scales.Reds,
+        dflt: 'Reds',
         role: 'style',
         editType: 'calc',
-        description: 'Sets the default sequential colorscale for positive values.'
+        description: [
+            'Sets the default sequential colorscale for positive values.',
+            msg
+        ].join(' ')
     },
     sequentialminus: {
         valType: 'colorscale',
-        dflt: scales.Blues,
+        dflt: 'Blues',
         role: 'style',
         editType: 'calc',
-        description: 'Sets the default sequential colorscale for negative values.'
+        description: [
+            'Sets the default sequential colorscale for negative values.',
+            msg
+        ].join(' ')
     },
     diverging: {
         valType: 'colorscale',
-        dflt: scales.RdBu,
+        dflt: 'RdBu',
         role: 'style',
         editType: 'calc',
-        description: 'Sets the default diverging colorscale.'
+        description: [
+            'Sets the default diverging colorscale.',
+            msg
+        ].join(' ')
     }
 };

From 2460fc3a83cc190c5530364dddb591c7c6e1397f Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Wed, 21 Nov 2018 14:20:30 -0500
Subject: [PATCH 07/15] fix lint

---
 src/components/colorscale/layout_attributes.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/colorscale/layout_attributes.js b/src/components/colorscale/layout_attributes.js
index 96ce49a4682..726de053e3f 100644
--- a/src/components/colorscale/layout_attributes.js
+++ b/src/components/colorscale/layout_attributes.js
@@ -1,16 +1,13 @@
 /**
- * Copyright 2012-2018, Plotly, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
+* Copyright 2012-2018, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
 
 'use strict';
 
-var scales = require('./scales');
-
 var msg = 'Note that `autocolorscale` must be true for this attribute to work.';
 module.exports = {
     editType: 'calc',

From 0c13592b65aed4e728efbbdcd763b17ea3a52b55 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Wed, 21 Nov 2018 15:39:23 -0500
Subject: [PATCH 08/15] change colorscaleCalc's signature, cleanup code

---
 src/components/colorscale/calc.js             | 12 +++++----
 src/components/colorscale/defaults.js         | 11 ++------
 src/components/colorscale/index.js            |  6 +++++
 .../colorscale/layout_attributes.js           |  8 +++---
 src/components/colorscale/layout_defaults.js  | 26 +++++++++++++++++++
 src/core.js                                   |  3 ++-
 src/plots/plots.js                            |  5 ----
 src/traces/bar/calc.js                        | 12 +++++++--
 src/traces/barpolar/calc.js                   | 12 +++++++--
 src/traces/choropleth/calc.js                 |  6 ++++-
 src/traces/cone/calc.js                       |  6 ++++-
 src/traces/contourcarpet/calc.js              |  6 ++++-
 src/traces/heatmap/calc.js                    |  6 ++++-
 src/traces/mesh3d/calc.js                     |  6 ++++-
 src/traces/parcats/calc.js                    |  6 ++++-
 src/traces/parcoords/calc.js                  |  6 ++++-
 src/traces/scatter/calc.js                    |  2 +-
 src/traces/scatter/colorscale_calc.js         | 20 +++++++++++---
 src/traces/scatter3d/calc.js                  |  2 +-
 src/traces/scattercarpet/calc.js              |  2 +-
 src/traces/scattergeo/calc.js                 |  2 +-
 src/traces/scattergl/index.js                 |  2 +-
 src/traces/scatterpolar/calc.js               |  2 +-
 src/traces/scatterpolargl/index.js            |  2 +-
 src/traces/scatterternary/calc.js             |  2 +-
 src/traces/splom/index.js                     |  4 +--
 src/traces/streamtube/calc.js                 |  6 ++++-
 src/traces/surface/calc.js                    | 12 +++++++--
 28 files changed, 144 insertions(+), 51 deletions(-)
 create mode 100644 src/components/colorscale/layout_defaults.js

diff --git a/src/components/colorscale/calc.js b/src/components/colorscale/calc.js
index b2af670db47..4232c8bc479 100644
--- a/src/components/colorscale/calc.js
+++ b/src/components/colorscale/calc.js
@@ -11,11 +11,13 @@
 
 var Lib = require('../../lib');
 
-var scales = require('./scales');
 var flipScale = require('./flip_scale');
 
 
-module.exports = function calc(trace, vals, containerStr, cLetter) {
+module.exports = function calc(gd, trace, opts) {
+    var vals = opts.vals;
+    var containerStr = opts.containerStr;
+    var cLetter = opts.cLetter;
     var container = trace;
     var inputContainer = trace._input;
     var fullInputContainer = trace._fullInput;
@@ -84,9 +86,9 @@ module.exports = function calc(trace, vals, containerStr, cLetter) {
     doUpdate(autoAttr, (auto !== false || (min === undefined && max === undefined)));
 
     if(container.autocolorscale) {
-        if(min * max < 0) scl = container.diverging || scales.RdBu;
-        else if(min >= 0) scl = container.sequential || scales.Reds;
-        else scl = container.sequentialminus || scales.Blues;
+        if(min * max < 0) scl = gd._fullLayout.colorscale.diverging;
+        else if(min >= 0) scl = gd._fullLayout.colorscale.sequential;
+        else scl = gd._fullLayout.colorscale.sequentialminus;
 
         // reversescale is handled at the containerOut level
         doUpdate('colorscale', scl, container.reversescale ? flipScale(scl) : scl);
diff --git a/src/components/colorscale/defaults.js b/src/components/colorscale/defaults.js
index 361ce48d56b..459fe1bb4dc 100644
--- a/src/components/colorscale/defaults.js
+++ b/src/components/colorscale/defaults.js
@@ -18,6 +18,7 @@ var colorbarDefaults = require('../colorbar/defaults');
 var isValidScale = require('./is_valid_scale');
 var flipScale = require('./flip_scale');
 
+
 module.exports = function colorScaleDefaults(traceIn, traceOut, layout, coerce, opts) {
     var prefix = opts.prefix,
         cLetter = opts.cLetter,
@@ -42,15 +43,7 @@ module.exports = function colorScaleDefaults(traceIn, traceOut, layout, coerce,
     var autoColorscaleDflt;
     if(sclIn !== undefined) autoColorscaleDflt = !isValidScale(sclIn);
     coerce(prefix + 'autocolorscale', autoColorscaleDflt);
-
-    var layoutColorscale = layout.colorscale || {};
-    containerOut.diverging = layoutColorscale.diverging;
-    containerOut.sequential = layoutColorscale.sequential;
-    containerOut.sequentialminus = layoutColorscale.sequentialminus;
-    var dfltScl = containerOut.diverging;
-    var sclOut;
-    if(dfltScl) sclOut = coerce(prefix + 'colorscale', dfltScl);
-    else sclOut = coerce(prefix + 'colorscale');
+    var sclOut = coerce(prefix + 'colorscale');
 
     // reversescale is handled at the containerOut level
     var reverseScale = coerce(prefix + 'reversescale');
diff --git a/src/components/colorscale/index.js b/src/components/colorscale/index.js
index e974e488232..d17e8f2305b 100644
--- a/src/components/colorscale/index.js
+++ b/src/components/colorscale/index.js
@@ -9,6 +9,10 @@
 
 'use strict';
 
+exports.moduleType = 'component';
+
+exports.name = 'colorscale';
+
 exports.scales = require('./scales');
 
 exports.defaultScale = require('./default_scale');
@@ -17,6 +21,8 @@ exports.attributes = require('./attributes');
 
 exports.layoutAttributes = require('./layout_attributes');
 
+exports.supplyLayoutDefaults = require('./layout_defaults');
+
 exports.handleDefaults = require('./defaults');
 
 exports.calc = require('./calc');
diff --git a/src/components/colorscale/layout_attributes.js b/src/components/colorscale/layout_attributes.js
index 726de053e3f..9285951850d 100644
--- a/src/components/colorscale/layout_attributes.js
+++ b/src/components/colorscale/layout_attributes.js
@@ -8,12 +8,14 @@
 
 'use strict';
 
+var scales = require('./scales');
+
 var msg = 'Note that `autocolorscale` must be true for this attribute to work.';
 module.exports = {
     editType: 'calc',
     sequential: {
         valType: 'colorscale',
-        dflt: 'Reds',
+        dflt: scales.Reds,
         role: 'style',
         editType: 'calc',
         description: [
@@ -23,7 +25,7 @@ module.exports = {
     },
     sequentialminus: {
         valType: 'colorscale',
-        dflt: 'Blues',
+        dflt: scales.Blues,
         role: 'style',
         editType: 'calc',
         description: [
@@ -33,7 +35,7 @@ module.exports = {
     },
     diverging: {
         valType: 'colorscale',
-        dflt: 'RdBu',
+        dflt: scales.RdBu,
         role: 'style',
         editType: 'calc',
         description: [
diff --git a/src/components/colorscale/layout_defaults.js b/src/components/colorscale/layout_defaults.js
new file mode 100644
index 00000000000..bbc12580614
--- /dev/null
+++ b/src/components/colorscale/layout_defaults.js
@@ -0,0 +1,26 @@
+/**
+* Copyright 2012-2018, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var Lib = require('../../lib');
+var colorscaleAttrs = require('./layout_attributes');
+var Template = require('../../plot_api/plot_template');
+
+module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
+    var colorscaleIn = layoutIn.colorscale;
+    var colorscaleOut = Template.newContainer(layoutOut, 'colorscale');
+    function coerce(attr, dflt) {
+        return Lib.coerce(colorscaleIn, colorscaleOut, colorscaleAttrs, attr, dflt);
+    }
+
+    coerce('sequential');
+    coerce('sequentialminus');
+    coerce('diverging');
+};
diff --git a/src/core.js b/src/core.js
index 1025c37d4a7..6a8ad04bba7 100644
--- a/src/core.js
+++ b/src/core.js
@@ -53,7 +53,8 @@ register([
     require('./components/rangeslider'),
     require('./components/rangeselector'),
     require('./components/grid'),
-    require('./components/errorbars')
+    require('./components/errorbars'),
+    require('./components/colorscale')
 ]);
 
 // locales en and en-US are required for default behavior
diff --git a/src/plots/plots.js b/src/plots/plots.js
index 593141879c8..7d8947ff6b9 100644
--- a/src/plots/plots.js
+++ b/src/plots/plots.js
@@ -1362,11 +1362,6 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
     coerce('hidesources');
 
     coerce('colorway');
-    if(layoutIn.colorscale) {
-        if(layoutIn.colorscale.sequential) coerce('colorscale.sequential');
-        if(layoutIn.colorscale.sequentialminus) coerce('colorscale.sequentialminus');
-        if(layoutIn.colorscale.diverging) coerce('colorscale.diverging');
-    }
 
     coerce('datarevision');
 
diff --git a/src/traces/bar/calc.js b/src/traces/bar/calc.js
index b3c5775d5e0..6c2ec1ecb19 100644
--- a/src/traces/bar/calc.js
+++ b/src/traces/bar/calc.js
@@ -42,10 +42,18 @@ module.exports = function calc(gd, trace) {
 
     // auto-z and autocolorscale if applicable
     if(hasColorscale(trace, 'marker')) {
-        colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
+        colorscaleCalc(gd, trace, {
+            vals: trace.marker.color,
+            containerStr: 'marker',
+            cLetter: 'c'
+        });
     }
     if(hasColorscale(trace, 'marker.line')) {
-        colorscaleCalc(trace, trace.marker.line.color, 'marker.line', 'c');
+        colorscaleCalc(gd, trace, {
+            vals: trace.marker.line.color,
+            containerStr: 'marker.line',
+            cLetter: 'c'
+        });
     }
 
     arraysToCalcdata(cd, trace);
diff --git a/src/traces/barpolar/calc.js b/src/traces/barpolar/calc.js
index 4c9876ef5c2..7181fccca41 100644
--- a/src/traces/barpolar/calc.js
+++ b/src/traces/barpolar/calc.js
@@ -53,10 +53,18 @@ function calc(gd, trace) {
     }
 
     if(hasColorscale(trace, 'marker')) {
-        colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
+        colorscaleCalc(gd, trace, {
+            vals: trace.marker.color,
+            containerStr: 'marker',
+            cLetter: 'c'
+        });
     }
     if(hasColorscale(trace, 'marker.line')) {
-        colorscaleCalc(trace, trace.marker.line.color, 'marker.line', 'c');
+        colorscaleCalc(gd, trace, {
+            vals: trace.marker.line.color,
+            containerStr: 'marker.line',
+            cLetter: 'c'
+        });
     }
 
     arraysToCalcdata(cd, trace);
diff --git a/src/traces/choropleth/calc.js b/src/traces/choropleth/calc.js
index b9a88430701..4f71dcb2886 100644
--- a/src/traces/choropleth/calc.js
+++ b/src/traces/choropleth/calc.js
@@ -30,7 +30,11 @@ module.exports = function calc(gd, trace) {
     }
 
     arraysToCalcdata(calcTrace, trace);
-    colorscaleCalc(trace, trace.z, '', 'z');
+    colorscaleCalc(gd, trace, {
+        vals: trace.z,
+        containerStr: '',
+        cLetter: 'z'
+    });
     calcSelection(calcTrace, trace);
 
     return calcTrace;
diff --git a/src/traces/cone/calc.js b/src/traces/cone/calc.js
index 2c0e5907326..64b36de9453 100644
--- a/src/traces/cone/calc.js
+++ b/src/traces/cone/calc.js
@@ -34,5 +34,9 @@ module.exports = function calc(gd, trace) {
     trace._len = len;
     trace._normMax = normMax;
 
-    colorscaleCalc(trace, [normMin, normMax], '', 'c');
+    colorscaleCalc(gd, trace, {
+        vals: [normMin, normMax],
+        containerStr: '',
+        cLetter: 'c'
+    });
 };
diff --git a/src/traces/contourcarpet/calc.js b/src/traces/contourcarpet/calc.js
index 0e02e252ff9..1a645d5f261 100644
--- a/src/traces/contourcarpet/calc.js
+++ b/src/traces/contourcarpet/calc.js
@@ -101,7 +101,11 @@ function heatmappishCalc(gd, trace) {
 
     if(trace.contours.type === 'levels' && trace.contours.coloring !== 'none') {
         // auto-z and autocolorscale if applicable
-        colorscaleCalc(trace, z, '', 'z');
+        colorscaleCalc(gd, trace, {
+            vals: z,
+            containerStr: '',
+            cLetter: 'z'
+        });
     }
 
     return [cd0];
diff --git a/src/traces/heatmap/calc.js b/src/traces/heatmap/calc.js
index 37477db0315..86ebf03aa83 100644
--- a/src/traces/heatmap/calc.js
+++ b/src/traces/heatmap/calc.js
@@ -146,7 +146,11 @@ module.exports = function calc(gd, trace) {
 
     // auto-z and autocolorscale if applicable
     if(!isContour || trace.contours.type !== 'constraint') {
-        colorscaleCalc(trace, z, '', 'z');
+        colorscaleCalc(gd, trace, {
+            vals: z,
+            containerStr: '',
+            cLetter: 'z'
+        });
     }
 
     if(isContour && trace.contours && trace.contours.coloring === 'heatmap') {
diff --git a/src/traces/mesh3d/calc.js b/src/traces/mesh3d/calc.js
index d5f133ee6b6..ffb18a71b38 100644
--- a/src/traces/mesh3d/calc.js
+++ b/src/traces/mesh3d/calc.js
@@ -12,6 +12,10 @@ var colorscaleCalc = require('../../components/colorscale/calc');
 
 module.exports = function calc(gd, trace) {
     if(trace.intensity) {
-        colorscaleCalc(trace, trace.intensity, '', 'c');
+        colorscaleCalc(gd, trace, {
+            vals: trace.intensity,
+            containerStr: '',
+            cLetter: 'c'
+        });
     }
 };
diff --git a/src/traces/parcats/calc.js b/src/traces/parcats/calc.js
index 70b8f8a277f..07ea14d3794 100644
--- a/src/traces/parcats/calc.js
+++ b/src/traces/parcats/calc.js
@@ -73,7 +73,11 @@ module.exports = function calc(gd, trace) {
     // Process colorscale
     if(line) {
         if(hasColorscale(trace, 'line')) {
-            colorscaleCalc(trace, trace.line.color, 'line', 'c');
+            colorscaleCalc(gd, trace, {
+                vals: trace.line.color,
+                containerStr: 'line',
+                cLetter: 'c'
+            });
         }
         markerColorscale = Drawing.tryColorscale(line);
     } else {
diff --git a/src/traces/parcoords/calc.js b/src/traces/parcoords/calc.js
index d584e66225d..c9ce1f7c7a0 100644
--- a/src/traces/parcoords/calc.js
+++ b/src/traces/parcoords/calc.js
@@ -19,7 +19,11 @@ module.exports = function calc(gd, trace) {
     var cscale = cs ? trace.line.colorscale : [[0, trace.line.color], [1, trace.line.color]];
 
     if(hasColorscale(trace, 'line')) {
-        calcColorscale(trace, color, 'line', 'c');
+        calcColorscale(gd, trace, {
+            vals: color,
+            containerStr: 'line',
+            cLetter: 'c'
+        });
     }
 
     return wrap({
diff --git a/src/traces/scatter/calc.js b/src/traces/scatter/calc.js
index d04c62ca541..d745433dbca 100644
--- a/src/traces/scatter/calc.js
+++ b/src/traces/scatter/calc.js
@@ -87,7 +87,7 @@ function calc(gd, trace) {
     }
 
     arraysToCalcdata(cd, trace);
-    calcColorscale(trace);
+    calcColorscale(gd, trace);
     calcSelection(cd, trace);
 
     if(stackGroupOpts) {
diff --git a/src/traces/scatter/colorscale_calc.js b/src/traces/scatter/colorscale_calc.js
index 20c52101a83..69d225eb7ae 100644
--- a/src/traces/scatter/colorscale_calc.js
+++ b/src/traces/scatter/colorscale_calc.js
@@ -15,17 +15,29 @@ var calcColorscale = require('../../components/colorscale/calc');
 var subTypes = require('./subtypes');
 
 
-module.exports = function calcMarkerColorscale(trace) {
+module.exports = function calcMarkerColorscale(gd, trace) {
     if(subTypes.hasLines(trace) && hasColorscale(trace, 'line')) {
-        calcColorscale(trace, trace.line.color, 'line', 'c');
+        calcColorscale(gd, trace, {
+            vals: trace.line.color,
+            containerStr: 'line',
+            cLetter: 'c'
+        });
     }
 
     if(subTypes.hasMarkers(trace)) {
         if(hasColorscale(trace, 'marker')) {
-            calcColorscale(trace, trace.marker.color, 'marker', 'c');
+            calcColorscale(gd, trace, {
+                vals: trace.marker.color,
+                containerStr: 'marker',
+                cLetter: 'c'
+            });
         }
         if(hasColorscale(trace, 'marker.line')) {
-            calcColorscale(trace, trace.marker.line.color, 'marker.line', 'c');
+            calcColorscale(gd, trace, {
+                vals: trace.marker.line.color,
+                containerStr: 'marker.line',
+                cLetter: 'c'
+            });
         }
     }
 };
diff --git a/src/traces/scatter3d/calc.js b/src/traces/scatter3d/calc.js
index e8235d82598..9f2fa358d49 100644
--- a/src/traces/scatter3d/calc.js
+++ b/src/traces/scatter3d/calc.js
@@ -21,7 +21,7 @@ module.exports = function calc(gd, trace) {
     var cd = [{x: false, y: false, trace: trace, t: {}}];
 
     arraysToCalcdata(cd, trace);
-    calcColorscales(trace);
+    calcColorscales(gd, trace);
 
     return cd;
 };
diff --git a/src/traces/scattercarpet/calc.js b/src/traces/scattercarpet/calc.js
index d3ea17ff846..48c1ae81691 100644
--- a/src/traces/scattercarpet/calc.js
+++ b/src/traces/scattercarpet/calc.js
@@ -50,7 +50,7 @@ module.exports = function calc(gd, trace) {
     cd[0].trace = trace;
 
     calcMarkerSize(trace, serieslen);
-    calcColorscale(trace);
+    calcColorscale(gd, trace);
     arraysToCalcdata(cd, trace);
     calcSelection(cd, trace);
 
diff --git a/src/traces/scattergeo/calc.js b/src/traces/scattergeo/calc.js
index af3af25236b..df31edbe330 100644
--- a/src/traces/scattergeo/calc.js
+++ b/src/traces/scattergeo/calc.js
@@ -39,7 +39,7 @@ module.exports = function calc(gd, trace) {
     }
 
     arraysToCalcdata(calcTrace, trace);
-    calcMarkerColorscale(trace);
+    calcMarkerColorscale(gd, trace);
     calcSelection(calcTrace, trace);
 
     if(len) {
diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js
index f6c2ba9be1b..ae16aa7e7fb 100644
--- a/src/traces/scattergl/index.js
+++ b/src/traces/scattergl/index.js
@@ -84,7 +84,7 @@ function calc(gd, trace) {
     }
 
     // create scene options and scene
-    calcColorscales(trace);
+    calcColorscales(gd, trace);
     var opts = sceneOptions(gd, subplot, trace, positions, x, y);
     var scene = sceneUpdate(gd, subplot);
 
diff --git a/src/traces/scatterpolar/calc.js b/src/traces/scatterpolar/calc.js
index 69d1cd55600..14e70964bb4 100644
--- a/src/traces/scatterpolar/calc.js
+++ b/src/traces/scatterpolar/calc.js
@@ -45,7 +45,7 @@ module.exports = function calc(gd, trace) {
     var ppad = calcMarkerSize(trace, len);
     trace._extremes.x = Axes.findExtremes(radialAxis, rArray, {ppad: ppad});
 
-    calcColorscale(trace);
+    calcColorscale(gd, trace);
     arraysToCalcdata(cd, trace);
     calcSelection(cd, trace);
 
diff --git a/src/traces/scatterpolargl/index.js b/src/traces/scatterpolargl/index.js
index 8118e3f2622..630904b668c 100644
--- a/src/traces/scatterpolargl/index.js
+++ b/src/traces/scatterpolargl/index.js
@@ -38,7 +38,7 @@ function calc(gd, trace) {
     stash.r = rArray;
     stash.theta = thetaArray;
 
-    calcColorscales(trace);
+    calcColorscales(gd, trace);
 
     // only compute 'style' options in calc, as position options
     // depend on the radial range and must be set in plot
diff --git a/src/traces/scatterternary/calc.js b/src/traces/scatterternary/calc.js
index e7a4be1b52e..f9316651016 100644
--- a/src/traces/scatterternary/calc.js
+++ b/src/traces/scatterternary/calc.js
@@ -72,7 +72,7 @@ module.exports = function calc(gd, trace) {
     }
 
     calcMarkerSize(trace, serieslen);
-    calcColorscale(trace);
+    calcColorscale(gd, trace);
     arraysToCalcdata(cd, trace);
     calcSelection(cd, trace);
 
diff --git a/src/traces/splom/index.js b/src/traces/splom/index.js
index ab74c2a3e79..a8c8cfbeb8d 100644
--- a/src/traces/splom/index.js
+++ b/src/traces/splom/index.js
@@ -80,7 +80,7 @@ function calc(gd, trace) {
         }
     }
 
-    calcColorscales(trace);
+    calcColorscales(gd, trace);
     Lib.extendFlat(opts, convertMarkerStyle(trace));
 
     var visibleLength = cdata.length;
@@ -310,7 +310,7 @@ function editStyle(gd, cd0) {
     var scene = gd._fullLayout._splomScenes[trace.uid];
 
     if(scene) {
-        calcColorscales(trace);
+        calcColorscales(gd, trace);
 
         Lib.extendFlat(scene.matrixOptions, convertMarkerStyle(trace));
         // TODO [un]selected styles?
diff --git a/src/traces/streamtube/calc.js b/src/traces/streamtube/calc.js
index 1ba591d3918..c5bc6a20bcf 100644
--- a/src/traces/streamtube/calc.js
+++ b/src/traces/streamtube/calc.js
@@ -43,7 +43,11 @@ module.exports = function calc(gd, trace) {
         normMin = Math.min(normMin, norm);
     }
 
-    colorscaleCalc(trace, [normMin, normMax], '', 'c');
+    colorscaleCalc(gd, trace, {
+        vals: [normMin, normMax],
+        containerStr: '',
+        cLetter: 'c'
+    });
 
     var xMax = -Infinity;
     var xMin = Infinity;
diff --git a/src/traces/surface/calc.js b/src/traces/surface/calc.js
index e838f898e6d..593cd05ddc6 100644
--- a/src/traces/surface/calc.js
+++ b/src/traces/surface/calc.js
@@ -15,8 +15,16 @@ var colorscaleCalc = require('../../components/colorscale/calc');
 // Compute auto-z and autocolorscale if applicable
 module.exports = function calc(gd, trace) {
     if(trace.surfacecolor) {
-        colorscaleCalc(trace, trace.surfacecolor, '', 'c');
+        colorscaleCalc(gd, trace, {
+            vals: trace.surfacecolor,
+            containerStr: '',
+            cLetter: 'c'
+        });
     } else {
-        colorscaleCalc(trace, trace.z, '', 'c');
+        colorscaleCalc(gd, trace, {
+            vals: trace.z,
+            containerStr: '',
+            cLetter: 'c'
+        });
     }
 };

From 93ce241abdbc912022e1bed1f999701ea4b68cc0 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Wed, 21 Nov 2018 17:56:45 -0500
Subject: [PATCH 09/15] update colorscale tests to provide a layout object to
 calcColorscale

---
 test/jasmine/assets/supply_defaults.js |   4 +
 test/jasmine/tests/colorscale_test.js  | 103 ++++++-------------------
 2 files changed, 29 insertions(+), 78 deletions(-)

diff --git a/test/jasmine/assets/supply_defaults.js b/test/jasmine/assets/supply_defaults.js
index 249b85cecf1..6d42aca0aca 100644
--- a/test/jasmine/assets/supply_defaults.js
+++ b/test/jasmine/assets/supply_defaults.js
@@ -2,6 +2,10 @@
 
 var Plots = require('@src/plots/plots');
 
+// The following is used to fill up the Registry module
+/* eslint-ignore */
+var Plotly = require('@lib');
+
 /**
  * supplyDefaults that fills in necessary _context
  */
diff --git a/test/jasmine/tests/colorscale_test.js b/test/jasmine/tests/colorscale_test.js
index 154cb2f471d..cedf8f1a0e4 100644
--- a/test/jasmine/tests/colorscale_test.js
+++ b/test/jasmine/tests/colorscale_test.js
@@ -4,6 +4,18 @@ var Plots = require('@src/plots/plots');
 var Heatmap = require('@src/traces/heatmap');
 var Scatter = require('@src/traces/scatter');
 
+var supplyAllDefaults = require('../assets/supply_defaults');
+
+function _supply(trace, layout) {
+    var gd = {
+        data: [trace],
+        layout: layout || {}
+    };
+
+    supplyAllDefaults(gd);
+
+    return gd;
+}
 
 describe('Test colorscale:', function() {
     'use strict';
@@ -296,41 +308,6 @@ describe('Test colorscale:', function() {
             handleDefaults(traceIn, traceOut, layout, coerce, opts);
             expect(traceOut.showscale).toBe(false);
         });
-
-        it('should use global colorscale.diverging if no colorscale is specified', function() {
-            traceIn = {
-                zmin: -10,
-                zmax: 10
-            };
-            var divergingScale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
-            var layout2 = {
-                colorscale: {
-                    diverging: divergingScale
-                },
-                _dfltTitle: {colorbar: 'cb'}
-            };
-            handleDefaults(traceIn, traceOut, layout2, coerce, opts);
-            expect(traceOut.colorscale).toBe(divergingScale);
-        });
-
-        it('should not use layout colorscale.diverging if colorscale is specified', function() {
-            var divergingScale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
-            var traceColorscale = [[0, 'rgb(128,128,128)'], [1, 'rgb(255,255,255)']];
-            traceIn = {
-                zmin: -10,
-                zmax: 10,
-                colorscale: traceColorscale
-            };
-
-            var layout2 = {
-                colorscale: {
-                    diverging: divergingScale
-                },
-                _dfltTitle: {colorbar: 'cb'}
-            };
-            handleDefaults(traceIn, traceOut, layout2, coerce, opts);
-            expect(traceOut.colorscale).toBe(traceColorscale);
-        });
     });
 
     describe('handleDefaults (scatter-like version)', function() {
@@ -384,61 +361,28 @@ describe('Test colorscale:', function() {
             expect(traceOut.marker.showscale).toBe(true);
         });
 
-        it('should use layout colorscale.diverging if no colorscale is specified', function() {
-            traceIn = {
-                zmin: -10,
-                zmax: 10
-            };
-            var divergingScale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
-            var layout2 = {
-                colorscale: {
-                    diverging: divergingScale
-                },
-                _dfltTitle: {colorbar: 'cb'}
-            };
-            handleDefaults(traceIn, traceOut, layout2, coerce, opts);
-            expect(traceOut.marker.colorscale).toBe(divergingScale);
-        });
-
-        it('should not use layout colorscale.diverging if colorscale is specified', function() {
-            var divergingScale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
-            var traceColorscale = [[0, 'rgb(128,128,128)'], [1, 'rgb(255,255,255)']];
-            traceIn = {
-                marker: {
-                    colorscale: traceColorscale
-                }
-            };
-
-            var layout2 = {
-                colorscale: {
-                    diverging: divergingScale
-                },
-                _dfltTitle: {colorbar: 'cb'}
-            };
-            handleDefaults(traceIn, traceOut, layout2, coerce, opts);
-            expect(traceOut.marker.colorscale).toBe(traceColorscale);
-        });
     });
 
     describe('calc', function() {
         var calcColorscale = Colorscale.calc;
         var trace, z;
+        var gd;
 
         beforeEach(function() {
             trace = {};
             z = {};
+            gd = {};
         });
 
         it('should be RdBuNeg when autocolorscale and z <= 0', function() {
             trace = {
                 type: 'heatmap',
-                z: [[0, -1.5], [-2, -10]],
+                z: [[-0, -1.5], [-2, -10]],
                 autocolorscale: true,
                 _input: {autocolorscale: true}
             };
-
-            z = [[0, -1.5], [-2, -10]];
-            calcColorscale(trace, z, '', 'z');
+            gd = _supply(trace);
+            calcColorscale(gd, trace, {vals: trace.z, containerStr: '', cLetter: 'z'});
             expect(trace.autocolorscale).toBe(true);
             expect(trace.colorscale[5]).toEqual([1, 'rgb(220,220,220)']);
         });
@@ -452,8 +396,8 @@ describe('Test colorscale:', function() {
                 autocolorscale: true,
                 _input: {}
             };
-            z = [[0, -1.5], [-2, -10]];
-            calcColorscale(trace, z, '', 'z');
+            gd = _supply(trace);
+            calcColorscale(gd, trace, {vals: trace.z, containerStr: '', cLetter: 'z'});
             expect(trace.autocolorscale).toBe(false);
             expect(trace.colorscale[5]).toEqual([1, 'rgb(220,220,220)']);
         });
@@ -466,7 +410,8 @@ describe('Test colorscale:', function() {
                 _input: {autocolorscale: true}
             };
             z = [[undefined, undefined], [-0.5, undefined]];
-            calcColorscale(trace, z, '', 'z');
+            gd = _supply(trace);
+            calcColorscale(gd, trace, {vals: z, containerStr: '', cLetter: 'z'});
             expect(trace.autocolorscale).toBe(true);
             expect(trace.colorscale[5]).toEqual([1, 'rgb(220,220,220)']);
         });
@@ -479,7 +424,8 @@ describe('Test colorscale:', function() {
                 _input: {autocolorscale: true}
             };
             z = [[undefined, undefined], [0.5, undefined]];
-            calcColorscale(trace, z, '', 'z');
+            gd = _supply(trace);
+            calcColorscale(gd, trace, {vals: z, containerStr: '', cLetter: 'z'});
             expect(trace.autocolorscale).toBe(true);
             expect(trace.colorscale[0]).toEqual([0, 'rgb(220,220,220)']);
         });
@@ -493,7 +439,8 @@ describe('Test colorscale:', function() {
                 _input: {autocolorscale: true}
             };
             z = [[undefined, undefined], [0.5, undefined]];
-            calcColorscale(trace, z, '', 'z');
+            gd = _supply(trace);
+            calcColorscale(gd, trace, {vals: z, containerStr: '', cLetter: 'z'});
             expect(trace.autocolorscale).toBe(true);
             expect(trace.colorscale[trace.colorscale.length - 1])
                 .toEqual([1, 'rgb(220,220,220)']);

From d263a7f1d3c63bb77b4b8aab2a4fc67b6157b4ba Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Wed, 21 Nov 2018 18:05:20 -0500
Subject: [PATCH 10/15] fix lint

---
 test/jasmine/assets/supply_defaults.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jasmine/assets/supply_defaults.js b/test/jasmine/assets/supply_defaults.js
index 6d42aca0aca..28bba9b870f 100644
--- a/test/jasmine/assets/supply_defaults.js
+++ b/test/jasmine/assets/supply_defaults.js
@@ -3,7 +3,7 @@
 var Plots = require('@src/plots/plots');
 
 // The following is used to fill up the Registry module
-/* eslint-ignore */
+/* eslint-disable-next-line */
 var Plotly = require('@lib');
 
 /**

From 84f0ea87c6beaf5c2160eecfccea6b005798f148 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Wed, 21 Nov 2018 18:17:01 -0500
Subject: [PATCH 11/15] revert parcoords_tests.js to master

---
 test/jasmine/tests/parcoords_test.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/test/jasmine/tests/parcoords_test.js b/test/jasmine/tests/parcoords_test.js
index b568c9d2921..3a8313c1d65 100644
--- a/test/jasmine/tests/parcoords_test.js
+++ b/test/jasmine/tests/parcoords_test.js
@@ -141,10 +141,7 @@ describe('parcoords initialization tests', function() {
                 cauto: true,
                 autocolorscale: false,
                 reversescale: false,
-                showscale: false,
-                diverging: undefined,
-                sequential: undefined,
-                sequentialminus: undefined
+                showscale: false
             });
         });
 
@@ -281,9 +278,6 @@ describe('parcoords initialization tests', function() {
                 ]
             }));
 
-            delete(fullTrace.line.diverging);
-            delete(fullTrace.line.sequential);
-            delete(fullTrace.line.sequentialminus);
             expect(fullTrace.line).toEqual({
                 color: [35, 63, 21, 42],
                 colorscale: attributes.line.colorscale.dflt,

From ee222d50016211eca4dc1fc9dd8917daa91e049b Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Thu, 22 Nov 2018 12:49:52 -0500
Subject: [PATCH 12/15] test layout.colorscale inheritance

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

diff --git a/test/jasmine/tests/colorscale_test.js b/test/jasmine/tests/colorscale_test.js
index cedf8f1a0e4..2721f5710bf 100644
--- a/test/jasmine/tests/colorscale_test.js
+++ b/test/jasmine/tests/colorscale_test.js
@@ -387,6 +387,25 @@ describe('Test colorscale:', function() {
             expect(trace.colorscale[5]).toEqual([1, 'rgb(220,220,220)']);
         });
 
+        it('should be layout.colorscale.sequentialminus when autocolorscale and z <= 0', function() {
+            var colorscale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
+            trace = {
+                type: 'heatmap',
+                z: [[-0, -1.5], [-2, -10]],
+                autocolorscale: true,
+                _input: {autocolorscale: true}
+            };
+            var layout = {
+                colorscale: {
+                    sequentialminus: colorscale
+                }
+            };
+            gd = _supply(trace, layout);
+            calcColorscale(gd, trace, {vals: trace.z, containerStr: '', cLetter: 'z'});
+            expect(trace.autocolorscale).toBe(true);
+            expect(trace.colorscale).toEqual(colorscale);
+        });
+
         it('should set autocolorscale to false if it wasn\'t explicitly set true in input', function() {
             trace = {
                 type: 'heatmap',
@@ -416,6 +435,26 @@ describe('Test colorscale:', function() {
             expect(trace.colorscale[5]).toEqual([1, 'rgb(220,220,220)']);
         });
 
+        it('should be layout.colorscale.sequentialminus when autocolorscale and the only numerical z <= -0.5', function() {
+            var colorscale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
+            trace = {
+                type: 'heatmap',
+                z: [['a', 'b'], [-0.5, 'd']],
+                autocolorscale: true,
+                _input: {autocolorscale: true}
+            };
+            z = [[undefined, undefined], [-0.5, undefined]];
+            var layout = {
+                colorscale: {
+                    sequentialminus: colorscale
+                }
+            };
+            gd = _supply(trace, layout);
+            calcColorscale(gd, trace, {vals: z, containerStr: '', cLetter: 'z'});
+            expect(trace.autocolorscale).toBe(true);
+            expect(trace.colorscale).toEqual(colorscale);
+        });
+
         it('should be Reds when the only numerical z >= 0.5', function() {
             trace = {
                 type: 'heatmap',
@@ -430,6 +469,68 @@ describe('Test colorscale:', function() {
             expect(trace.colorscale[0]).toEqual([0, 'rgb(220,220,220)']);
         });
 
+        it('should be layout.colorscale.sequential when autocolorscale and the only numerical z >= 0.5', function() {
+            var colorscale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
+            trace = {
+                type: 'heatmap',
+                z: [['a', 'b'], [0.5, 'd']],
+                autocolorscale: true,
+                _input: {autocolorscale: true}
+            };
+            z = [[undefined, undefined], [0.5, undefined]];
+            var layout = {
+                colorscale: {
+                    sequential: colorscale
+                }
+            };
+            gd = _supply(trace, layout);
+            calcColorscale(gd, trace, {vals: z, containerStr: '', cLetter: 'z'});
+            expect(trace.autocolorscale).toBe(true);
+            expect(trace.colorscale).toEqual(colorscale);
+        });
+
+        it('should be layout.colorscale.diverging when autocolorscale and there are positive and negative values', function() {
+            var colorscale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
+            trace = {
+                type: 'heatmap',
+                z: [[-1.0, 'b'], [0.5, 'd']],
+                autocolorscale: true,
+                _input: {autocolorscale: true}
+            };
+            z = [[-1.0, undefined], [0.5, undefined]];
+            var layout = {
+                colorscale: {
+                    diverging: colorscale
+                }
+            };
+            gd = _supply(trace, layout);
+            calcColorscale(gd, trace, {vals: z, containerStr: '', cLetter: 'z'});
+            expect(trace.autocolorscale).toBe(true);
+            expect(trace.colorscale).toEqual(colorscale);
+        });
+
+        it('should ignore layout.colorscale.diverging when colorscale is defined at trace-level', function() {
+            var colorscale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
+            var layoutColorscale = [[0, 'rgb(0,0,0)'], [1, 'rgb(255,255,255)']];
+            trace = {
+                type: 'heatmap',
+                z: [[-1.0, 'b'], [0.5, 'd']],
+                autocolorscale: true,
+                _input: {autocolorscale: true},
+                colorscale: colorscale
+            };
+            z = [[-1.0, undefined], [0.5, undefined]];
+            var layout = {
+                colorscale: {
+                    diverging: layoutColorscale
+                }
+            };
+            gd = _supply(trace, layout);
+            calcColorscale(gd, trace, {vals: z, containerStr: '', cLetter: 'z'});
+            expect(trace.autocolorscale).toBe(true);
+            expect(trace.colorscale).toEqual(colorscale);
+        });
+
         it('should be reverse the auto scale when reversescale is true', function() {
             trace = {
                 type: 'heatmap',

From 75e8910b4251564fd9d1f7edcc0150a15ebf64c8 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Thu, 22 Nov 2018 16:48:14 -0500
Subject: [PATCH 13/15] improve code readability

---
 src/components/colorscale/calc.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/colorscale/calc.js b/src/components/colorscale/calc.js
index 4232c8bc479..e887b6820cd 100644
--- a/src/components/colorscale/calc.js
+++ b/src/components/colorscale/calc.js
@@ -15,6 +15,7 @@ var flipScale = require('./flip_scale');
 
 
 module.exports = function calc(gd, trace, opts) {
+    var fullLayout = gd._fullLayout;
     var vals = opts.vals;
     var containerStr = opts.containerStr;
     var cLetter = opts.cLetter;
@@ -86,8 +87,8 @@ module.exports = function calc(gd, trace, opts) {
     doUpdate(autoAttr, (auto !== false || (min === undefined && max === undefined)));
 
     if(container.autocolorscale) {
-        if(min * max < 0) scl = gd._fullLayout.colorscale.diverging;
-        else if(min >= 0) scl = gd._fullLayout.colorscale.sequential;
+        if(min * max < 0) scl = fullLayout.colorscale.diverging;
+        else if(min >= 0) scl = fullLayout.colorscale.sequential;
         else scl = gd._fullLayout.colorscale.sequentialminus;
 
         // reversescale is handled at the containerOut level

From e50a6aa51b40e9686595d682858cf5803d6c2e80 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Thu, 22 Nov 2018 18:47:37 -0500
Subject: [PATCH 14/15] add a mock using template and layout.colorscale

---
 test/image/baselines/colorscale_template.png | Bin 0 -> 22275 bytes
 test/image/mocks/colorscale_template.json    | 157 +++++++++++++++++++
 2 files changed, 157 insertions(+)
 create mode 100644 test/image/baselines/colorscale_template.png
 create mode 100644 test/image/mocks/colorscale_template.json

diff --git a/test/image/baselines/colorscale_template.png b/test/image/baselines/colorscale_template.png
new file mode 100644
index 0000000000000000000000000000000000000000..be36c46dba041cd0adee6647de179548b04d30a9
GIT binary patch
literal 22275
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%0AdGf)B
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

literal 0
HcmV?d00001

diff --git a/test/image/mocks/colorscale_template.json b/test/image/mocks/colorscale_template.json
new file mode 100644
index 00000000000..a506fb9d1bd
--- /dev/null
+++ b/test/image/mocks/colorscale_template.json
@@ -0,0 +1,157 @@
+{
+  "data": [{
+    "x": [
+      50076,
+      -42372,
+      -19260,
+      3852,
+      26964,
+      -65484,
+      -42372,
+      -19260,
+      3852,
+      26964,
+      -88596,
+      -65484,
+      -42372,
+      -19260,
+      3852,
+      26964,
+      50076,
+      73188,
+      -65484,
+      -42372,
+      -19260,
+      3852,
+      26964,
+      50076,
+      -42372,
+      -19260,
+      3852,
+      26964,
+      -88596,
+      -65484,
+      -42372,
+      -19260,
+      3852,
+      26964,
+      50076,
+      73188,
+      -88596,
+      -65484,
+      -42372,
+      -19260,
+      3852,
+      26964,
+      50076,
+      73188
+    ],
+    "y": [
+      51851.8,
+      77841.4,
+      77841.4,
+      77841.4,
+      77841.4,
+      51851.8,
+      51851.8,
+      51851.8,
+      51851.8,
+      51851.8,
+      -26117,
+      -26117,
+      -26117,
+      -26117,
+      -26117,
+      -26117,
+      -26117,
+      -26117,
+      -52106.6,
+      -52106.6,
+      -52106.6,
+      -52106.6,
+      -52106.6,
+      -52106.6,
+      -78096.2,
+      -78096.2,
+      -78096.2,
+      -78096.2,
+      -127.4,
+      -127.4,
+      -127.4,
+      -127.4,
+      -127.4,
+      -127.4,
+      -127.4,
+      -127.4,
+      25862.2,
+      25862.2,
+      25862.2,
+      25862.2,
+      25862.2,
+      25862.2,
+      25862.2,
+      25862.2
+    ],
+    "z": [
+      4.361856,
+      4.234497,
+      4.321701,
+      4.450315,
+      4.416136,
+      4.210373,
+      4.32009,
+      4.246728,
+      4.293992,
+      4.316364,
+      3.908434,
+      4.433257,
+      4.364234,
+      4.308714,
+      4.275516,
+      4.126979,
+      4.296483,
+      4.320471,
+      4.339848,
+      4.39907,
+      4.345006,
+      4.315032,
+      4.295618,
+      4.262052,
+      4.154291,
+      4.404264,
+      4.33847,
+      4.270931,
+      4.032226,
+      4.381492,
+      4.328922,
+      4.24046,
+      4.349151,
+      4.202861,
+      4.256402,
+      4.28972,
+      3.956225,
+      4.337909,
+      4.31226,
+      4.259435,
+      4.146854,
+      4.235799,
+      4.238752,
+      4.299876
+    ],
+    "type": "heatmap",
+    "autocolorscale": true
+  }],
+  "layout": {
+    "template": {
+      "layout": {
+        "title": "heatmap template",
+        "colorscale": {
+          "sequential": [
+            [0, "rgb(0,0,0)"],
+            [1, "rgb(255,255,255)"]
+          ]
+        }
+      }
+    }
+  }
+}

From dca43502a49a70b576ca2748a094ded8b2edcb34 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Fri, 23 Nov 2018 12:02:28 -0500
Subject: [PATCH 15/15] set autocolorscale: true in template to properly test
 mock

---
 test/image/mocks/colorscale_template.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/image/mocks/colorscale_template.json b/test/image/mocks/colorscale_template.json
index a506fb9d1bd..e3fa4e38505 100644
--- a/test/image/mocks/colorscale_template.json
+++ b/test/image/mocks/colorscale_template.json
@@ -138,11 +138,15 @@
       4.238752,
       4.299876
     ],
-    "type": "heatmap",
-    "autocolorscale": true
+    "type": "heatmap"
   }],
   "layout": {
     "template": {
+      "data": {
+        "heatmap": [{
+          "autocolorscale": true
+        }]
+      },
       "layout": {
         "title": "heatmap template",
         "colorscale": {