Skip to content

Migrate NumericInput slider to pointer events #500

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
willeastcott wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate NumericInput slider to pointer events #500

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
30 changes: 19 additions & 11 deletions src/components/NumericInput/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class NumericInput extends InputElement {
* @example
* ```ts
* const numericInput = new NumericInput();
* numericInput.on('slider:mousedown', (evt: MouseEvent) => {
* numericInput.on('slider:mousedown', (evt: PointerEvent) => {
* console.log('Slider drag started');
* });
* ```
Expand Down Expand Up @@ -131,6 +131,8 @@ class NumericInput extends InputElement {

protected _sliderUsed = false;

protected _sliderPointerId: number = null;

/**
* Creates a new NumericInput.
*
Expand Down Expand Up @@ -183,8 +185,8 @@ class NumericInput extends InputElement {
this._sliderControl.class.add(CLASS_NUMERIC_INPUT_SLIDER_CONTROL);
this.dom.append(this._sliderControl.dom);

this._sliderControl.dom.addEventListener('mousedown', this._onSliderMouseDown);
this._sliderControl.dom.addEventListener('mouseup', this._onSliderMouseUp);
this._sliderControl.dom.addEventListener('pointerdown', this._onSliderPointerDown);
this._sliderControl.dom.addEventListener('pointerup', this._onSliderPointerUp);

document.addEventListener('pointerlockchange', this._onPointerLockChange, false);
}
Expand All @@ -194,10 +196,10 @@ class NumericInput extends InputElement {
if (this.destroyed) return;

if (this._sliderControl) {
this._sliderControl.dom.removeEventListener('mousedown', this._onSliderMouseDown);
this._sliderControl.dom.removeEventListener('mouseup', this._onSliderMouseUp);
this._sliderControl.dom.removeEventListener('pointerdown', this._onSliderPointerDown);
this._sliderControl.dom.removeEventListener('pointerup', this._onSliderPointerUp);

this._sliderControl.dom.removeEventListener('mousemove', this._onSliderMouseMove, false);
this._sliderControl.dom.removeEventListener('pointermove', this._onSliderPointerMove, false);
this._sliderControl.dom.removeEventListener('wheel', this._onSliderMouseWheel);

document.removeEventListener('pointerlockchange', this._onPointerLockChange, false);
Expand All @@ -216,11 +218,14 @@ class NumericInput extends InputElement {
this._updatePosition(evt.deltaY, evt.shiftKey);
};

protected _onSliderMouseMove = (evt: MouseEvent) => {
protected _onSliderPointerMove = (evt: PointerEvent) => {
this._updatePosition(evt.movementX, evt.shiftKey);
};

protected _onSliderMouseDown = (evt: MouseEvent) => {
protected _onSliderPointerDown = (evt: PointerEvent) => {
if (this._sliderPointerId !== null) return;

this._sliderPointerId = evt.pointerId;
this._sliderControl.dom.requestPointerLock();
this._sliderMovement = 0.0;
this._sliderPrevValue = this.value;
Expand All @@ -236,7 +241,10 @@ class NumericInput extends InputElement {
this.emit('slider:mousedown', evt);
};

protected _onSliderMouseUp = () => {
protected _onSliderPointerUp = (evt: PointerEvent) => {
if (this._sliderPointerId !== evt.pointerId) return;

this._sliderPointerId = null;
document.exitPointerLock();
if (!this._sliderUsed) return;
this._sliderUsed = false;
Expand Down Expand Up @@ -290,11 +298,11 @@ class NumericInput extends InputElement {

protected _onPointerLockChange = () => {
if (this._isScrolling()) {
this._sliderControl.dom.addEventListener('mousemove', this._onSliderMouseMove, false);
this._sliderControl.dom.addEventListener('pointermove', this._onSliderPointerMove, false);
this._sliderControl.dom.addEventListener('wheel', this._onSliderMouseWheel, { passive: true });
this._sliderControl.class.add(CLASS_NUMERIC_INPUT_SLIDER_CONTROL_ACTIVE);
} else {
this._sliderControl.dom.removeEventListener('mousemove', this._onSliderMouseMove, false);
this._sliderControl.dom.removeEventListener('pointermove', this._onSliderPointerMove, false);
this._sliderControl.dom.removeEventListener('wheel', this._onSliderMouseWheel);
this._sliderControl.class.remove(CLASS_NUMERIC_INPUT_SLIDER_CONTROL_ACTIVE);
}
Expand Down