From 9b7cd8d68a0d623e1292a8806e2fefa9de8d88c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Mon, 25 Mar 2019 15:33:40 -0400
Subject: [PATCH 1/3] lint in Bar.crossTraceCalc

- convert sieve instantiation to `new Sieve(traces, {/* */}` signature
- more readable barmode switchboard
---
 src/traces/bar/cross_trace_calc.js | 111 ++++++++++++++++-------------
 src/traces/bar/sieve.js            |  22 +++---
 2 files changed, 73 insertions(+), 60 deletions(-)

diff --git a/src/traces/bar/cross_trace_calc.js b/src/traces/bar/cross_trace_calc.js
index 916e853eec5..065969a595b 100644
--- a/src/traces/bar/cross_trace_calc.js
+++ b/src/traces/bar/cross_trace_calc.js
@@ -57,52 +57,57 @@ function setGroupPositions(gd, pa, sa, calcTraces) {
     if(!calcTraces.length) return;
 
     var barmode = gd._fullLayout.barmode;
-    var overlay = (barmode === 'overlay');
-    var group = (barmode === 'group');
     var excluded;
     var included;
     var i, calcTrace, fullTrace;
 
     initBase(gd, pa, sa, calcTraces);
 
-    if(overlay) {
-        setGroupPositionsInOverlayMode(gd, pa, sa, calcTraces);
-    } else if(group) {
-        // exclude from the group those traces for which the user set an offset
-        excluded = [];
-        included = [];
-        for(i = 0; i < calcTraces.length; i++) {
-            calcTrace = calcTraces[i];
-            fullTrace = calcTrace[0].trace;
-
-            if(fullTrace.offset === undefined) included.push(calcTrace);
-            else excluded.push(calcTrace);
-        }
+    switch(barmode) {
+        case 'overlay':
+            setGroupPositionsInOverlayMode(gd, pa, sa, calcTraces);
+            break;
+
+        case 'group':
+            // exclude from the group those traces for which the user set an offset
+            excluded = [];
+            included = [];
+            for(i = 0; i < calcTraces.length; i++) {
+                calcTrace = calcTraces[i];
+                fullTrace = calcTrace[0].trace;
+
+                if(fullTrace.offset === undefined) included.push(calcTrace);
+                else excluded.push(calcTrace);
+            }
 
-        if(included.length) {
-            setGroupPositionsInGroupMode(gd, pa, sa, included);
-        }
-        if(excluded.length) {
-            setGroupPositionsInOverlayMode(gd, pa, sa, excluded);
-        }
-    } else {
-        // exclude from the stack those traces for which the user set a base
-        excluded = [];
-        included = [];
-        for(i = 0; i < calcTraces.length; i++) {
-            calcTrace = calcTraces[i];
-            fullTrace = calcTrace[0].trace;
-
-            if(fullTrace.base === undefined) included.push(calcTrace);
-            else excluded.push(calcTrace);
-        }
+            if(included.length) {
+                setGroupPositionsInGroupMode(gd, pa, sa, included);
+            }
+            if(excluded.length) {
+                setGroupPositionsInOverlayMode(gd, pa, sa, excluded);
+            }
+            break;
+
+        case 'stack':
+        case 'relative':
+            // exclude from the stack those traces for which the user set a base
+            excluded = [];
+            included = [];
+            for(i = 0; i < calcTraces.length; i++) {
+                calcTrace = calcTraces[i];
+                fullTrace = calcTrace[0].trace;
+
+                if(fullTrace.base === undefined) included.push(calcTrace);
+                else excluded.push(calcTrace);
+            }
 
-        if(included.length) {
-            setGroupPositionsInStackOrRelativeMode(gd, pa, sa, included);
-        }
-        if(excluded.length) {
-            setGroupPositionsInOverlayMode(gd, pa, sa, excluded);
-        }
+            if(included.length) {
+                setGroupPositionsInStackOrRelativeMode(gd, pa, sa, included);
+            }
+            if(excluded.length) {
+                setGroupPositionsInOverlayMode(gd, pa, sa, excluded);
+            }
+            break;
     }
 
     collectExtents(calcTraces, pa);
@@ -154,13 +159,15 @@ function initBase(gd, pa, sa, calcTraces) {
 
 function setGroupPositionsInOverlayMode(gd, pa, sa, calcTraces) {
     var barnorm = gd._fullLayout.barnorm;
-    var separateNegativeValues = false;
-    var dontMergeOverlappingData = !barnorm;
 
     // update position axis and set bar offsets and widths
     for(var i = 0; i < calcTraces.length; i++) {
         var calcTrace = calcTraces[i];
-        var sieve = new Sieve([calcTrace], separateNegativeValues, dontMergeOverlappingData);
+
+        var sieve = new Sieve([calcTrace], {
+            separateNegativeValues: false,
+            dontMergeOverlappingData: !barnorm
+        });
 
         // set bar offsets and widths, and update position axis
         setOffsetAndWidth(gd, pa, sieve);
@@ -182,9 +189,11 @@ function setGroupPositionsInOverlayMode(gd, pa, sa, calcTraces) {
 function setGroupPositionsInGroupMode(gd, pa, sa, calcTraces) {
     var fullLayout = gd._fullLayout;
     var barnorm = fullLayout.barnorm;
-    var separateNegativeValues = false;
-    var dontMergeOverlappingData = !barnorm;
-    var sieve = new Sieve(calcTraces, separateNegativeValues, dontMergeOverlappingData);
+
+    var sieve = new Sieve(calcTraces, {
+        separateNegativeValues: false,
+        dontMergeOverlappingData: !barnorm
+    });
 
     // set bar offsets and widths, and update position axis
     setOffsetAndWidthInGroupMode(gd, pa, sieve);
@@ -201,12 +210,12 @@ function setGroupPositionsInGroupMode(gd, pa, sa, calcTraces) {
 function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
     var fullLayout = gd._fullLayout;
     var barmode = fullLayout.barmode;
-    var stack = barmode === 'stack';
-    var relative = barmode === 'relative';
     var barnorm = fullLayout.barnorm;
-    var separateNegativeValues = relative;
-    var dontMergeOverlappingData = !(barnorm || stack || relative);
-    var sieve = new Sieve(calcTraces, separateNegativeValues, dontMergeOverlappingData);
+
+    var sieve = new Sieve(calcTraces, {
+        separateNegativeValues: barmode === 'relative',
+        dontMergeOverlappingData: !(barnorm || barmode === 'stack' || barmode === 'relative')
+    });
 
     // set bar offsets and widths, and update position axis
     setOffsetAndWidth(gd, pa, sieve);
@@ -562,7 +571,9 @@ function sieveBars(gd, sa, sieve) {
         for(var j = 0; j < calcTrace.length; j++) {
             var bar = calcTrace[j];
 
-            if(bar.s !== BADNUM) sieve.put(bar.p, bar.b + bar.s);
+            if(bar.s !== BADNUM) {
+                sieve.put(bar.p, bar.b + bar.s);
+            }
         }
     }
 }
diff --git a/src/traces/bar/sieve.js b/src/traces/bar/sieve.js
index fd22a27ec02..2005fb759a7 100644
--- a/src/traces/bar/sieve.js
+++ b/src/traces/bar/sieve.js
@@ -17,18 +17,20 @@ var BADNUM = require('../../constants/numerical').BADNUM;
  * Helper class to sieve data from traces into bins
  *
  * @class
- * @param {Array}   traces
- *                  Array of calculated traces
- * @param {boolean} [separateNegativeValues]
- *                  If true, then split data at the same position into a bar
- *                  for positive values and another for negative values
- * @param {boolean} [dontMergeOverlappingData]
- *                  If true, then don't merge overlapping bars into a single bar
+ *
+ * @param {Array} traces
+*   Array of calculated traces
+ * @param {object} opts
+ *  - @param {boolean} [separateNegativeValues]
+ *      If true, then split data at the same position into a bar
+ *      for positive values and another for negative values
+ *  - @param {boolean} [dontMergeOverlappingData]
+ *     If true, then don't merge overlapping bars into a single bar
  */
-function Sieve(traces, separateNegativeValues, dontMergeOverlappingData) {
+function Sieve(traces, opts) {
     this.traces = traces;
-    this.separateNegativeValues = separateNegativeValues;
-    this.dontMergeOverlappingData = dontMergeOverlappingData;
+    this.separateNegativeValues = opts.separateNegativeValues;
+    this.dontMergeOverlappingData = opts.dontMergeOverlappingData;
 
     // for single-bin histograms - see histogram/calc
     var width1 = Infinity;

From 8a5c655cc2bdfedca5e6d74c3e0b4b87e3e22aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Mon, 25 Mar 2019 15:56:47 -0400
Subject: [PATCH 2/3] relative-stack bars within the same trace that would
 otherwise be hidden

... under barmode:'group'
---
 src/traces/bar/cross_trace_calc.js    |  34 ++++++++++++++
 test/image/baselines/bar_unhidden.png | Bin 0 -> 8620 bytes
 test/image/mocks/bar_unhidden.json    |  27 ++++++++++++
 test/jasmine/tests/bar_test.js        |  61 ++++++++++++++++++++++++++
 4 files changed, 122 insertions(+)
 create mode 100644 test/image/baselines/bar_unhidden.png
 create mode 100644 test/image/mocks/bar_unhidden.json

diff --git a/src/traces/bar/cross_trace_calc.js b/src/traces/bar/cross_trace_calc.js
index 065969a595b..448b5412281 100644
--- a/src/traces/bar/cross_trace_calc.js
+++ b/src/traces/bar/cross_trace_calc.js
@@ -198,6 +198,10 @@ function setGroupPositionsInGroupMode(gd, pa, sa, calcTraces) {
     // set bar offsets and widths, and update position axis
     setOffsetAndWidthInGroupMode(gd, pa, sieve);
 
+    // relative-stack bars within the same trace that would otherwise
+    // be hidden
+    unhideBarsWithinTrace(gd, sa, sieve);
+
     // set bar bases and sizes, and update size axis
     if(barnorm) {
         sieveBars(gd, sa, sieve);
@@ -578,6 +582,36 @@ function sieveBars(gd, sa, sieve) {
     }
 }
 
+function unhideBarsWithinTrace(gd, sa, sieve) {
+    var calcTraces = sieve.traces;
+
+    for(var i = 0; i < calcTraces.length; i++) {
+        var calcTrace = calcTraces[i];
+        var fullTrace = calcTrace[0].trace;
+
+        if(fullTrace.base === undefined) {
+            var inTraceSieve = new Sieve([calcTrace], {
+                separateNegativeValues: true,
+                dontMergeOverlappingData: true
+            });
+
+            for(var j = 0; j < calcTrace.length; j++) {
+                var bar = calcTrace[j];
+
+                if(bar.p !== BADNUM) {
+                    // stack current bar and get previous sum
+                    var barBase = inTraceSieve.put(bar.p, bar.b + bar.s);
+
+                    // if previous sum if non-zero, this means:
+                    // multiple bars have same starting point are potentially hidden,
+                    // shift them vertically so that all bars are visible by default
+                    if(barBase) bar.b = barBase;
+                }
+            }
+        }
+    }
+}
+
 // Note:
 //
 // normalizeBars requires that either sieveBars or stackBars has been
diff --git a/test/image/baselines/bar_unhidden.png b/test/image/baselines/bar_unhidden.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c5d33a0e8b3417b35424566a4c3a68483341dd3
GIT binary patch
literal 8620
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
NSJQ}CsD3i+KLB=0&87eV

literal 0
HcmV?d00001

diff --git a/test/image/mocks/bar_unhidden.json b/test/image/mocks/bar_unhidden.json
new file mode 100644
index 00000000000..0db6f1c6062
--- /dev/null
+++ b/test/image/mocks/bar_unhidden.json
@@ -0,0 +1,27 @@
+{
+  "data": [
+    {
+      "type": "bar",
+      "x": [ 0, 0, 0 ],
+      "y": [ 1, 1, -1 ],
+      "marker": {
+        "color": [ "red", "green", "blue" ]
+      }
+    },
+    {
+      "type": "bar",
+      "x": [ 0, 0, 0 ],
+      "y": [ 1, 1, -1 ],
+      "marker": {
+        "color": [ "cyan", "magenta", "yellow" ]
+      }
+    }
+  ],
+  "layout": {
+    "margin": { "t": 30, "b": 30, "l": 30, "r": 30 },
+    "width": 400,
+    "height": 400,
+    "showlegend": false,
+    "hovermode": "closest"
+  }
+}
diff --git a/test/jasmine/tests/bar_test.js b/test/jasmine/tests/bar_test.js
index eef374418f8..f30ee24c7cc 100644
--- a/test/jasmine/tests/bar_test.js
+++ b/test/jasmine/tests/bar_test.js
@@ -926,6 +926,67 @@ describe('Bar.crossTraceCalc (formerly known as setPositions)', function() {
         expect(gd._fullLayout.xaxis.type).toBe('multicategory');
         assertPointField(gd.calcdata, 'b', [[0, 0, 0, 0]]);
     });
+
+    describe('should relative-stack bar within the same trace that overlap under barmode=group', function() {
+        it('- base case', function() {
+            var gd = mockBarPlot([{
+                x: [0, 0, 0],
+                y: [1, -2, -1]
+            }]);
+
+            assertPointField(gd.calcdata, 'b', [[0, 0, -2]]);
+            assertPointField(gd.calcdata, 'y', [[1, -2, -3]]);
+        });
+
+        it('- with blank positions', function() {
+            var gd = mockBarPlot([{
+                x: [0, null, 0, null, 0],
+                y: [1, null, -2, null, -1]
+            }]);
+
+            assertPointField(gd.calcdata, 'b', [[0, 0, 0, 0, -2]]);
+            assertPointField(gd.calcdata, 'y', [[1, NaN, -2, NaN, -3]]);
+        });
+
+        it('- with barnorm set', function() {
+            var gd = mockBarPlot([{
+                x: [0, 0, 0],
+                y: [1, -2, -1],
+            }], {
+                barnorm: 'fraction'
+            });
+
+            assertPointField(gd.calcdata, 'b', [[0, 0, -0.5]]);
+            assertPointField(gd.calcdata, 'y', [[0.25, -0.5, -0.75]]);
+        });
+
+        it('- skipped when base is set', function() {
+            var gd = mockBarPlot([{
+                x: [0, 0, 0],
+                y: [1, -2, -1],
+                base: 10
+            }, {
+                x: [0, 0, 0],
+                y: [1, -2, -1],
+                base: [1, 2, 1]
+            }]);
+
+            assertPointField(gd.calcdata, 'b', [[10, 10, 10], [1, 2, 1]]);
+            assertPointField(gd.calcdata, 'y', [[11, 8, 9], [2, 0, 0]]);
+        });
+
+        it('- skipped when barmode=overlay', function() {
+            var gd = mockBarPlot([{
+                x: [0, 0, 0],
+                y: [1, -2, -1]
+            }], {
+                barmode: 'overlay'
+            });
+
+            assertPointField(gd.calcdata, 'b', [[0, 0, 0]]);
+            assertPointField(gd.calcdata, 'y', [[1, -2, -1]]);
+        });
+    });
 });
 
 describe('A bar plot', function() {

From c019c5ca804a2ed02216d1fa036dc60216835761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Thu, 28 Mar 2019 16:09:47 -0400
Subject: [PATCH 3/3] shorten sieve option keys

---
 src/traces/bar/cross_trace_calc.js | 16 ++++++++--------
 src/traces/bar/sieve.js            | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/traces/bar/cross_trace_calc.js b/src/traces/bar/cross_trace_calc.js
index 448b5412281..65591fcd587 100644
--- a/src/traces/bar/cross_trace_calc.js
+++ b/src/traces/bar/cross_trace_calc.js
@@ -165,8 +165,8 @@ function setGroupPositionsInOverlayMode(gd, pa, sa, calcTraces) {
         var calcTrace = calcTraces[i];
 
         var sieve = new Sieve([calcTrace], {
-            separateNegativeValues: false,
-            dontMergeOverlappingData: !barnorm
+            sepNegVal: false,
+            overlapNoMerge: !barnorm
         });
 
         // set bar offsets and widths, and update position axis
@@ -191,8 +191,8 @@ function setGroupPositionsInGroupMode(gd, pa, sa, calcTraces) {
     var barnorm = fullLayout.barnorm;
 
     var sieve = new Sieve(calcTraces, {
-        separateNegativeValues: false,
-        dontMergeOverlappingData: !barnorm
+        sepNegVal: false,
+        overlapNoMerge: !barnorm
     });
 
     // set bar offsets and widths, and update position axis
@@ -217,8 +217,8 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
     var barnorm = fullLayout.barnorm;
 
     var sieve = new Sieve(calcTraces, {
-        separateNegativeValues: barmode === 'relative',
-        dontMergeOverlappingData: !(barnorm || barmode === 'stack' || barmode === 'relative')
+        sepNegVal: barmode === 'relative',
+        overlapNoMerge: !(barnorm || barmode === 'stack' || barmode === 'relative')
     });
 
     // set bar offsets and widths, and update position axis
@@ -591,8 +591,8 @@ function unhideBarsWithinTrace(gd, sa, sieve) {
 
         if(fullTrace.base === undefined) {
             var inTraceSieve = new Sieve([calcTrace], {
-                separateNegativeValues: true,
-                dontMergeOverlappingData: true
+                sepNegVal: true,
+                overlapNoMerge: true
             });
 
             for(var j = 0; j < calcTrace.length; j++) {
diff --git a/src/traces/bar/sieve.js b/src/traces/bar/sieve.js
index 2005fb759a7..d9490bd7a7a 100644
--- a/src/traces/bar/sieve.js
+++ b/src/traces/bar/sieve.js
@@ -21,16 +21,16 @@ var BADNUM = require('../../constants/numerical').BADNUM;
  * @param {Array} traces
 *   Array of calculated traces
  * @param {object} opts
- *  - @param {boolean} [separateNegativeValues]
+ *  - @param {boolean} [sepNegVal]
  *      If true, then split data at the same position into a bar
  *      for positive values and another for negative values
- *  - @param {boolean} [dontMergeOverlappingData]
+ *  - @param {boolean} [overlapNoMerge]
  *     If true, then don't merge overlapping bars into a single bar
  */
 function Sieve(traces, opts) {
     this.traces = traces;
-    this.separateNegativeValues = opts.separateNegativeValues;
-    this.dontMergeOverlappingData = opts.dontMergeOverlappingData;
+    this.sepNegVal = opts.sepNegVal;
+    this.overlapNoMerge = opts.overlapNoMerge;
 
     // for single-bin histograms - see histogram/calc
     var width1 = Infinity;
@@ -81,7 +81,7 @@ Sieve.prototype.put = function put(position, value) {
  * @method
  * @param {number} position  Position of datum
  * @param {number} [value]   Value of datum
- *                           (required if this.separateNegativeValues is true)
+ *                           (required if this.sepNegVal is true)
  * @returns {number} Current bin value
  */
 Sieve.prototype.get = function put(position, value) {
@@ -95,14 +95,14 @@ Sieve.prototype.get = function put(position, value) {
  * @method
  * @param {number} position  Position of datum
  * @param {number} [value]   Value of datum
- *                           (required if this.separateNegativeValues is true)
+ *                           (required if this.sepNegVal is true)
  * @returns {string} Bin label
- * (prefixed with a 'v' if value is negative and this.separateNegativeValues is
+ * (prefixed with a 'v' if value is negative and this.sepNegVal is
  * true; otherwise prefixed with '^')
  */
 Sieve.prototype.getLabel = function getLabel(position, value) {
-    var prefix = (value < 0 && this.separateNegativeValues) ? 'v' : '^';
-    var label = (this.dontMergeOverlappingData) ?
+    var prefix = (value < 0 && this.sepNegVal) ? 'v' : '^';
+    var label = (this.overlapNoMerge) ?
         position :
         Math.round(position / this.binWidth);
     return prefix + label;