Skip to content

Commit 6f5b591

Browse files
committed
fix(web): Cite shows for text selected by touch
1 parent a2398c2 commit 6f5b591

2 files changed

Lines changed: 46 additions & 4 deletions

File tree

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { describe, expect, it, vi } from "vite-plus/test";
2+
import { observeSelectionActions } from "./selectionActions";
3+
4+
describe("observeSelectionActions", () => {
5+
it("reports a touch long-press selection that cancels the pointer", async () => {
6+
const element = document.createElement("div");
7+
element.textContent = "Select this text on a phone";
8+
document.body.append(element);
9+
const onSelection = vi.fn();
10+
const actions = observeSelectionActions({ element, onSelection, onDismiss: vi.fn() });
11+
document.addEventListener("selectionchange", actions.selectionChanged);
12+
using _cleanup = {
13+
[Symbol.dispose]: () => {
14+
document.removeEventListener("selectionchange", actions.selectionChanged);
15+
actions.dispose();
16+
element.remove();
17+
},
18+
};
19+
20+
const touch = { bubbles: true, isPrimary: true, pointerType: "touch", button: 0 };
21+
element.dispatchEvent(new PointerEvent("pointerdown", touch));
22+
element.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true }));
23+
window.dispatchEvent(new PointerEvent("pointercancel", touch));
24+
window.getSelection()!.selectAllChildren(element);
25+
26+
await vi.waitFor(() => expect(onSelection).toHaveBeenCalledWith(null));
27+
});
28+
});

‎apps/web/src/lib/selectionActions.ts‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export function observeSelectionActions({
6262
let gestureActive = false;
6363
let dismissed = false;
6464
let restorable = false;
65+
let touch = false;
6566
let pointer: SelectionActionPoint | null = null;
6667
let timer: number | null = null;
6768
let frame: number | null = null;
@@ -86,6 +87,8 @@ export function observeSelectionActions({
8687
onDismiss("cancel");
8788
};
8889
const onContextMenu = () => {
90+
// A touch long-press is how text gets selected, not a context menu.
91+
if (touch) return;
8992
cancel();
9093
onDismiss("interaction");
9194
};
@@ -102,6 +105,7 @@ export function observeSelectionActions({
102105
};
103106
const onPointerDown = (event: PointerEvent) => {
104107
if (!event.isPrimary) return;
108+
touch = event.pointerType === "touch";
105109
if (isActionTarget(event.target)) {
106110
cancel();
107111
return;
@@ -123,6 +127,11 @@ export function observeSelectionActions({
123127
gestureActive = event.button === 0 && !event.defaultPrevented;
124128
dismissed = !gestureActive;
125129
};
130+
const onPointerCancel = (event: PointerEvent) => {
131+
// Touch long-press selection and panning cancel the pointer; selectionchange and scroll own those.
132+
if (event.pointerType !== "touch") return dismiss();
133+
pointerDown = gestureActive = false;
134+
};
126135
const onPointerUp = (event: PointerEvent) => {
127136
// Preventing pointerdown (for example on a toolbar) can suppress mouseup.
128137
if (event.isPrimary && event.button === 0) pointerDown = false;
@@ -155,7 +164,8 @@ export function observeSelectionActions({
155164
// Autoscroll during a drag must not cancel that gesture's eventual release.
156165
if (!pointerDown) {
157166
pointer = null;
158-
if (restoreAfterScroll && !dismissed && restorable) schedule(SELECTION_SCROLL_SETTLE_MS);
167+
if (restoreAfterScroll && (touch || (!dismissed && restorable)))
168+
schedule(SELECTION_SCROLL_SETTLE_MS);
159169
else dismissed = true;
160170
}
161171
onDismiss("cancel");
@@ -165,7 +175,7 @@ export function observeSelectionActions({
165175
element.addEventListener("pointerdown", onSelectionStart);
166176
view.addEventListener("pointerup", onPointerUp);
167177
view.addEventListener("mouseup", onMouseUp);
168-
view.addEventListener("pointercancel", dismiss);
178+
view.addEventListener("pointercancel", onPointerCancel);
169179
document.addEventListener("keydown", onKeyDown);
170180
document.addEventListener("focusin", onFocusIn);
171181
element.addEventListener("contextmenu", onContextMenu, true);
@@ -180,7 +190,11 @@ export function observeSelectionActions({
180190
cancel,
181191
selectionChanged() {
182192
if (isActionTarget(document.activeElement)) return;
183-
if (pointerDown || gestureActive) {
193+
// Touch selection handles dispatch no pointer events, so wait for the selection to settle.
194+
if (touch) {
195+
onDismiss("cancel");
196+
schedule(SELECTION_SCROLL_SETTLE_MS);
197+
} else if (pointerDown || gestureActive) {
184198
onDismiss("cancel");
185199
} else if (!dismissed && timer === null && frame === null) {
186200
schedule(0);
@@ -192,7 +206,7 @@ export function observeSelectionActions({
192206
element.removeEventListener("pointerdown", onSelectionStart);
193207
view.removeEventListener("pointerup", onPointerUp);
194208
view.removeEventListener("mouseup", onMouseUp);
195-
view.removeEventListener("pointercancel", dismiss);
209+
view.removeEventListener("pointercancel", onPointerCancel);
196210
document.removeEventListener("keydown", onKeyDown);
197211
document.removeEventListener("focusin", onFocusIn);
198212
element.removeEventListener("contextmenu", onContextMenu, true);

0 commit comments

Comments
 (0)