preserve impliedEdits: {key: undefined} by extendDeepAll

or better yet don't do deep extend, simplify to extendFlat also fix a weird bug with calendars and box plots
plotly · alexcjohnson · Sep 20, 2017 · Aug 18, 2017 · Aug 29, 2017 · Aug 30, 2017
commit 238e2482f06810fd759d14aebee386724c0e1e45
diff --git a/src/components/calendars/index.js b/src/components/calendars/index.js
@@ -206,6 +206,7 @@ module.exports = {
         traces: {
             scatter: xyAttrs,
             bar: xyAttrs,
+            box: xyAttrs,
             heatmap: xyAttrs,
             contour: xyAttrs,
             histogram: xyAttrs,

diff --git a/src/components/sliders/attributes.js b/src/components/sliders/attributes.js
@@ -10,7 +10,7 @@
 
 var fontAttrs = require('../../plots/font_attributes');
 var padAttrs = require('../../plots/pad_attributes');
-var extendDeep = require('../../lib/extend').extendDeep;
+var extendDeepAll = require('../../lib/extend').extendDeepAll;
 var overrideAll = require('../../plot_api/edit_types').overrideAll;
 var animationAttrs = require('../../plots/animation_attributes');
 var constants = require('./constants');
@@ -128,7 +128,7 @@ module.exports = overrideAll({
         role: 'style',
         description: 'Sets the x position (in normalized coordinates) of the slider.'
     },
-    pad: extendDeep({}, padAttrs, {
+    pad: extendDeepAll({}, padAttrs, {
         description: 'Set the padding of the slider component along each side.'
     }, {t: {dflt: 20}}),
     xanchor: {

diff --git a/src/plot_api/plot_schema.js b/src/plot_api/plot_schema.js
@@ -24,7 +24,7 @@ var polarAxisAttrs = require('../plots/polar/axis_attributes');
 var editTypes = require('./edit_types');
 
 var extendFlat = Lib.extendFlat;
-var extendDeep = Lib.extendDeep;
+var extendDeepAll = Lib.extendDeepAll;
 
 var IS_SUBPLOT_OBJ = '_isSubplotObj';
 var IS_LINKED_TO_ARRAY = '_isLinkedToArray';
@@ -140,7 +140,7 @@ exports.crawl = function(attrs, callback, specifiedLevel, attrString) {
 
         if(exports.isValObject(attr)) return;
 
-        if(Lib.isPlainObject(attr)) {
+        if(Lib.isPlainObject(attr) && attrName !== 'impliedEdits') {
             exports.crawl(attr, callback, level + 1, fullAttrString);
         }
     });
@@ -428,14 +428,14 @@ function getTraceAttributes(type) {
     attributes.type = null;
 
     // base attributes (same for all trace types)
-    extendDeep(attributes, baseAttributes);
+    extendDeepAll(attributes, baseAttributes);
 
     // module attributes
-    extendDeep(attributes, _module.attributes);
+    extendDeepAll(attributes, _module.attributes);
 
     // subplot attributes
     if(basePlotModule.attributes) {
-        extendDeep(attributes, basePlotModule.attributes);
+        extendDeepAll(attributes, basePlotModule.attributes);
     }
 
     // 'type' gets overwritten by baseAttributes; reset it here
@@ -450,7 +450,7 @@ function getTraceAttributes(type) {
     if(_module.layoutAttributes) {
         var layoutAttributes = {};
 
-        extendDeep(layoutAttributes, _module.layoutAttributes);
+        extendDeepAll(layoutAttributes, _module.layoutAttributes);
         out.layoutAttributes = formatAttributes(layoutAttributes);
     }
 
@@ -462,7 +462,7 @@ function getLayoutAttributes() {
     var key, _module;
 
     // global layout attributes
-    extendDeep(layoutAttributes, baseLayoutAttributes);
+    extendDeepAll(layoutAttributes, baseLayoutAttributes);
 
     // add base plot module layout attributes
     for(key in Registry.subplotsRegistry) {
@@ -518,7 +518,7 @@ function getLayoutAttributes() {
 
 function getTransformAttributes(type) {
     var _module = Registry.transformsRegistry[type];
-    var attributes = extendDeep({}, _module.attributes);
+    var attributes = extendDeepAll({}, _module.attributes);
 
     // add registered components transform attributes
     Object.keys(Registry.componentsRegistry).forEach(function(k) {
@@ -538,7 +538,7 @@ function getTransformAttributes(type) {
 
 function getFramesAttributes() {
     var attrs = {
-        frames: Lib.extendDeep({}, frameAttributes)
+        frames: Lib.extendDeepAll({}, frameAttributes)
     };
 
     formatAttributes(attrs);
@@ -621,7 +621,7 @@ function assignPolarLayoutAttrs(layoutAttributes) {
 
 function handleBasePlotModule(layoutAttributes, _module, astr) {
     var np = Lib.nestedProperty(layoutAttributes, astr),
-        attrs = extendDeep({}, _module.layoutAttributes);
+        attrs = extendDeepAll({}, _module.layoutAttributes);
 
     attrs[IS_SUBPLOT_OBJ] = true;
     np.set(attrs);
@@ -630,5 +630,5 @@ function handleBasePlotModule(layoutAttributes, _module, astr) {
 function insertAttrs(baseAttrs, newAttrs, astr) {
     var np = Lib.nestedProperty(baseAttrs, astr);
 
-    np.set(extendDeep(np.get() || {}, newAttrs));
+    np.set(extendDeepAll(np.get() || {}, newAttrs));
 }
diff --git a/src/registry.js b/src/registry.js
@@ -14,7 +14,7 @@ var noop = require('./lib/noop');
 var pushUnique = require('./lib/push_unique');
 var ExtendModule = require('./lib/extend');
 var extendFlat = ExtendModule.extendFlat;
-var extendDeep = ExtendModule.extendDeep;
+var extendDeepAll = ExtendModule.extendDeepAll;
 
 var basePlotAttributes = require('./plots/attributes');
 var baseLayoutAttributes = require('./plots/layout_attributes');
@@ -140,7 +140,7 @@ exports.registerComponent = function(_module) {
     }
 
     if(_module.schema && _module.schema.layout) {
-        extendDeep(baseLayoutAttributes, _module.schema.layout);
+        extendDeepAll(baseLayoutAttributes, _module.schema.layout);
     }
 };
 
@@ -169,7 +169,7 @@ function mergeComponentAttrsToTrace(componentName, traceType) {
 
     var traceAttrs = componentSchema.traces[traceType];
     if(traceAttrs) {
-        extendDeep(exports.modules[traceType]._module.attributes, traceAttrs);
+        extendDeepAll(exports.modules[traceType]._module.attributes, traceAttrs);
     }
 }
 
@@ -179,7 +179,7 @@ function mergeComponentAttrsToTransform(componentName, transformType) {
 
     var transformAttrs = componentSchema.transforms[transformType];
     if(transformAttrs) {
-        extendDeep(exports.transformsRegistry[transformType].attributes, transformAttrs);
+        extendDeepAll(exports.transformsRegistry[transformType].attributes, transformAttrs);
     }
 }
 
@@ -194,7 +194,7 @@ function mergeComponentAttrsToSubplot(componentName, subplotName) {
 
     var componentLayoutAttrs = componentSchema.subplots[subplotAttr];
     if(subplotAttrs && componentLayoutAttrs) {
-        extendDeep(subplotAttrs, componentLayoutAttrs);
+        extendDeepAll(subplotAttrs, componentLayoutAttrs);
     }
 }
 

diff --git a/src/traces/box/attributes.js b/src/traces/box/attributes.js
@@ -63,8 +63,6 @@ module.exports = {
             'missing and the position axis is categorical'
         ].join(' ')
     },
-    xcalendar: scatterAttrs.xcalendar,
-    ycalendar: scatterAttrs.ycalendar,
     whiskerwidth: {
         valType: 'number',
         min: 0,

diff --git a/src/traces/candlestick/attributes.js b/src/traces/candlestick/attributes.js
@@ -9,23 +9,25 @@
 
 'use strict';
 
-var Lib = require('../../lib');
+var extendFlat = require('../../lib').extendFlat;
 var OHLCattrs = require('../ohlc/attributes');
 var boxAttrs = require('../box/attributes');
 
-var directionAttrs = {
-    name: OHLCattrs.increasing.name,
-    showlegend: OHLCattrs.increasing.showlegend,
+function directionAttrs(lineColorDefault) {
+    return {
+        name: OHLCattrs.increasing.name,
+        showlegend: OHLCattrs.increasing.showlegend,
 
-    line: {
-        color: Lib.extendFlat({}, boxAttrs.line.color),
-        width: Lib.extendFlat({}, boxAttrs.line.width),
-        editType: 'style'
-    },
+        line: {
+            color: extendFlat({}, boxAttrs.line.color, {dflt: lineColorDefault}),
+            width: boxAttrs.line.width,
+            editType: 'style'
+        },
 
-    fillcolor: Lib.extendFlat({}, boxAttrs.fillcolor),
-    editType: 'style'
-};
+        fillcolor: boxAttrs.fillcolor,
+        editType: 'style'
+    };
+}
 
 module.exports = {
     x: OHLCattrs.x,
@@ -35,7 +37,7 @@ module.exports = {
     close: OHLCattrs.close,
 
     line: {
-        width: Lib.extendFlat({}, boxAttrs.line.width, {
+        width: extendFlat({}, boxAttrs.line.width, {
             description: [
                 boxAttrs.line.width.description,
                 'Note that this style setting can also be set per',
@@ -46,14 +48,10 @@ module.exports = {
         editType: 'style'
     },
 
-    increasing: Lib.extendDeep({}, directionAttrs, {
-        line: { color: { dflt: OHLCattrs.increasing.line.color.dflt } }
-    }),
+    increasing: directionAttrs(OHLCattrs.increasing.line.color.dflt),
 
-    decreasing: Lib.extendDeep({}, directionAttrs, {
-        line: { color: { dflt: OHLCattrs.decreasing.line.color.dflt } }
-    }),
+    decreasing: directionAttrs(OHLCattrs.decreasing.line.color.dflt),
 
     text: OHLCattrs.text,
-    whiskerwidth: Lib.extendFlat({}, boxAttrs.whiskerwidth, { dflt: 0 })
+    whiskerwidth: extendFlat({}, boxAttrs.whiskerwidth, { dflt: 0 })
 };
diff --git a/src/traces/choropleth/attributes.js b/src/traces/choropleth/attributes.js
@@ -15,7 +15,7 @@ var plotAttrs = require('../../plots/attributes');
 
 var extend = require('../../lib/extend');
 var extendFlat = extend.extendFlat;
-var extendDeep = extend.extendDeep;
+var extendDeepAll = extend.extendDeepAll;
 
 var ScatterGeoMarkerLineAttrs = ScatterGeoAttrs.marker.line;
 
@@ -52,7 +52,7 @@ module.exports = extendFlat({
         flags: ['location', 'z', 'text', 'name']
     }),
 },
-    extendDeep({}, colorscaleAttrs, {
+    extendDeepAll({}, colorscaleAttrs, {
         zmax: {editType: 'calc'},
         zmin: {editType: 'calc'}
     }),

diff --git a/src/traces/ohlc/attributes.js b/src/traces/ohlc/attributes.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-var Lib = require('../../lib');
+var extendFlat = require('../../lib').extendFlat;
 var scatterAttrs = require('../scatter/attributes');
 var dash = require('../../components/drawing/attributes').dash;
 
@@ -18,36 +18,38 @@ var DECREASING_COLOR = '#FF4136';
 
 var lineAttrs = scatterAttrs.line;
 
-var directionAttrs = {
-    name: {
-        valType: 'string',
-        role: 'info',
-        editType: 'style',
-        description: [
-            'Sets the segment name.',
-            'The segment name appear as the legend item and on hover.'
-        ].join(' ')
-    },
-
-    showlegend: {
-        valType: 'boolean',
-        role: 'info',
-        dflt: true,
-        editType: 'style',
-        description: [
-            'Determines whether or not an item corresponding to this',
-            'segment is shown in the legend.'
-        ].join(' ')
-    },
+function directionAttrs(lineColorDefault) {
+    return {
+        name: {
+            valType: 'string',
+            role: 'info',
+            editType: 'style',
+            description: [
+                'Sets the segment name.',
+                'The segment name appear as the legend item and on hover.'
+            ].join(' ')
+        },
 
-    line: {
-        color: lineAttrs.color,
-        width: lineAttrs.width,
-        dash: dash,
+        showlegend: {
+            valType: 'boolean',
+            role: 'info',
+            dflt: true,
+            editType: 'style',
+            description: [
+                'Determines whether or not an item corresponding to this',
+                'segment is shown in the legend.'
+            ].join(' ')
+        },
+
+        line: {
+            color: extendFlat({}, lineAttrs.color, {dflt: lineColorDefault}),
+            width: lineAttrs.width,
+            dash: dash,
+            editType: 'style'
+        },
         editType: 'style'
-    },
-    editType: 'style'
-};
+    };
+}
 
 module.exports = {
 
@@ -89,15 +91,15 @@ module.exports = {
     },
 
     line: {
-        width: Lib.extendFlat({}, lineAttrs.width, {
+        width: extendFlat({}, lineAttrs.width, {
             description: [
                 lineAttrs.width,
                 'Note that this style setting can also be set per',
                 'direction via `increasing.line.width` and',
                 '`decreasing.line.width`.'
             ].join(' ')
         }),
-        dash: Lib.extendFlat({}, dash, {
+        dash: extendFlat({}, dash, {
             description: [
                 dash.description,
                 'Note that this style setting can also be set per',
@@ -108,13 +110,9 @@ module.exports = {
         editType: 'style'
     },
 
-    increasing: Lib.extendDeep({}, directionAttrs, {
-        line: { color: { dflt: INCREASING_COLOR } }
-    }),
+    increasing: directionAttrs(INCREASING_COLOR),
 
-    decreasing: Lib.extendDeep({}, directionAttrs, {
-        line: { color: { dflt: DECREASING_COLOR } }
-    }),
+    decreasing: directionAttrs(DECREASING_COLOR),
 
     text: {
         valType: 'string',

diff --git a/src/traces/parcoords/attributes.js b/src/traces/parcoords/attributes.js
@@ -15,7 +15,7 @@ var axesAttrs = require('../../plots/cartesian/layout_attributes');
 var fontAttrs = require('../../plots/font_attributes');
 
 var extend = require('../../lib/extend');
-var extendDeep = extend.extendDeep;
+var extendDeepAll = extend.extendDeepAll;
 var extendFlat = extend.extendFlat;
 
 module.exports = {
@@ -137,7 +137,7 @@ module.exports = {
     line: extendFlat(
         // 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
-        extendDeep(
+        extendDeepAll(
             colorAttributes('line', 'calc'),
             {
                 colorscale: {dflt: colorscales.Viridis},