Fix broken handling of multi-touch input

minetoblend · Jan 17, 2025 · 4f0a2c0 · 4f0a2c0
1 parent 62d43f8
commit 4f0a2c0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/packages/framework/src/input/InputManager.ts b/packages/framework/src/input/InputManager.ts
@@ -2,7 +2,6 @@ import type { Drawable } from '../graphics/drawables/Drawable';
 import type { GameHost } from '../platform/GameHost';
 import type { UIEvent } from './events/UIEvent';
 import type { InputHandler } from './handlers/InputHandler';
-import type { TouchSource } from './handlers/Touch';
 import type { IFocusManager } from './IFocusManager';
 import type { InputStateChangeEvent } from './stateChanges/events/InputStateChangeEvent';
 import type { IInput } from './stateChanges/IInput';
@@ -25,6 +24,7 @@ import { HoverLostEvent } from './events/HoverLostEvent';
 import { MouseMoveEvent } from './events/MouseMoveEvent';
 import { ScrollEvent } from './events/ScrollEvent';
 import { KeyboardHandler } from './handlers/KeyboardHandler';
+import { TouchSource } from './handlers/Touch';
 import { KeyEventManager } from './KeyEventManager';
 import { MouseButtonEventManager } from './MouseButtonEventManager';
 import { InputState } from './state/InputState';
@@ -611,6 +611,9 @@ export abstract class InputManager extends Container implements IInputStateChang
     if (!this.mapMouseToLatestTouch)
       return false;
 
+    if (e.touch.source !== TouchSource.Touch1)
+      return false;
+
     if (e.isActive === true || e.lastPosition !== null) {
       new MousePositionAbsoluteInputFromTouch(e, e.touch.position).apply(this.currentState, this);
     }

diff --git a/packages/framework/src/input/handlers/MouseHandler.ts b/packages/framework/src/input/handlers/MouseHandler.ts
@@ -104,6 +104,9 @@ export class MouseHandler extends InputHandler {
   #handleMouseMove = (event: PointerEvent) => {
     event.preventDefault();
 
+    if (event.pointerType === 'touch')
+      return;
+
     const rect = (event.target as HTMLCanvasElement).getBoundingClientRect();
     const x = event.clientX - rect.left;
     const y = event.clientY - rect.top;

diff --git a/packages/framework/src/input/handlers/TouchHandler.ts b/packages/framework/src/input/handlers/TouchHandler.ts
@@ -51,12 +51,13 @@ export class TouchHandler extends InputHandler {
   #handleTouchStart = (event: TouchEvent) => {
     event.preventDefault();
 
-    const touches = this.#getTouches(event, event.changedTouches);
+    const touches = this.#getTouches(event, event.touches);
     if (touches.length === 0)
       return;
 
     this.#enqueueTouch(new TouchInput(touches, true));
-    this.flush.emit();
+    if (event.type === 'touchstart')
+      this.flush.emit();
   };
 
   #handleTouchEnd = (event: TouchEvent) => {