From 65d079db2029ae76266fb90e0bd9c7724a02a26b Mon Sep 17 00:00:00 2001
From: Braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:34:16 +0100
Subject: [PATCH] feat: use a storage class to map flow instances

* improves cleanup of instances
---
 examples/Interaction/InteractionExample.vue |  5 +-
 src/composables/useVueFlow.ts               | 70 ++++++++++++++++-----
 src/store/store.ts                          | 10 +--
 3 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/examples/Interaction/InteractionExample.vue b/examples/Interaction/InteractionExample.vue
index d6a496f5..69b1a6ad 100644
--- a/examples/Interaction/InteractionExample.vue
+++ b/examples/Interaction/InteractionExample.vue
@@ -1,8 +1,5 @@
 <script lang="ts" setup>
-import { VueFlow, MiniMap, Controls, useVueFlow, useWindow } from '~/index'
-
-const window: any = useWindow()
-const isWindows = window.navigator.oscpu.includes('Windows')
+import { VueFlow, MiniMap, Controls, useVueFlow } from '~/index'
 
 const {
   nodesDraggable,
diff --git a/src/composables/useVueFlow.ts b/src/composables/useVueFlow.ts
index cf5a45ef..b7975713 100644
--- a/src/composables/useVueFlow.ts
+++ b/src/composables/useVueFlow.ts
@@ -1,32 +1,74 @@
 import { EffectScope } from 'vue'
-import { FlowOptions, UseVueFlow, Store } from '~/types'
+import { FlowOptions, UseVueFlow } from '~/types'
 import { VueFlow } from '~/context'
 import { useStore } from '~/store'
 
-let id = 0
+export class Storage {
+  public flows = new Map<string, UseVueFlow>()
+  static instance: Storage
 
-type Scope = EffectScope & { vueFlow: UseVueFlow }
-export default <N = any, E = N>(options?: Partial<FlowOptions<N, E>>): UseVueFlow<N, E> => {
-  const scope = getCurrentScope() as Scope
-  let vueFlow: UseVueFlow | null = scope ? inject(VueFlow, null) ?? (scope.vueFlow as UseVueFlow) : null
-  if (!vueFlow || (vueFlow && options?.id && options.id !== vueFlow.id)) {
-    const name = options?.id ?? `vue-flow-${id++}`
-    const store: Store = useStore(options)
-    vueFlow = {
-      id: name,
+  public static getInstance(): Storage {
+    if (!Storage.instance) {
+      Storage.instance = new Storage()
+    }
+
+    return Storage.instance
+  }
+
+  public set(id: string, flow: UseVueFlow) {
+    this.flows.set(id, flow)
+  }
+
+  public get(id: string) {
+    return this.flows.get(id)
+  }
+
+  public remove(id: string) {
+    this.flows.delete(id)
+  }
+
+  public create(id: string, options?: Partial<FlowOptions>) {
+    const store = useStore(options)
+    const flow = {
+      id,
       store: reactive(store),
       ...toRefs(store.state),
       ...store.getters,
       ...store.actions,
       ...store.hooksOn,
     } as unknown as UseVueFlow
+    this.set(id, flow)
+    return flow
+  }
+}
+
+let id = 0
+
+type Scope = EffectScope & { vueFlowId: string }
+export default <N = any, E = N>(options?: Partial<FlowOptions<N, E>>): UseVueFlow<N, E> => {
+  const storage = Storage.getInstance()
+  const scope = getCurrentScope() as Scope
+  let vueFlow =
+    typeof inject(VueFlow, undefined) !== 'undefined'
+      ? inject(VueFlow, undefined)!
+      : scope && scope.vueFlowId
+      ? storage.get(scope.vueFlowId)
+      : undefined
+  if (!vueFlow || (vueFlow && options?.id && options.id !== vueFlow.id)) {
+    const name = options?.id ?? `vue-flow-${id++}`
 
     if (scope) {
-      provide(VueFlow, vueFlow)
-      scope.vueFlow = vueFlow
+      vueFlow = storage.create(name, options)
+      provide(VueFlow, storage.get(name))
+      scope.vueFlowId = name
     }
+
+    onScopeDispose(() => {
+      console.log(scope)
+      storage.remove(name)
+    })
   }
   if (!vueFlow) throw new Error('VueFlow instance not found.')
 
-  return <UseVueFlow<N, E>>vueFlow
+  return vueFlow
 }
diff --git a/src/store/store.ts b/src/store/store.ts
index 99d70dd9..efd5e15f 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -1,7 +1,7 @@
 import useState from './state'
 import useActions from './actions'
 import useGetters from './getters'
-import { FlowHooksOn, FlowOptions, Store, State } from '~/types'
+import { FlowHooksOn, FlowOptions, State, Store } from '~/types'
 
 export default (preloadedState?: FlowOptions): Store => {
   const state: State = useState(preloadedState)
@@ -20,7 +20,7 @@ export default (preloadedState?: FlowOptions): Store => {
     if (preloadedState.edges) actions.setEdges(preloadedState.edges)
   }
 
-  const store = {
+  return {
     state: reactiveState,
     actions,
     getters,
@@ -29,10 +29,4 @@ export default (preloadedState?: FlowOptions): Store => {
     ...getters,
     ...actions,
   } as unknown as Store
-
-  onScopeDispose(() => {
-    store.$reset()
-  })
-
-  return store
 }