Skip to content

Commit 5c8055b

Browse files
archmojarchmoj
committed
fix issue 4879
1 parent 0fb92d4 commit 5c8055b

File tree

5 files changed

+216
-2
lines changed

5 files changed

+216
-2
lines changed

‎src/plots/cartesian/axes.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,12 @@ axes.calcTicks = function calcTicks(ax) {
645645
}
646646

647647
var pos = ax.c2p(tickVal.value);
648-
if(prevPos === undefined || Math.abs(pos - prevPos) > tf2) {
648+
649+
if(pos === prevPos) {
650+
if(newTickVals[newTickVals.length - 1].value < tickVal.value) {
651+
newTickVals[newTickVals.length - 1] = tickVal;
652+
}
653+
} else if(prevPos === undefined || Math.abs(pos - prevPos) > tf2) {
649654
prevPos = pos;
650655
newTickVals.push(tickVal);
651656
}

‎src/plots/cartesian/set_convert.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ module.exports = function setConvert(ax, fullLayout) {
686686
var isNewBreak = true;
687687
for(var j = 0; j < rangebreaksOut.length; j++) {
688688
var brkj = rangebreaksOut[j];
689-
if(min > brkj.max || max < brkj.min) {
689+
if(min >= brkj.max || max < brkj.min) {
690690
// potentially a new break
691691
} else {
692692
if(min < brkj.min) {

‎test/image/baselines/axes_breaks-overlap.png

50.5 KB
Loading

‎test/image/mocks/axes_breaks-overlap.json

+207
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
{
2+
"data": [
3+
{
4+
"x": [
5+
"2020-05-19",
6+
"2020-05-20",
7+
"2020-05-21",
8+
"2020-05-22",
9+
"2020-05-23",
10+
"2020-05-24",
11+
"2020-05-25",
12+
"2020-05-26",
13+
"2020-05-27",
14+
"2020-05-28"
15+
]
16+
},
17+
{
18+
"xaxis": "x2",
19+
"yaxis": "y2",
20+
"x": [
21+
"2020-05-19",
22+
"2020-05-20",
23+
"2020-05-21",
24+
"2020-05-22",
25+
"2020-05-23",
26+
"2020-05-24",
27+
"2020-05-25",
28+
"2020-05-26",
29+
"2020-05-27",
30+
"2020-05-28"
31+
]
32+
},
33+
{
34+
"xaxis": "x3",
35+
"yaxis": "y3",
36+
"y": [
37+
"2020-05-19",
38+
"2020-05-20",
39+
"2020-05-21",
40+
"2020-05-22",
41+
"2020-05-23",
42+
"2020-05-24",
43+
"2020-05-25",
44+
"2020-05-26",
45+
"2020-05-27",
46+
"2020-05-28"
47+
]
48+
},
49+
{
50+
"xaxis": "x4",
51+
"yaxis": "y4",
52+
"y": [
53+
"2020-05-19",
54+
"2020-05-20",
55+
"2020-05-21",
56+
"2020-05-22",
57+
"2020-05-23",
58+
"2020-05-24",
59+
"2020-05-25",
60+
"2020-05-26",
61+
"2020-05-27",
62+
"2020-05-28"
63+
]
64+
}
65+
],
66+
"layout": {
67+
"showlegend": false,
68+
"width": 800,
69+
"height": 800,
70+
"xaxis": {
71+
"rangebreaks": [
72+
{
73+
"bounds": [
74+
"sat",
75+
"mon"
76+
]
77+
},
78+
{
79+
"values": [
80+
"2020-05-21",
81+
"2020-05-22"
82+
]
83+
},
84+
{
85+
"values": [
86+
"2020-05-25",
87+
"2020-05-26"
88+
]
89+
}
90+
],
91+
"domain": [
92+
0,
93+
0.48
94+
]
95+
},
96+
"xaxis2": {
97+
"rangebreaks": [
98+
{
99+
"bounds": [
100+
"sat",
101+
"mon"
102+
]
103+
},
104+
{
105+
"values": [
106+
"2020-05-21",
107+
"2020-05-22"
108+
]
109+
},
110+
{
111+
"values": [
112+
"2020-05-25",
113+
"2020-05-26"
114+
]
115+
}
116+
],
117+
"autorange": "reversed",
118+
"anchor": "y2",
119+
"domain": [
120+
0.52,
121+
1
122+
]
123+
},
124+
"xaxis3": {
125+
"anchor": "y3",
126+
"domain": [
127+
0,
128+
0.48
129+
]
130+
},
131+
"xaxis4": {
132+
"anchor": "y4",
133+
"domain": [
134+
0.52,
135+
1
136+
]
137+
},
138+
"yaxis": {
139+
"domain": [
140+
0,
141+
0.48
142+
]
143+
},
144+
"yaxis2": {
145+
"anchor": "x2",
146+
"domain": [
147+
0.52,
148+
1
149+
]
150+
},
151+
"yaxis3": {
152+
"rangebreaks": [
153+
{
154+
"bounds": [
155+
"sat",
156+
"mon"
157+
]
158+
},
159+
{
160+
"values": [
161+
"2020-05-21",
162+
"2020-05-22"
163+
]
164+
},
165+
{
166+
"values": [
167+
"2020-05-25",
168+
"2020-05-26"
169+
]
170+
}
171+
],
172+
"anchor": "x3",
173+
"domain": [
174+
0.52,
175+
1
176+
]
177+
},
178+
"yaxis4": {
179+
"rangebreaks": [
180+
{
181+
"bounds": [
182+
"sat",
183+
"mon"
184+
]
185+
},
186+
{
187+
"values": [
188+
"2020-05-21",
189+
"2020-05-22"
190+
]
191+
},
192+
{
193+
"values": [
194+
"2020-05-25",
195+
"2020-05-26"
196+
]
197+
}
198+
],
199+
"autorange": "reversed",
200+
"anchor": "x4",
201+
"domain": [
202+
0,
203+
0.48
204+
]
205+
}
206+
}
207+
}

‎test/jasmine/tests/mock_test.js

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ var list = [
6262
'axes_breaks-heatmap2d',
6363
'axes_breaks-histogram2d',
6464
'axes_breaks-night_autorange-reversed',
65+
'axes_breaks-overlap',
6566
'axes_breaks-rangeslider',
6667
'axes_breaks-reversed-without-pattern',
6768
'axes_breaks-round-weekdays',
@@ -1099,6 +1100,7 @@ figs['axes_breaks-heatmap1d'] = require('@mocks/axes_breaks-heatmap1d');
10991100
figs['axes_breaks-heatmap2d'] = require('@mocks/axes_breaks-heatmap2d');
11001101
figs['axes_breaks-histogram2d'] = require('@mocks/axes_breaks-histogram2d');
11011102
figs['axes_breaks-night_autorange-reversed'] = require('@mocks/axes_breaks-night_autorange-reversed');
1103+
figs['axes_breaks-overlap'] = require('@mocks/axes_breaks-overlap');
11021104
figs['axes_breaks-rangeslider'] = require('@mocks/axes_breaks-rangeslider');
11031105
figs['axes_breaks-reversed-without-pattern'] = require('@mocks/axes_breaks-reversed-without-pattern');
11041106
figs['axes_breaks-round-weekdays'] = require('@mocks/axes_breaks-round-weekdays');

0 commit comments

Comments
 (0)