fix(react): capitalize and make PageContext generic or null, forc…

…e `usePage` return type explicit
inertiajs-revamped · Apr 23, 2024 · 8d7ffbc · 8d7ffbc
1 parent c4bd85a
commit 8d7ffbc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/react/src/PageContext.ts b/packages/react/src/PageContext.ts
@@ -1,6 +1,7 @@
+import type { Page, PageProps } from '@inertiajs-revamped/core'
 import { createContext } from 'react'
 
-const pageContext = createContext(undefined)
-pageContext.displayName = 'InertiaPageContext'
+const PageContext = createContext<Page<PageProps> | null>(null)
+PageContext.displayName = 'InertiaPageContext'
 
-export default pageContext
+export default PageContext
diff --git a/packages/react/src/usePage.ts b/packages/react/src/usePage.ts
@@ -3,9 +3,10 @@ import { useContext } from 'react'
 import PageContext from './PageContext'
 
 export default function usePage<
-  TPageProps extends PageProps = PageProps,
->(): Page<TPageProps> {
-  const page = useContext(PageContext)
+  SharedProps extends PageProps = PageProps,
+>(): Page<SharedProps> {
+  // @ts-expect-error Satisfy TS if branch on line below
+  const page: Page<SharedProps> = useContext(PageContext)
 
   if (!page) {
     throw new Error('usePage must be used within the Inertia component')