useSiteLoaderData always return site object

manawiki · Aug 30, 2024 · d98b7be · d98b7be
1 parent 1b35982
commit d98b7be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/root.tsx b/app/root.tsx
@@ -140,8 +140,6 @@ function App() {
    const theme = useTheme();
 
    useChangeLanguage(locale);
-
-   //site data should live in layout, this may be potentially brittle if we shift site architecture around
    const { site } = useSiteLoaderData();
 
    // Hook to show the toasts

diff --git a/app/utils/useSiteLoaderData.tsx b/app/utils/useSiteLoaderData.tsx
@@ -18,5 +18,9 @@ export function useSiteLoaderData() {
    // return useRouteLoaderData<typeof loader>("routes/_site+/_layout")!
 
    // more brittle since we're using the layout hierarchy
-   return useMatches()?.[1]?.data as SerializeFrom<typeof layoutLoaderType>;
+   return (
+      (useMatches()?.[1]?.data as SerializeFrom<typeof layoutLoaderType>) ?? {
+         site: undefined,
+      }
+   );
 }