Skip to content

Commit 3fa57b9

Browse files
juliusmarmingeclaudeYash-Singh1
authored
fix(web): boring sidebar threads drag onto the composer again (#26724)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Yash Singh <[email protected]>
1 parent 4549bee commit 3fa57b9

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1710,7 +1710,11 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
17101710
};
17111711
};
17121712

1713-
const isContextDrag = dragState?.contextDrag === true || dragState?.activeSection === "working";
1713+
// Folder rows only drag out to the composer; folders own their order, so nothing drops in the list.
1714+
const isContextDrag =
1715+
projectFolders !== null ||
1716+
dragState?.contextDrag === true ||
1717+
dragState?.activeSection === "working";
17141718
const dragTargetSection = isContextDrag ? null : (dragState?.targetSection ?? null);
17151719
const finishThreadDrag = (started: boolean) => {
17161720
dragSensorRef.current = null;
@@ -2075,6 +2079,7 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
20752079
);
20762080
})();
20772081
const handleThreadDragEnd = (event: DragEndEvent) => {
2082+
if (projectFolders !== null) return;
20782083
const activeKey = String(event.active.id);
20792084
const activeSection = sectionByThreadKey.get(activeKey);
20802085
const target =
@@ -3354,7 +3359,6 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
33543359
sortableId={threadKey}
33553360
contextDrag={isContextDrag}
33563361
sortableDisabled={
3357-
projectFolders !== null ||
33583362
renamingThreadKey === threadKey ||
33593363
!draggableThreadKeys.has(threadKey) ||
33603364
optimisticDrop !== null

‎docs/user/thread-sidebar.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ project's folder comes last and shows only while it has active threads. Click a
157157
close it. A closed folder shows how many threads it holds, and a dot when one of them
158158
needs you. Use the pen button on a folder, or right-click it, to start a thread in that project.
159159
Pinned threads stay above the folders, and Snoozed and Settled stay below them. In this mode you
160-
cannot drag threads, and the Working section is off. Each device keeps its own choice.
160+
can drag a thread onto the composer to mention it, but not within the sidebar, and the Working
161+
section is off. Each device keeps its own choice.
161162

162163
## Settle finished work
163164

0 commit comments

Comments
 (0)