fix #2723 - list correct 'color' attribute in cone,

... mesh3d, surface and streamtube attribute declarations.

Author: etpinard

src/traces/cone/attributes.js

@@ -8,7 +8,6 @@
 
 'use strict';
 
-var colorAttrs = require('../../components/colorscale/color_attributes');
 var colorscaleAttrs = require('../../components/colorscale/attributes');
 var colorbarAttrs = require('../../components/colorbar/attributes');
 var mesh3dAttrs = require('../mesh3d/attributes');
@@ -161,11 +160,13 @@ var attrs = {
     }
 };
 
-extendFlat(attrs, colorAttrs('', 'calc', true), {
-    showscale: colorscaleAttrs.showscale,
+extendFlat(attrs, colorscaleAttrs('', {
+    colorAttr: 'u/v/w norm',
+    showScaleDflt: true,
+    editTypeOverride: 'calc'
+}), {
     colorbar: colorbarAttrs
 });
-delete attrs.color;
 
 var fromMesh3d = ['opacity', 'lightposition', 'lighting'];
 

src/traces/mesh3d/attributes.js

@@ -8,15 +8,14 @@
 
 'use strict';
 
-var colorAttrs = require('../../components/colorscale/color_attributes');
 var colorscaleAttrs = require('../../components/colorscale/attributes');
 var colorbarAttrs = require('../../components/colorbar/attributes');
 var surfaceAtts = require('../surface/attributes');
 var baseAttrs = require('../../plots/attributes');
 
 var extendFlat = require('../../lib/extend').extendFlat;
 
-module.exports = extendFlat(colorAttrs('', 'calc', false), {
+module.exports = extendFlat({
     x: {
         valType: 'data_array',
         editType: 'calc+clearAxisTypes',
@@ -166,8 +165,16 @@ module.exports = extendFlat(colorAttrs('', 'calc', false), {
             'Overrides *color* and *vertexcolor*.'
         ].join(' ')
     },
+},
+
+colorscaleAttrs('', {
+    colorAttr: '`intensity`',
+    showScaleDflt: true,
+    editTypeOverride: 'calc'
+}), {
+
+    colorbar: colorbarAttrs,
 
-    // Opacity
     opacity: surfaceAtts.opacity,
 
     // Flat shaded mode
@@ -193,9 +200,6 @@ module.exports = extendFlat(colorAttrs('', 'calc', false), {
         editType: 'calc'
     },
 
-    showscale: colorscaleAttrs.showscale,
-    colorbar: colorbarAttrs,
-
     lightposition: {
         x: extendFlat({}, surfaceAtts.lightposition.x, {dflt: 1e5}),
         y: extendFlat({}, surfaceAtts.lightposition.y, {dflt: 1e5}),

src/traces/streamtube/attributes.js

@@ -8,7 +8,6 @@
 
 'use strict';
 
-var colorAttrs = require('../../components/colorscale/color_attributes');
 var colorscaleAttrs = require('../../components/colorscale/attributes');
 var colorbarAttrs = require('../../components/colorbar/attributes');
 var mesh3dAttrs = require('../mesh3d/attributes');
@@ -134,11 +133,13 @@ var attrs = {
     }
 };
 
-extendFlat(attrs, colorAttrs('', 'calc', true), {
-    showscale: colorscaleAttrs.showscale,
+extendFlat(attrs, colorscaleAttrs('', {
+    colorAttr: 'u/v/w norm',
+    showScaleDflt: true,
+    editTypeOverride: 'calc'
+}), {
     colorbar: colorbarAttrs
 });
-delete attrs.color;
 
 var fromMesh3d = ['opacity', 'lightposition', 'lighting'];
 fromMesh3d.forEach(function(k) {

src/traces/surface/attributes.js

@@ -98,7 +98,7 @@ function makeContourAttr(axLetter) {
     };
 }
 
-var attrs = module.exports = overrideAll({
+var attrs = module.exports = overrideAll(extendFlat({
     z: {
         valType: 'data_array',
         description: 'Sets the z coordinates.'
@@ -131,15 +131,14 @@ var attrs = module.exports = overrideAll({
             'used for setting a color scale independent of `z`.'
         ].join(' ')
     },
+},
 
-    cauto: colorscaleAttrs.zauto,
-    cmin: colorscaleAttrs.zmin,
-    cmax: colorscaleAttrs.zmax,
-    colorscale: colorscaleAttrs.colorscale,
-    autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale,
-        {dflt: false}),
-    reversescale: colorscaleAttrs.reversescale,
-    showscale: colorscaleAttrs.showscale,
+colorscaleAttrs('', {
+    colorAttr: 'z or surfacecolor',
+    showScaleDflt: true,
+    autoColorDflt: false,
+    editTypeOverride: 'calc'
+}), {
     colorbar: colorbarAttrs,
 
     contours: {
@@ -254,6 +253,6 @@ var attrs = module.exports = overrideAll({
     },
 
     hoverinfo: extendFlat({}, baseAttrs.hoverinfo)
-}, 'calc', 'nested');
+}), 'calc', 'nested');
 
 attrs.x.editType = attrs.y.editType = attrs.z.editType = 'calc+clearAxisTypes';