Skip to content

Commit e328c9f

Browse files
my-tienmy-tien
committed
Allow ticklabelindex also for non-period date axes and linear axes.
- Also adjust baseline tests to add tests for these.
1 parent 0019cb0 commit e328c9f

File tree

4 files changed

+227
-9
lines changed

4 files changed

+227
-9
lines changed

‎src/plots/cartesian/axis_defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
5959
}
6060
}
6161

62-
if(!options.noTicklabelindex && axType === 'date' && containerOut.ticklabelmode === 'period') {
62+
if(!options.noTicklabelindex && (axType === 'date' || axType === 'linear')) {
6363
coerce('ticklabelindex');
6464
}
6565

‎test/image/mocks/zzz_date_axes-ticklabelstep-ticklabelindex.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@
157157
"tickcolor": "black"
158158
},
159159
"tickcolor": "red",
160-
"ticklabelmode": "period",
161160
"ticklabelindex": 4,
162161
"anchor": "y"
163162
},
@@ -168,7 +167,6 @@
168167
"tickcolor": "black"
169168
},
170169
"tickcolor": "red",
171-
"ticklabelmode": "period",
172170
"anchor": "y2",
173171
"ticklabelindex": 1
174172
},
@@ -179,7 +177,6 @@
179177
"tickcolor": "black"
180178
},
181179
"tickcolor": "red",
182-
"ticklabelmode": "period",
183180
"anchor": "y3",
184181
"ticklabelindex": 1
185182
},
@@ -190,9 +187,8 @@
190187
"tickcolor": "black"
191188
},
192189
"tickcolor": "red",
193-
"ticklabelmode": "period",
194190
"anchor": "y4",
195-
"ticklabelindex": 1
191+
"ticklabelindex": 3
196192
},
197193
"xaxis5": {
198194
"ticklabelstep": 2,
@@ -201,7 +197,6 @@
201197
"tickcolor": "black"
202198
},
203199
"tickcolor": "red",
204-
"ticklabelmode": "period",
205200
"anchor": "y5",
206201
"ticklabelindex": -2
207202
},
@@ -212,7 +207,6 @@
212207
"tickcolor": "black"
213208
},
214209
"tickcolor": "red",
215-
"ticklabelmode": "period",
216210
"anchor": "y6",
217211
"ticklabelindex": 2
218212
},
@@ -223,7 +217,6 @@
223217
"tickcolor": "black"
224218
},
225219
"tickcolor": "red",
226-
"ticklabelmode": "period",
227220
"anchor": "y7",
228221
"ticklabelindex": -3
229222
}

‎test/image/mocks/zzz_date_axes_ticklabelindex.json

Lines changed: 216 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,216 @@
1+
{
2+
"data": [
3+
{
4+
"x": [
5+
"1900-01-01",
6+
"2000-01-01",
7+
"2100-01-01"
8+
],
9+
"y": [
10+
1,
11+
3,
12+
2
13+
]
14+
},
15+
{
16+
"x": [
17+
"2013-05-01",
18+
"2013-09-01",
19+
"2014-01-01"
20+
],
21+
"y": [
22+
1,
23+
3,
24+
2
25+
],
26+
"xaxis": "x2",
27+
"yaxis": "y2"
28+
},
29+
{
30+
"x": [
31+
"2013-11-17",
32+
"2013-12-15",
33+
"2014-01-12"
34+
],
35+
"y": [
36+
1,
37+
3,
38+
2
39+
],
40+
"xaxis": "x3",
41+
"yaxis": "y3"
42+
},
43+
{
44+
"x": [
45+
"2013-01-01",
46+
"2013-01-02",
47+
"2013-01-03"
48+
],
49+
"y": [
50+
1,
51+
3,
52+
2
53+
],
54+
"xaxis": "x4",
55+
"yaxis": "y4"
56+
},
57+
{
58+
"x": [
59+
"2013-07-01 18:00",
60+
"2013-07-02 00:00",
61+
"2013-07-02 06:00"
62+
],
63+
"y": [
64+
1,
65+
3,
66+
2
67+
],
68+
"xaxis": "x5",
69+
"yaxis": "y5"
70+
},
71+
{
72+
"x": [
73+
"2013-01-01 23:59",
74+
"2013-01-02 00:00",
75+
"2013-01-02 00:01"
76+
],
77+
"y": [
78+
1,
79+
3,
80+
2
81+
],
82+
"xaxis": "x6",
83+
"yaxis": "y6"
84+
},
85+
{
86+
"x": [
87+
"2013-07-01 23:59:59",
88+
"2013-07-02 00:00:00",
89+
"2013-07-02 00:00:01"
90+
],
91+
"y": [
92+
1,
93+
3,
94+
2
95+
],
96+
"xaxis": "x7",
97+
"yaxis": "y7"
98+
}
99+
],
100+
"layout": {
101+
"showlegend": false,
102+
"width": 600,
103+
"height": 500,
104+
"yaxis": {
105+
"domain": [
106+
0,
107+
0.04
108+
]
109+
},
110+
"yaxis2": {
111+
"domain": [
112+
0.16,
113+
0.2
114+
]
115+
},
116+
"yaxis3": {
117+
"domain": [
118+
0.32,
119+
0.36
120+
]
121+
},
122+
"yaxis4": {
123+
"domain": [
124+
0.48,
125+
0.52
126+
]
127+
},
128+
"yaxis5": {
129+
"domain": [
130+
0.64,
131+
0.68
132+
]
133+
},
134+
"yaxis6": {
135+
"domain": [
136+
0.80,
137+
0.84
138+
]
139+
},
140+
"yaxis7": {
141+
"domain": [
142+
0.96,
143+
1
144+
]
145+
},
146+
"xaxis": {
147+
"ticks": "outside",
148+
"tickcolor": "red",
149+
"minor": {
150+
"ticks": "outside",
151+
"tickcolor": "black"
152+
},
153+
"ticklabelindex": 2
154+
},
155+
"xaxis2": {
156+
"anchor": "y2",
157+
"ticks": "outside",
158+
"tickcolor": "red",
159+
"minor": {
160+
"ticks": "outside",
161+
"tickcolor": "black"
162+
},
163+
"ticklabelindex": 1
164+
},
165+
"xaxis3": {
166+
"anchor": "y3",
167+
"ticks": "outside",
168+
"tickcolor": "red",
169+
"minor": {
170+
"ticks": "outside",
171+
"tickcolor": "black"
172+
},
173+
"ticklabelindex": -1
174+
},
175+
"xaxis4": {
176+
"anchor": "y4",
177+
"ticks": "outside",
178+
"tickcolor": "red",
179+
"minor": {
180+
"ticks": "outside",
181+
"tickcolor": "black"
182+
},
183+
"ticklabelindex": 3
184+
},
185+
"xaxis5": {
186+
"anchor": "y5",
187+
"ticks": "outside",
188+
"tickcolor": "red",
189+
"minor": {
190+
"ticks": "outside",
191+
"tickcolor": "black"
192+
},
193+
"ticklabelindex": 2
194+
},
195+
"xaxis6": {
196+
"anchor": "y6",
197+
"ticks": "outside",
198+
"tickcolor": "red",
199+
"minor": {
200+
"ticks": "outside",
201+
"tickcolor": "black"
202+
},
203+
"ticklabelindex": -2
204+
},
205+
"xaxis7": {
206+
"anchor": "y7",
207+
"ticks": "outside",
208+
"tickcolor": "red",
209+
"minor": {
210+
"ticks": "outside",
211+
"tickcolor": "black"
212+
},
213+
"ticklabelindex": 4
214+
}
215+
}
216+
}

‎test/image/mocks/zzz_ticklabelindex_period_axes.json renamed to ‎test/image/mocks/zzz_ticklabelindex.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,15 @@
182182
"side": "top",
183183
"overlaying": "x",
184184
"type": "date"
185+
},
186+
"yaxis": {
187+
"ticks": "outside",
188+
"ticklabelindex": 5,
189+
"ticklen": 10,
190+
"minor": {
191+
"dtick": 1,
192+
"ticks": "outside"
193+
}
185194
}
186195
}
187196
}

0 commit comments

Comments
 (0)