fix(bar): negative values for stacked charts

Fix #16 Inspired from morrisjs#533
pierresh · May 15, 2020 · 4ea2bcc · 4ea2bcc
1 parent d9bdefe
commit 4ea2bcc
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/lib/morris.bar.coffee b/lib/morris.bar.coffee
@@ -252,7 +252,8 @@ class Morris.Bar extends Morris.Grid
       @data[idx].label_x = []
       @data[idx].label_y = []
       @seriesBars[idx] = []
-      lastTop = 0
+      lastTop = null
+      lastBottom = null
       if @options.rightAxisBar is true
         nb = row._y.length
       else
@@ -284,9 +285,10 @@ class Morris.Bar extends Morris.Grid
               @drawBar(@yStart, @xStart + idx * groupWidth, @ySize, groupWidth, @options.verticalGridColor, @options.verticalGridOpacity, @options.barRadius)
 
 
-          top -= lastTop if @options.stacked
+
           if not @options.horizontal
-            lastTop += size
+            top += lastTop-bottom if @options.stacked and lastTop?
+            lastTop = top
             if size == 0 && @options.showZero then size = 1
             @seriesBars[idx][sidx] = @drawBar(left, top, barWidth, size, @colorFor(row, sidx, 'bar'),
                 @options.barOpacity, @options.barRadius)
@@ -300,7 +302,7 @@ class Morris.Bar extends Morris.Grid
                 @data[idx].label_y[sidx] = top+depth;
 
           else
-            lastTop -= size
+            lastBottom = bottom
             if size == 0 then size = 1
             @seriesBars[idx][sidx] = @drawBar(top, left, size, barWidth, @colorFor(row, sidx, 'bar'),
                 @options.barOpacity, @options.barRadius)

diff --git a/lib/morris.grid.coffee b/lib/morris.grid.coffee
@@ -194,7 +194,10 @@ class Morris.Grid extends Morris.EventEmitter
         if idx < @options.ykeys.length - @options.nbYkeys2
           if yval? and @hasToShow(idx)
             if @cumulative
-              total += yval
+              if total < 0 and yval > 0
+                total = yval
+              else
+                total += yval
             else
               if ymax?
                 ymax = Math.max(yval, ymax)

diff --git a/morris.js b/morris.js
@@ -350,7 +350,11 @@ Licensed under the BSD-2-Clause License.
               if (idx < this.options.ykeys.length - this.options.nbYkeys2) {
                 if ((yval != null) && this.hasToShow(idx)) {
                   if (this.cumulative) {
-                    total += yval;
+                    if (total < 0 && yval > 0) {
+                      total = yval;
+                    } else {
+                      total += yval;
+                    }
                   } else {
                     if (ymax != null) {
                       ymax = Math.max(yval, ymax);
@@ -2753,7 +2757,7 @@ Licensed under the BSD-2-Clause License.
     };
 
     Bar.prototype.drawSeries = function() {
-      var barMiddle, barWidth, bottom, depth, groupWidth, i, idx, lastTop, left, leftPadding, nb, numBars, row, sidx, size, spaceLeft, top, ypos, zeroPos, _i, _ref;
+      var barMiddle, barWidth, bottom, depth, groupWidth, i, idx, lastBottom, lastTop, left, leftPadding, nb, numBars, row, sidx, size, spaceLeft, top, ypos, zeroPos, _i, _ref;
       this.seriesBars = [];
       groupWidth = this.xSize / this.options.data.length;
       if (this.options.stacked) {
@@ -2785,7 +2789,8 @@ Licensed under the BSD-2-Clause License.
           this.data[idx].label_x = [];
           this.data[idx].label_y = [];
           this.seriesBars[idx] = [];
-          lastTop = 0;
+          lastTop = null;
+          lastBottom = null;
           if (this.options.rightAxisBar === true) {
             nb = row._y.length;
           } else {
@@ -2825,11 +2830,11 @@ Licensed under the BSD-2-Clause License.
                     this.drawBar(this.yStart, this.xStart + idx * groupWidth, this.ySize, groupWidth, this.options.verticalGridColor, this.options.verticalGridOpacity, this.options.barRadius);
                   }
                 }
-                if (this.options.stacked) {
-                  top -= lastTop;
-                }
                 if (!this.options.horizontal) {
-                  lastTop += size;
+                  if (this.options.stacked && (lastTop != null)) {
+                    top += lastTop - bottom;
+                  }
+                  lastTop = top;
                   if (size === 0 && this.options.showZero) {
                     size = 1;
                   }
@@ -2850,7 +2855,7 @@ Licensed under the BSD-2-Clause License.
                     _results1.push(void 0);
                   }
                 } else {
-                  lastTop -= size;
+                  lastBottom = bottom;
                   if (size === 0) {
                     size = 1;
                   }

diff --git a/morris.min.js b/morris.min.js