fix plotly#3600 - skip automargin pushes that lead to negative plot area

etpinard · etpinard · commit 87b10a78ac7a · 2019-03-04T17:22:19.000-05:00
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -1841,6 +1841,8 @@ plots.doAutoMargin = function(gd) {
     var mr = margin.r;
     var mt = margin.t;
     var mb = margin.b;
+    var width = fullLayout.width;
+    var height = fullLayout.height;
     var pushMargin = fullLayout._pushmargin;
     var pushMarginIds = fullLayout._pushmarginIds;
 
@@ -1876,11 +1878,9 @@ plots.doAutoMargin = function(gd) {
                     var pr = pushMargin[k2].r.size;
 
                     if(fr > fl) {
-                        var newl = (pl * fr +
-                            (pr - fullLayout.width) * fl) / (fr - fl);
-                        var newr = (pr * (1 - fl) +
-                            (pl - fullLayout.width) * (1 - fr)) / (fr - fl);
-                        if(newl >= 0 && newr >= 0 && newl + newr > ml + mr) {
+                        var newl = (pl * fr + (pr - width) * fl) / (fr - fl);
+                        var newr = (pr * (1 - fl) + (pl - width) * (1 - fr)) / (fr - fl);
+                        if(newl >= 0 && newr >= 0 && width - (newl + newr) > 0 && newl + newr > ml + mr) {
                             ml = newl;
                             mr = newr;
                         }
@@ -1892,11 +1892,9 @@ plots.doAutoMargin = function(gd) {
                     var pt = pushMargin[k2].t.size;
 
                     if(ft > fb) {
-                        var newb = (pb * ft +
-                            (pt - fullLayout.height) * fb) / (ft - fb);
-                        var newt = (pt * (1 - fb) +
-                            (pb - fullLayout.height) * (1 - ft)) / (ft - fb);
-                        if(newb >= 0 && newt >= 0 && newb + newt > mb + mt) {
+                        var newb = (pb * ft + (pt - height) * fb) / (ft - fb);
+                        var newt = (pt * (1 - fb) + (pb - height) * (1 - ft)) / (ft - fb);
+                        if(newb >= 0 && newt >= 0 && height - (newt + newb) > 0 && newb + newt > mb + mt) {
                             mb = newb;
                             mt = newt;
                         }
@@ -1911,8 +1909,8 @@ plots.doAutoMargin = function(gd) {
     gs.t = Math.round(mt);
     gs.b = Math.round(mb);
     gs.p = Math.round(margin.pad);
-    gs.w = Math.round(fullLayout.width) - gs.l - gs.r;
-    gs.h = Math.round(fullLayout.height) - gs.t - gs.b;
+    gs.w = Math.round(width) - gs.l - gs.r;
+    gs.h = Math.round(height) - gs.t - gs.b;
 
     // if things changed and we're not already redrawing, trigger a redraw
     if(!fullLayout._replotting &&
diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js
@@ -3383,6 +3383,86 @@ describe('Test axes', function() {
             .catch(failTest)
             .then(done);
         });
+
+        it('should not lead to negative plot area heights', function(done) {
+            function _assert(msg, exp) {
+                var gs = gd._fullLayout._size;
+                expect(gs.h).toBeGreaterThan(0, msg + '- positive height');
+                expect(gs.b).toBeGreaterThan(exp.bottomLowerBound, msg + ' - margin bottom');
+                expect(gs.b + gs.h + gs.t).toBeWithin(exp.totalHeight, 1.5, msg + ' - total height');
+            }
+
+            Plotly.plot(gd, [{
+                x: ['loooooong label 1', 'loooooong label 2'],
+                y: [1, 2]
+            }], {
+                xaxis: {automargin: true, tickangle: 90},
+                width: 500,
+                height: 500
+            })
+            .then(function() {
+                _assert('base', {
+                    bottomLowerBound: 80,
+                    totalHeight: 500
+                });
+            })
+            .then(function() { return Plotly.relayout(gd, 'height', 100); })
+            .then(function() {
+                _assert('after relayout to *small* height', {
+                    bottomLowerBound: 30,
+                    totalHeight: 100
+                });
+            })
+            .then(function() { return Plotly.relayout(gd, 'height', 800); })
+            .then(function() {
+                _assert('after relayout to *big* height', {
+                    bottomLowerBound: 80,
+                    totalHeight: 800
+                });
+            })
+            .catch(failTest)
+            .then(done);
+        });
+
+        it('should not lead to negative plot area widths', function(done) {
+            function _assert(msg, exp) {
+                var gs = gd._fullLayout._size;
+                expect(gs.w).toBeGreaterThan(0, msg + '- positive width');
+                expect(gs.l).toBeGreaterThan(exp.leftLowerBound, msg + ' - margin left');
+                expect(gs.l + gs.w + gs.r).toBeWithin(exp.totalWidth, 1.5, msg + ' - total width');
+            }
+
+            Plotly.plot(gd, [{
+                y: ['loooooong label 1', 'loooooong label 2'],
+                x: [1, 2]
+            }], {
+                yaxis: {automargin: true},
+                width: 500,
+                height: 500
+            })
+            .then(function() {
+                _assert('base', {
+                    leftLowerBound: 80,
+                    totalWidth: 500
+                });
+            })
+            .then(function() { return Plotly.relayout(gd, 'width', 100); })
+            .then(function() {
+                _assert('after relayout to *small* width', {
+                    leftLowerBound: 30,
+                    totalWidth: 100
+                });
+            })
+            .then(function() { return Plotly.relayout(gd, 'width', 1000); })
+            .then(function() {
+                _assert('after relayout to *big* width', {
+                    leftLowerBound: 80,
+                    totalWidth: 1000
+                });
+            })
+            .catch(failTest)
+            .then(done);
+        });
     });
 
     describe('zeroline visibility logic', function() {
