adding waterfall attributes

archmoj · archmoj · commit 70fa028b7ffe · 2019-02-01T11:32:35.000-05:00
diff --git a/src/traces/waterfall/attributes.js b/src/traces/waterfall/attributes.js
@@ -0,0 +1,83 @@
+/**
+* Copyright 2012-2019, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+var barAttrs = require('../bar/attributes');
+
+module.exports = {
+
+    x: barAttrs.x,
+    x0: barAttrs.x0,
+    dx: barAttrs.dx,
+    y: barAttrs.y,
+    y0: barAttrs.y0,
+    dy: barAttrs.dy,
+
+    text: barAttrs.text,
+    hovertext: barAttrs.hovertext,
+    hovertemplate: barAttrs.hovertemplate,
+
+    textposition: barAttrs.textposition,
+
+    textfont: barAttrs.textfont,
+
+    insidetextfont: barAttrs.insidetextfont,
+
+    outsidetextfont: barAttrs.outsidetextfont,
+
+    constraintext: barAttrs.constraintext,
+
+    cliponaxis: barAttrs.cliponaxis,
+
+    orientation: barAttrs.orientation,
+
+    base: barAttrs.base,
+
+    offset: barAttrs.offset,
+
+    width: barAttrs.width,
+    marker: barAttrs.marker,
+
+    selected: barAttrs.selected,
+    unselected: barAttrs.unselected,
+
+    r: barAttrs.r,
+    t: barAttrs.t,
+
+    _deprecated: barAttrs._deprecated,
+
+    report: {
+        editType: 'calc',
+
+        after: {
+            valType: 'data_array',
+            dflt: [],
+            role: 'info',
+            editType: 'calc',
+            description: [
+                'Specifies the indices of horizontal or vertical slices',
+                'on the axis depending on `orientation`.'
+            ].join(' ')
+        },
+        text: {
+            valType: 'string',
+            dflt: 'sum',
+            arrayOk: true,
+            role: 'info',
+            editType: 'calc',
+            description: [
+                'Sets text elements associated with all/each `fall`',
+                'If a single string, the same string appears over',
+                'all the data points.',
+                'If an array of string, the items are mapped in order to the',
+                'this trace\'s `fall` indices.'
+            ].join(' ')
+        }
+    }
+};
diff --git a/src/traces/waterfall/defaults.js b/src/traces/waterfall/defaults.js
@@ -0,0 +1,26 @@
+/**
+* Copyright 2012-2019, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var Lib = require('../../lib');
+var barDefaults = require('../bar/defaults');
+var attributes = require('./attributes');
+
+module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
+
+    barDefaults(traceIn, traceOut, defaultColor, layout);
+
+    function coerce(attr, dflt) {
+        return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
+    }
+
+    coerce('report.text');
+    coerce('report.after');
+};
diff --git a/src/traces/waterfall/index.js b/src/traces/waterfall/index.js
@@ -11,9 +11,9 @@
 
 var Waterfall = {};
 
-Waterfall.attributes = require('../bar/attributes');
+Waterfall.attributes = require('./attributes');
 Waterfall.layoutAttributes = require('../bar/layout_attributes');
-Waterfall.supplyDefaults = require('../bar/defaults');
+Waterfall.supplyDefaults = require('./defaults');
 Waterfall.supplyLayoutDefaults = require('../bar/layout_defaults');
 Waterfall.calc = require('../bar/calc');
 Waterfall.crossTraceCalc = require('../bar/cross_trace_calc').crossTraceCalc;
diff --git a/test/image/mocks/waterfall_display-positive-negative-contributions.json b/test/image/mocks/waterfall_display-positive-negative-contributions.json
@@ -16,7 +16,12 @@
           5
         ],
         "name": "first",
-        "type": "waterfall"
+        "type": "waterfall",
+        "report" : {
+          "after": [2, 5],
+          "label": ["intermediate sum", "total"]
+        },
+        "orientation": "v"
       },
       {
         "x": [
@@ -34,7 +39,12 @@
           -2
         ],
         "name": "second",
-        "type": "waterfall"
+        "type": "waterfall",
+        "report" : {
+          "after": [2, 5],
+          "label": ["intermediate sum", "total"]
+        },
+        "orientation": "v"
       }
     ],
     "layout": {
