Skip to content

fix: compute axis drag zoom from local coordinates #847

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

Open
NemeZZiZZ wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: compute axis drag zoom from local coordinates #847

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
24 changes: 12 additions & 12 deletions src/Event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ export default class Event implements EventHandler {
private readonly _prevYAxisRanges = new Map<YAxisImp, Nullable<AxisRange>>()

private _xAxisStartScaleCoordinate: Nullable<Coordinate> = null
private _xAxisStartScaleDistance = 0
private _xAxisStartScaleDistance: Nullable<number> = null
private _xAxisScale = 1

private _yAxisStartScaleDistance = 0
private _yAxisStartScaleDistance: Nullable<number> = null

private _mouseMoveTriggerWidgetInfo: EventTriggerWidgetInfo = { pane: null, widget: null }

Expand Down Expand Up @@ -441,9 +441,9 @@ export default class Event implements EventHandler {
this._startScrollCoordinate = null
this._prevYAxisRanges.clear()
this._xAxisStartScaleCoordinate = null
this._xAxisStartScaleDistance = 0
this._xAxisStartScaleDistance = null
this._xAxisScale = 1
this._yAxisStartScaleDistance = 0
this._yAxisStartScaleDistance = null
return consumed
}

Expand Down Expand Up @@ -642,9 +642,9 @@ export default class Event implements EventHandler {
this._startScrollCoordinate = null
this._prevYAxisRanges.clear()
this._xAxisStartScaleCoordinate = null
this._xAxisStartScaleDistance = 0
this._xAxisStartScaleDistance = null
this._xAxisScale = 1
this._yAxisStartScaleDistance = 0
this._yAxisStartScaleDistance = null
}
return false
}
Expand Down Expand Up @@ -743,16 +743,16 @@ export default class Event implements EventHandler {
this._chart.updatePane(UpdateLevel.Overlay)
}
this._xAxisStartScaleCoordinate = { x: event.x, y: event.y }
this._xAxisStartScaleDistance = event.pageX
this._xAxisStartScaleDistance = event.x
return consumed
}

private _processXAxisScrollingEvent(widget: Widget<DrawPane<XAxis>>, event: MouseTouchEvent): boolean {
const consumed = widget.dispatchEvent('pressedMouseMoveEvent', event)
if (!consumed) {
const xAxis = (widget.getPane() as unknown as XAxisPane).getXAxisComponent()
if (xAxis.scrollZoomEnabled && this._xAxisStartScaleDistance !== 0) {
const scale = this._xAxisStartScaleDistance / event.pageX
if (xAxis.scrollZoomEnabled && this._xAxisStartScaleDistance !== null && this._xAxisStartScaleDistance !== 0 && event.x !== 0) {
const scale = this._xAxisStartScaleDistance / event.x
if (Number.isFinite(scale)) {
const zoomScale = (scale - this._xAxisScale) * 10
this._xAxisScale = scale
Expand All @@ -773,7 +773,7 @@ export default class Event implements EventHandler {
const yAxis = this._getYAxisScaleTargetByWidget(widget)
const range = yAxis.getRange()
this._prevYAxisRanges.set(yAxis, { ...range })
this._yAxisStartScaleDistance = event.pageY
this._yAxisStartScaleDistance = event.y
return consumed
}

Expand All @@ -783,9 +783,9 @@ export default class Event implements EventHandler {
const yAxis = this._getYAxisByWidget(widget)
const targetYAxis = this._getYAxisScaleTargetByWidget(widget)
const prevYAxisRange = this._prevYAxisRanges.get(targetYAxis)
if (isValid(prevYAxisRange) && yAxis.scrollZoomEnabled && this._yAxisStartScaleDistance !== 0) {
if (isValid(prevYAxisRange) && yAxis.scrollZoomEnabled && this._yAxisStartScaleDistance !== null && this._yAxisStartScaleDistance !== 0 && event.y !== 0) {
event.preventDefault?.()
const scaleFactor = event.pageY / this._yAxisStartScaleDistance
const scaleFactor = event.y / this._yAxisStartScaleDistance
this._zoomYAxis(targetYAxis, scaleFactor, prevYAxisRange)
this._syncManualYAxesValueRange(widget, targetYAxis)
}
Expand Down