@pactor-app/app 1.48.0 → 1.48.1

package/dist/index.cjs

@@ -1010,7 +1010,7 @@ var defaultSitemapActions = {
 
 // src/sitemap/SitemapApp.tsx
 var import_core4 = require("@pactor-app/core");
-var import_router3 = require("@pactor-app/router");
+var import_router4 = require("@pactor-app/router");
 var import_runtime6 = require("@pactor-app/runtime");
 var import_components2 = require("@pactor-app/ui/components");
 var import_react8 = require("react");
@@ -1278,6 +1278,7 @@ function toSitemapNavItems(menuTree) {
 }
 
 // src/sitemap/route.ts
+var import_router3 = require("@pactor-app/router");
 function resolveSitemapRoute(sitemap, registry, pathname) {
   const match = registry.findByPath(pathname);
   const menu = match?.menu ?? null;
@@ -1287,6 +1288,8 @@ function resolveSitemapRoute(sitemap, registry, pathname) {
   const layoutName = menu.layout ?? sitemap.layout ?? Object.keys(sitemap.layouts)[0] ?? "";
   const highlightId = menu.activeMenu ?? menu.id;
   const highlightItem = registry.findById(highlightId);
+  const page = sitemap.pages.find((p) => p.id === menu.pageId);
+  const params = page !== void 0 && page.path !== menu.path ? (0, import_router3.match)(page.path, pathname)?.params ?? match.params : match.params;
   return {
     menu,
     route: {
@@ -1294,7 +1297,7 @@ function resolveSitemapRoute(sitemap, registry, pathname) {
       layoutName,
       layoutChain: resolveLayoutChain(sitemap, layoutName),
       highlightKey: highlightItem?.path ?? highlightId,
-      params: match.params
+      params
     }
   };
 }
@@ -1397,7 +1400,7 @@ function SitemapAppInner(props) {
     };
   }, [fetcher, baseUrl, props.httpAdapter, JSON.stringify(sources)]);
   const registry = (0, import_react8.useMemo)(
-    () => state.status === "ready" ? new import_router3.MenuRegistry(mergeSitemapMenus(state.sitemap)) : null,
+    () => state.status === "ready" ? new import_router4.MenuRegistry(mergeSitemapMenus(state.sitemap)) : null,
     [state]
   );
   const resolution = (0, import_react8.useMemo)(

package/dist/index.js

@@ -1279,6 +1279,7 @@ function toSitemapNavItems(menuTree) {
 }
 
 // src/sitemap/route.ts
+import { match as matchPath } from "@pactor-app/router";
 function resolveSitemapRoute(sitemap, registry, pathname) {
   const match = registry.findByPath(pathname);
   const menu = match?.menu ?? null;
@@ -1288,6 +1289,8 @@ function resolveSitemapRoute(sitemap, registry, pathname) {
   const layoutName = menu.layout ?? sitemap.layout ?? Object.keys(sitemap.layouts)[0] ?? "";
   const highlightId = menu.activeMenu ?? menu.id;
   const highlightItem = registry.findById(highlightId);
+  const page = sitemap.pages.find((p) => p.id === menu.pageId);
+  const params = page !== void 0 && page.path !== menu.path ? matchPath(page.path, pathname)?.params ?? match.params : match.params;
   return {
     menu,
     route: {
@@ -1295,7 +1298,7 @@ function resolveSitemapRoute(sitemap, registry, pathname) {
       layoutName,
       layoutChain: resolveLayoutChain(sitemap, layoutName),
       highlightKey: highlightItem?.path ?? highlightId,
-      params: match.params
+      params
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pactor-app/app",
-  "version": "1.48.0",
+  "version": "1.48.1",
   "description": "Pactor application: one-stop composition layer (createPactorApplication) wiring loader, bootstrap, registries, router, layout, interaction and page runtimes",
   "keywords": [
     "pactor",
@@ -46,14 +46,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@pactor-app/core": "1.48.0",
-    "@pactor-app/permission": "1.48.0",
-    "@pactor-app/expression": "1.48.0",
-    "@pactor-app/router": "1.48.0",
-    "@pactor-app/runtime": "1.48.0",
-    "@pactor-app/resource": "1.48.0",
-    "@pactor-app/ui": "1.48.0",
-    "@pactor-app/schema": "1.48.0"
+    "@pactor-app/core": "1.48.1",
+    "@pactor-app/expression": "1.48.1",
+    "@pactor-app/resource": "1.48.1",
+    "@pactor-app/permission": "1.48.1",
+    "@pactor-app/schema": "1.48.1",
+    "@pactor-app/runtime": "1.48.1",
+    "@pactor-app/ui": "1.48.1",
+    "@pactor-app/router": "1.48.1"
   },
   "peerDependencies": {
     "react": ">=18",