Skip to content

Write HTML. Render video. Built for agents.

fix(studio): a hand drag moves only with its own pointer pressed (#4880)

Miguel Ángel6388845ac9aa
diff --git a/.fallowrc.jsonc b/.fallowrc.jsonc
index 99968ceb77..cee55ad865 100644
--- a/.fallowrc.jsonc
+++ b/.fallowrc.jsonc
@@ -507,6 +507,11 @@
"packages/studio-server/src/routes/files.test.ts",
"packages/studio-server/src/routes/render.test.ts",
"packages/studio-server/src/routes/lint.test.ts",
+ // Studio gesture tests: pre-existing parallel overlay-option setups and arrange/assert blocks.
+ "packages/studio/src/components/editor/domEditOverlayStartGesture.test.ts",
+ "packages/studio/src/components/editor/anchoredResizeCommitFeedsOffset.test.ts",
+ "packages/studio/src/components/editor/rotateInlineSave.test.ts",
+ "packages/studio/src/hooks/useDomGeometryCommits.test.tsx",
// extractionCache.test.ts: pre-existing parallel describe setup and publish-case arrange/assert blocks.
"packages/engine/src/services/extractionCache.test.ts",
"packages/studio-server/src/routes/preview.test.ts",
diff --git a/packages/studio/src/components/editor/DomEditCropHandles.test.tsx b/packages/studio/src/components/editor/DomEditCropHandles.test.tsx
index ce934ebd96..0357a5b5b1 100644
--- a/packages/studio/src/components/editor/DomEditCropHandles.test.tsx
+++ b/packages/studio/src/components/editor/DomEditCropHandles.test.tsx
@@ -35,6 +35,19 @@ function makeEl(id: string, clip: string): HTMLElement {
return el;
}
+/** Presses at the first x, moves through the rest with their buttons, and lets go where the last held move was. */
+function dragCropRight(handle: HTMLElement, pointerId: number, points: [number, number][]) {
+ const [[start], ...moves] = points;
+ const release = moves.filter(([, buttons]) => buttons & 1).at(-1)?.[0] ?? start;
+ const send = (type: string, clientX: number, buttons: number) =>
+ handle.dispatchEvent(new PointerEvent(type, { bubbles: true, pointerId, buttons, clientX }));
+ act(() => {
+ send("pointerdown", start, 1);
+ for (const [x, buttons] of moves) send("pointermove", x, buttons);
+ send("pointerup", release, 0);
+ });
+}
+
function render(
el: HTMLElement,
onStyleCommit: (property: string, value: string) => Promise<unknown> | void = () => undefined,
@@ -111,7 +124,14 @@ describe("DomEditCropHandles clip lift", () => {
] as const) {
const at = { clientX: 100 + d * c.dx, clientY: 50 + d * c.dy };
act(() =>
- handle.dispatchEvent(new PointerEvent(type, { bubbles: true, pointerId: 3, ...at })),
+ handle.dispatchEvent(
+ new PointerEvent(type, {
+ bubbles: true,
+ buttons: type === "pointerup" ? 0 : 1,
+ pointerId: 3,
+ ...at,
+ }),
+ ),
);
}
expect(onStyleCommit).not.toHaveBeenCalled();
@@ -121,16 +141,23 @@ describe("DomEditCropHandles clip lift", () => {
const onStyleCommit = vi.fn();
render(makeEl("a", "inset(10px)"), onStyleCommit);
const handle = document.querySelector<HTMLButtonElement>('[aria-label="Crop right"]')!;
- act(() => {
- for (const [type, clientX] of [
- ["pointerdown", 100],
- ["pointermove", 90],
- ["pointermove", 80],
- ["pointerup", 80],
- ] as const) {
- handle.dispatchEvent(new PointerEvent(type, { bubbles: true, pointerId: 4, clientX }));
- }
- });
+ dragCropRight(handle, 4, [
+ [100, 1],
+ [90, 1],
+ [80, 1],
+ ]);
+ expect(onStyleCommit).toHaveBeenCalledWith("clip-path", "inset(10px 30px 10px 10px)");
+ });
+
+ it("commits where the pointer let go, not at a buttonless move back at the press point", () => {
+ const onStyleCommit = vi.fn();
+ render(makeEl("a", "inset(10px)"), onStyleCommit);
+ const handle = document.querySelector<HTMLButtonElement>('[aria-label="Crop right"]')!;
+ dragCropRight(handle, 6, [
+ [100, 1],
+ [80, 1],
+ [100, 0],
+ ]);
expect(onStyleCommit).toHaveBeenCalledWith("clip-path", "inset(10px 30px 10px 10px)");
});
@@ -138,16 +165,11 @@ describe("DomEditCropHandles clip lift", () => {
const a = makeEl("a", "");
const { root } = render(a, (property, value) => void a.style.setProperty(property, value));
const handle = document.querySelector<HTMLButtonElement>('[aria-label="Crop right"]')!;
- act(() => {
- for (const [type, clientX] of [
- ["pointerdown", 100],
- ["pointermove", 90],
- ["pointermove", 80],
- ["pointerup", 80],
- ] as const) {
- handle.dispatchEvent(new PointerEvent(type, { bubbles: true, pointerId: 5, clientX }));
- }
- });
+ dragCropRight(handle, 5, [
+ [100, 1],
+ [90, 1],
+ [80, 1],
+ ]);
await act(async () => undefined);
act(() => root.unmount());
expect(a.style.getPropertyValue("clip-path")).toBe("inset(0px 20px 0px 0px)");
@@ -163,7 +185,14 @@ describe("DomEditCropHandles clip lift", () => {
const handle = document.querySelector<HTMLButtonElement>('[aria-label="Crop right"]')!;
const press = (type: string, clientX: number) =>
act(() =>
- handle.dispatchEvent(new PointerEvent(type, { bubbles: true, pointerId: 1, clientX })),
+ handle.dispatchEvent(
+ new PointerEvent(type, {
+ bubbles: true,
+ buttons: type === "pointerup" ? 0 : 1,
+ pointerId: 1,
+ clientX,
+ }),
+ ),
);
press("pointerdown", 100);
press("pointermove", 80);
diff --git a/packages/studio/src/components/editor/DomEditCropHandles.tsx b/packages/studio/src/components/editor/DomEditCropHandles.tsx
index d1ac3cbfbf..6ec3d5a322 100644
--- a/packages/studio/src/components/editor/DomEditCropHandles.tsx
+++ b/packages/studio/src/components/editor/DomEditCropHandles.tsx
@@ -17,6 +17,7 @@ import { buildInsetClipPathSides, type ClipPathInsetSides } from "./clipPathHelp
import { readCropFollowingResize } from "./cropResize";
import { isCropBarTarget, useCropPresetBarStore } from "./cropPresetStore";
import { CropPresetBar } from "./CropPresetBar";
+import { movesGesture } from "./domEditOverlayGestures";
interface CropGestureState {
edge: CropEdge | "move";
@@ -188,7 +189,7 @@ export function DomEditCropHandles({
const updateCropGesture = (event: ReactPointerEvent<HTMLElement>) => {
const gesture = gestureRef.current;
- if (!gesture || gesture.pointerId !== event.pointerId) return;
+ if (!gesture || !movesGesture(gesture, event)) return;
event.preventDefault();
event.stopPropagation();
const local = rotateDeltaIntoFrame(
diff --git a/packages/studio/src/components/editor/anchoredResizeCommitFeedsOffset.test.ts b/packages/studio/src/components/editor/anchoredResizeCommitFeedsOffset.test.ts
index 6d25c86da3..1e065adc33 100644
--- a/packages/studio/src/components/editor/anchoredResizeCommitFeedsOffset.test.ts
+++ b/packages/studio/src/components/editor/anchoredResizeCommitFeedsOffset.test.ts
@@ -196,6 +196,7 @@ function evt(clientX: number, clientY: number) {
clientY,
pointerId: 1,
button: 0,
+ buttons: 1,
altKey: false,
shiftKey: false,
preventDefault() {},
diff --git a/packages/studio/src/components/editor/commitPreflightHandles.test.tsx b/packages/studio/src/components/editor/commitPreflightHandles.test.tsx
index aa48cdd01b..6e680f66f8 100644
--- a/packages/studio/src/components/editor/commitPreflightHandles.test.tsx
+++ b/packages/studio/src/components/editor/commitPreflightHandles.test.tsx
@@ -182,7 +182,10 @@ async function settle() {
const fire = (target: Element, type: string, init: MouseEventInit = {}) => {
act(() => {
- target.dispatchEvent(new MouseEvent(type, { bubbles: true, cancelable: true, ...init }));
+ const buttons = type === "pointerdown" || type === "pointermove" ? 1 : 0;
+ target.dispatchEvent(
+ new MouseEvent(type, { bubbles: true, cancelable: true, buttons, ...init }),
+ );
});
};
diff --git a/packages/studio/src/components/editor/domEditOverlayGestures.ts b/packages/studio/src/components/editor/domEditOverlayGestures.ts
index 9aa2b46274..069dae076d 100644
--- a/packages/studio/src/components/editor/domEditOverlayGestures.ts
+++ b/packages/studio/src/components/editor/domEditOverlayGestures.ts
@@ -49,6 +49,7 @@ export interface GestureState {
kind: GestureKind;
mode: "path-offset" | "box-size" | "rotation";
selection: DomEditSelection;
+ pointerId: number;
startX: number;
startY: number;
centerX: number;
@@ -93,6 +94,7 @@ export interface GestureState {
}
export interface GroupGestureState {
+ pointerId: number;
startX: number;
startY: number;
originItems: GroupOverlayItem[];
@@ -103,6 +105,14 @@ export interface GroupGestureState {
travelled?: boolean;
}
+/** Only the pressing pointer's moves with its button held drive a gesture, not Chromium's buttonless resends. */
+export function movesGesture(
+ gesture: { pointerId: number },
+ e: { pointerId: number; buttons: number },
+): boolean {
+ return e.pointerId === gesture.pointerId && (e.buttons & 1) === 1;
+}
+
export interface BlockedMoveState {
pointerId: number;
startX: number;
diff --git a/packages/studio/src/components/editor/domEditOverlayStartGesture.test.ts b/packages/studio/src/components/editor/domEditOverlayStartGesture.test.ts
index 5ab32f9c76..37998fbe7e 100644
--- a/packages/studio/src/components/editor/domEditOverlayStartGesture.test.ts
+++ b/packages/studio/src/components/editor/domEditOverlayStartGesture.test.ts
@@ -177,6 +177,7 @@ describe("a rotate on a page that loads GSAP", () => {
clientY,
pointerId: 1,
button: 0,
+ buttons: 1,
shiftKey: false,
preventDefault() {},
stopPropagation() {},
diff --git a/packages/studio/src/components/editor/domEditOverlayStartGesture.ts b/packages/studio/src/components/editor/domEditOverlayStartGesture.ts
index 03ce61124e..9d254697a6 100644
--- a/packages/studio/src/components/editor/domEditOverlayStartGesture.ts
+++ b/packages/studio/src/components/editor/domEditOverlayStartGesture.ts
@@ -119,6 +119,7 @@ export function startGroupDrag(
e.currentTarget.setPointerCapture(e.pointerId);
opts.rafPausedRef.current = true;
opts.groupGestureRef.current = {
+ pointerId: e.pointerId,
startX: e.clientX,
startY: e.clientY,
originItems: items,
@@ -265,6 +266,7 @@ export function startGesture(
kind,
mode,
selection: sel,
+ pointerId: e.pointerId,
startX: e.clientX,
startY: e.clientY,
centerX,
diff --git a/packages/studio/src/components/editor/gestureHoldsPreviewReload.test.tsx b/packages/studio/src/components/editor/gestureHoldsPreviewReload.test.tsx
index 8eaaa25e81..e139ef34d3 100644
--- a/packages/studio/src/components/editor/gestureHoldsPreviewReload.test.tsx
+++ b/packages/studio/src/components/editor/gestureHoldsPreviewReload.test.tsx
@@ -66,8 +66,24 @@ const byId = (iframe: HTMLIFrameElement | null, id: string) =>
iframe!.contentDocument!.getElementById(id) as HTMLElement;
const api = (): TimelinePlayerApi => player.getApi();
-function pointer(target: Element, type: string, x: number, y: number) {
- const init = { bubbles: true, cancelable: true, button: 0, pointerId: 1, clientX: x, clientY: y };
+function pointer(
+ target: Element,
+ type: string,
+ x: number,
+ y: number,
+ extra: PointerEventInit = {},
+) {
+ const buttons = type === "pointerdown" || type === "pointermove" ? 1 : 0;
+ const init = {
+ bubbles: true,
+ cancelable: true,
+ button: 0,
+ buttons,
+ pointerId: 1,
+ clientX: x,
+ clientY: y,
+ ...extra,
+ };
act(() => void target.dispatchEvent(new PointerEvent(type, init)));
}
@@ -252,6 +268,27 @@ describe("a reload during a drag", () => {
});
});
+describe("a drag moves only with its own pointer pressed", () => {
+ it.each([
+ ["no button held, as Chromium sends after a layout change", { buttons: 0 }],
+ ["another pointer", { pointerId: 2 }],
+ ])(
+ "a move with %s at a fixed point leaves the drop where the pointer let go",
+ async (_, stray) => {
+ const { live, overlay, box } = mountEditor(false);
+ pointer(box, "pointerdown", 150, 150);
+ pointer(overlay, "pointermove", 170, 160);
+ pointer(overlay, "pointermove", 20, 20, stray);
+ pointer(overlay, "pointermove", 190, 170);
+ pointer(overlay, "pointermove", 20, 20, stray);
+ expect(byId(live, "title").style.getPropertyValue("translate")).toBe("40px 20px");
+ pointer(overlay, "pointerup", 190, 170);
+ await settle();
+ expect(file.title).toBe("translate: 40px 20px");
+ },
+ );
+});
+
type Editor = ReturnType<typeof mountEditor>;
describe("every way a drag ends without a drop clears its mark and promotes the held reload", () => {
diff --git a/packages/studio/src/components/editor/marqueeCommit.test.tsx b/packages/studio/src/components/editor/marqueeCommit.test.tsx
index 053644b6bd..8586f15e0a 100644
--- a/packages/studio/src/components/editor/marqueeCommit.test.tsx
+++ b/packages/studio/src/components/editor/marqueeCommit.test.tsx
@@ -35,18 +35,23 @@ function Overlay() {
onPointerMove={marquee.onPointerMove}
onPointerUp={marquee.onPointerUp}
>
- {marquee.marqueeRect && <div data-band />}
+ {marquee.marqueeRect && <div data-band data-width={marquee.marqueeRect.width} />}
</div>
);
}
const pointer = (type: string, clientX: number, clientY: number) =>
act(() => {
- document
- .querySelector("[data-overlay]")!
- .dispatchEvent(
- new PointerEvent(type, { bubbles: true, button: 0, pointerId: 1, clientX, clientY }),
- );
+ document.querySelector("[data-overlay]")!.dispatchEvent(
+ new PointerEvent(type, {
+ bubbles: true,
+ buttons: type === "pointerup" ? 0 : 1,
+ button: 0,
+ pointerId: 1,
+ clientX,
+ clientY,
+ }),
+ );
});
const escape = () => {
const event = new KeyboardEvent("keydown", { key: "Escape", bubbles: true, cancelable: true });
@@ -86,6 +91,25 @@ it("an escape cancels a preview band while the pointer is still down, and stops
expect(hostEscapes).toHaveLength(0);
});
+it("a buttonless move back at the start does not shrink the band", () => {
+ pointer("pointerdown", 10, 10);
+ pointer("pointermove", 120, 90);
+ const band = () => document.querySelector<HTMLElement>("[data-band]")?.dataset.width;
+ expect(band()).toBe("110");
+ act(() => {
+ document.querySelector("[data-overlay]")!.dispatchEvent(
+ new PointerEvent("pointermove", {
+ bubbles: true,
+ pointerId: 1,
+ buttons: 0,
+ clientX: 10,
+ clientY: 10,
+ }),
+ );
+ });
+ expect(band()).toBe("110");
+});
+
it("an escape with no band in flight still reaches the host", () => {
const event = escape();
@@ -133,6 +157,7 @@ it("a reload promoted mid-band selects from the preview on screen, not the retir
new PointerEvent(type, {
bubbles: true,
button: 0,
+ buttons: type === "pointerup" ? 0 : 1,
pointerId: 1,
clientX: x,
clientY: y,
diff --git a/packages/studio/src/components/editor/marqueeCommit.ts b/packages/studio/src/components/editor/marqueeCommit.ts
index daf6c68161..d00194dd63 100644
--- a/packages/studio/src/components/editor/marqueeCommit.ts
+++ b/packages/studio/src/components/editor/marqueeCommit.ts
@@ -6,6 +6,7 @@ import { isElementComputedVisible } from "./domEditingElement";
import { coversComposition } from "../../utils/studioPreviewHelpers";
import { rectsOverlap, type Rect } from "../../utils/marqueeGeometry";
import { toVisibleOverlayRect } from "./domEditOverlayGeometry";
+import { movesGesture } from "./domEditOverlayGestures";
interface MarqueeState {
startX: number;
@@ -226,10 +227,23 @@ export function useMarqueeGestures<T>(deps: MarqueeGesturesDeps<T>): MarqueeGest
window.removeEventListener("keydown", cancelBandBeforeHostEscape, { capture: true });
}, [cancel]);
+ const showCandidates = useCallback(
+ (rect: Rect) => {
+ const iframe = deps.iframeRef.current;
+ const overlay = deps.overlayRef.current;
+ if (!iframe || !overlay) return;
+ const acp = deps.activeCompositionPathRef.current ?? "index.html";
+ candidatesRef.current ??= collectMarqueeCandidates(iframe, overlay, acp);
+ setCandidateRects(hitsWithin(rect, candidatesRef.current).map((h) => h.rect));
+ },
+ [deps.overlayRef, deps.iframeRef, deps.activeCompositionPathRef],
+ );
+
const onPointerMove = useCallback(
(event: React.PointerEvent<HTMLDivElement>) => {
const m = marqueeRef.current;
if (m) {
+ if (!movesGesture(m, event)) return;
const oRect = deps.overlayRef.current?.getBoundingClientRect();
if (!oRect) return;
m.currentX = event.clientX - oRect.left;
@@ -248,18 +262,12 @@ export function useMarqueeGestures<T>(deps: MarqueeGesturesDeps<T>): MarqueeGest
height: Math.abs(m.currentY - m.startY),
};
setMarqueeRect(rect);
- const iframe = deps.iframeRef.current;
- const overlay = deps.overlayRef.current;
- if (iframe && overlay) {
- const acp = deps.activeCompositionPathRef.current ?? "index.html";
- candidatesRef.current ??= collectMarqueeCandidates(iframe, overlay, acp);
- setCandidateRects(hitsWithin(rect, candidatesRef.current).map((h) => h.rect));
- }
+ showCandidates(rect);
return;
}
deps.gestures?.onPointerMove(event);
},
- [deps.gestures, deps.overlayRef, deps.iframeRef, deps.activeCompositionPathRef],
+ [deps.gestures, deps.overlayRef, showCandidates],
);
const onPointerUp = useCallback(
diff --git a/packages/studio/src/components/editor/previewReadOnly.overlay.test.tsx b/packages/studio/src/components/editor/previewReadOnly.overlay.test.tsx
index bfb03479cd..1385264707 100644
--- a/packages/studio/src/components/editor/previewReadOnly.overlay.test.tsx
+++ b/packages/studio/src/components/editor/previewReadOnly.overlay.test.tsx
@@ -105,7 +105,14 @@ function fixture(
}
const fire = (target: Element, type: string, init: MouseEventInit = {}) => {
- const event = new MouseEvent(type, { bubbles: true, cancelable: true, button: 0, ...init });
+ const buttons = type === "pointerdown" || type === "pointermove" ? 1 : 0;
+ const event = new MouseEvent(type, {
+ bubbles: true,
+ cancelable: true,
+ button: 0,
+ buttons,
+ ...init,
+ });
act(() => {
target.dispatchEvent(event);
});
diff --git a/packages/studio/src/components/editor/shiftDragAxisLock.test.tsx b/packages/studio/src/components/editor/shiftDragAxisLock.test.tsx
index 55588abe28..2e4f9782cc 100644
--- a/packages/studio/src/components/editor/shiftDragAxisLock.test.tsx
+++ b/packages/studio/src/components/editor/shiftDragAxisLock.test.tsx
@@ -31,7 +31,7 @@ function gestureHarness(gesture: Partial<GestureState> | null, group: GroupGestu
};
const handlers = createDomEditOverlayGestureHandlers(opts as never);
const pointer = (clientX: number, clientY: number, shiftKey: boolean) =>
- ({ clientX, clientY, shiftKey, altKey: false }) as never;
+ ({ clientX, clientY, shiftKey, altKey: false, pointerId: 1, buttons: 1 }) as never;
return { opts, handlers, pointer };
}
@@ -41,6 +41,7 @@ function singleDrag() {
{
kind: "drag",
mode: "path-offset",
+ pointerId: 1,
selection: { element } as unknown as DomEditSelection,
startX: 100,
startY: 100,
@@ -57,7 +58,13 @@ function singleDrag() {
}
const groupGesture = () =>
- ({ startX: 100, startY: 100, originItems: [], members: [] }) as unknown as GroupGestureState;
+ ({
+ pointerId: 1,
+ startX: 100,
+ startY: 100,
+ originItems: [],
+ members: [],
+ }) as unknown as GroupGestureState;
describe("shift+drag locks a move to the axis the pointer travels further on", () => {
it("keeps a mostly horizontal single drag on its row", () => {
@@ -278,6 +285,7 @@ function singleMemberDrag() {
{
kind: "drag",
mode: "path-offset",
+ pointerId: 1,
selection,
startX: 100,
startY: 100,
@@ -300,7 +308,13 @@ function singleMemberDrag() {
function groupMemberDrag() {
const a = draggableMember("a");
const b = draggableMember("b");
- const group = { startX: 100, startY: 100, originItems: [], members: [a.member, b.member] };
+ const group = {
+ pointerId: 1,
+ startX: 100,
+ startY: 100,
+ originItems: [],
+ members: [a.member, b.member],
+ };
const harness = gestureHarness(null, group as unknown as GroupGestureState);
return { ...harness, at: () => [a.at(), b.at()] };
}
diff --git a/packages/studio/src/components/editor/useDomEditOverlayGestures.ts b/packages/studio/src/components/editor/useDomEditOverlayGestures.ts
index 08d41490ea..4cc806e9ae 100644
--- a/packages/studio/src/components/editor/useDomEditOverlayGestures.ts
+++ b/packages/studio/src/components/editor/useDomEditOverlayGestures.ts
@@ -38,6 +38,7 @@ import {
ROTATED_SNAP_BYPASS_DEGREES,
hasDomEditRotationChanged,
lockDragToDominantAxis,
+ movesGesture,
resolveDomEditRotationGesture,
} from "./domEditOverlayGestures";
import { resolveCenterResizeSize } from "./domEditResizeLocal";
@@ -131,6 +132,8 @@ export function createDomEditOverlayGestureHandlers(opts: UseDomEditOverlayGestu
if (!blockedMove && !g && !groupG) {
opts.onCanvasPointerMoveRef.current(e, { preferClipAncestor: false });
}
+ const held = g ?? groupG;
+ if (held && !movesGesture(held, e)) return;
if (blockedMove) {
const dx = e.clientX - blockedMove.startX;
diff --git a/packages/studio/src/editorGesturesExports.test.tsx b/packages/studio/src/editorGesturesExports.test.tsx
index 58425a83fb..08501430bc 100644
--- a/packages/studio/src/editorGesturesExports.test.tsx
+++ b/packages/studio/src/editorGesturesExports.test.tsx
@@ -82,6 +82,7 @@ function mountMarquee<T>(extra: Partial<MarqueeGesturesDeps<T>> = {}) {
clientX: x,
clientY: y,
pointerId: 7,
+ buttons: 1,
shiftKey,
currentTarget: overlay,
}) as unknown as PointerEvent<HTMLDivElement>;
diff --git a/packages/studio/src/hooks/useDomGeometryCommits.test.tsx b/packages/studio/src/hooks/useDomGeometryCommits.test.tsx
index e4c4dbb182..e6d81df47f 100644
--- a/packages/studio/src/hooks/useDomGeometryCommits.test.tsx
+++ b/packages/studio/src/hooks/useDomGeometryCommits.test.tsx
@@ -443,7 +443,14 @@ describe("useDomGeometryCommits resize of a cropped element", () => {
const handle = document.querySelector<HTMLButtonElement>('[aria-label="Crop right"]')!;
const press = (type: string, clientX: number) =>
act(() =>
- handle.dispatchEvent(new PointerEvent(type, { bubbles: true, pointerId: 3, clientX })),
+ handle.dispatchEvent(
+ new PointerEvent(type, {
+ bubbles: true,
+ pointerId: 3,
+ buttons: type === "pointerup" ? 0 : 1,
+ clientX,
+ }),
+ ),
);
press("pointerdown", 100);
press("pointermove", 100 - by);
diff --git a/packages/studio/tests/e2e/edit-accuracy/baseline.json b/packages/studio/tests/e2e/edit-accuracy/baseline.json
index 4813103dd0..76fdba6349 100644
--- a/packages/studio/tests/e2e/edit-accuracy/baseline.json
+++ b/packages/studio/tests/e2e/edit-accuracy/baseline.json
@@ -544,6 +544,15 @@
"pathpause-none-px-r0-root-z200": {"pass":true,"tracking":0.03,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0.03,"render":0.03,"undo":true,"dropped":0,"controlDropped":0,"work":4.79,"frameP95":18.2},
"pathpause-none-px-r0-root-z50": {"pass":true,"tracking":0,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0.05,"render":0.05,"undo":true,"dropped":0,"controlDropped":0,"work":4.72,"frameP95":17.8},
"pathpause-none-px-r30-root-z100": {"pass":true,"tracking":0.04,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.13,"undo":true,"dropped":0,"controlDropped":0,"work":4.63,"frameP95":18.3},
+ "pathstray-none-center-r0-nested-z100": {"pass":true,"tracking":0.03,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.01,"undo":true,"dropped":0,"controlDropped":0,"work":4.79,"frameP95":17.3},
+ "pathstray-none-center-r0-root-z100": {"pass":true,"tracking":0.03,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.01,"undo":true,"dropped":0,"controlDropped":0,"work":4.16,"frameP95":17.1},
+ "pathstray-none-pct-r0-nested-z100": {"pass":true,"tracking":0.03,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.03,"undo":true,"dropped":0,"controlDropped":0,"work":4.38,"frameP95":17.5},
+ "pathstray-none-pct-r0-root-z100": {"pass":true,"tracking":0.06,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.03,"undo":true,"dropped":0,"controlDropped":0,"work":2.76,"frameP95":17},
+ "pathstray-none-px-r0-nested-z100": {"pass":true,"tracking":0.04,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.03,"undo":true,"dropped":0,"controlDropped":0,"work":4.98,"frameP95":17.5},
+ "pathstray-none-px-r0-root-z100": {"pass":true,"tracking":0.03,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.01,"undo":true,"dropped":0,"controlDropped":0,"work":6.11,"frameP95":17.6},
+ "pathstray-none-px-r0-root-z200": {"pass":true,"tracking":0.03,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0.03,"render":0.03,"undo":true,"dropped":0,"controlDropped":0,"work":4.75,"frameP95":17.2},
+ "pathstray-none-px-r0-root-z50": {"pass":true,"tracking":0,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0.05,"render":0.05,"undo":true,"dropped":0,"controlDropped":0,"work":5.19,"frameP95":19.8},
+ "pathstray-none-px-r30-root-z100": {"pass":true,"tracking":0.04,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.13,"undo":true,"dropped":0,"controlDropped":0,"work":4.5,"frameP95":18.4},
"pathzigzag-none-center-r0-nested-z100": {"pass":false,"tracking":0.03,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.02,"undo":true,"dropped":1,"controlDropped":0,"work":4.62,"frameP95":18.6},
"pathzigzag-none-center-r0-root-z100": {"pass":true,"tracking":0.03,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.02,"undo":true,"dropped":0,"controlDropped":0,"work":4.69,"frameP95":18.3},
"pathzigzag-none-pct-r0-nested-z100": {"pass":true,"tracking":0.05,"pressJump":0,"teleport":true,"teleportPx":0.01,"drop":0,"reload":0,"render":0.04,"undo":true,"dropped":0,"controlDropped":0,"work":4.42,"frameP95":17.7},
diff --git a/packages/studio/tests/e2e/edit-accuracy/case.mjs b/packages/studio/tests/e2e/edit-accuracy/case.mjs
index 8fccf39f72..87d34e03f5 100644
--- a/packages/studio/tests/e2e/edit-accuracy/case.mjs
+++ b/packages/studio/tests/e2e/edit-accuracy/case.mjs
@@ -570,7 +570,30 @@ export async function controlDrag(browser, gesture) {
}
}
-/** `route`, given the press point, replaces the gesture's straight path; a `{ pause }` entry holds still. */
+/** The move Chromium resends at the last known point after a layout change: no button, capture kept. A CDP move
+ * with no button ends the capture instead, so it goes to the captured box (the mouse is pointer 1). */
+async function strayMove(page, [x, y]) {
+ const sent = await page.evaluate(
+ ([clientX, clientY]) =>
+ document.querySelector("[data-dom-edit-selection-box]")?.dispatchEvent(
+ new PointerEvent("pointermove", {
+ bubbles: true,
+ pointerId: 1,
+ pointerType: "mouse",
+ isPrimary: true,
+ buttons: 0,
+ clientX,
+ clientY,
+ }),
+ ),
+ [x, y],
+ );
+ if (sent === undefined) throw new Error("no selection box to send the stray move to");
+ await nextFrame(page);
+}
+
+/** `route`, given the press point, replaces the gesture's straight path.
+ * `{ pause }` holds still; `{ stray }`: see strayMove. */
// fallow-ignore-next-line complexity
export async function pointerGesture(ctx, gesture, pre, route) {
const press = await handlePoint(ctx, pre, gesture);
@@ -596,6 +619,10 @@ export async function pointerGesture(ctx, gesture, pre, route) {
await sleep(p.pause);
continue;
}
+ if (p.stray) {
+ await strayMove(ctx.page, p.stray);
+ continue;
+ }
await ctx.page.mouse.move(p[0], p[1]);
await nextFrame(ctx.page);
last = await sample(ctx, gesture, g.point, p);
diff --git a/packages/studio/tests/e2e/edit-accuracy/drags.mjs b/packages/studio/tests/e2e/edit-accuracy/drags.mjs
index b72aed8eb7..76b18a6449 100644
--- a/packages/studio/tests/e2e/edit-accuracy/drags.mjs
+++ b/packages/studio/tests/e2e/edit-accuracy/drags.mjs
@@ -5,7 +5,7 @@ const MOVE = { do: "drag", gesture: "move", by: [90, 60] };
const BACK = { do: "drag", gesture: "move", by: [-70, 50] };
const UP = { do: "drag", gesture: "move", by: [60, -80] };
-const PATHS = ["zigzag", "circle", "flick", "pause", "edge"];
+const PATHS = ["zigzag", "circle", "flick", "pause", "edge", "stray"];
/** Each sequence's steps; a drag names its element (A is #target, B is #other) and its screen-px path. */
const SEQUENCES = {
diff --git a/packages/studio/tests/e2e/edit-accuracy/sequences.mjs b/packages/studio/tests/e2e/edit-accuracy/sequences.mjs
index 1ccdf94c03..08ee635da0 100644
--- a/packages/studio/tests/e2e/edit-accuracy/sequences.mjs
+++ b/packages/studio/tests/e2e/edit-accuracy/sequences.mjs
@@ -68,6 +68,8 @@ const ROUTES = {
const half = legN(p, [p[0] + 90, p[1] + 45], 20);
return [...half, { pause: 1000 }, ...legN(half.at(-1), [p[0] + 180, p[1] + 90], 20)];
},
+ // Just before the release, Chromium resends the press point with no button down; the drop must not take it.
+ stray: (p) => [...legN(p, [p[0] + 180, p[1] + 90], 20), { stray: p }],
edge: (p, v) => {
const out = [Math.min(v.edge + 60, VIEWPORT.width - 2), p[1]];
return legs(p, [out, [p[0] + 60, p[1] + 30]]);
diff --git a/packages/studio/tests/e2e/edit-accuracy/teleport.mjs b/packages/studio/tests/e2e/edit-accuracy/teleport.mjs
index 89bd5f7a3a..027640bdf3 100644
--- a/packages/studio/tests/e2e/edit-accuracy/teleport.mjs
+++ b/packages/studio/tests/e2e/edit-accuracy/teleport.mjs
@@ -107,6 +107,8 @@ function frameSampler() {
window.addEventListener(
type,
(e) => {
+ // The stray move case.mjs sends is not where the pointer is.
+ if (!e.isTrusted) return;
rec.pointer = [e.clientX, e.clientY];
// From the buttons, not the event type: a move after release is not a drag.
rec.down = (e.buttons & 1) === 1;
diff --git a/packages/studio/tests/e2e/edit-accuracy/teleport.test.mjs b/packages/studio/tests/e2e/edit-accuracy/teleport.test.mjs
index 57e7df24ee..bfcf2a48f6 100644
--- a/packages/studio/tests/e2e/edit-accuracy/teleport.test.mjs
+++ b/packages/studio/tests/e2e/edit-accuracy/teleport.test.mjs
@@ -199,12 +199,16 @@ describe("frameSamplerScript", () => {
};
runInNewContext(frameSamplerScript, page);
const rec = window.__editBenchFrames;
- on.pointerdown({ clientX: 1, clientY: 1, buttons: 1 });
- on.pointermove({ clientX: 2, clientY: 1, buttons: 1 });
+ on.pointerdown({ clientX: 1, clientY: 1, buttons: 1, isTrusted: true });
+ on.pointermove({ clientX: 2, clientY: 1, buttons: 1, isTrusted: true });
expect(rec).toMatchObject({ down: true, ups: 0 });
- on.pointerup({ clientX: 2, clientY: 1, buttons: 0 });
- on.pointermove({ clientX: 90, clientY: 1, buttons: 0 });
+ on.pointerup({ clientX: 2, clientY: 1, buttons: 0, isTrusted: true });
+ on.pointermove({ clientX: 90, clientY: 1, buttons: 0, isTrusted: true });
expect(rec).toMatchObject({ down: false, ups: 1, pointer: [90, 1] });
+ on.pointermove({ clientX: 5, clientY: 5, buttons: 0, isTrusted: false });
+ expect(rec, "the bench's own stray move is not the pointer").toMatchObject({
+ pointer: [90, 1],
+ });
});
it("runs beside a page script that declares the same names, and leaves them alone", () => {