@noego/wood 0.1.0 → 0.1.1

package/src/components/NavigationShell.svelte

@@ -1,6 +1,8 @@
 <script lang="ts">
   import { setContext, onDestroy } from 'svelte';
   import { getNavigation } from '@noego/wood/navigation';
+  import { disposeControllerLifecycle } from '../controller/controller_lifecycle';
+  import { createNavigationMountKey } from '../navigation/navigation_identity';
   import WoodRecursiveRender from './WoodRecursiveRender.svelte';
 
   type ViewManifestEntry = {
@@ -48,6 +50,7 @@
   let activeLayoutControllers: Array<unknown> = $state(initialLayoutControllers);
   let activeParams: Record<string, unknown> = $state({});
   let activeQuery: Record<string, unknown> = $state({});
+  let activeMountKey = $state(createNavigationMountKey(initialEntry.key, {}));
 
   let activePage = $derived({
     key: activeEntry.key,
@@ -106,6 +109,13 @@
     }
   }
 
+  async function disposeActiveControllers(): Promise<void> {
+    await disposeControllerLifecycle(activeController);
+    for (const layoutController of activeLayoutControllers) {
+      await disposeControllerLifecycle(layoutController);
+    }
+  }
+
   setContext('wood:navigate', (
     viewKey: string,
     params?: Record<string, unknown>,
@@ -138,6 +148,7 @@
       if (navEntry) {
         activeParams = { ...navEntry.params };
         activeQuery = { ...navEntry.query };
+        activeMountKey = createNavigationMountKey(navEntry.page, navEntry.params);
       }
       return;
     }
@@ -148,12 +159,15 @@
     const entry = getViewManifestEntryFn(newKey);
     if (!entry) return;
 
-    if (newKey === activeEntry.key) {
+    const nextMountKey = createNavigationMountKey(newKey, navEntry.params);
+
+    if (nextMountKey === activeMountKey) {
       activeParams = { ...navEntry.params };
       activeQuery = { ...navEntry.query };
       return;
     }
 
+    await disposeActiveControllers();
     const [controller, layoutControllers] = await Promise.all([
       createViewControllerFn(entry),
       createLayoutControllersFn(entry),
@@ -164,6 +178,7 @@
     activeLayoutControllers = layoutControllers;
     activeParams = { ...navEntry.params };
     activeQuery = { ...navEntry.query };
+    activeMountKey = nextMountKey;
   });
 
   const bridge = getWoodBridge();
@@ -188,10 +203,11 @@
   onDestroy(() => {
     unsubscribe();
     unsubscribeWindowNavigate?.();
+    void disposeActiveControllers();
   });
 </script>
 
-{#key activeEntry.key}
+{#key activeMountKey}
   <WoodRecursiveRender
     layouts={activeEntry.layouts}
     layoutControllers={activeLayoutControllers}