feat!: change index fallback behavior

serkodev · Apr 20, 2024 · b7d9d17 · b7d9d17
1 parent c42c921
commit b7d9d17
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/...parallel-sidebar/pages/@left/~default.vue → ...s/parallel-sidebar/pages/@left/~index.vue b/...parallel-sidebar/pages/@left/~default.vue → ...s/parallel-sidebar/pages/@left/~index.vue
@@ -1,5 +1,5 @@
 <template>
   <ExampleView label="$__PAGES_PATH__">
-    default fallback path
+    @left index fallback
   </ExampleView>
 </template>
diff --git a/examples/parallel-sidebar/pages/@main/~index.vue b/examples/parallel-sidebar/pages/@main/~index.vue
@@ -0,0 +1,5 @@
+<template>
+  <ExampleView label="$__PAGES_PATH__">
+    @main index fallback
+  </ExampleView>
+</template>
diff --git a/src/runtime/parallel-router.ts b/src/runtime/parallel-router.ts
@@ -77,6 +77,7 @@ export default defineNuxtPlugin(async () => {
 async function createParallelRouter(name: string, routes: RouteRecord[], router: Router, parallelPageOptions: Partial<ParallelPageOptions>): Promise<ParallelRouter> {
   const options = defu(parallelPageOptions, {
     mode: 'sync',
+    index: '/~index',
     fallback: true,
   } satisfies ParallelPageOptions)
 
@@ -136,19 +137,23 @@ async function createParallelRouter(name: string, routes: RouteRecord[], router:
   }
 
   async function init() {
+    async function tryIndex() {
+      const pushIndex = options.index && tryPush(options.index)
+      if (pushIndex) {
+        await pushIndex
+      } else {
+        fallback.index = true
+      }
+    }
+
     if (options.mode === 'manual') {
-      if (options.index)
-        await parallelRouter.push(options.index)
+      await tryIndex()
     } else {
       const initSync = sync()
       if (initSync)
         await initSync
       else {
-        if (options.index) {
-          await parallelRouter.push(options.index)
-        } else {
-          fallback.index = true
-        }
+        await tryIndex()
       }
     }
   }