Skip to content

Commit 4d90f20

Browse files
committed
fix(web): refresh swipe path when locking the gesture axis
1 parent 17d21d3 commit 4d90f20

2 files changed

Lines changed: 18 additions & 3 deletions

File tree

‎apps/web/src/components/HistorySwipeNavigation.browser.test.tsx‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,36 @@ describe("HistorySwipeNavigation", () => {
1616
it.each([
1717
["scrolling left inside a shadow-root scroller keeps the thread", "shadow", 100, -130, false],
1818
["scrolling right inside a shadow-root scroller keeps the thread", "shadow", 100, 130, false],
19+
[
20+
"scrolling after a shadow scroller remount keeps the thread",
21+
"shadow-remount",
22+
100,
23+
130,
24+
false,
25+
],
1926
["scrolling left inside a scroller keeps the thread", "light", 100, -130, false],
2027
["swiping back at a shadow-root scroller's left edge navigates", "shadow", 0, -130, true],
2128
["swiping back over a panel without overflow navigates", "none", 0, -130, true],
2229
] as const)("%s", async (_name, scroller, scrollLeft, deltaX, navigates) => {
2330
navigateHistory.mockReset();
2431
await using screen = await render(<HistorySwipeNavigation />);
2532
const panel = screen.container.appendChild(document.createElement("div"));
26-
const root = scroller === "shadow" ? panel.attachShadow({ mode: "open" }) : panel;
33+
const root = scroller.startsWith("shadow") ? panel.attachShadow({ mode: "open" }) : panel;
2734
const viewport = root.appendChild(document.createElement("div"));
2835
viewport.style.cssText = `width: 200px; overflow-x: ${scroller === "none" ? "visible" : "auto"}`;
2936
const content = viewport.appendChild(document.createElement("div"));
3037
content.style.cssText = `height: 20px; width: ${scroller === "none" ? 100 : 1000}px`;
3138
viewport.scrollLeft = scrollLeft;
3239

33-
swipe(content, deltaX);
40+
if (scroller === "shadow-remount") {
41+
content.dispatchEvent(new WheelEvent("wheel", { deltaX: 1, bubbles: true, composed: true }));
42+
const replacement = viewport.cloneNode(true) as HTMLDivElement;
43+
viewport.replaceWith(replacement);
44+
replacement.scrollLeft = scrollLeft;
45+
swipe(replacement, deltaX);
46+
} else {
47+
swipe(content, deltaX);
48+
}
3449

3550
expect(navigateHistory).toHaveBeenCalledTimes(navigates ? 1 : 0);
3651
});

‎apps/web/src/components/HistorySwipeNavigation.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export function HistorySwipeNavigation() {
125125
gesture.sumX += event.deltaX;
126126
gesture.sumY += event.deltaY;
127127
if (Math.abs(gesture.sumX) + Math.abs(gesture.sumY) < SWIPE_AXIS_LOCK_DISTANCE) return;
128-
gesture = lockSwipeAxis(gesture);
128+
gesture = lockSwipeAxis({ ...gesture, path: event.composedPath() });
129129
if (gesture.kind === "ignored") return;
130130
} else {
131131
const delta = gesture.direction === "back" ? -event.deltaX : event.deltaX;

0 commit comments

Comments
 (0)