Skip to content

Commit aa9db72

Browse files
authored
Merge pull request #21352 from Srajan-Sanjay-Saxena/fix/time-axis-custom-labels
fix(axis-time): fix chart can't work when using `customValues` with `formatter` in axis label
2 parents 6f305b4 + e9b24db commit aa9db72

File tree

3 files changed

+60
-3
lines changed

3 files changed

+60
-3
lines changed

src/scale/Time.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,10 @@ class TimeScale extends IntervalScale<TimeScaleSetting> {
206206
let upperUnitIndex = primaryTimeUnits.length - 1;
207207
let maxLevel = 0;
208208
each(ticks, tick => {
209-
upperUnitIndex = Math.min(upperUnitIndex, indexOf(primaryTimeUnits, tick.time.upperTimeUnit));
210-
maxLevel = Math.max(maxLevel, tick.time.level);
209+
if (tick.time) {
210+
upperUnitIndex = Math.min(upperUnitIndex, indexOf(primaryTimeUnits, tick.time.upperTimeUnit));
211+
maxLevel = Math.max(maxLevel, tick.time.level);
212+
}
211213
});
212214

213215
if (scaleBreakHelper) {

src/util/time.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ export function leveledFormat(
343343
else if (zrUtil.isFunction(formatter)) {
344344
const extra: TimeAxisLabelFormatterExtraParams = {
345345
time: tick.time,
346-
level: tick.time.level,
346+
level: tick.time ? tick.time.level : 0,
347347
};
348348
const scaleBreakHelper = getScaleBreakHelper();
349349
if (scaleBreakHelper) {

test/axis-customTicks.html

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)