@datarailsshared/dr_renderer 1.2.257 → 1.2.259

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.257",
+  "version": "1.2.259",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/highcharts_renderer.js

@@ -1470,7 +1470,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 val = 0;
             }
 
-            if (val > 0 && value.trend === 'decrease' || val < 0 && value.trend === 'increase' ) {
+            if (value.trend === 'decrease') {
                 val = val * -1;
             }
 
@@ -1482,12 +1482,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             const name = value.trend === 'total' ? value.formattedKey || value.key[0] : keys.join(highchartsRenderer.delimer);
             let color = '';
-            if (value.color) {
+
+            if (!lodash.get(waterfallOptions, 'colors', {}) && value.color) {
                 color = value.color;
+            } else if (value.trend === 'total') {
+                color = lodash.get(waterfallOptions, 'colors', {}).total || baseColor.total;
             } else {
-                color = lodash.get(waterfallOptions, 'colors', {})
-                    ? lodash.get(waterfallOptions, 'colors', {})[value.trend]
-                    : baseColor[value.trend];
+                color = val > 0
+                    ? lodash.get(waterfallOptions, 'colors', {}).increase || baseColor.increase
+                    : lodash.get(waterfallOptions, 'colors', {}).decrease || baseColor.decrease;
             }
 
             resultObject.data.push({
@@ -7259,8 +7262,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         [highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH]: {
             name: 'Walkthrough Chart',
             label: 'Walkthrough Chart',
-            title: 'Drag one or more fields to configure your x-axis.',
-            description: 'The category is shown on the x-axis and should be between 2 to 10 columns.',
+            title: 'Describe and explain changes in your financial outcomes.',
+            description: 'For example, describe the gaps between income and your gross profit.',
             titleInEditor: 'Waterfall walkthrough widget.',
             descriptionInEditor: 'This chart visualizes the cumulative effect of positive and negative changes on an initial value, ultimately showing the net value.  You can change the trend of each item and add new totals columns using the Walkthrough options button.',
             axisName: 'Category',
@@ -8936,7 +8939,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         pivot.sorters = highchartsRenderer.getWidgetDataSorters(res, widget_obj);
         pivot.rowData = res;
         widget_obj.options = highchartsRenderer.parseOptionsToObject(widget_obj.options);
-        
+
         if (templateNoData) {
             let hasServerDrill = widget_obj.chart_type.indexOf("column-chart") > -1 && widget_obj.cols && widget_obj.cols.length >= 1;
             if (hasServerDrill)