Skip to content

Commit e5550b4

Browse files
committed
fix(web): allow pane dragging without server reorder support
1 parent 26c01eb commit e5550b4

3 files changed

Lines changed: 22 additions & 1 deletion

File tree

‎apps/web/src/components/Sidebar.logic.test.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,6 +1221,20 @@ describe("planSidebarThreadDrop", () => {
12211221
target: { activeOrder: [], ...overrides.target },
12221222
});
12231223

1224+
it.each(["pinned", "active", "settled"] as const)(
1225+
"rejects a pane-only drag into %s",
1226+
(section) => {
1227+
expect(
1228+
plan({
1229+
activeKey: "a1",
1230+
activeSection: "active",
1231+
reorderableKeys: new Set(),
1232+
target: { section, pinnedOrder: ["a1", "p1"], activeOrder: ["a2", "a1"] },
1233+
}),
1234+
).toEqual({ kind: "none" });
1235+
},
1236+
);
1237+
12241238
it("allows old-server pinned reordering while rejecting settlement", () => {
12251239
expect(
12261240
plan({

‎apps/web/src/components/Sidebar.logic.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ export function planSidebarThreadDrop(input: {
313313
activeKeysById,
314314
activeReorderableKeys,
315315
} = input;
316+
if (reorderableKeys && !reorderableKeys.has(activeKey)) return { kind: "none" };
316317
if (input.supportsSettlement === false && (target.section === "settled" || activeSettled)) {
317318
return { kind: "none" };
318319
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4822,7 +4822,13 @@ export default function Sidebar() {
48224822
key={threadKey}
48234823
id={threadKey}
48244824
disabled={
4825-
!draggableThreadKeys.has(threadKey) || optimisticDrop !== null
4825+
optimisticDrop !== null ||
4826+
(!draggableThreadKeys.has(threadKey) &&
4827+
(isMobile ||
4828+
!canOpenThreadInSplit(
4829+
routeThreadRef,
4830+
scopeThreadRef(thread.environmentId, thread.id),
4831+
)))
48264832
}
48274833
>
48284834
{(bag) => renderThreadRowInner(thread, section, bag)}

0 commit comments

Comments
 (0)