@pnkx-lib/ui 1.9.448 → 1.9.450

package/es/chunks/{useBreadcrumb-CpCPSE3S.js → useBreadcrumb-DtXCsh1h.js}

@@ -1,7 +1,7 @@
 import { jsx } from 'react/jsx-runtime';
 import * as React from 'react';
 import React__default from 'react';
-import { useLocation, Link } from 'react-router';
+import { useLocation, generatePath, Link } from 'react-router';
 
 const extractRoutesFromMenu = (menuItems) => {
   const routes = [];
@@ -54,17 +54,31 @@ 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}/?$`);
-};
+function compilePattern(pattern) {
+  const pat = normalize(pattern);
+  const keys = [];
+  const escaped = pat.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+  const withCaptures = escaped.replace(/:([^/]+)/g, (_m, key) => {
+    keys.push(key);
+    return "([^/]+)";
+  });
+  const regex = new RegExp(`^${withCaptures}/?$`);
+  return { regex, keys };
+}
+function matchPath(pattern, pathname) {
+  const { regex } = compilePattern(pattern);
+  return regex.test(normalize(pathname));
+}
+function extractParams(pattern, pathname) {
+  const { regex, keys } = compilePattern(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 full = (itemPath) => normalize(itemPath ?? "/");
-const matchPath = (configPath, pathname) => {
-  const rx = pathToRegex(configPath);
-  return rx.test(normalize(pathname));
-};
 function findTrail(menu, pathUrl) {
   const trail = [];
   const walk = (items) => {
@@ -87,16 +101,38 @@ function useBreadcrumb(menuRouter, customBreadcrumb) {
     () => findTrail(menuRouter, normalizedPath),
     [menuRouter, normalizedPath]
   );
-  if (trail.length === 0) return [];
-  const leaf = trail[trail.length - 1];
-  if (leaf.isShowBreadcrumb !== true) return [];
-  const filtered = trail.filter(
-    (node, i) => i === trail.length - 1 || Boolean(node.path)
+  const leaf = React.useMemo(
+    () => trail.length ? trail[trail.length - 1] : void 0,
+    [trail]
+  );
+  const paramsFromLeaf = React.useMemo(
+    () => leaf?.path ? extractParams(leaf.path, normalizedPath) : {},
+    [leaf?.path, normalizedPath]
   );
-  const last = filtered.length - 1;
-  const items = filtered.map((node, i) => ({
-    title: i === last ? /* @__PURE__ */ jsx("span", { children: node.name }) : /* @__PURE__ */ jsx(Link, { to: node.fullPath, children: node.name })
-  }));
+  const filteredTrail = React.useMemo(() => {
+    if (!trail.length || leaf?.isShowBreadcrumb !== true) return [];
+    return trail.filter(
+      (node, i) => i === trail.length - 1 || Boolean(node.path)
+    );
+  }, [trail, leaf]);
+  if (!filteredTrail.length) return [];
+  const last = filteredTrail.length - 1;
+  const items = filteredTrail.map((node, i) => {
+    const isLast = i === last;
+    const pattern = node.path ?? node.fullPath;
+    let href;
+    if (pattern) {
+      href = hasParams(pattern) ? (() => {
+        try {
+          return generatePath(pattern, paramsFromLeaf);
+        } catch {
+          return void 0;
+        }
+      })() : 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 [
     ...items,
     ...customBreadcrumb?.length ? [

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-CpCPSE3S.js';
+export { c as createComponentWithProps, e as extractRoutesFromMenu, n as normalize, v as validateAbsolutePaths } from './chunks/useBreadcrumb-DtXCsh1h.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-CpCPSE3S.js';
+import { u as useBreadcrumb } from '../chunks/useBreadcrumb-DtXCsh1h.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-CpCPSE3S.js';
+import { u as useBreadcrumb } from '../chunks/useBreadcrumb-DtXCsh1h.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.448",
+  "version": "1.9.450",
   "type": "module",
   "main": "./es/index.js",
   "module": "./es/index.js",