Skip to content

feat: fix dataZoom range factor #4523 #4524

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

Closed
da730 wants to merge 1 commit into from
Closed

feat: fix dataZoom range factor #4523 #4524

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
44 changes: 21 additions & 23 deletions packages/vchart/src/component/brush/brush.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,14 +700,29 @@ export class Brush<T extends IBrushSpec = IBrushSpec> extends BaseComponent<T> i
const boundsStart = isHorizontal ? x1 : y1;
const boundsEnd = isHorizontal ? x2 : y2;

const range = axis.getScale().range();
const rangeFactor = axis.scaleRangeFactor() ?? [0, 1];

// 判断轴是否为反向轴（last(range) < range[0])，即从右到左, 或从下到上
// 如果是反向轴, 计算start和end时, 也要保持 start < end
const isAxisReverse = last(range) < range[0];
const startPosTemp = boundsStart - region.getLayoutStartPoint()[regionStartAttr];
const endPosTemp = boundsEnd - region.getLayoutStartPoint()[regionStartAttr];
const endPos = isAxisReverse ? Math.min(startPosTemp, endPosTemp) : Math.max(startPosTemp, endPosTemp);
const startPos = isAxisReverse ? Math.max(startPosTemp, endPosTemp) : Math.min(startPosTemp, endPosTemp);

const start =
((startPos - range[0]) / (last(range) - range[0])) * (rangeFactor[1] - rangeFactor[0]) + rangeFactor[0];
const end =
((endPos - range[0]) / (last(range) - range[0])) * (rangeFactor[1] - rangeFactor[0]) + rangeFactor[0];
const newStart = this._stateClamp(start - axisRangeExpand);
const newEnd = this._stateClamp(end + axisRangeExpand);

if (this._axisDataZoomMap[axis.id]) {
const dataZoom = this._axisDataZoomMap[axis.id];
const startPercent =
(boundsStart - region.getLayoutStartPoint()[regionStartAttr]) / region.getLayoutRect()[regionSizeAttr];
const endPercent =
(boundsEnd - region.getLayoutStartPoint()[regionStartAttr]) / region.getLayoutRect()[regionSizeAttr];
const newStartPercent = this._stateClamp(startPercent - axisRangeExpand);
const newEndPercent = this._stateClamp(endPercent + axisRangeExpand);

const newStartPercent = isAxisReverse ? 1 - newStart : newStart;
const newEndPercent = isAxisReverse ? 1 - newEnd : newEnd;
dataZoom.setStartAndEnd(Math.min(newStartPercent, newEndPercent), Math.max(newStartPercent, newEndPercent), [
'percent',
'percent'
Expand All @@ -729,23 +744,6 @@ export class Brush<T extends IBrushSpec = IBrushSpec> extends BaseComponent<T> i
)
});
} else {
const range = axis.getScale().range();
const rangeFactor = axis.scaleRangeFactor() ?? [0, 1];

// 判断轴是否为反向轴（last(range) < range[0])，即从右到左, 或从下到上
// 如果是反向轴, 计算start和end时, 也要保持 start < end
const isAxisReverse = last(range) < range[0];
const startPosTemp = boundsStart - region.getLayoutStartPoint()[regionStartAttr];
const endPosTemp = boundsEnd - region.getLayoutStartPoint()[regionStartAttr];
const endPos = isAxisReverse ? Math.min(startPosTemp, endPosTemp) : Math.max(startPosTemp, endPosTemp);
const startPos = isAxisReverse ? Math.max(startPosTemp, endPosTemp) : Math.min(startPosTemp, endPosTemp);

const start =
((startPos - range[0]) / (last(range) - range[0])) * (rangeFactor[1] - rangeFactor[0]) + rangeFactor[0];
const end =
((endPos - range[0]) / (last(range) - range[0])) * (rangeFactor[1] - rangeFactor[0]) + rangeFactor[0];
const newStart = this._stateClamp(start - axisRangeExpand);
const newEnd = this._stateClamp(end + axisRangeExpand);
axis.scaleRangeFactor([newStart, newEnd]);
axis.effect.scaleUpdate();

Expand Down
Loading