change colorscaleCalc's signature, cleanup code

Author: antoinerg

Diff for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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);