@homebound/beam 3.8.0 → 3.9.1

package/dist/index.cjs

@@ -9149,7 +9149,6 @@ function Menu(props) {
 // src/components/internal/MenuItem.tsx
 var import_react35 = require("react");
 var import_react_aria16 = require("react-aria");
-var import_react_router = require("react-router");
 var import_react_router_dom3 = require("react-router-dom");
 
 // src/components/Avatar/Avatar.tsx
@@ -10185,20 +10184,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 = (0, import_react35.useRef)(null);
-  const history = (0, import_react_router.useHistory)();
+  const navigate = (0, import_react_router_dom3.useNavigate)();
   const {
     hoverProps,
     isHovered
@@ -10208,20 +10195,37 @@ function MenuItemImpl(props) {
     menuItemProps
   } = (0, import_react_aria16.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__ */ (0, import_jsx_runtime41.jsx)("li", { ...menuItemProps, ...hoverProps, ref, ...(0, import_runtime30.trussProps)({
     ...{
       display: "df",
@@ -22032,7 +22036,7 @@ function visit(rows, fn) {
 var import_change_case7 = require("change-case");
 var import_react123 = require("react");
 var import_react_aria53 = require("react-aria");
-var import_react_router2 = require("react-router");
+var import_react_router = require("react-router");
 var import_react_router_dom5 = require("react-router-dom");
 var import_runtime93 = require("@homebound/truss/runtime");
 var import_jsx_runtime171 = require("react/jsx-runtime");
@@ -22058,16 +22062,16 @@ function TabContent(props) {
   const location = (0, import_react_router_dom5.useLocation)();
   const selectedTab = isRouteTabs(props) ? props.tabs.find((t) => {
     const paths = Array.isArray(t.path) ? t.path : [t.path];
-    return paths.some((p) => !!(0, import_react_router2.matchPath)(location.pathname, {
+    return paths.some((p) => !!(0, import_react_router.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__ */ (0, import_jsx_runtime171.jsx)(FullBleed, { omitPadding: omitFullBleedPadding, children: /* @__PURE__ */ (0, import_jsx_runtime171.jsx)("div", { "aria-labelledby": `${uniqueValue}-tab`, id: `${uniqueValue}-tabPanel`, role: "tabpanel", tabIndex: 0, ...tid.panel, ...(0, import_runtime93.trussProps)(contentXss), children: isRouteTab(selectedTab) ? /* @__PURE__ */ (0, import_jsx_runtime171.jsx)(import_react_router2.Route, { path: selectedTab.path, render: selectedTab.render }) : selectedTab.render() }) })
+    /* @__PURE__ */ (0, import_jsx_runtime171.jsx)(FullBleed, { omitPadding: omitFullBleedPadding, children: /* @__PURE__ */ (0, import_jsx_runtime171.jsx)("div", { "aria-labelledby": `${uniqueValue}-tab`, id: `${uniqueValue}-tabPanel`, role: "tabpanel", tabIndex: 0, ...tid.panel, ...(0, import_runtime93.trussProps)(contentXss), children: selectedTab.render() }) })
   );
 }
 function Tabs(props) {
@@ -22079,10 +22083,13 @@ function Tabs(props) {
     ...others
   } = props;
   const location = (0, import_react_router_dom5.useLocation)();
-  const selected = isRouteTabs(props) ? uniqueTabValue(props.tabs.find((t) => !!(0, import_react_router2.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) => !!(0, import_react_router.matchPath)({
+      path: p,
+      end: true
+    }, location.pathname));
+  }) || props.tabs[0]) : props.selected;
   const {
     isFocusVisible,
     focusProps