fix(vue): fix setup props type error

inertiajs-revamped · May 7, 2024 · 3fb081a · 3fb081a
1 parent 660bdc8
commit 3fb081a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/packages/vue/src/app.ts b/packages/vue/src/app.ts
@@ -24,14 +24,6 @@ import remember from './remember'
 import type { InertiaComponentType } from './types'
 import useForm from './useForm'
 
-export interface InertiaAppProps {
-  initialPage: Page
-  initialComponent?: object
-  resolveComponent: PageResolver<InertiaComponentType>
-  titleCallback?: HeadManagerTitleCallback
-  onHeadUpdate?: HeadManagerOnUpdate | null
-}
-
 const page = ref({}) as Ref<Page>
 const layout = shallowRef(null)
 
@@ -58,7 +50,10 @@ const App = defineComponent({
       default: ((title) => title) as HeadManagerTitleCallback,
     },
     onHeadUpdate: {
-      type: Function as PropType<HeadManagerOnUpdate> | null,
+      type: [
+        Function,
+        null,
+      ] as unknown as Object as PropType<HeadManagerOnUpdate | null>,
       required: false,
       default: () => {},
     },
@@ -75,7 +70,11 @@ const App = defineComponent({
     const key = ref<number | string | undefined>(undefined)
 
     const isServer = typeof window === 'undefined'
-    headManager = createHeadManager(isServer, titleCallback, onHeadUpdate)
+    headManager = createHeadManager(
+      isServer,
+      titleCallback,
+      onHeadUpdate ? onHeadUpdate : () => {}
+    )
 
     if (!isServer) {
       router.init({

diff --git a/packages/vue/src/createInertiaApp.ts b/packages/vue/src/createInertiaApp.ts
@@ -5,7 +5,7 @@ import type {
   ProgressCallback,
 } from '@inertiajs-revamped/core'
 import { type Plugin, type App as VueApp, createSSRApp, h } from 'vue'
-import App, { type InertiaAppProps, plugin } from './app'
+import App, { plugin } from './app'
 import type { InertiaComponentType } from './types'
 
 export interface CreateInertiaAppProps {
@@ -14,7 +14,7 @@ export interface CreateInertiaAppProps {
   setup: (props: {
     el: HTMLElement | null
     App: typeof App
-    props: InertiaAppProps
+    props: InstanceType<typeof App>['$props']
     plugin: Plugin
   }) => void | VueApp
   title?: HeadManagerTitleCallback