Make useTreeExpansion hook accept expandedKeys as param

Comfy-Org · Sep 14, 2024 · cb1fe2c · cb1fe2c
1 parent c98ea5b
commit cb1fe2c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
@@ -92,7 +92,8 @@ import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
 
 const nodeDefStore = useNodeDefStore()
 const nodeBookmarkStore = useNodeBookmarkStore()
-const { expandedKeys, expandNode, toggleNodeOnEvent } = useTreeExpansion()
+const expandedKeys = ref<Record<string, boolean>>({})
+const { expandNode, toggleNodeOnEvent } = useTreeExpansion(expandedKeys)
 
 const nodeBookmarkTreeExplorerRef = ref<InstanceType<
   typeof NodeBookmarkTreeExplorer

diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue b/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
@@ -47,7 +47,8 @@ const props = defineProps<{
   filteredNodeDefs: ComfyNodeDefImpl[]
 }>()
 
-const { expandedKeys, expandNode, toggleNodeOnEvent } = useTreeExpansion()
+const expandedKeys = ref<Record<string, boolean>>({})
+const { expandNode, toggleNodeOnEvent } = useTreeExpansion(expandedKeys)
 
 const handleNodeClick = (
   node: RenderedTreeExplorerNode<ComfyNodeDefImpl>,

diff --git a/src/hooks/treeHooks.ts b/src/hooks/treeHooks.ts
@@ -1,9 +1,7 @@
-import { ref } from 'vue'
+import { Ref } from 'vue'
 import type { TreeNode } from 'primevue/treenode'
 
-export function useTreeExpansion() {
-  const expandedKeys = ref<Record<string, boolean>>({})
-
+export function useTreeExpansion(expandedKeys: Ref<Record<string, boolean>>) {
   const toggleNode = (node: TreeNode) => {
     if (node.key && typeof node.key === 'string') {
       if (node.key in expandedKeys.value) {
@@ -63,7 +61,6 @@ export function useTreeExpansion() {
   }
 
   return {
-    expandedKeys,
     toggleNode,
     toggleNodeRecursive,
     expandNode,