@pnkx-lib/ui 1.9.449 → 1.9.451

package/es/chunks/{useBreadcrumb-CQA2mBvb.js → useBreadcrumb-DEKhv1-Z.js}

@@ -54,31 +54,49 @@ function validateAbsolutePaths(menu, nearestAncestorPath) {
   }
 }
 
-const pathToRegex = (pattern) => {
-  const normalized = normalize(pattern);
-  const escaped = normalized.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
-  const withParams = escaped.replace(/:([^/]+)/g, "[^/]+");
-  return new RegExp(`^${withParams}/?$`);
-};
-const full = (itemPath) => normalize(itemPath ?? "/");
-const matchPath = (configPath, pathname) => pathToRegex(configPath).test(normalize(pathname));
-function extractParams(pattern, pathname) {
+function compilePatternStrict(pattern) {
   const pat = normalize(pattern);
-  const path = normalize(pathname);
+  const keys = [];
   const escaped = pat.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
-  const named = escaped.replace(/:([^/]+)/g, (_, key) => `(?<${key}>[^/]+)`);
-  const rx = new RegExp(`^${named}/?$`);
-  const m = rx.exec(path);
-  return m?.groups ?? {};
+  const withCaptures = escaped.replace(/:([^/]+)/g, (_m, raw) => {
+    const key = raw.replace(/[\\'"]/g, "");
+    keys.push(key);
+    return "([^/]+)";
+  });
+  return { regex: new RegExp(`^${withCaptures}/?$`), keys };
+}
+function matchPathStrict(pattern, pathname) {
+  const { regex } = compilePatternStrict(pattern);
+  return regex.test(normalize(pathname));
+}
+function compilePatternLoose(pattern) {
+  const pat = normalize(pattern);
+  const keys = [];
+  const escaped = pat.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+  const withCaptures = escaped.replace(/:([^/]+)/g, (_m, raw) => {
+    const key = raw.replace(/[\\'"]/g, "");
+    keys.push(key);
+    return "([^/]+)";
+  });
+  return { regex: new RegExp(`^${withCaptures}(?:/.*)?$`), keys };
+}
+function extractParamsLoose(pattern, pathname) {
+  const { regex, keys } = compilePatternLoose(pattern);
+  const m = regex.exec(normalize(pathname));
+  if (!m) return {};
+  const out = {};
+  for (let i = 0; i < keys.length; i++) out[keys[i]] = m[i + 1];
+  return out;
 }
-const hasParams = (p) => !!p && /:([^/]+)/.test(p ?? "");
+const hasParams = (p) => !!p && /:([^/]+)/.test(p);
+const full = (itemPath) => normalize(itemPath ?? "/");
 function findTrail(menu, pathUrl) {
   const trail = [];
   const walk = (items) => {
     for (const item of items) {
       const fullPath = full(item.path);
       trail.push({ ...item, fullPath });
-      if (item.path && matchPath(fullPath, pathUrl)) return true;
+      if (item.path && matchPathStrict(fullPath, pathUrl)) return true;
       if (item.children?.length && walk(item.children)) return true;
       trail.pop();
     }
@@ -87,6 +105,20 @@ function findTrail(menu, pathUrl) {
   walk(menu);
   return trail;
 }
+function pickParamsFromNearestAncestor(trail, fromIndex, pathname, patternKeys) {
+  for (let j = fromIndex; j >= 0; j--) {
+    const p = trail[j].path;
+    if (p && /:([^/]+)/.test(p)) {
+      const all = extractParamsLoose(p, pathname);
+      const picked = {};
+      for (const k of patternKeys) {
+        if (all[k]) picked[k] = all[k];
+      }
+      if (Object.keys(picked).length) return picked;
+    }
+  }
+  return {};
+}
 function useBreadcrumb(menuRouter, customBreadcrumb) {
   const { pathname } = useLocation();
   const normalizedPath = React.useMemo(() => normalize(pathname), [pathname]);
@@ -98,10 +130,6 @@ function useBreadcrumb(menuRouter, customBreadcrumb) {
     () => trail.length ? trail[trail.length - 1] : void 0,
     [trail]
   );
-  const paramsFromLeaf = React.useMemo(
-    () => leaf?.path ? extractParams(leaf.path, normalizedPath) : {},
-    [leaf?.path, normalizedPath]
-  );
   const filteredTrail = React.useMemo(() => {
     if (!trail.length || leaf?.isShowBreadcrumb !== true) return [];
     return trail.filter(
@@ -115,16 +143,37 @@ function useBreadcrumb(menuRouter, customBreadcrumb) {
     const pattern = node.path ?? node.fullPath;
     let href;
     if (pattern) {
-      href = hasParams(pattern) ? (() => {
+      if (hasParams(pattern)) {
+        const { keys: requiredKeys } = compilePatternLoose(pattern);
+        const extracted = extractParamsLoose(pattern, normalizedPath);
+        let paramsForNode = requiredKeys.reduce(
+          (acc, k) => {
+            if (extracted[k]) acc[k] = extracted[k];
+            return acc;
+          },
+          {}
+        );
+        if (Object.keys(paramsForNode).length < requiredKeys.length) {
+          const fromAncestor = pickParamsFromNearestAncestor(
+            filteredTrail,
+            i,
+            normalizedPath,
+            requiredKeys
+          );
+          paramsForNode = { ...fromAncestor, ...paramsForNode };
+        }
         try {
-          return generatePath(pattern, paramsFromLeaf);
+          href = Object.keys(paramsForNode).length === requiredKeys.length ? generatePath(pattern, paramsForNode) : void 0;
         } catch {
-          return void 0;
+          href = void 0;
         }
-      })() : pattern;
+      } else {
+        href = pattern;
+      }
     }
-    const titleNode = isLast ? /* @__PURE__ */ jsx("span", { children: node.name }) : href ? /* @__PURE__ */ jsx(Link, { to: href, children: node.name }) : /* @__PURE__ */ jsx("span", { children: node.name });
-    return { title: titleNode };
+    return {
+      title: isLast ? /* @__PURE__ */ jsx("span", { children: node.name }) : href ? /* @__PURE__ */ jsx(Link, { to: href, children: node.name }) : /* @__PURE__ */ jsx("span", { children: node.name })
+    };
   });
   return [
     ...items,

package/es/index.js

@@ -84,7 +84,7 @@ export { Cascader } from './fields/CascaderField.js';
 export { InputRangePicker } from './fields/InputRangePicker.js';
 export { useToast } from './hooks/useToast.js';
 export { useMessage } from './hooks/useMessage.js';
-export { c as createComponentWithProps, e as extractRoutesFromMenu, n as normalize, v as validateAbsolutePaths } from './chunks/useBreadcrumb-CQA2mBvb.js';
+export { c as createComponentWithProps, e as extractRoutesFromMenu, n as normalize, v as validateAbsolutePaths } from './chunks/useBreadcrumb-DEKhv1-Z.js';
 
 const generateId = (name, path) => {
   const source = `${name}-${path || ""}`;

package/es/ui/BreadcrumbHeading.js

@@ -1,7 +1,7 @@
 import { jsx } from 'react/jsx-runtime';
 import { r } from '../chunks/index-t0ynpS_n.js';
 import { Breadcrumb } from './Breadcrumb.js';
-import { u as useBreadcrumb } from '../chunks/useBreadcrumb-CQA2mBvb.js';
+import { u as useBreadcrumb } from '../chunks/useBreadcrumb-DEKhv1-Z.js';
 
 const BreadcrumbHeading = (props) => {
   const { menu, customBreadcum } = props;

package/es/ui/WrapperBreadcrumb.js

@@ -1,5 +1,5 @@
 import { jsx } from 'react/jsx-runtime';
-import { u as useBreadcrumb } from '../chunks/useBreadcrumb-CQA2mBvb.js';
+import { u as useBreadcrumb } from '../chunks/useBreadcrumb-DEKhv1-Z.js';
 import { Breadcrumb } from './Breadcrumb.js';
 
 const WrapperBreadcrumb = ({ menu }) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pnkx-lib/ui",
   "private": false,
-  "version": "1.9.449",
+  "version": "1.9.451",
   "type": "module",
   "main": "./es/index.js",
   "module": "./es/index.js",