@zubyjs/react 1.0.65 → 1.0.67

package/contexts/pageContext.d.ts

@@ -0,0 +1,2 @@
+import { PageContext } from 'zuby/contexts/index.js';
+export declare const pageContext: import("react").Context<PageContext>;

package/contexts/pageContext.js

@@ -0,0 +1,3 @@
+import { PageContext } from 'zuby/contexts/index.js';
+import { createContext } from 'react';
+export const pageContext = createContext(new PageContext({}));

package/hooks/index.d.ts

@@ -1,2 +1,4 @@
 export { useFetch } from './useFetch.js';
+export { usePageContext } from './usePageContext.js';
+export { useProps } from './useProps.js';
 export * from 'zuby/hooks/index.js';

package/hooks/index.js

@@ -1,2 +1,4 @@
 export { useFetch } from './useFetch.js';
+export { usePageContext } from './usePageContext.js';
+export { useProps } from './useProps.js';
 export * from 'zuby/hooks/index.js';

package/hooks/usePageContext.d.ts

@@ -0,0 +1 @@
+export declare function usePageContext(): import("zuby/contexts/pageContext.js").PageContext;

package/hooks/usePageContext.js

@@ -0,0 +1,5 @@
+import { useContext } from 'react';
+import { pageContext } from '../contexts/pageContext.js';
+export function usePageContext() {
+    return useContext(pageContext);
+}

package/hooks/useProps.d.ts

@@ -1 +1 @@
-export default function useProps(path: string, priority?: 'low' | 'high' | 'auto'): string | Object;
+export declare function useProps(path: string, priority?: 'low' | 'high' | 'auto'): string | Object;

package/hooks/useProps.js

@@ -1,6 +1,6 @@
 import { useFetch } from './useFetch.js';
 import { getGlobalContext } from 'zuby/contexts/index.js';
-export default function useProps(path, priority = 'auto') {
+export function useProps(path, priority = 'auto') {
     const { buildId } = getGlobalContext();
     path = `/_props${path}/?${buildId}`;
     path = path.replace(/\/+/g, '/');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zubyjs/react",
-  "version": "1.0.65",
+  "version": "1.0.67",
   "description": "Zuby.js JsxProvider for react",
   "type": "module",
   "main": "index.js",

package/router.js

@@ -5,7 +5,8 @@ import { useParams } from 'wouter';
 import { createElement, Suspense } from 'react';
 import { preloadPage } from 'zuby/preload/index.js';
 import lazyWithPreload from './components/lazyWithPreload.js';
-import useProps from './hooks/useProps.js';
+import { useProps } from './hooks/useProps.js';
+import { pageContext } from './contexts/pageContext.js';
 let pages;
 let apps;
 let errors;
@@ -35,15 +36,20 @@ export default function Router({ context }) {
         _jsx(WouterRoute, { children: error?.component && _jsx(Error, { context: context, error: error }) }, "error"),
     ];
     const page = _jsx(WouterSwitch, { children: routes });
-    return (_jsx(WouterRouter, { ssrPath: context.url.pathname, children: _jsx(Suspense, { fallback: loader?.component && _jsx(loader.component, {}), children: createElement(app?.component, {
-                children: page,
-            }) }) }));
+    return (_jsx(pageContext.Provider, { value: context, children: _jsx(WouterRouter, { ssrPath: context.url.pathname, children: _jsx(Suspense, { fallback: loader?.component && _jsx(loader.component, {}), children: createElement(app?.component, {
+                    children: page,
+                }) }) }) }));
 }
 export function Page({ page, context }) {
     context.statusCode = 200;
     context.params = useParams();
-    if (typeof window !== 'undefined' && !context.isInitialPath) {
-        context.props = useProps(context.url.pathname);
+    if (typeof window !== 'undefined') {
+        if (context.isInitialPath) {
+            context.props = globalThis.initialPageContext || {};
+        }
+        else {
+            context.props = useProps(context.url.pathname);
+        }
     }
     return _jsx(page.component, { ...context.props, context: context });
 }

package/templates/entry.js

@@ -5,9 +5,7 @@ import { hydrateRoot, createRoot } from 'react-dom/client';
 import Router from '@zubyjs/react/router.js';
 import { PageContext } from 'zuby/contexts/index.js';
 if (typeof window !== 'undefined') {
-    const pageContext = new PageContext({
-        ...(globalThis?.initialPageContext || {}),
-    });
+    const pageContext = new PageContext();
     const appElement = document.getElementById('app');
     if (appElement.hasChildNodes()) {
         hydrateRoot(appElement, _jsx(Router, { context: pageContext }));