Skip to content
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

[twisty] DragTracker: Switch to pure movementX/movementY. #194

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

[twisty] DragTracker: Switch to pure movementX/movementY. #194

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
40 changes: 7 additions & 33 deletions src/cubing/twisty/views/3D/DragTracker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
interface DragInfo {
attachedInfo: Record<any, any>;
hasMoved: boolean;
lastClientX: number;
lastClientY: number;
lastTimeStamp: number;
}

Expand Down Expand Up @@ -106,35 +104,13 @@ export class DragTracker extends EventTarget {
if (!existing) {
return { movementInfo: null, hasMoved: false };
}
// We would try to use `e.movementX`/`e.movementY`, except Safari:
// - Does not have those values on i[Pad]OS.
// - Will always report `0` for these values on macOS.
// https://bugs.webkit.org/show_bug.cgi?id=220194
//
// The following are all insufficiently powerful for detecting the Safari `0` bug:
// - `"movementX" in e`
// - `e.movementX !== "undefined"`
// - `e.hasOwnProperty("movementX")`

let movementInfo: DragMovementInfo;
if ((e.movementX ?? 0) !== 0 || (e.movementY ?? 0) !== 0) {
// We optimistically try to catch sub-pixel movements in Chrome.
movementInfo = {
attachedInfo: existing.attachedInfo,
movementX: e.movementX,
movementY: e.movementY,
elapsedMs: e.timeStamp - existing.lastTimeStamp,
};
} else {
movementInfo = {
attachedInfo: existing.attachedInfo,
movementX: e.clientX - existing.lastClientX,
movementY: e.clientY - existing.lastClientY,
elapsedMs: e.timeStamp - existing.lastTimeStamp,
};
}
existing.lastClientX = e.clientX;
existing.lastClientY = e.clientY;
// We optimistically try to catch sub-pixel movements in Chrome.
const movementInfo: DragMovementInfo = {
attachedInfo: existing.attachedInfo,
movementX: e.movementX,
movementY: e.movementY,
elapsedMs: e.timeStamp - existing.lastTimeStamp,
};
existing.lastTimeStamp = e.timeStamp;
if (
Math.abs(movementInfo.movementX) < MOVEMENT_EPSILON &&
Expand All @@ -152,8 +128,6 @@ export class DragTracker extends EventTarget {
const newDragInfo: DragInfo = {
attachedInfo: {},
hasMoved: false,
lastClientX: e.clientX,
lastClientY: e.clientY,
lastTimeStamp: e.timeStamp,
};
this.#dragInfoMap.set(e.pointerId, newDragInfo);
Expand Down