@akanjs/next 0.0.29 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/next",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"

package/src/bootCsr.js

@@ -34,6 +34,7 @@ module.exports = __toCommonJS(bootCsr_exports);
 var import_client = require("@akanjs/client");
 var import_client2 = require("@akanjs/client");
 var import_common = require("@akanjs/common");
+var import_react = __toESM(require("react"));
 var ReactDOM = __toESM(require("react-dom/client"));
 var import_useCsrValues = require("./useCsrValues");
 const supportLanguages = ["en", "ko"];
@@ -122,11 +123,12 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
   pathRoutes.forEach((pathRoute) => {
     const pathSegments = pathRoute.pathSegments.slice(1);
     pathSegments.reduce((routeGuide2, pathSegment, index) => {
+      const child = routeGuide2.children[pathSegment];
       routeGuide2.children[pathSegment] = {
-        ...routeGuide2.children[pathSegment] ?? {},
+        ...child ?? {},
         pathSegment,
         ...index === pathSegments.length - 1 ? { pathRoute } : {},
-        children: routeGuide2.children[pathSegment].children ?? {}
+        children: child?.children ?? {}
       };
       return routeGuide2.children[pathSegment];
     }, routeGuide);
@@ -134,11 +136,11 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
   const RouterProvider = () => {
     const csrValues = (0, import_useCsrValues.useCsrValues)(routeGuide, pathRoutes);
     const { location } = csrValues;
-    return /* @__PURE__ */ React.createElement(import_client2.csrContext.Provider, { value: csrValues }, location.pathRoute.RootLayouts.reduceRight(
+    return /* @__PURE__ */ import_react.default.createElement(import_client2.csrContext.Provider, { value: csrValues }, location.pathRoute.RootLayouts.reduceRight(
       (children, Layout) => {
-        return /* @__PURE__ */ React.createElement(Layout, { params: location.params, searchParams: location.searchParams }, children);
+        return /* @__PURE__ */ import_react.default.createElement(Layout, { params: location.params, searchParams: location.searchParams }, children);
       },
-      /* @__PURE__ */ React.createElement(React.Fragment, null)
+      /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null)
     ));
   };
   if (pathname !== `/${initialPath}`) {
@@ -149,7 +151,7 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
     if (!el)
       throw new Error("No root element");
     const root = ReactDOM.createRoot(el);
-    root.render(/* @__PURE__ */ React.createElement(RouterProvider, null));
+    root.render(/* @__PURE__ */ import_react.default.createElement(RouterProvider, null));
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/src/useCsrValues.js

@@ -548,7 +548,7 @@ const useCsrValues = (rootRouteGuide, pathRoutes) => {
       }
     };
     window.onpopstate = async (ev) => {
-      const routeType = window.location.pathname === getCurrentLocation().pathname ? "forward" : window.location.pathname === getPrevLocation()?.pathname ? "back" : null;
+      const routeType = window.location.pathname === getCurrentLocation().pathname && history.current.type !== "back" ? "forward" : window.location.pathname === getPrevLocation()?.pathname ? "back" : null;
       const scrollTop = pageContentRef.current?.scrollTop ?? 0;
       if (!routeType)
         return;