declare colorbar attrs within Colorscale.attributes()

- adapt multiple trace attributes.js files accordingly
- standard colorscale/attributes import to colorScaleAttrs

Author: etpinard

src/components/colorscale/attributes.js

@@ -8,6 +8,7 @@
 
 'use strict';
 
+var colorbarAttrs = require('../colorbar/attributes');
 var palettes = require('./scales.js').scales;
 var paletteStr = Object.keys(palettes);
 
@@ -240,6 +241,8 @@ module.exports = function colorScaleAttrs(context, opts) {
                 effectDesc
             ].join('')
         };
+
+        attrs.colorbar = colorbarAttrs;
     }
 
     return attrs;

src/traces/bar/attributes.js

@@ -10,8 +10,7 @@
 
 var scatterAttrs = require('../scatter/attributes');
 var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes');
-var colorAttributes = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 var fontAttrs = require('../../plots/font_attributes');
 var constants = require('./constants.js');
 
@@ -33,13 +32,12 @@ var markerLineWidth = extendFlat({},
 var markerLine = extendFlat({
     width: markerLineWidth,
     editType: 'calc'
-}, colorAttributes('marker.line'));
+}, colorScaleAttrs('marker.line'));
 
 var marker = extendFlat({
     line: markerLine,
     editType: 'calc'
-}, colorAttributes('marker'), {
-    colorbar: colorbarAttrs,
+}, colorScaleAttrs('marker'), {
     opacity: {
         valType: 'number',
         arrayOk: true,

src/traces/choropleth/attributes.js

@@ -10,8 +10,7 @@
 
 var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes');
 var scatterGeoAttrs = require('../scattergeo/attributes');
-var colorscaleAttrs = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 var plotAttrs = require('../../plots/attributes');
 
 var extendFlat = require('../../lib/extend').extendFlat;
@@ -80,9 +79,8 @@ module.exports = extendFlat({
     hovertemplate: hovertemplateAttrs(),
 },
 
-    colorscaleAttrs('', {
+    colorScaleAttrs('', {
         cLetter: 'z',
         editTypeOverride: 'calc'
-    }),
-    {colorbar: colorbarAttrs}
+    })
 );

src/traces/cone/attributes.js

@@ -8,8 +8,7 @@
 
 'use strict';
 
-var colorscaleAttrs = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes');
 var mesh3dAttrs = require('../mesh3d/attributes');
 var baseAttrs = require('../../plots/attributes');
@@ -170,13 +169,11 @@ var attrs = {
     hovertemplate: hovertemplateAttrs({editType: 'calc'}, {keys: ['norm']})
 };
 
-extendFlat(attrs, colorscaleAttrs('', {
+extendFlat(attrs, colorScaleAttrs('', {
     colorAttr: 'u/v/w norm',
     showScaleDflt: true,
     editTypeOverride: 'calc'
-}), {
-    colorbar: colorbarAttrs
-});
+}));
 
 var fromMesh3d = ['opacity', 'lightposition', 'lighting'];
 

src/traces/contour/attributes.js

@@ -10,8 +10,7 @@
 
 var heatmapAttrs = require('../heatmap/attributes');
 var scatterAttrs = require('../scatter/attributes');
-var colorscaleAttrs = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 var dash = require('../../components/drawing/attributes').dash;
 var fontAttrs = require('../../plots/font_attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
@@ -251,10 +250,9 @@ module.exports = extendFlat({
         editType: 'plot'
     }
 },
-    colorscaleAttrs('', {
+    colorScaleAttrs('', {
         cLetter: 'z',
         autoColorDflt: false,
         editTypeOverride: 'calc'
-    }),
-    { colorbar: colorbarAttrs }
+    })
 );

src/traces/contourcarpet/attributes.js

@@ -12,8 +12,7 @@ var heatmapAttrs = require('../heatmap/attributes');
 var contourAttrs = require('../contour/attributes');
 var contourContourAttrs = contourAttrs.contours;
 var scatterAttrs = require('../scatter/attributes');
-var colorscaleAttrs = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 
 var extendFlat = require('../../lib/extend').extendFlat;
 
@@ -95,9 +94,8 @@ module.exports = extendFlat({
     transforms: undefined
 },
 
-    colorscaleAttrs('', {
+    colorScaleAttrs('', {
         cLetter: 'z',
         autoColorDflt: false
-    }),
-    { colorbar: colorbarAttrs }
+    })
 );

src/traces/heatmap/attributes.js

@@ -10,8 +10,7 @@
 
 var scatterAttrs = require('../scatter/attributes');
 var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes');
-var colorscaleAttrs = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 
 var extendFlat = require('../../lib/extend').extendFlat;
 
@@ -121,9 +120,5 @@ module.exports = extendFlat({
 }, {
     transforms: undefined
 },
-    colorscaleAttrs('', {
-        cLetter: 'z',
-        autoColorDflt: false
-    }),
-    { colorbar: colorbarAttrs }
+    colorScaleAttrs('', {cLetter: 'z', autoColorDflt: false})
 );

src/traces/heatmapgl/attributes.js

@@ -8,15 +8,12 @@
 
 'use strict';
 
-
 var heatmapAttrs = require('../heatmap/attributes');
-var colorscaleAttrs = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 
 var extendFlat = require('../../lib/extend').extendFlat;
 var overrideAll = require('../../plot_api/edit_types').overrideAll;
 
-
 var commonList = [
     'z',
     'x', 'x0', 'dx',
@@ -34,8 +31,7 @@ for(var i = 0; i < commonList.length; i++) {
 
 extendFlat(
     attrs,
-    colorscaleAttrs('', {cLetter: 'z', autoColorDflt: false}),
-    {colorbar: colorbarAttrs}
+    colorScaleAttrs('', {cLetter: 'z', autoColorDflt: false})
 );
 
 module.exports = overrideAll(attrs, 'calc', 'nested');

src/traces/histogram2d/attributes.js

@@ -12,8 +12,7 @@ var histogramAttrs = require('../histogram/attributes');
 var makeBinAttrs = require('../histogram/bin_attributes');
 var heatmapAttrs = require('../heatmap/attributes');
 var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes');
-var colorscaleAttrs = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 
 var extendFlat = require('../../lib/extend').extendFlat;
 
@@ -51,9 +50,5 @@ module.exports = extendFlat(
         zhoverformat: heatmapAttrs.zhoverformat,
         hovertemplate: hovertemplateAttrs({}, {keys: 'z'})
     },
-    colorscaleAttrs('', {
-        cLetter: 'z',
-        autoColorDflt: false
-    }),
-    { colorbar: colorbarAttrs }
+    colorScaleAttrs('', {cLetter: 'z', autoColorDflt: false})
 );

src/traces/histogram2dcontour/attributes.js

@@ -10,8 +10,7 @@
 
 var histogram2dAttrs = require('../histogram2d/attributes');
 var contourAttrs = require('../contour/attributes');
-var colorscaleAttrs = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 
 var extendFlat = require('../../lib/extend').extendFlat;
 
@@ -37,9 +36,8 @@ module.exports = extendFlat({
     zhoverformat: histogram2dAttrs.zhoverformat,
     hovertemplate: histogram2dAttrs.hovertemplate
 },
-    colorscaleAttrs('', {
+    colorScaleAttrs('', {
         cLetter: 'z',
         editTypeOverride: 'calc'
-    }),
-    { colorbar: colorbarAttrs }
+    })
 );

src/traces/isosurface/attributes.js

@@ -8,8 +8,7 @@
 
 'use strict';
 
-var colorscaleAttrs = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes');
 var meshAttrs = require('../mesh3d/attributes');
 var baseAttrs = require('../../plots/attributes');
@@ -236,14 +235,11 @@ var attrs = module.exports = overrideAll(extendFlat({
     hovertemplate: hovertemplateAttrs()
 },
 
-colorscaleAttrs('', {
+colorScaleAttrs('', {
     colorAttr: '`value`',
     showScaleDflt: true,
     editTypeOverride: 'calc'
 }), {
-
-    colorbar: colorbarAttrs,
-
     opacity: meshAttrs.opacity,
     lightposition: meshAttrs.lightposition,
     lighting: meshAttrs.lighting,

src/traces/mesh3d/attributes.js

@@ -8,8 +8,7 @@
 
 'use strict';
 
-var colorscaleAttrs = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes');
 var surfaceAtts = require('../surface/attributes');
 var baseAttrs = require('../../plots/attributes');
@@ -178,14 +177,11 @@ module.exports = extendFlat({
     transforms: undefined
 },
 
-colorscaleAttrs('', {
+colorScaleAttrs('', {
     colorAttr: '`intensity`',
     showScaleDflt: true,
     editTypeOverride: 'calc'
 }), {
-
-    colorbar: colorbarAttrs,
-
     opacity: surfaceAtts.opacity,
 
     // Flat shaded mode

src/traces/parcats/attributes.js

@@ -11,19 +11,14 @@
 var extendFlat = require('../../lib/extend').extendFlat;
 var plotAttrs = require('../../plots/attributes');
 var fontAttrs = require('../../plots/font_attributes');
-var colorAttributes = require('../../components/colorscale/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes');
 var domainAttrs = require('../../plots/domain').attributes;
-var scatterAttrs = require('../scatter/attributes');
-var scatterLineAttrs = scatterAttrs.line;
-var colorbarAttrs = require('../../components/colorbar/attributes');
 
-var line = extendFlat({
-    editType: 'calc'
-}, colorAttributes('line', {editType: 'calc'}),
+var line = extendFlat(
+    {editType: 'calc'},
+    colorScaleAttrs('line', {editTypeOverride: 'calc'}),
     {
-        showscale: scatterLineAttrs.showscale,
-        colorbar: colorbarAttrs,
         shape: {
             valType: 'enumerated',
             values: ['linear', 'hspline'],
@@ -46,7 +41,8 @@ var line = extendFlat({
                 'This value here applies when hovering over lines.'
             ].join(' ')
         })
-    });
+    }
+);
 
 module.exports = {
     domain: domainAttrs({name: 'parcats', trace: true, editType: 'calc'}),

src/traces/parcoords/attributes.js

@@ -8,8 +8,7 @@
 
 'use strict';
 
-var colorAttributes = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 var axesAttrs = require('../../plots/cartesian/layout_attributes');
 var fontAttrs = require('../../plots/font_attributes');
 var domainAttrs = require('../../plots/domain').attributes;
@@ -112,15 +111,13 @@ module.exports = {
         description: 'The dimensions (variables) of the parallel coordinates chart. 2..60 dimensions are supported.'
     }),
 
-    line: extendFlat(
-        colorAttributes('line', {
+    line: extendFlat({editType: 'calc'},
+        colorScaleAttrs('line', {
             // the default autocolorscale isn't quite usable for parcoords due to context ambiguity around 0 (grey, off-white)
             // autocolorscale therefore defaults to false too, to avoid being overridden by the  blue-white-red autocolor palette
             colorscaleDflt: 'Viridis',
             autoColorDflt: false,
             editTypeOverride: 'calc'
-        }), {
-            colorbar: colorbarAttrs,
-            editType: 'calc'
         })
+    )
 };

src/traces/scatter/attributes.js

@@ -9,8 +9,7 @@
 'use strict';
 
 var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes');
-var colorAttributes = require('../../components/colorscale/attributes');
-var colorbarAttrs = require('../../components/colorbar/attributes');
+var colorScaleAttrs = require('../../components/colorscale/attributes');
 var fontAttrs = require('../../plots/font_attributes');
 var dash = require('../../components/drawing/attributes').dash;
 
@@ -415,8 +414,6 @@ module.exports = {
             ].join(' ')
         },
 
-        colorbar: colorbarAttrs,
-
         line: extendFlat({
             width: {
                 valType: 'number',
@@ -429,7 +426,7 @@ module.exports = {
             },
             editType: 'calc'
         },
-            colorAttributes('marker.line', {anim: true})
+            colorScaleAttrs('marker.line', {anim: true})
         ),
         gradient: {
             type: {
@@ -458,7 +455,7 @@ module.exports = {
         },
         editType: 'calc'
     },
-        colorAttributes('marker', {anim: true})
+        colorScaleAttrs('marker', {anim: true})
     ),
     selected: {
         marker: {