no editType nesting - just docalc on editing full containers

Author: alexcjohnson

src/plot_api/edit_types.js

@@ -47,38 +47,14 @@ module.exports = {
 
     /*
      * update `flags` with the `editType` values found in `attr`
-     *
-     * If `attr` itself contains an `editType`, we just use that.
-     * If it doesn't, we recurse into any other objects contained
-     * in `attr` and update with all `editType` values found in
-     * *any* of them.
-     *
-     * So container objects may not need their own `editType`,
-     * if they're content to delegate to their members, but they
-     * may provide one either for performance or, in case of arrays,
-     * if adding/removing entries requires different flags than
-     * simply changing attributes of an existing entry.
      */
     update: function(flags, attr) {
-        function extend(attr1) {
-            var editType = attr1.editType;
-            if(editType === undefined) {
-                // if there's no editType defined, recurse into
-                Object.keys(attr1).forEach(function(attrName) {
-                    var attr2 = attr1[attrName];
-                    if(attrName.charAt(0) !== '_' && isPlainObject(attr2)) {
-                        extend(attr2);
-                    }
-                });
-            }
-            else {
-                var editTypeParts = editType.split('+');
-                editTypeParts.forEach(function(part) {
-                    flags[part] = true;
-                });
+        var editType = attr.editType;
+        if(editType) {
+            var editTypeParts = editType.split('+');
+            for(var i = 0; i < editTypeParts.length; i++) {
+                flags[editTypeParts[i]] = true;
             }
         }
-
-        extend(attr);
     }
 };

src/plot_api/plot_api.js

@@ -1626,8 +1626,14 @@ function _restyle(gd, aobj, _traces) {
                         else break;
                     }
 
-                    // must redo calcdata when restyling array values of arrayOk attributes
-                    if(valObject.arrayOk && (Array.isArray(newVal) || Array.isArray(oldVal))) {
+                    /*
+                     * must redo calcdata when restyling:
+                     * 1) array values of arrayOk attributes
+                     * 2) a container object (it would be hard to tell what
+                     *    pieces changed, whether any are arrays, so to be
+                     *    safe we need to recalc)
+                     */
+                    if(!valObject.valType || (valObject.arrayOk && (Array.isArray(newVal) || Array.isArray(oldVal)))) {
                         flags.docalc = true;
                     }
 

test/jasmine/tests/plot_api_test.js

@@ -1777,29 +1777,12 @@ describe('plot_api edit_types', function() {
         var flags = {docalc: false, dolegend: true};
 
         editTypes.update(flags, {
-            editType: 'docalc',
-            family: {valType: 'string', dflt: 'Comic sans', editType: 'doticks'},
-            size: {valType: 'number', dflt: 96, editType: 'doticks'},
-            color: {valType: 'color', dflt: 'red', editType: 'dolayoutstyle'}
-        });
-
-        expect(flags).toEqual({docalc: true, dolegend: true});
-    });
-
-    it('gets all updates from nested items if outer object has none', function() {
-        var flags = {docalc: false, dolegend: true};
-
-        editTypes.update(flags, {
-            family: {valType: 'string', dflt: 'Comic sans', editType: 'doticks'},
-            size: {valType: 'number', dflt: 96, editType: 'doticks'},
-            color: {valType: 'color', dflt: 'red', editType: 'dolayoutstyle'}
+            editType: 'docalc+dostyle',
+            valType: 'number',
+            dflt: 1,
+            role: 'style'
         });
 
-        expect(flags).toEqual({
-            docalc: false,
-            dolegend: true,
-            doticks: true,
-            dolayoutstyle: true
-        });
+        expect(flags).toEqual({docalc: true, dolegend: true, dostyle: true});
     });
 });