plotly.js 1.58.0 → 1.58.4

package/src/plots/plots.js

@@ -1866,8 +1866,13 @@ function initMargins(fullLayout) {
     if(!fullLayout._pushmarginIds) fullLayout._pushmarginIds = {};
 }
 
-var minFinalWidth = 64; // could possibly be exposed as layout.margin.minfinalwidth
-var minFinalHeight = 64; // could possibly be exposed as layout.margin.minfinalheight
+// non-negotiable - this is the smallest height we will allow users to specify via explicit margins
+var MIN_SPECIFIED_WIDTH = 2;
+var MIN_SPECIFIED_HEIGHT = 2;
+
+// could be exposed as an option - the smallest we will allow automargin to shrink a larger plot
+var MIN_REDUCED_WIDTH = 64;
+var MIN_REDUCED_HEIGHT = 64;
 
 /**
  * autoMargin: called by components that may need to expand the margins to
@@ -1888,20 +1893,33 @@ plots.autoMargin = function(gd, id, o) {
     var fullLayout = gd._fullLayout;
     var width = fullLayout.width;
     var height = fullLayout.height;
+    var margin = fullLayout.margin;
+
+    var minFinalWidth = Lib.constrain(
+        width - margin.l - margin.r,
+        MIN_SPECIFIED_WIDTH,
+        MIN_REDUCED_WIDTH
+    );
+
+    var minFinalHeight = Lib.constrain(
+        height - margin.t - margin.b,
+        MIN_SPECIFIED_HEIGHT,
+        MIN_REDUCED_HEIGHT
+    );
+
     var maxSpaceW = Math.max(0, width - minFinalWidth);
     var maxSpaceH = Math.max(0, height - minFinalHeight);
 
     var pushMargin = fullLayout._pushmargin;
     var pushMarginIds = fullLayout._pushmarginIds;
 
-    if(fullLayout.margin.autoexpand !== false) {
+    if(margin.autoexpand !== false) {
         if(!o) {
             delete pushMargin[id];
             delete pushMarginIds[id];
         } else {
             var pad = o.pad;
             if(pad === undefined) {
-                var margin = fullLayout.margin;
                 // if no explicit pad is given, use 12px unless there's a
                 // specified margin that's smaller than that
                 pad = Math.min(12, margin.l, margin.r, margin.t, margin.b);
@@ -1909,15 +1927,19 @@ plots.autoMargin = function(gd, id, o) {
 
             // if the item is too big, just give it enough automargin to
             // make sure you can still grab it and bring it back
-            var rW = (o.l + o.r) / maxSpaceW;
-            if(rW > 1) {
-                o.l /= rW;
-                o.r /= rW;
+            if(maxSpaceW) {
+                var rW = (o.l + o.r) / maxSpaceW;
+                if(rW > 1) {
+                    o.l /= rW;
+                    o.r /= rW;
+                }
             }
-            var rH = (o.t + o.b) / maxSpaceH;
-            if(rH > 1) {
-                o.t /= rH;
-                o.b /= rH;
+            if(maxSpaceH) {
+                var rH = (o.t + o.b) / maxSpaceH;
+                if(rH > 1) {
+                    o.t /= rH;
+                    o.b /= rH;
+                }
             }
 
             var xl = o.xl !== undefined ? o.xl : o.x;
@@ -1944,8 +1966,6 @@ plots.doAutoMargin = function(gd) {
     var fullLayout = gd._fullLayout;
     var width = fullLayout.width;
     var height = fullLayout.height;
-    var maxSpaceW = Math.max(0, width - minFinalWidth);
-    var maxSpaceH = Math.max(0, height - minFinalHeight);
 
     if(!fullLayout._size) fullLayout._size = {};
     initMargins(fullLayout);
@@ -2018,16 +2038,35 @@ plots.doAutoMargin = function(gd) {
         }
     }
 
-    var rW = (ml + mr) / maxSpaceW;
-    if(rW > 1) {
-        ml /= rW;
-        mr /= rW;
+    var minFinalWidth = Lib.constrain(
+        width - margin.l - margin.r,
+        MIN_SPECIFIED_WIDTH,
+        MIN_REDUCED_WIDTH
+    );
+
+    var minFinalHeight = Lib.constrain(
+        height - margin.t - margin.b,
+        MIN_SPECIFIED_HEIGHT,
+        MIN_REDUCED_HEIGHT
+    );
+
+    var maxSpaceW = Math.max(0, width - minFinalWidth);
+    var maxSpaceH = Math.max(0, height - minFinalHeight);
+
+    if(maxSpaceW) {
+        var rW = (ml + mr) / maxSpaceW;
+        if(rW > 1) {
+            ml /= rW;
+            mr /= rW;
+        }
     }
 
-    var rH = (mb + mt) / maxSpaceH;
-    if(rH > 1) {
-        mb /= rH;
-        mt /= rH;
+    if(maxSpaceH) {
+        var rH = (mb + mt) / maxSpaceH;
+        if(rH > 1) {
+            mb /= rH;
+            mt /= rH;
+        }
     }
 
     gs.l = Math.round(ml);

package/src/plots/polar/polar.js

@@ -255,6 +255,8 @@ proto.updateLayout = function(fullLayout, polarLayout) {
             counterclockwise: 'top',
             clockwise: 'bottom'
         }[radialLayout.side],
+        // keep track of real side
+        _realSide: radialLayout.side,
         // spans length 1 radius
         domain: [innerRadius / gs.w, radius / gs.w]
     });

package/src/traces/carpet/attributes.js

@@ -37,7 +37,7 @@ module.exports = {
         editType: 'calc+clearAxisTypes',
         description: [
             'A two dimensional array of x coordinates at each carpet point.',
-            'If ommitted, the plot is a cheater plot and the xaxis is hidden',
+            'If omitted, the plot is a cheater plot and the xaxis is hidden',
             'by default.'
         ].join(' ')
     },
@@ -109,7 +109,7 @@ module.exports = {
         editType: 'calc',
         description: [
             'The shift applied to each successive row of data in creating a cheater plot.',
-            'Only used if `x` is been ommitted.'
+            'Only used if `x` is been omitted.'
         ].join(' ')
     },
     aaxis: axisAttrs,

package/src/traces/carpet/create_i_derivative_evaluator.js

@@ -19,7 +19,7 @@
  * Also note that the discontinuity of the derivative is in magnitude only. The direction *is*
  * continuous across cell boundaries.
  *
- * For example, to compute the derivative of the xcoordinate halfway betwen the 7 and 8th i-gridpoints
+ * For example, to compute the derivative of the xcoordinate halfway between the 7 and 8th i-gridpoints
  * and the 10th and 11th j-gridpoints given bicubic smoothing in both dimensions, you'd write:
  *
  *     var deriv = createIDerivativeEvaluator([x], 1, 1);

package/src/traces/carpet/plot.js

@@ -45,7 +45,7 @@ module.exports = function plot(gd, plotinfo, cdcarpet, carpetLayer) {
         drawGridLines(xa, ya, minorLayer, aax, 'a', aax._minorgridlines, true);
         drawGridLines(xa, ya, minorLayer, bax, 'b', bax._minorgridlines, true);
 
-        // NB: These are not ommitted if the lines are not active. The joins must be executed
+        // NB: These are not omitted if the lines are not active. The joins must be executed
         // in order for them to get cleaned up without a full redraw
         drawGridLines(xa, ya, boundaryLayer, aax, 'a-boundary', aax._boundarylines);
         drawGridLines(xa, ya, boundaryLayer, bax, 'b-boundary', bax._boundarylines);

package/src/traces/carpet/set_convert.js

@@ -215,7 +215,7 @@ module.exports = function setConvert(trace) {
 
         var i0 = Math.max(0, Math.min(a.length - 2, i));
 
-        // The step (demoninator) is implicitly 1 since that's the grid spacing.
+        // The step (denominator) is implicitly 1 since that's the grid spacing.
         return a[i0 + 1] - a[i0];
     };
 
@@ -223,7 +223,7 @@ module.exports = function setConvert(trace) {
         // See above caveats for dadi which also apply here
         var j0 = Math.max(0, Math.min(b.length - 2, j));
 
-        // The step (demoninator) is implicitly 1 since that's the grid spacing.
+        // The step (denominator) is implicitly 1 since that's the grid spacing.
         return b[j0 + 1] - b[j0];
     };
 

package/src/traces/carpet/smooth_fill_2d_array.js

@@ -200,7 +200,7 @@ module.exports = function smoothFill2dArray(data, a, b) {
             overrelaxation = boundaryCnt ? 0 : 0.85;
 
             // If there are four non-null neighbors, then we want a simple average without
-            // overrelaxation. If all the surrouding points are null, then we want the full
+            // overrelaxation. If all the surrounding points are null, then we want the full
             // overrelaxation
             //
             // Based on experiments, this actually seems to slow down convergence just a bit.

package/src/traces/parcats/attributes.js

@@ -75,7 +75,7 @@ module.exports = {
         ],
         description: [
             'This value here applies when hovering over dimensions.',
-            'Note tath `*categorycount`, *colorcount* and *bandcolorcount*',
+            'Note that `*categorycount`, *colorcount* and *bandcolorcount*',
             'are only available when `hoveron` contains the *color* flag'
         ].join(' ')
     }),

package/src/traces/scatter/plot.js

@@ -491,7 +491,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
         join.selectAll('text')
             .call(Drawing.textPointStyle, trace, gd)
             .each(function(d) {
-                // This just *has* to be totally custom becuase of SVG text positioning :(
+                // This just *has* to be totally custom because of SVG text positioning :(
                 // It's obviously copied from translatePoint; we just can't use that
                 var x = xa.c2p(d.x);
                 var y = ya.c2p(d.y);

package/src/traces/scattercarpet/plot.js

@@ -30,7 +30,7 @@ module.exports = function plot(gd, plotinfoproxy, data, layer) {
         trace = data[i][0].trace;
 
         // Note: .select is adequate but seems to mutate the node data,
-        // which is at least a bit suprising and causes problems elsewhere
+        // which is at least a bit surprising and causes problems elsewhere
         node = layer.selectAll('g.trace' + trace.uid + ' .js-line');
 
         // Note: it would be more efficient if this didn't need to be applied

package/src/traces/sunburst/calc.js

@@ -258,6 +258,7 @@ exports._runCrossTraceCalc = function(desiredType, gd) {
     }
     var dfltColorCount = 0;
 
+    var rootColor;
     function pickColor(d) {
         var cdi = d.data.data;
         var id = cdi.id;
@@ -277,7 +278,7 @@ exports._runCrossTraceCalc = function(desiredType, gd) {
                 }
             } else {
                 // set root color. no coloring by default.
-                cdi.color = cdi.trace.root.color;
+                cdi.color = rootColor;
             }
         }
     }
@@ -286,6 +287,7 @@ exports._runCrossTraceCalc = function(desiredType, gd) {
         var cd = calcdata[i];
         var cd0 = cd[0];
         if(cd0.trace.type === desiredType && cd0.hierarchy) {
+            rootColor = cd0.trace.root.color;
             cd0.hierarchy.each(pickColor);
         }
     }

package/src/version.js

@@ -9,4 +9,4 @@
 'use strict';
 
 // package version injected by `npm run preprocess`
-exports.version = '1.58.0';
+exports.version = '1.58.4';