feat(input): route temporary pan through tool state

This commit is contained in:
syntaxbullet
2026-07-03 10:14:43 +02:00
parent 9e1050e5f3
commit c7730518ad
5 changed files with 135 additions and 7 deletions

View File

@@ -5,6 +5,8 @@ export {
} from "./dom";
export type { CommandKeybind, GlobalKeybindConsumer, Keybind, KeybindEvent, KeybindMap } from "./keyboard";
export { handleKeybind, keybindFromEvent } from "./keyboard";
export type { ViewportPanInputController } from "./viewport-pan";
export { createViewportPanInputController } from "./viewport-pan";
export type { GlobalPointerConsumer, GlobalWheelConsumer, PointerInputEvent, WheelInputEvent } from "./pointer";
export type { ViewportPointerPanHandler } from "./viewport";
export { createViewportPointerPanHandler, handleViewportWheel } from "./viewport";

View File

@@ -0,0 +1,48 @@
import { describe, expect, test } from "bun:test";
import { createViewportPanInputController } from "./viewport-pan";
const ignoredState = undefined as never;
describe("viewport pan input controller", () => {
test("space enters and exits temporary pan through commands", () => {
const dispatched: unknown[] = [];
const controller = createViewportPanInputController({
globalKeyConsumer: () => false,
globalPointerConsumer: () => false,
getCurrentZoom: () => 1,
isPanMode: () => false,
dispatch: (commandId, payload) => {
dispatched.push({ commandId, payload });
return ignoredState;
},
});
expect(controller.keyDown(keyEvent("Space"))).toBe(true);
expect(controller.keyUp(keyEvent("Space"))).toBe(true);
expect(dispatched).toEqual([
{ commandId: "tool.enterTemporaryPan", payload: undefined },
{ commandId: "tool.exitTemporaryPan", payload: undefined },
]);
});
test("global key consumer prevents temporary pan command", () => {
let dispatched = false;
const controller = createViewportPanInputController({
globalKeyConsumer: () => true,
globalPointerConsumer: () => false,
getCurrentZoom: () => 1,
isPanMode: () => false,
dispatch: () => {
dispatched = true;
return ignoredState;
},
});
expect(controller.keyDown(keyEvent("Space"))).toBe(true);
expect(dispatched).toBe(false);
});
});
function keyEvent(code: string) {
return { key: code === "Space" ? " " : code, code, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false };
}

48
input/viewport-pan.ts Normal file
View File

@@ -0,0 +1,48 @@
import type { Dispatch } from "@commands/dispatcher";
import type { GlobalKeybindConsumer, KeybindEvent } from "./keyboard";
import type { GlobalPointerConsumer, PointerInputEvent } from "./pointer";
import { createViewportPointerPanHandler } from "./viewport";
export type ViewportPanInputController = {
keyDown(event: KeybindEvent): boolean;
keyUp(event: KeybindEvent): boolean;
pointerDown(event: PointerInputEvent): boolean;
pointerMove(event: PointerInputEvent): boolean;
pointerUp(event: PointerInputEvent): boolean;
isPanMode(): boolean;
};
export function createViewportPanInputController(options: {
globalKeyConsumer: GlobalKeybindConsumer;
globalPointerConsumer: GlobalPointerConsumer;
dispatch: Dispatch;
getCurrentZoom: () => number;
isPanMode: () => boolean;
}): ViewportPanInputController {
const pointerPan = createViewportPointerPanHandler({
globalConsumer: options.globalPointerConsumer,
dispatch: options.dispatch,
getCurrentZoom: options.getCurrentZoom,
canPan: (event) => event.pointerType !== "mouse" || (event.buttons & 4) === 4 || (options.isPanMode() && (event.buttons & 1) === 1),
});
return {
keyDown(event) {
if (options.globalKeyConsumer(event)) return true;
if (event.code !== "Space") return false;
options.dispatch("tool.enterTemporaryPan", undefined);
return true;
},
keyUp(event) {
if (event.code !== "Space") return false;
options.dispatch("tool.exitTemporaryPan", undefined);
return true;
},
pointerDown: pointerPan.pointerDown,
pointerMove: pointerPan.pointerMove,
pointerUp: pointerPan.pointerUp,
isPanMode: options.isPanMode,
};
}

View File

@@ -11,11 +11,12 @@ export function createViewportPointerPanHandler(options: {
globalConsumer: GlobalPointerConsumer;
dispatch: Dispatch;
getCurrentZoom: () => number;
canPan?: (event: PointerInputEvent) => boolean;
}): ViewportPointerPanHandler {
let activePointerId: number | undefined;
let lastPosition: PointerInputEvent["position"] | undefined;
const canPan = (event: PointerInputEvent) => event.pointerType !== "mouse" || (event.buttons & 4) === 4;
const canPan = options.canPan ?? defaultCanPan;
return {
pointerDown(event) {
@@ -55,6 +56,10 @@ export function createViewportPointerPanHandler(options: {
};
}
function defaultCanPan(event: PointerInputEvent) {
return event.pointerType !== "mouse" || (event.buttons & 4) === 4;
}
export function handleViewportWheel(options: {
event: WheelInputEvent;
globalConsumer: GlobalWheelConsumer;