fix(sidebar): preserve order on same-folder sorted drops
This commit is contained in:
1 parent
34a158765e
commit
7a707e77d8
6 files changed
+168
-16
No files matched your search
@@ -354,6 +354,20 @@ export function moveConnectionToGroup(layout: SidebarLayout, connectionId: strin
|
||||
|
||||
export type DropPosition = "before" | "after" | "inside";
|
||||
|
||||
export interface ReorderEntriesOptions {
|
||||
preserveSameGroupOrder?: boolean;
|
||||
}
|
||||
|
||||
function findEntryParentGroupId(entries: SidebarOrderEntry[], entryId: string, parentGroupId: string | null = null): string | null | undefined {
|
||||
for (const entry of entries) {
|
||||
if (entry.id === entryId) return parentGroupId;
|
||||
if (entry.type !== "group") continue;
|
||||
const found = findEntryParentGroupId(entryChildren(entry), entryId, entry.id);
|
||||
if (found !== undefined) return found;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
export function reorderEntry(layout: SidebarLayout, draggedId: string, targetId: string, position: DropPosition): SidebarLayout {
|
||||
if (draggedId === targetId) return layout;
|
||||
|
||||
@@ -387,6 +401,16 @@ export function reorderEntry(layout: SidebarLayout, draggedId: string, targetId:
|
||||
return { ...layout, order };
|
||||
}
|
||||
|
||||
export function reorderEntries(layout: SidebarLayout, draggedIds: string[], targetId: string, position: DropPosition, options: ReorderEntriesOptions = {}): SidebarLayout {
|
||||
let nextLayout = layout;
|
||||
for (const draggedId of draggedIds) {
|
||||
if (draggedId === targetId) continue;
|
||||
if (position === "inside" && options.preserveSameGroupOrder && findEntryParentGroupId(nextLayout.order, draggedId) === targetId) continue;
|
||||
nextLayout = reorderEntry(nextLayout, draggedId, targetId, position);
|
||||
}
|
||||
return nextLayout;
|
||||
}
|
||||
|
||||
export function createGroup(layout: SidebarLayout, name: string, parentGroupId?: string | null): { layout: SidebarLayout; groupId: string } {
|
||||
const groupId = uuid();
|
||||
const group: ConnectionGroup = { id: groupId, name, collapsed: false };
|
||||
|
||||
Reference in new issue
Block a user