enforce scale constraints after matching axis autorange

etpinard · etpinard · commit 74cf76c394f1 · 2019-02-05T10:34:58.000-05:00
- that way (under `constrain:'domain'`) both matching axis range
  and ax._m constraints can be satisfy at the same time.
- Now, does this fit with what users expect? I'm not too sure.
diff --git a/src/plot_api/subroutines.js b/src/plot_api/subroutines.js
@@ -708,8 +708,6 @@ exports.doAutoRangeAndConstraints = function(gd) {
         doAutoRange(gd, ax);
     }
 
-    enforceAxisConstraints(gd);
-
     groupLoop:
     for(var j = 0; j < matchGroups.length; j++) {
         var group = matchGroups[j];
@@ -738,8 +736,11 @@ exports.doAutoRangeAndConstraints = function(gd) {
             ax.range = rng.slice();
             ax._input.range = rng.slice();
             ax.setScale();
+            ax._matched = true;
         }
     }
+
+    enforceAxisConstraints(gd);
 };
 
 // An initial paint must be completed before these components can be
diff --git a/src/plots/cartesian/constraints.js b/src/plots/cartesian/constraints.js
@@ -276,7 +276,7 @@ exports.enforce = function enforceAxisConstraints(gd) {
                         factor *= rangeShrunk;
                     }
 
-                    if(ax.autorange) {
+                    if(ax.autorange && !ax._matched) {
                         /*
                          * range & factor may need to change because range was
                          * calculated for the larger scaling, so some pixel
diff --git a/test/image/baselines/axes_scaleanchor-with-matches.png b/test/image/baselines/axes_scaleanchor-with-matches.png
diff --git a/test/image/mocks/axes_scaleanchor-with-matches.json b/test/image/mocks/axes_scaleanchor-with-matches.json
@@ -5,7 +5,7 @@
   ],
   "layout":{
     "width": 500,
-    "height": 500,
+    "height": 700,
     "xaxis": {
         "constrain": "domain"
     },

Original file line number	Diff line number	Diff line change
`@@ -708,8 +708,6 @@ exports.doAutoRangeAndConstraints = function(gd) {`
`708`	`708`	`doAutoRange(gd, ax);`
`709`	`709`	`}`
`710`	`710`
`711`		`- enforceAxisConstraints(gd);`
`712`		`-`
`713`	`711`	`groupLoop:`
`714`	`712`	`for(var j = 0; j < matchGroups.length; j++) {`
`715`	`713`	`var group = matchGroups[j];`
`@@ -738,8 +736,11 @@ exports.doAutoRangeAndConstraints = function(gd) {`
`738`	`736`	`ax.range = rng.slice();`
`739`	`737`	`ax._input.range = rng.slice();`
`740`	`738`	`ax.setScale();`
	`739`	`+ ax._matched = true;`
`741`	`740`	`}`
`742`	`741`	`}`
	`742`	`+`
	`743`	`+ enforceAxisConstraints(gd);`
`743`	`744`	`};`
`744`	`745`
`745`	`746`	`// An initial paint must be completed before these components can be`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ exports.enforce = function enforceAxisConstraints(gd) {`
`276`	`276`	`factor *= rangeShrunk;`
`277`	`277`	`}`
`278`	`278`
`279`		`- if(ax.autorange) {`
	`279`	`+ if(ax.autorange && !ax._matched) {`
`280`	`280`	`/*`
`281`	`281`	`* range & factor may need to change because range was`
`282`	`282`	`* calculated for the larger scaling, so some pixel`