change overrideAll API to nested/from-root only

turns out we weren't using the default no-containers at all

Author: alexcjohnson

src/components/annotations3d/attributes.js

@@ -90,4 +90,4 @@ module.exports = overrideAll({
     // xref: 'x'
     // yref: 'y
     // zref: 'z'
-}, 'docalc', true);
+}, 'docalc', 'from-root');

src/components/colorbar/attributes.js

@@ -192,4 +192,4 @@ module.exports = overrideAll({
             'with respect to the color bar.'
         ].join(' ')
     }
-}, 'docolorbars', true);
+}, 'docolorbars', 'from-root');

src/components/sliders/attributes.js

@@ -285,4 +285,4 @@ module.exports = overrideAll({
         role: 'style',
         description: 'Sets the length in pixels of minor step tick marks'
     }
-}, 'doarraydraw', true);
+}, 'doarraydraw', 'from-root');

src/plot_api/edit_types.js

@@ -65,18 +65,20 @@ module.exports = {
     overrideAll: overrideAll
 };
 
-/*
+/**
  * For attributes that are largely copied from elsewhere into a plot type that doesn't
  * support partial redraws - overrides the editType field of all attributes in the object
  *
  * @param {object} attrs: the attributes to override. Will not be mutated.
  * @param {string} editTypeOverride: the new editType to use
- * @param {bool|'nested'} overrideContainers: should we override editType for containers or just
- *   `valObject`s? 'nested' will override editType for all but the top level. Containers below
- *   the absolute top level (trace or layout root) DO need an editType, to handle the case
- *   where you edit the whole container, but in some cases you want to provide it explicitly
- *   as it may be more expansive than the attribute editTypes, since you don't know if there
- *   is a data array in the container (which if provided directly triggers an automatic docalc)
+ * @param {'nested'|'from-root'} overrideContainers:
+ *   - 'nested' will override editType for nested containers but not the root.
+ *   - 'from-root' will also override editType of the root container.
+ *   Containers below the absolute top level (trace or layout root) DO need an
+ *   editType even if they are not `valObject`s themselves (eg `scatter.marker`)
+ *   to handle the case where you edit the whole container.
+ *
+ * @return {object} a new attributes object with `editType` modified as directed
  */
 function overrideAll(attrs, editTypeOverride, overrideContainers) {
     var out = extendFlat({}, attrs);
@@ -86,7 +88,7 @@ function overrideAll(attrs, editTypeOverride, overrideContainers) {
             out[key] = overrideOne(attr, editTypeOverride, overrideContainers, key);
         }
     }
-    if(overrideContainers === true) out.editType = editTypeOverride;
+    if(overrideContainers === 'from-root') out.editType = editTypeOverride;
 
     return out;
 }
@@ -99,14 +101,14 @@ function overrideOne(attr, editTypeOverride, overrideContainers, key) {
         if(Array.isArray(attr.items)) {
             out.items = new Array(attr.items.length);
             for(var i = 0; i < attr.items.length; i++) {
-                out.items[i] = overrideOne(attr.items[i], editTypeOverride, !!overrideContainers);
+                out.items[i] = overrideOne(attr.items[i], editTypeOverride, 'from-root');
             }
         }
         return out;
     }
     else {
         // don't provide an editType for the _deprecated container
         return overrideAll(attr, editTypeOverride,
-            (key.charAt(0) === '_') ? overrideContainers && 'nested' : !!overrideContainers);
+            (key.charAt(0) === '_') ? 'nested' : 'from-root');
     }
 }

src/plots/geo/layout/layout_attributes.js

@@ -255,4 +255,4 @@ module.exports = overrideAll({
     },
     lonaxis: geoAxesAttrs,
     lataxis: geoAxesAttrs
-}, 'doplot', true);
+}, 'doplot', 'from-root');

src/plots/gl2d/index.js

@@ -34,7 +34,7 @@ exports.attributes = require('../cartesian/attributes');
 // this could potentially be just `layoutAttributes` but it would
 // still need special handling somewhere to give it precedence over
 // the svg version when both are in use on one plot
-exports.layoutAttrOverrides = overrideAll(Cartesian.layoutAttributes, 'doplot', true);
+exports.layoutAttrOverrides = overrideAll(Cartesian.layoutAttributes, 'doplot', 'from-root');
 
 // similar overrides for base plot attributes (and those added by components)
 exports.baseLayoutAttrOverrides = overrideAll({

src/plots/gl3d/layout/axis_attributes.js

@@ -113,4 +113,4 @@ module.exports = overrideAll({
     zeroline: axesAttrs.zeroline,
     zerolinecolor: axesAttrs.zerolinecolor,
     zerolinewidth: axesAttrs.zerolinewidth
-}, 'doplot', true);
+}, 'doplot', 'from-root');

src/plots/mapbox/layout_attributes.js

@@ -263,4 +263,4 @@ module.exports = overrideAll({
             textposition: Lib.extendFlat({}, textposition, { arrayOk: false })
         }
     }
-}, 'doplot', true);
+}, 'doplot', 'from-root');

src/plots/ternary/layout/layout_attributes.js

@@ -61,4 +61,4 @@ module.exports = overrideAll({
     aaxis: ternaryAxesAttrs,
     baxis: ternaryAxesAttrs,
     caxis: ternaryAxesAttrs
-}, 'doplot', true);
+}, 'doplot', 'from-root');

src/traces/scattermapbox/attributes.js

@@ -62,8 +62,7 @@ module.exports = overrideAll({
 
     line: {
         color: lineAttrs.color,
-        width: lineAttrs.width,
-        editType: 'docalc'
+        width: lineAttrs.width
 
         // TODO
         // dash: dash
@@ -98,7 +97,6 @@ module.exports = overrideAll({
         reversescale: markerAttrs.reversescale,
         showscale: markerAttrs.showscale,
         colorbar: colorbarAttrs,
-        editType: 'docalc'
 
         // line
     },
@@ -112,4 +110,4 @@ module.exports = overrideAll({
     hoverinfo: extendFlat({}, plotAttrs.hoverinfo, {
         flags: ['lon', 'lat', 'text', 'name']
     })
-}, 'docalc');
+}, 'docalc', 'nested');

src/traces/surface/attributes.js

@@ -45,8 +45,7 @@ function makeContourAttr(axLetter) {
         project: {
             x: makeContourProjAttr('x'),
             y: makeContourProjAttr('y'),
-            z: makeContourProjAttr('z'),
-            editType: 'docalc'
+            z: makeContourProjAttr('z')
         },
         color: {
             valType: 'color',
@@ -94,8 +93,7 @@ function makeContourAttr(axLetter) {
             max: 16,
             dflt: 2,
             description: 'Sets the width of the highlighted contour lines.'
-        },
-        editType: 'docalc'
+        }
     };
 }
 
@@ -138,8 +136,7 @@ module.exports = overrideAll({
     contours: {
         x: makeContourAttr('x'),
         y: makeContourAttr('y'),
-        z: makeContourAttr('z'),
-        editType: 'docalc'
+        z: makeContourAttr('z')
     },
     hidesurface: {
         valType: 'boolean',
@@ -177,8 +174,7 @@ module.exports = overrideAll({
             max: 1e5,
             dflt: 0,
             description: 'Numeric vector, representing the Z coordinate for each vertex.'
-        },
-        editType: 'docalc'
+        }
     },
 
     lighting: {
@@ -224,8 +220,7 @@ module.exports = overrideAll({
                 'Represents the reflectance as a dependency of the viewing angle; e.g. paper is reflective',
                 'when viewing it from the edge of the paper (almost 90 degrees), causing shine.'
             ].join(' ')
-        },
-        editType: 'docalc'
+        }
     },
 
     opacity: {
@@ -248,4 +243,4 @@ module.exports = overrideAll({
             description: 'Obsolete. Use `cmax` instead.'
         })
     }
-}, 'docalc');
+}, 'docalc', 'nested');