@homebound/beam 3.8.0 → 3.9.0

package/dist/index.js

@@ -8735,8 +8735,7 @@ function Menu(props) {
 // src/components/internal/MenuItem.tsx
 import { useRef as useRef14 } from "react";
 import { useHover as useHover7, useMenuItem } from "react-aria";
-import { useHistory } from "react-router";
-import { Link as Link3 } from "react-router-dom";
+import { Link as Link3, useNavigate } from "react-router-dom";
 
 // src/components/Avatar/Avatar.tsx
 import { useState as useState12 } from "react";
@@ -9771,20 +9770,8 @@ function MenuItemImpl(props) {
     onClose
   } = props;
   const menuItem = item.value;
-  if (!menuItem) {
-    return null;
-  }
-  const {
-    disabled,
-    onClick,
-    label,
-    destructive
-  } = menuItem;
-  const isDisabled = Boolean(disabled);
-  const isSelected = state.selectionManager.selectedKeys.has(label);
-  const isFocused = state.selectionManager.focusedKey === item.key;
   const ref = useRef14(null);
-  const history = useHistory();
+  const navigate = useNavigate();
   const {
     hoverProps,
     isHovered
@@ -9794,20 +9781,37 @@ function MenuItemImpl(props) {
     menuItemProps
   } = useMenuItem({
     key: item.key,
-    isDisabled,
+    isDisabled: Boolean(menuItem?.disabled),
     onAction: () => {
+      if (!menuItem) {
+        return;
+      }
+      const {
+        onClick
+      } = menuItem;
       if (typeof onClick === "string") {
         if (isAbsoluteUrl(onClick)) {
           window.open(onClick, "_blank").opener = null;
           return;
         }
-        history.push(onClick);
+        navigate(onClick);
         return;
       }
       onClick && onClick();
     },
     onClose
   }, state, ref);
+  if (!menuItem) {
+    return null;
+  }
+  const {
+    disabled,
+    label,
+    destructive
+  } = menuItem;
+  const isDisabled = Boolean(disabled);
+  const isSelected = state.selectionManager.selectedKeys.has(label);
+  const isFocused = state.selectionManager.focusedKey === item.key;
   return /* @__PURE__ */ jsx41("li", { ...menuItemProps, ...hoverProps, ref, ...trussProps27({
     ...{
       display: "df",
@@ -21618,7 +21622,7 @@ function visit(rows, fn) {
 import { camelCase as camelCase5 } from "change-case";
 import { useEffect as useEffect33, useMemo as useMemo49, useRef as useRef54, useState as useState48 } from "react";
 import { mergeProps as mergeProps26, useFocusRing as useFocusRing15, useHover as useHover19 } from "react-aria";
-import { matchPath, Route } from "react-router";
+import { matchPath, Route, Routes } from "react-router";
 import { Link as Link5, useLocation } from "react-router-dom";
 import { trussProps as trussProps85, maybeCssVar as maybeCssVar44 } from "@homebound/truss/runtime";
 import { Fragment as Fragment40, jsx as jsx171, jsxs as jsxs90 } from "react/jsx-runtime";
@@ -21644,16 +21648,16 @@ function TabContent(props) {
   const location = useLocation();
   const selectedTab = isRouteTabs(props) ? props.tabs.find((t) => {
     const paths = Array.isArray(t.path) ? t.path : [t.path];
-    return paths.some((p) => !!matchPath(location.pathname, {
+    return paths.some((p) => !!matchPath({
       path: p,
-      exact: true
-    }));
+      end: true
+    }, location.pathname));
   }) || tabs[0] : props.tabs.find((tab) => tab.value === props.selected) || tabs[0];
   const uniqueValue = uniqueTabValue(selectedTab);
   return (
     // Using FullBleed to allow the tab's bgColor to extend to the edges of the <ScrollableContent /> element.
     // Omit the padding from `FullBleed` if the caller passes in the `paddingLeft/Right` styles.
-    /* @__PURE__ */ jsx171(FullBleed, { omitPadding: omitFullBleedPadding, children: /* @__PURE__ */ jsx171("div", { "aria-labelledby": `${uniqueValue}-tab`, id: `${uniqueValue}-tabPanel`, role: "tabpanel", tabIndex: 0, ...tid.panel, ...trussProps85(contentXss), children: isRouteTab(selectedTab) ? /* @__PURE__ */ jsx171(Route, { path: selectedTab.path, render: selectedTab.render }) : selectedTab.render() }) })
+    /* @__PURE__ */ jsx171(FullBleed, { omitPadding: omitFullBleedPadding, children: /* @__PURE__ */ jsx171("div", { "aria-labelledby": `${uniqueValue}-tab`, id: `${uniqueValue}-tabPanel`, role: "tabpanel", tabIndex: 0, ...tid.panel, ...trussProps85(contentXss), children: isRouteTab(selectedTab) ? /* @__PURE__ */ jsx171(Routes, { children: (Array.isArray(selectedTab.path) ? selectedTab.path : [selectedTab.path]).map((p) => /* @__PURE__ */ jsx171(Route, { path: p, element: selectedTab.render() }, p)) }) : selectedTab.render() }) })
   );
 }
 function Tabs(props) {
@@ -21665,10 +21669,13 @@ function Tabs(props) {
     ...others
   } = props;
   const location = useLocation();
-  const selected = isRouteTabs(props) ? uniqueTabValue(props.tabs.find((t) => !!matchPath(location.pathname, {
-    path: t.path,
-    exact: true
-  })) || props.tabs[0]) : props.selected;
+  const selected = isRouteTabs(props) ? uniqueTabValue(props.tabs.find((t) => {
+    const paths = Array.isArray(t.path) ? t.path : [t.path];
+    return paths.some((p) => !!matchPath({
+      path: p,
+      end: true
+    }, location.pathname));
+  }) || props.tabs[0]) : props.selected;
   const {
     isFocusVisible,
     focusProps