split container opts from item opts in handleArrayContainerDefaults

etpinard · etpinard · commit 5de6ff02108d · 2016-11-10T18:28:07.000-05:00
diff --git a/src/components/annotations/annotation_defaults.js b/src/components/annotations/annotation_defaults.js
@@ -16,14 +16,15 @@ var Axes = require('../../plots/cartesian/axes');
 var attributes = require('./attributes');
 
 
-module.exports = function handleAnnotationDefaults(annIn, annOut, fullLayout, opts) {
+module.exports = function handleAnnotationDefaults(annIn, annOut, fullLayout, opts, itemOpts) {
     opts = opts || {};
+    itemOpts = itemOpts || {};
 
     function coerce(attr, dflt) {
         return Lib.coerce(annIn, annOut, attributes, attr, dflt);
     }
 
-    var visible = coerce('visible', !opts.itemIsNotPlainObject);
+    var visible = coerce('visible', !itemOpts.itemIsNotPlainObject);
 
     if(!visible) return annOut;
 
diff --git a/src/components/shapes/shape_defaults.js b/src/components/shapes/shape_defaults.js
@@ -16,14 +16,15 @@ var attributes = require('./attributes');
 var helpers = require('./helpers');
 
 
-module.exports = function handleShapeDefaults(shapeIn, shapeOut, fullLayout, opts) {
+module.exports = function handleShapeDefaults(shapeIn, shapeOut, fullLayout, opts, itemOpts) {
     opts = opts || {};
+    itemOpts = itemOpts || {};
 
     function coerce(attr, dflt) {
         return Lib.coerce(shapeIn, shapeOut, attributes, attr, dflt);
     }
 
-    var visible = coerce('visible', !opts.itemIsNotPlainObject);
+    var visible = coerce('visible', !itemOpts.itemIsNotPlainObject);
 
     if(!visible) return shapeOut;
 
diff --git a/src/plots/array_container_defaults.js b/src/plots/array_container_defaults.js
@@ -26,16 +26,20 @@ var Lib = require('../lib');
  *   - name {string}
  *      name of the key linking the container in question
  *   - handleItemDefaults {function}
- *      defaults method to be called on each item in the array container in question,
+ *      defaults method to be called on each item in the array container in question
  *
+ *      Its arguments are:
+ *          - itemIn {object} item in user layout
+ *          - itemOut {object} item in full layout
+ *          - parentObj {object} (as in closure)
+ *          - opts {object} (as in closure)
+ *          - itemOpts {object}
+ *              - itemIsNotPlainObject {boolean}
  * N.B.
  *
  *  - opts is passed to handleItemDefaults so it can also store
  *    links to supplementary data (e.g. fullData for layout components)
  *
- *  - opts.itemIsNotPlainObject is mutated on every pass in case so logic
- *    in handleItemDefaults relies on that fact.
- *
  */
 module.exports = function handleArrayContainerDefaults(parentObjIn, parentObjOut, opts) {
     var name = opts.name;
@@ -45,17 +49,15 @@ module.exports = function handleArrayContainerDefaults(parentObjIn, parentObjOut
 
     for(var i = 0; i < contIn.length; i++) {
         var itemIn = contIn[i],
-            itemOut = {};
+            itemOut = {},
+            itemOpts = {};
 
         if(!Lib.isPlainObject(itemIn)) {
-            opts.itemIsNotPlainObject = true;
+            itemOpts.itemIsNotPlainObject = true;
             itemIn = {};
         }
-        else {
-            opts.itemIsNotPlainObject = false;
-        }
 
-        opts.handleItemDefaults(itemIn, itemOut, parentObjOut, opts);
+        opts.handleItemDefaults(itemIn, itemOut, parentObjOut, opts, itemOpts);
 
         itemOut._input = itemIn;
         itemOut._index = i;
