remove one unnecessary check - improve tests

plotly · Dec 9, 2020 · 0b254e7 · 0b254e7
1 parent 15b002a
commit 0b254e7
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 12 deletions.
diff --git a/src/plots/cartesian/autorange.js b/src/plots/cartesian/autorange.js
@@ -226,17 +226,12 @@ function makePadFn(fullLayout, ax, max) {
     var A = 0;
     var B = 0;
     if(!isLinked(fullLayout, ax._id)) {
+        A = padInsideLabelsOnAnchorAxis(ax, max);
         if(
-            ax.rangemode !== 'tozero' &&
-            ax.rangemode !== 'nonnegative'
+            anchorAxis.rangemode !== 'tozero' &&
+            anchorAxis.rangemode !== 'nonnegative'
         ) {
-            A = padInsideLabelsOnAnchorAxis(ax, max);
-            if(
-                anchorAxis.rangemode !== 'tozero' &&
-                anchorAxis.rangemode !== 'nonnegative'
-            ) {
-                B = padInsideLabelsOnThisAxis(ax, max);
-            }
+            B = padInsideLabelsOnThisAxis(ax, max);
         }
     }
 

diff --git a/test/image/baselines/ticklabelposition-5.png b/test/image/baselines/ticklabelposition-5.png
diff --git a/test/image/baselines/ticklabelposition-6.png b/test/image/baselines/ticklabelposition-6.png
diff --git a/test/image/mocks/ticklabelposition-5.json b/test/image/mocks/ticklabelposition-5.json
@@ -162,6 +162,7 @@
             "gridcolor": "white"
         },
         "yaxis4": {
+            "autorange": "reversed",
             "rangemode": "nonnegative",
             "anchor": "x4",
             "domain": [0.525, 1],
@@ -170,12 +171,12 @@
             "gridcolor": "white"
         },
         "font": {
-            "size": 24
+            "size": 16
         },
         "plot_bgcolor": "lightblue",
         "showlegend": false,
-        "width": 1000,
-        "height": 1000,
+        "width": 800,
+        "height": 800,
         "margin": {
             "t": 40,
             "b": 40,

diff --git a/test/image/mocks/ticklabelposition-6.json b/test/image/mocks/ticklabelposition-6.json
@@ -0,0 +1,90 @@
+{
+    "data": [{
+        "xaxis": "x",
+        "yaxis": "y",
+        "orientation": "h",
+        "x": [0.4, 0.5, 0.6, 0.7, 0.8],
+        "y": ["Oo", "Pp", "Qq", "Rr", "Ss"]
+    }, {
+        "xaxis": "x2",
+        "yaxis": "y2",
+        "orientation": "h",
+        "x": [0.4, 0.5, 0.6, 0.7, 0.8],
+        "y": ["Oo", "Pp", "Qq", "Rr", "Ss"]
+    }, {
+        "xaxis": "x3",
+        "yaxis": "y3",
+        "orientation": "v",
+        "y": [0.4, 0.5, 0.6, 0.7, 0.8],
+        "x": ["Oo", "Pp", "Qq", "Rr", "Ss"]
+    }, {
+        "xaxis": "x4",
+        "yaxis": "y4",
+        "orientation": "v",
+        "y": [0.4, 0.5, 0.6, 0.7, 0.8],
+        "x": ["Oo", "Pp", "Qq", "Rr", "Ss"]
+    }],
+    "layout": {
+        "xaxis": {
+            "rangemode": "nonnegative",
+            "anchor": "y",
+            "domain": [0, 0.475],
+            "gridcolor": "white"
+        },
+        "yaxis": {
+            "anchor": "x",
+            "domain": [0, 0.475],
+            "ticklabelposition": "inside",
+            "gridcolor": "white"
+        },
+        "xaxis2": {
+            "rangemode": "tozero",
+            "anchor": "y2",
+            "domain": [0.525, 1],
+            "gridcolor": "white"
+        },
+        "yaxis2": {
+            "anchor": "x2",
+            "domain": [0, 0.475],
+            "ticklabelposition": "inside",
+            "gridcolor": "white"
+        },
+        "xaxis3": {
+            "anchor": "y3",
+            "domain": [0.525, 1],
+            "ticklabelposition": "inside",
+            "gridcolor": "white"
+        },
+        "yaxis3": {
+            "rangemode": "nonnegative",
+            "anchor": "x3",
+            "domain": [0.525, 1],
+            "gridcolor": "white"
+        },
+        "xaxis4": {
+            "anchor": "y4",
+            "domain": [0, 0.475],
+            "ticklabelposition": "inside",
+            "gridcolor": "white"
+        },
+        "yaxis4": {
+            "rangemode": "tozero",
+            "anchor": "x4",
+            "domain": [0.525, 1],
+            "gridcolor": "white"
+        },
+        "font": {
+            "size": 20
+        },
+        "plot_bgcolor": "lightblue",
+        "showlegend": false,
+        "width": 800,
+        "height": 800,
+        "margin": {
+            "t": 40,
+            "b": 40,
+            "l": 40,
+            "r": 40
+        }
+    }
+}