@zubyjs/react 1.0.41 → 1.0.42

package/package.json

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

package/router.d.ts

@@ -7,10 +7,9 @@ import { ZubyPageContext } from 'zuby/pageContext/index.js';
 export default function Router({ context }: {
     context: ZubyPageContext;
 }): import("react/jsx-runtime").JSX.Element;
-export declare function Page({ page, context, initialPath, }: {
+export declare function Page({ page, context }: {
     page: LazyTemplate;
     context: ZubyPageContext;
-    initialPath?: boolean;
 }): import("react/jsx-runtime").JSX.Element;
 export declare function Error({ error, context }: {
     error: LazyTemplate;

package/router.js

@@ -2,8 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Router as WouterRouter, Route as WouterRoute, Switch as WouterSwitch } from 'wouter';
 export { useRoute, useRouter, useParams, useLocation, Link, Redirect, } from 'wouter';
 import { useParams } from 'wouter';
-import { Suspense, lazy, useEffect, useState } from 'react';
-import { createElement } from 'react';
+import { createElement, Suspense, lazy } from 'react';
 import { useFetch } from './hooks/index.js';
 let pages;
 let apps;
@@ -13,14 +12,6 @@ let errors;
  */
 export default function Router({ context }) {
     const isProduction = import.meta?.env?.MODE === 'production';
-    const [initialPath, setInitialPath] = useState(true);
-    useEffect(() => {
-        const onPathChange = () => setInitialPath(false);
-        window.addEventListener('popstate', onPathChange);
-        return () => {
-            window.removeEventListener('popstate', onPathChange);
-        };
-    }, [initialPath, setInitialPath]);
     const loadTemplates = (templates) => templates?.map((pageTemplate) => ({
         ...pageTemplate,
         component: lazy(pageTemplate.component),
@@ -41,7 +32,7 @@ export default function Router({ context }) {
         return pathRegex.test(context.url.pathname ?? '');
     });
     const routes = [
-        ...pages.map((page) => (_jsx(WouterRoute, { path: page.path, children: _jsx(Page, { context: context, page: page, initialPath: initialPath }) }, page.path))),
+        ...pages.map((page) => (_jsx(WouterRoute, { path: page.path, children: _jsx(Page, { context: context, page: page }) }, page.path))),
         _jsx(WouterRoute, { children: error?.component && _jsx(Error, { context: context, error: error }) }, "error"),
     ];
     const page = _jsx(WouterSwitch, { children: routes });
@@ -49,10 +40,10 @@ export default function Router({ context }) {
                 children: page,
             }) }) }));
 }
-export function Page({ page, context, initialPath, }) {
+export function Page({ page, context }) {
     context.statusCode = 200;
     context.params = useParams();
-    if (typeof window !== 'undefined' && !initialPath) {
+    if (typeof window !== 'undefined' && !context.isInitialPath) {
         context.props = useFetch(`/_props${context.url.pathname}`);
     }
     return _jsx(page.component, { ...context.props, context: context });

package/templates/entry.js

@@ -6,7 +6,7 @@ import Router from '@zubyjs/react/router.js';
 import { ZubyPageContext } from 'zuby/pageContext/index.js';
 if (typeof window !== 'undefined') {
     const pageContext = new ZubyPageContext({
-        props: global._props,
+        ...(globalThis?.initialPageContext || {}),
     });
     const appElement = document.getElementById('app');
     if (appElement.hasChildNodes()) {

package/templates/innerLayout.js

@@ -1,6 +1,9 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 export default function InnerLayout({ innerHtml, context, }) {
     return (_jsxs(_Fragment, { children: [_jsx("div", { id: "app", dangerouslySetInnerHTML: { __html: innerHtml } }), _jsx("script", { type: "text/javascript", dangerouslySetInnerHTML: {
-                    __html: `global._props=${JSON.stringify(context.props)};`,
+                    __html: `globalThis.initialPageContext=${JSON.stringify({
+                        props: context.props,
+                        initialPath: context.url.pathname,
+                    })};`,
                 } })] }));
 }