Skip to content

fix(axis): fix ticks overflowing grid area with dataZoom #20194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2024
Merged

fix(axis): fix ticks overflowing grid area with dataZoom #20194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/coord/axisTickLabelBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,11 @@ export function createAxisLabels(axis: Axis): {
const custom = axis.getLabelModel().get('customValues');
if (custom) {
const labelFormatter = makeLabelFormatter(axis);
const extent = axis.scale.getExtent();
const tickNumbers = tickValuesToNumbers(axis, custom);
const ticks = zrUtil.filter(tickNumbers, val => val >= extent[0] && val <= extent[1]);
return {
labels: tickValuesToNumbers(axis, custom).map(numval => {
labels: zrUtil.map(ticks, numval => {
const tick = {value: numval};
return {
formattedLabel: labelFormatter(tick),
Expand Down Expand Up @@ -115,8 +118,10 @@ export function createAxisTicks(axis: Axis, tickModel: AxisBaseModel): {
} {
const custom = axis.getTickModel().get('customValues');
if (custom) {
const extent = axis.scale.getExtent();
const tickNumbers = tickValuesToNumbers(axis, custom);
return {
ticks: tickValuesToNumbers(axis, custom)
ticks: zrUtil.filter(tickNumbers, val => val >= extent[0] && val <= extent[1])
};
}
// Only ordinal scale support tick interval
Expand Down
186 changes: 186 additions & 0 deletions test/axis-customTicks.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.