TypeScript
fix(web): tagging a thread by drag no longer scrolls the sidebar (#31924)
Theo Brownec8267db9ac19
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsxindex 2d904e1ec6f..d45ba6a3a36 100644--- a/apps/web/src/components/Sidebar.tsx+++ b/apps/web/src/components/Sidebar.tsx@@ -1055,6 +1055,7 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve} | null>(null);const dragSensorRef = useRef<SidebarPointerSensor | null>(null);const contextDragKeyRef = useRef<string | null>(null);+ const dragScrollRef = useRef<{ readonly viewport: Element; readonly top: number } | null>(null);const [actionSweep, setActionSweep] = useState<{action: SidebarSweepAction;keys: ReadonlySet<string>;@@ -1713,6 +1714,7 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReveconst finishThreadDrag = (started: boolean) => {dragSensorRef.current = null;contextDragKeyRef.current = null;+ dragScrollRef.current = null;endThreadContextDrag();if (started) {listMotionRef.current?.release();@@ -1739,6 +1741,11 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReveconst bounds = threadListRef.current?.getBoundingClientRect();return bounds !== undefined && (point.x < bounds.left || point.x > bounds.right);};+ // The path out of the list often crosses dnd-kit's edge zone, which autoscrolls the sidebar.+ const restoreDragScroll = () => {+ const scroll = dragScrollRef.current;+ if (scroll && scroll.viewport.scrollTop !== scroll.top) scroll.viewport.scrollTop = scroll.top;+ };const moveThreadContextDrag = (point: { x: number; y: number }) => {const contextDrag = pointerOutsideThreadList(point);setDragState((current) =>@@ -1750,6 +1757,7 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReveendThreadContextDrag();return false;}+ restoreDragScroll();const threads = contextDragThreads();const title =threadByKeyRef.current.get(contextDragKeyRef.current ?? "")?.title.trim() || "Thread";@@ -1758,6 +1766,7 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve};const dropThreadContextDrag = (point: { x: number; y: number }) => {if (!pointerOutsideThreadList(point)) return false;+ restoreDragScroll();dropThreadContext(point, contextDragThreads());return true;};@@ -1884,6 +1893,8 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReveif (activeSection === undefined) return;listMotionRef.current?.suspend();const list = threadListRef.current;+ const viewport = list?.closest('[data-slot="scroll-area-viewport"]');+ dragScrollRef.current = viewport ? { viewport, top: viewport.scrollTop } : null;const header = list?.querySelector<HTMLElement>('[data-testid="sidebar-pinned-header"]');if (list && header) {const listRect = list.getBoundingClientRect();