fix matches + rangebreaks, with a mock

Author: alexcjohnson

src/plots/cartesian/constraints.js

@@ -9,13 +9,12 @@
 'use strict';
 
 var Lib = require('../../lib');
-var axisIds = require('./axis_ids');
-var id2name = axisIds.id2name;
+
+var autorange = require('./autorange');
+var id2name = require('./axis_ids').id2name;
 var layoutAttributes = require('./layout_attributes');
 var scaleZoom = require('./scale_zoom');
-var autorange = require('./autorange');
-var makePadFn = autorange.makePadFn;
-var concatExtremes = autorange.concatExtremes;
+var setConvert = require('./set_convert');
 
 var ALMOST_EQUAL = require('../../constants/numerical').ALMOST_EQUAL;
 var FROM_BL = require('../../constants/alignment').FROM_BL;
@@ -30,7 +29,7 @@ exports.handleDefaults = function(layoutIn, layoutOut, opts) {
     // similar to _axisConstraintGroups, but only matching axes
     var matchGroups = layoutOut._axisMatchGroups = [];
 
-    var i, group, axId, axName, axIn, axOut;
+    var i, group, axId, axName, axIn, axOut, attr, val;
 
     for(i = 0; i < axIds.length; i++) {
         axName = id2name(axIds[i]);
@@ -113,13 +112,22 @@ exports.handleDefaults = function(layoutIn, layoutOut, opts) {
         'categoryarray'
     ];
     var hasRange = false;
+    var hasDayOfWeekBreaks = false;
+
+    function setAttrVal() {
+        val = axOut[attr];
+        if(attr === 'rangebreaks') {
+            hasDayOfWeekBreaks = axOut._hasDayOfWeekBreaks;
+        }
+    }
+
     for(i = 0; i < matchGroups.length; i++) {
         group = matchGroups[i];
 
         // find 'matching' range attrs
         for(var j = 0; j < matchAttrs.length; j++) {
-            var attr = matchAttrs[j];
-            var val = null;
+            attr = matchAttrs[j];
+            val = null;
             var baseAx;
             for(axId in group) {
                 axName = id2name(axId);
@@ -132,13 +140,13 @@ exports.handleDefaults = function(layoutIn, layoutOut, opts) {
                     baseAx = axOut;
                     // top priority: explicit value in base axis
                     if(attr in axIn) {
-                        val = axOut[attr];
+                        setAttrVal();
                         break;
                     }
                 }
                 if(val === null && attr in axIn) {
                     // second priority: first explicit value in another axis
-                    val = axOut[attr];
+                    setAttrVal();
                 }
             }
 
@@ -159,8 +167,14 @@ exports.handleDefaults = function(layoutIn, layoutOut, opts) {
             // but we still might not have a value, which is fine.
             if(val !== null) {
                 for(axId in group) {
+                    axOut = layoutOut[id2name(axId)];
                     // TODO: do we also need to (deep) copy rangebreaks?
-                    layoutOut[id2name(axId)][attr] = attr === 'range' ? val.slice() : val;
+                    axOut[attr] = attr === 'range' ? val.slice() : val;
+
+                    if(attr === 'rangebreaks') {
+                        axOut._hasDayOfWeekBreaks = hasDayOfWeekBreaks;
+                        setConvert(axOut, layoutOut);
+                    }
                 }
             }
         }
@@ -552,11 +566,11 @@ exports.enforce = function enforce(gd) {
                         // *are* expanding to the full domain
                         var outerMin = rangeCenter - halfRange * factor * 1.0001;
                         var outerMax = rangeCenter + halfRange * factor * 1.0001;
-                        var getPad = makePadFn(ax);
+                        var getPad = autorange.makePadFn(ax);
 
                         updateDomain(ax, factor);
                         var m = Math.abs(ax._m);
-                        var extremes = concatExtremes(gd, ax);
+                        var extremes = autorange.concatExtremes(gd, ax);
                         var minArray = extremes.min;
                         var maxArray = extremes.max;
                         var newVal;

test/image/baselines/axes_breaks-matches.png

@@ -0,0 +1,71 @@
+{
+    "data": [
+        {
+            "mode": "lines+markers",
+            "x": [
+                "2020-05-09",
+                "2020-05-10",
+                "2020-05-11",
+                "2020-05-12",
+                "2020-05-13",
+                "2020-05-14",
+                "2020-05-15",
+                "2020-05-16",
+                "2020-05-17",
+                "2020-05-18",
+                "2020-05-19",
+                "2020-05-20",
+                "2020-05-21",
+                "2020-05-22",
+                "2020-05-23",
+                "2020-05-24",
+                "2020-05-25",
+                "2020-05-26",
+                "2020-05-27",
+                "2020-05-28"
+            ]
+        },
+        {
+            "mode": "lines+markers",
+            "xaxis": "x2",
+            "yaxis": "y2",
+            "x": [
+                "2020-05-09",
+                "2020-05-10",
+                "2020-05-11",
+                "2020-05-12",
+                "2020-05-13",
+                "2020-05-14",
+                "2020-05-15",
+                "2020-05-16",
+                "2020-05-17",
+                "2020-05-18",
+                "2020-05-19",
+                "2020-05-20",
+                "2020-05-21",
+                "2020-05-22",
+                "2020-05-23",
+                "2020-05-24",
+                "2020-05-25",
+                "2020-05-26",
+                "2020-05-27",
+                "2020-05-28"
+            ],
+            "y0": 10
+        }
+    ],
+    "layout": {
+        "showlegend": false,
+        "width": 600,
+        "height": 400,
+        "xaxis": {"domain": [0, 0.45]},
+        "xaxis2": {
+            "rangebreaks": [{"bounds": ["sat", "mon"]}],
+            "matches": "x",
+            "anchor": "y2",
+            "domain": [0.55, 1]
+        },
+        "yaxis2": {"anchor": "x2"},
+        "title": {"text": "matches + rangebreaks"}
+    }
+}