diff --git a/apps/desktop/src/components/sidebar/ConnectionTree.vue b/apps/desktop/src/components/sidebar/ConnectionTree.vue index 53b869d45c..d81a860471 100644 --- a/apps/desktop/src/components/sidebar/ConnectionTree.vue +++ b/apps/desktop/src/components/sidebar/ConnectionTree.vue @@ -1184,9 +1184,9 @@ function onSearchToggle(node: TreeNode) { searchCollapsedIds.value = next; } -function onNodeToggled(node: TreeNode) { +function onNodeToggled(node: TreeNode, wasExpanded: boolean) { if (isTreeSearchFiltering.value) return; - syncSidebarTreeNodeExpansion(store.treeNodes, node); + syncSidebarTreeNodeExpansion(store.treeNodes, node, !wasExpanded); } function openSidebarContextMenu(event: MouseEvent, node: TreeNode, openContextMenu: (event: MouseEvent, itemsOverride?: ContextMenuItem[]) => void) { diff --git a/apps/desktop/src/lib/sidebar/sidebarTreeExpansion.ts b/apps/desktop/src/lib/sidebar/sidebarTreeExpansion.ts index 06eeef538d..3d575f0d4d 100644 --- a/apps/desktop/src/lib/sidebar/sidebarTreeExpansion.ts +++ b/apps/desktop/src/lib/sidebar/sidebarTreeExpansion.ts @@ -1,9 +1,9 @@ import type { TreeNode } from "@/types/database"; import { findSidebarActionTarget } from "@/lib/sidebar/sidebarActionTarget"; -export function syncSidebarTreeNodeExpansion(nodes: readonly TreeNode[], renderedNode: TreeNode): boolean { +export function syncSidebarTreeNodeExpansion(nodes: readonly TreeNode[], renderedNode: TreeNode, expanded: boolean): boolean { const liveNode = findSidebarActionTarget(nodes, renderedNode); - if (!liveNode || liveNode === renderedNode || liveNode.isExpanded === renderedNode.isExpanded) return false; - liveNode.isExpanded = renderedNode.isExpanded; + if (!liveNode || liveNode === renderedNode || liveNode.isExpanded === expanded) return false; + liveNode.isExpanded = expanded; return true; } diff --git a/packages/app-tests/sidebarTreeAffordances.test.ts b/packages/app-tests/sidebarTreeAffordances.test.ts index dbbfb75dfc..eef9895ad7 100644 --- a/packages/app-tests/sidebarTreeAffordances.test.ts +++ b/packages/app-tests/sidebarTreeAffordances.test.ts @@ -48,17 +48,35 @@ test("tree toggles synchronize filtered node clones with the live sidebar tree", }; const expandedClone: TreeNode = { ...collapsedConnection, isExpanded: true }; - assert.equal(syncSidebarTreeNodeExpansion([expandedConnection], collapsedClone), true); + assert.equal(syncSidebarTreeNodeExpansion([expandedConnection], collapsedClone, false), true); assert.equal(expandedConnection.isExpanded, false); - assert.equal(syncSidebarTreeNodeExpansion([collapsedConnection], expandedClone), true); + assert.equal(syncSidebarTreeNodeExpansion([collapsedConnection], expandedClone, true), true); assert.equal(collapsedConnection.isExpanded, true); - assert.equal(syncSidebarTreeNodeExpansion([expandedConnection], expandedConnection), false); + assert.equal(syncSidebarTreeNodeExpansion([expandedConnection], expandedConnection, true), false); +}); + +test("async tree expansion does not restore a stale rendered clone state", () => { + const liveDatabase: TreeNode = { + id: "connection-1:database-1", + label: "Database 1", + type: "database", + connectionId: "connection-1", + database: "database-1", + isExpanded: false, + children: [], + }; + const staleRenderedClone: TreeNode = { ...liveDatabase, children: [] }; + + liveDatabase.isExpanded = true; + + assert.equal(syncSidebarTreeNodeExpansion([liveDatabase], staleRenderedClone, true), false); + assert.equal(liveDatabase.isExpanded, true); }); test("local table search preserves live expansion state", () => { assert.match(connectionTree, /return \{ \.\.\.node, children: matchingChildren \};/); assert.doesNotMatch(connectionTree, /children: matchingChildren,\s*isExpanded:\s*true/); - assert.match(connectionTree, /function onNodeToggled\(node: TreeNode\) \{\s*if \(isTreeSearchFiltering\.value\) return;\s*syncSidebarTreeNodeExpansion/); + assert.match(connectionTree, /function onNodeToggled\(node: TreeNode, wasExpanded: boolean\) \{\s*if \(isTreeSearchFiltering\.value\) return;\s*syncSidebarTreeNodeExpansion\(store\.treeNodes, node, !wasExpanded\)/); }); test("tree rebuilds keep a context menu only while its target row remains visible", () => {