Fix zindex routing in attributes

Author: Farkites

src/traces/candlestick/attributes.js

@@ -4,7 +4,6 @@ var extendFlat = require('../../lib').extendFlat;
 var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
 var OHLCattrs = require('../ohlc/attributes');
 var boxAttrs = require('../box/attributes');
-var scatterAttrs = require('../scatter/attributes');
 
 function directionAttrs(lineColorDefault) {
     return {
@@ -54,5 +53,5 @@ module.exports = {
     whiskerwidth: extendFlat({}, boxAttrs.whiskerwidth, { dflt: 0 }),
 
     hoverlabel: OHLCattrs.hoverlabel,
-    zindex: scatterAttrs.zindex
+    zindex: boxAttrs.zindex
 };

src/traces/carpet/attributes.js

@@ -9,7 +9,7 @@ var carpetFont = fontAttrs({
     description: 'The default font used for axis & tick labels on this carpet'
 });
 
-var scatterAttrs = require('../scatter/attributes');
+var zindex = require('../scatter/attributes').zindex;
 
 // TODO: inherit from global font
 carpetFont.family.dflt = '"Open Sans", verdana, arial, sans-serif';
@@ -116,5 +116,5 @@ module.exports = {
         ].join(' ')
     },
     transforms: undefined,
-    zindex: scatterAttrs.zindex
+    zindex: zindex
 };

src/traces/contourcarpet/attributes.js

@@ -2,7 +2,6 @@
 
 var heatmapAttrs = require('../heatmap/attributes');
 var contourAttrs = require('../contour/attributes');
-var scatterAttrs = require('../scatter/attributes');
 var colorScaleAttrs = require('../../components/colorscale/attributes');
 
 var extendFlat = require('../../lib/extend').extendFlat;
@@ -71,8 +70,8 @@ module.exports = extendFlat({
         editType: 'plot'
     },
 
-    transforms: undefined,
-    zindex: scatterAttrs.zindex
+    zindex: contourAttrs.zindex,
+    transforms: undefined
 },
 
     colorScaleAttrs('', {

src/traces/funnel/attributes.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var barAttrs = require('../bar/attributes');
-var scatterAttrs = require('../scatter/attributes');
 var lineAttrs = require('../scatter/attributes').line;
 var baseAttrs = require('../../plots/attributes');
 var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
@@ -111,7 +110,7 @@ module.exports = {
 
     offsetgroup: barAttrs.offsetgroup,
     alignmentgroup: barAttrs.alignmentgroup,
-    zindex: scatterAttrs.zindex
+    zindex: barAttrs.zindex
 };
 
 function funnelMarker() {

src/traces/histogram/attributes.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var barAttrs = require('../bar/attributes');
-var scatterAttrs = require('../bar/attributes');
 var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
 var hovertemplateAttrs = require('../../plots/template_attributes').hovertemplateAttrs;
 var texttemplateAttrs = require('../../plots/template_attributes').texttemplateAttrs;
@@ -251,5 +250,5 @@ module.exports = {
         bardir: barAttrs._deprecated.bardir
     },
 
-    zindex: scatterAttrs.zindex
+    zindex: barAttrs.zindex
 };

src/traces/image/attributes.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var baseAttrs = require('../../plots/attributes');
-var scatterAttrs = require('../scatter/attributes');
+var zindex = require('../scatter/attributes').zindex;
 var hovertemplateAttrs = require('../../plots/template_attributes').hovertemplateAttrs;
 var extendFlat = require('../../lib/extend').extendFlat;
 var colormodel = require('./constants').colormodel;
@@ -134,6 +134,6 @@ module.exports = extendFlat({
         keys: ['z', 'color', 'colormodel']
     }),
 
-    transforms: undefined,
-    zindex: scatterAttrs.zindex
+    zindex: zindex,
+    transforms: undefined
 });

src/traces/violin/attributes.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var boxAttrs = require('../box/attributes');
-var scatterAttrs = require('../scatter/attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
 
@@ -256,5 +255,5 @@ module.exports = {
             'or sample points or the kernel density estimate or any combination of them?'
         ].join(' ')
     },
-    zindex: scatterAttrs.zindex
+    zindex: boxAttrs.zindex
 };

src/traces/waterfall/attributes.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var barAttrs = require('../bar/attributes');
-var scatterAttrs = require('../scatter/attributes');
 var lineAttrs = require('../scatter/attributes').line;
 var baseAttrs = require('../../plots/attributes');
 var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
@@ -153,5 +152,5 @@ module.exports = {
 
     offsetgroup: barAttrs.offsetgroup,
     alignmentgroup: barAttrs.alignmentgroup,
-    zindex: scatterAttrs.zindex
+    zindex: barAttrs.zindex
 };

test/plot-schema.json

@@ -14843,7 +14843,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -17522,7 +17522,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -18076,7 +18076,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -19483,7 +19483,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -23960,7 +23960,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -25015,7 +25015,7 @@
      "valType": "boolean"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -27432,7 +27432,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -29404,7 +29404,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -32173,6 +32173,12 @@
      "description": "Sets the source reference on Chart Studio Cloud for `y`.",
      "editType": "none",
      "valType": "string"
+    },
+    "zindex": {
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "dflt": 0,
+     "editType": "calc",
+     "valType": "integer"
     }
    },
    "categories": [
@@ -36522,7 +36528,7 @@
      "valType": "data_array"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -40533,7 +40539,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -47283,7 +47289,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -51516,7 +51522,7 @@
      "valType": "subplotid"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -73470,7 +73476,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"
@@ -75664,7 +75670,7 @@
      "valType": "string"
     },
     "zindex": {
-     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same axes. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
+     "description": "Sets the layer on which this trace is displayed, relative to  other traces on the same subplot. Traces with higher `zindex`  appear in front of those with lower `zindex`.",
      "dflt": 0,
      "editType": "calc",
      "valType": "integer"