@eightshift/ui-components 2.0.2 → 3.0.0

package/dist/{Dialog-CIh-hX93.js → Dialog-s3fX5lSh.js}

@@ -1,23 +1,22 @@
-import { a as $d2b4bc8c273e7be6$export$24d547caef80ccd1 } from "./Button-OQ5EIPvt.js";
-import { m as $df56164dff5785e2$export$4338b53315abf666, d as $3ef42575df84b30b$export$9d1611c77c2fe928, g as $8ae05eaa5c114e9c$export$7f54fc3180508a52, f as $bdb11010cef70236$export$f680877a34711e37, l as $f0a04ccd8dbdd83b$export$e5c5a5f917a5871c, p as $ff5963eb1fccf552$export$e08e3b67e392101e, e as $b5e257d569688ac6$export$535bd6ca7f90a273, k as $bdb11010cef70236$export$b4cc09c592e8fdb8, a as $64fa3d84918910a7$export$29f1550f4b0d4415, b as $64fa3d84918910a7$export$4d86445c2cf5e3, j as $64fa3d84918910a7$export$2881499e37b75b9a, n as $5dc95899b306f630$export$c9058316764c140e, h as $64fa3d84918910a7$export$9d4c57ee4c6ffdd8, $ as $64fa3d84918910a7$export$fabf2dc03a41866e, o as $64fa3d84918910a7$export$c62b8e45d58ddad9 } from "./utils-39D0mStj.js";
+import { a as $d2b4bc8c273e7be6$export$24d547caef80ccd1 } from "./Button-D7c-vzAt.js";
+import { l as $df56164dff5785e2$export$4338b53315abf666, d as $3ef42575df84b30b$export$9d1611c77c2fe928, f as $8ae05eaa5c114e9c$export$7f54fc3180508a52, e as $bdb11010cef70236$export$f680877a34711e37, k as $f0a04ccd8dbdd83b$export$e5c5a5f917a5871c, p as $ff5963eb1fccf552$export$e08e3b67e392101e, n as $b5e257d569688ac6$export$535bd6ca7f90a273, j as $bdb11010cef70236$export$b4cc09c592e8fdb8, a as $64fa3d84918910a7$export$29f1550f4b0d4415, b as $64fa3d84918910a7$export$4d86445c2cf5e3, i as $64fa3d84918910a7$export$2881499e37b75b9a, m as $5dc95899b306f630$export$c9058316764c140e, g as $64fa3d84918910a7$export$9d4c57ee4c6ffdd8, $ as $64fa3d84918910a7$export$fabf2dc03a41866e, o as $64fa3d84918910a7$export$c62b8e45d58ddad9 } from "./utils-DkCSC521.js";
 import { $ as $4e85f108e88277b8$export$d688439359537581 } from "./RSPContexts-2lR5GG9p.js";
-import { g as $dd149f63282afbbf$export$f6211563215e3b37, c as $2a41e45df1593e64$export$d39e1813b3bdd0e1, f as $9daab02d461809db$export$683480f191c0e3ea, a as $fc909762b330b746$export$61c6a8c84e605fb6, b as $d3f049242431219c$export$45fda7c47f93fd48, $ as $d3f049242431219c$export$6d3443f2c48bfc20, d as $44f671af83e7d9e0$export$2de4954e8ae13b9f } from "./OverlayArrow-1jx-ZyCR.js";
-import { l as $cc38e7bd3fc7b213$export$2bb74740c4e19def, o as $8a26561d2877236e$export$c24ed0104d07eab9, c as $880e95eb8b93ba9a$export$ecf600387e221c37, $ as $7af3f5b51489e0b5$export$253fe78d46329472, a as $7613b1592d41b092$export$6cd28814d92fa9c9, b as $d496c0a20b6e58ec$export$6c8a5aaad13c9852, p as $e1995378a142960e$export$e953bb1cd0f19726, f as $7135fc7d473fd974$export$4feb769f8ddf26c5, d as $e1995378a142960e$export$bf788dd355e3a401, e as $e1995378a142960e$export$fb8073518f34e6ec, g as $7135fc7d473fd974$export$d40e14dec8b060a8, j as $7135fc7d473fd974$export$90e00781bc59d8f9, h as $e1995378a142960e$export$18af5c7a9e9b3664 } from "./Collection-CJM_asJz.js";
-import { b as $982254629710d113$export$b95089534ab7c1fd, c as $453cc9f0df89c0a5$export$77d5aafae4e095b2, d as $d2f53cda644affe3$export$65d2a03b8800d6e3, g as $431f98aba6844401$export$6615d83f6de245ce, h as $72a5793c14baf454$export$e0e4026c12a8bdbb } from "./Separator-BhZycTUp.js";
+import { g as $dd149f63282afbbf$export$f6211563215e3b37, c as $2a41e45df1593e64$export$d39e1813b3bdd0e1, f as $9daab02d461809db$export$683480f191c0e3ea, a as $fc909762b330b746$export$61c6a8c84e605fb6, b as $d3f049242431219c$export$45fda7c47f93fd48, $ as $d3f049242431219c$export$6d3443f2c48bfc20, d as $44f671af83e7d9e0$export$2de4954e8ae13b9f } from "./OverlayArrow-CMh-7gEM.js";
+import { j as $cc38e7bd3fc7b213$export$2bb74740c4e19def, q as $8a26561d2877236e$export$c24ed0104d07eab9, c as $880e95eb8b93ba9a$export$ecf600387e221c37, $ as $7af3f5b51489e0b5$export$253fe78d46329472, a as $7613b1592d41b092$export$6cd28814d92fa9c9, b as $d496c0a20b6e58ec$export$6c8a5aaad13c9852, r as $e1995378a142960e$export$e953bb1cd0f19726, f as $7135fc7d473fd974$export$4feb769f8ddf26c5, d as $e1995378a142960e$export$bf788dd355e3a401, e as $e1995378a142960e$export$fb8073518f34e6ec, g as $7135fc7d473fd974$export$d40e14dec8b060a8, m as $7135fc7d473fd974$export$90e00781bc59d8f9, h as $e1995378a142960e$export$18af5c7a9e9b3664 } from "./Collection-CDEKDgvV.js";
+import { b as $982254629710d113$export$b95089534ab7c1fd, c as $453cc9f0df89c0a5$export$77d5aafae4e095b2, d as $d2f53cda644affe3$export$65d2a03b8800d6e3, g as $431f98aba6844401$export$6615d83f6de245ce, h as $72a5793c14baf454$export$e0e4026c12a8bdbb } from "./Separator-BxbOoGIK.js";
 import React__default, { useRef, useContext, useEffect, useMemo, createContext, useState, useCallback, forwardRef } from "react";
-import { a as $514c0188e459b4c0$export$9afb8bc826b033ea } from "./Text-aOUPPvTO.js";
+import { a as $514c0188e459b4c0$export$9afb8bc826b033ea } from "./Text-DVSAPY-K.js";
 import { $ as $65484d02dcb7eb3e$export$457c3d6518dd4c6f } from "./filterDOMProps-EDDcM64A.js";
-import { d as $ae1eeba8b9eafd08$export$5165eccb35aaadb5, b as $ea8dcbcb9ea1b556$export$9a302a45f65d0572, $ as $f6c31cce2adf654f$export$45712eceda6fad21, a as $ea8dcbcb9ea1b556$export$7e924b3091a3bd18 } from "./usePress-rg_OQIGW.js";
-import { o as $e7801be82b4b2a53$export$4debdb1a3f0fa79e, g as $431fbd86ca7dc216$export$b204af158042fbac, d as $9ab94262bd0047c7$export$420e68273165f4ec, m as $c87311424ea30a05$export$fedb369cb70207f1, $ as $6179b936705e76d3$export$ae780daf29e6d456, a as $507fabe10e71c6fb$export$b9b3dfddab17db27, c as $a1ea59d68270f0dd$export$f8168d8dd8fd66e6, y as $507fabe10e71c6fb$export$98e20ec92f614cfe, h as $6a99195332edec8b$export$80f3e147d781571c, e as $458b0a5536c1a7cf$export$40bfa8c7b0832715 } from "./focusSafely-CiqTTjWy.js";
-import { $ as $fca6afa0e843324b$export$f12b703ca79dfbb1 } from "./useLocalizedStringFormatter-BQ4TF72x.js";
-import { b as $46d819fcbaf35654$export$8f71654801c2f7cd } from "./useFocusable-087cO5Ct.js";
-import { $ as $18f2051aff69b9bf$export$43bb16f9c6d9e3f7 } from "./context-CDOs-GuR.js";
-import { c as $9bf71ea28793e738$export$1258395f99bf9cbf, b as $9bf71ea28793e738$export$20e40289641fbbb6 } from "./FocusScope-Cs5_OoeA.js";
-import { $ as $f7dceffc5ad7768b$export$4e328f61c538687f } from "./useFocusRing-CGp3guTX.js";
+import { d as $ae1eeba8b9eafd08$export$5165eccb35aaadb5, b as $ea8dcbcb9ea1b556$export$9a302a45f65d0572, $ as $f6c31cce2adf654f$export$45712eceda6fad21, a as $ea8dcbcb9ea1b556$export$7e924b3091a3bd18 } from "./usePress-C3dxzVyi.js";
+import { H as $e7801be82b4b2a53$export$4debdb1a3f0fa79e, d as $431fbd86ca7dc216$export$b204af158042fbac, c as $c87311424ea30a05$export$fedb369cb70207f1, y as $7215afc6de606d6b$export$de79e2c695e052f3, $ as $6179b936705e76d3$export$ae780daf29e6d456, m as $507fabe10e71c6fb$export$b9b3dfddab17db27, z as $46d819fcbaf35654$export$8f71654801c2f7cd, o as $a1ea59d68270f0dd$export$f8168d8dd8fd66e6, L as $507fabe10e71c6fb$export$98e20ec92f614cfe, r as $3ad3f6e1647bc98d$export$80f3e147d781571c, b as $458b0a5536c1a7cf$export$40bfa8c7b0832715 } from "./useHover-B-8Wji4B.js";
+import { $ as $fca6afa0e843324b$export$f12b703ca79dfbb1 } from "./useLocalizedStringFormatter-CFP1YZWQ.js";
+import { $ as $18f2051aff69b9bf$export$43bb16f9c6d9e3f7 } from "./context-D2KUdwNL.js";
+import { c as $9bf71ea28793e738$export$1258395f99bf9cbf, b as $9bf71ea28793e738$export$20e40289641fbbb6 } from "./FocusScope-DbqfVa2Z.js";
 import { $ as $dbSRa$reactdom } from "./index-BRp93Yfa.js";
-import { b as $f39a9eba43920ace$export$b5d7cc18bb8d2b59 } from "./Hidden-DnOd_jPX.js";
-import { $ as $313b98861ee5dd6c$export$d6875122194c7b44 } from "./useLabels-C_2wWraB.js";
-import { $ as $5c3e21d68f1c4674$export$439d29a4e110a164 } from "./VisuallyHidden-ClTQo25k.js";
+import { b as $f39a9eba43920ace$export$b5d7cc18bb8d2b59 } from "./Hidden-rE6uR-lr.js";
+import { a as $9ab94262bd0047c7$export$420e68273165f4ec } from "./useFocusRing-CxlVCVpL.js";
+import { $ as $313b98861ee5dd6c$export$d6875122194c7b44 } from "./useLabels-D8cxd1Z8.js";
+import { $ as $5c3e21d68f1c4674$export$439d29a4e110a164 } from "./VisuallyHidden-ooItkWYR.js";
 function $62d8ded9296f3872$export$cfa2225e87938781(node, checkForOverflow) {
   let scrollableNode = node;
   if ($cc38e7bd3fc7b213$export$2bb74740c4e19def(scrollableNode, checkForOverflow)) scrollableNode = scrollableNode.parentElement;
@@ -123,17 +122,20 @@ function $e0b6e0b68ec7f50f$var$isValidEvent(event, ref) {
     if (!ownerDocument || !ownerDocument.documentElement.contains(event.target)) return false;
     if (event.target.closest("[data-react-aria-top-layer]")) return false;
   }
-  return ref.current && !ref.current.contains(event.target);
+  if (!ref.current) return false;
+  return !event.composedPath().includes(ref.current);
 }
 const $a11501f3d1d39e6c$var$visibleOverlays = [];
 function $a11501f3d1d39e6c$export$ea8f71083e90600f(props, ref) {
   let { onClose, shouldCloseOnBlur, isOpen, isDismissable = false, isKeyboardDismissDisabled = false, shouldCloseOnInteractOutside } = props;
   useEffect(() => {
-    if (isOpen) $a11501f3d1d39e6c$var$visibleOverlays.push(ref);
-    return () => {
-      let index = $a11501f3d1d39e6c$var$visibleOverlays.indexOf(ref);
-      if (index >= 0) $a11501f3d1d39e6c$var$visibleOverlays.splice(index, 1);
-    };
+    if (isOpen && !$a11501f3d1d39e6c$var$visibleOverlays.includes(ref)) {
+      $a11501f3d1d39e6c$var$visibleOverlays.push(ref);
+      return () => {
+        let index = $a11501f3d1d39e6c$var$visibleOverlays.indexOf(ref);
+        if (index >= 0) $a11501f3d1d39e6c$var$visibleOverlays.splice(index, 1);
+      };
+    }
   }, [
     isOpen,
     ref
@@ -595,6 +597,8 @@ function $5e3802645cc19319$export$1c3ebcada18427bf(targets, root = document.body
     subtree: true
   });
   let observerWrapper = {
+    visibleNodes,
+    hiddenNodes,
     observe() {
       observer.observe(root, {
         childList: true,
@@ -622,35 +626,49 @@ function $5e3802645cc19319$export$1c3ebcada18427bf(targets, root = document.body
     } else $5e3802645cc19319$var$observerStack.splice($5e3802645cc19319$var$observerStack.indexOf(observerWrapper), 1);
   };
 }
+function $5e3802645cc19319$export$1020fa7f77e17884(element) {
+  let observer = $5e3802645cc19319$var$observerStack[$5e3802645cc19319$var$observerStack.length - 1];
+  if (observer && !observer.visibleNodes.has(element)) {
+    observer.visibleNodes.add(element);
+    return () => {
+      observer.visibleNodes.delete(element);
+    };
+  }
+}
 function $f2f8a6077418541e$export$542a6fd13ac93354(props, state) {
-  let { triggerRef, popoverRef, isNonModal, isKeyboardDismissDisabled, shouldCloseOnInteractOutside, ...otherProps } = props;
+  let { triggerRef, popoverRef, groupRef, isNonModal, isKeyboardDismissDisabled, shouldCloseOnInteractOutside, ...otherProps } = props;
+  let isSubmenu = otherProps["trigger"] === "SubmenuTrigger";
   let { overlayProps, underlayProps } = $a11501f3d1d39e6c$export$ea8f71083e90600f({
-    // If popover is in the top layer, it should not prevent other popovers from being dismissed.
-    isOpen: state.isOpen && !otherProps["data-react-aria-top-layer"],
+    isOpen: state.isOpen,
     onClose: state.close,
     shouldCloseOnBlur: true,
-    isDismissable: !isNonModal,
+    isDismissable: !isNonModal || isSubmenu,
     isKeyboardDismissDisabled,
     shouldCloseOnInteractOutside
-  }, popoverRef);
+  }, groupRef !== null && groupRef !== void 0 ? groupRef : popoverRef);
   let { overlayProps: positionProps, arrowProps, placement } = $2a41e45df1593e64$export$d39e1813b3bdd0e1({
     ...otherProps,
     targetRef: triggerRef,
     overlayRef: popoverRef,
     isOpen: state.isOpen,
-    onClose: isNonModal ? state.close : null
+    onClose: isNonModal && !isSubmenu ? state.close : null
   });
   $49c51c25361d4cd2$export$ee0f7cc6afcd1c18({
     isDisabled: isNonModal || !state.isOpen
   });
   $f0a04ccd8dbdd83b$export$e5c5a5f917a5871c(() => {
-    if (state.isOpen && !isNonModal && popoverRef.current) return $5e3802645cc19319$export$1c3ebcada18427bf([
-      popoverRef.current
-    ]);
+    if (state.isOpen && popoverRef.current) {
+      var _groupRef_current, _groupRef_current1;
+      if (isNonModal) return $5e3802645cc19319$export$1020fa7f77e17884((_groupRef_current = groupRef === null || groupRef === void 0 ? void 0 : groupRef.current) !== null && _groupRef_current !== void 0 ? _groupRef_current : popoverRef.current);
+      else return $5e3802645cc19319$export$1c3ebcada18427bf([
+        (_groupRef_current1 = groupRef === null || groupRef === void 0 ? void 0 : groupRef.current) !== null && _groupRef_current1 !== void 0 ? _groupRef_current1 : popoverRef.current
+      ]);
+    }
   }, [
     isNonModal,
     state.isOpen,
-    popoverRef
+    popoverRef,
+    groupRef
   ]);
   return {
     popoverProps: $3ef42575df84b30b$export$9d1611c77c2fe928(overlayProps, positionProps),
@@ -682,7 +700,7 @@ function $337b884510726a0d$export$c6fdb837b070b4ff(props) {
   let contents = props.children;
   if (!props.disableFocusManagement) contents = /* @__PURE__ */ React__default.createElement($9bf71ea28793e738$export$20e40289641fbbb6, {
     restoreFocus: true,
-    contain: contain && !isExiting
+    contain: (props.shouldContainFocus || contain) && !isExiting
   }, contents);
   contents = /* @__PURE__ */ React__default.createElement($337b884510726a0d$export$a2200b96afd16271.Provider, {
     value: contextValue
@@ -914,9 +932,12 @@ function $168583247155ddda$export$dc9c12ed27dd1b49(props, state, ref) {
     }
   });
   let pressProps = {
+    preventFocusOnPress: true,
     onPressStart(e) {
-      if (e.pointerType !== "touch" && e.pointerType !== "keyboard" && !isDisabled)
+      if (e.pointerType !== "touch" && e.pointerType !== "keyboard" && !isDisabled) {
+        $7215afc6de606d6b$export$de79e2c695e052f3(e.target);
         state.open(e.pointerType === "virtual" ? "first" : null);
+      }
     },
     onPress(e) {
       if (e.pointerType === "touch" && !isDisabled) state.toggle();
@@ -1070,7 +1091,7 @@ function $a2e5df62f93c7633$export$9d32628fc2aea7da(props, state, ref) {
   let { hoverProps } = $6179b936705e76d3$export$ae780daf29e6d456({
     isDisabled,
     onHoverStart(e) {
-      if (!$507fabe10e71c6fb$export$b9b3dfddab17db27() && !(isTriggerExpanded && hasPopup === "dialog")) {
+      if (!$507fabe10e71c6fb$export$b9b3dfddab17db27() && !(isTriggerExpanded && hasPopup)) {
         selectionManager.setFocused(true);
         selectionManager.setFocusedKey(key);
       }
@@ -1111,12 +1132,25 @@ function $a2e5df62f93c7633$export$9d32628fc2aea7da(props, state, ref) {
   return {
     menuItemProps: {
       ...ariaProps,
-      ...$3ef42575df84b30b$export$9d1611c77c2fe928(domProps, linkProps, isTrigger ? {
-        onFocus: itemProps.onFocus,
-        "data-key": itemProps["data-key"]
-      } : itemProps, pressProps, hoverProps, keyboardProps, focusProps),
+      ...$3ef42575df84b30b$export$9d1611c77c2fe928(
+        domProps,
+        linkProps,
+        isTrigger ? {
+          onFocus: itemProps.onFocus,
+          "data-collection": itemProps["data-collection"],
+          "data-key": itemProps["data-key"]
+        } : itemProps,
+        pressProps,
+        hoverProps,
+        keyboardProps,
+        focusProps,
+        // Prevent DOM focus from moving on mouse down when using virtual focus or this is a submenu/subdialog trigger.
+        data.shouldUseVirtualFocus || isTrigger ? {
+          onMouseDown: (e) => e.preventDefault()
+        } : void 0
+      ),
       // If a submenu is expanded, set the tabIndex to -1 so that shift tabbing goes out of the menu instead of the parent menu item.
-      tabIndex: itemProps.tabIndex != null && isTriggerExpanded ? -1 : itemProps.tabIndex
+      tabIndex: itemProps.tabIndex != null && isTriggerExpanded && !data.shouldUseVirtualFocus ? -1 : itemProps.tabIndex
     },
     labelProps: {
       id: labelId
@@ -1128,6 +1162,7 @@ function $a2e5df62f93c7633$export$9d32628fc2aea7da(props, state, ref) {
       id: keyboardId
     },
     isFocused,
+    isFocusVisible: isFocused && selectionManager.isFocused && $507fabe10e71c6fb$export$b9b3dfddab17db27() && !isTriggerExpanded,
     isSelected,
     isPressed,
     isDisabled
@@ -1184,6 +1219,9 @@ function $d275435c250248f8$export$85ec83e04c95f50a(options) {
     prevPointerPos.current = void 0;
   };
   let modality = $507fabe10e71c6fb$export$98e20ec92f614cfe();
+  let onPointerDown = $8ae05eaa5c114e9c$export$7f54fc3180508a52((e) => {
+    if (preventPointerEvents) e.preventDefault();
+  });
   useEffect(() => {
     if (preventPointerEvents && menuRef.current) menuRef.current.style.pointerEvents = "none";
     else menuRef.current.style.pointerEvents = "";
@@ -1246,8 +1284,10 @@ function $d275435c250248f8$export$85ec83e04c95f50a(options) {
       }, $d275435c250248f8$var$TIMEOUT_TIME);
     };
     window.addEventListener("pointermove", onPointerMove);
+    window.addEventListener("pointerdown", onPointerDown, true);
     return () => {
       window.removeEventListener("pointermove", onPointerMove);
+      window.removeEventListener("pointerdown", onPointerDown, true);
       clearTimeout(timeout.current);
       clearTimeout(autoCloseTimeout.current);
       movementsTowardsSubmenuCount.current = $d275435c250248f8$var$ALLOWED_INVALID_MOVEMENTS;
@@ -1258,11 +1298,12 @@ function $d275435c250248f8$export$85ec83e04c95f50a(options) {
     menuRef,
     modality,
     setPreventPointerEvents,
+    onPointerDown,
     submenuRef
   ]);
 }
 function $0065b146e7192841$export$7138b0d059a6e743(props, state, ref) {
-  let { parentMenuRef, submenuRef, type = "menu", isDisabled, delay = 200 } = props;
+  let { parentMenuRef, submenuRef, type = "menu", isDisabled, delay = 200, shouldUseVirtualFocus } = props;
   let submenuTriggerId = $bdb11010cef70236$export$f680877a34711e37();
   let overlayId = $bdb11010cef70236$export$f680877a34711e37();
   let { direction } = $18f2051aff69b9bf$export$43bb16f9c6d9e3f7();
@@ -1291,26 +1332,31 @@ function $0065b146e7192841$export$7138b0d059a6e743(props, state, ref) {
     cancelOpenTimeout
   ]);
   let submenuKeyDown = (e) => {
+    if (!e.currentTarget.contains(document.activeElement)) return;
     switch (e.key) {
       case "ArrowLeft":
         if (direction === "ltr" && e.currentTarget.contains(e.target)) {
-          var _ref_current;
+          e.preventDefault();
           e.stopPropagation();
           onSubmenuClose();
-          (_ref_current = ref.current) === null || _ref_current === void 0 ? void 0 : _ref_current.focus();
+          if (!shouldUseVirtualFocus && ref.current) $7215afc6de606d6b$export$de79e2c695e052f3(ref.current);
         }
         break;
       case "ArrowRight":
         if (direction === "rtl" && e.currentTarget.contains(e.target)) {
-          var _ref_current1;
+          e.preventDefault();
           e.stopPropagation();
           onSubmenuClose();
-          (_ref_current1 = ref.current) === null || _ref_current1 === void 0 ? void 0 : _ref_current1.focus();
+          if (!shouldUseVirtualFocus && ref.current) $7215afc6de606d6b$export$de79e2c695e052f3(ref.current);
         }
         break;
       case "Escape":
-        e.stopPropagation();
-        state.closeAll();
+        var _submenuRef_current;
+        if ((_submenuRef_current = submenuRef.current) === null || _submenuRef_current === void 0 ? void 0 : _submenuRef_current.contains(e.target)) {
+          e.stopPropagation();
+          onSubmenuClose();
+          if (!shouldUseVirtualFocus && ref.current) $7215afc6de606d6b$export$de79e2c695e052f3(ref.current);
+        }
         break;
     }
   };
@@ -1330,8 +1376,9 @@ function $0065b146e7192841$export$7138b0d059a6e743(props, state, ref) {
       case "ArrowRight":
         if (!isDisabled) {
           if (direction === "ltr") {
+            e.preventDefault();
             if (!state.isOpen) onSubmenuOpen("first");
-            if (type === "menu" && !!(submenuRef === null || submenuRef === void 0 ? void 0 : submenuRef.current) && document.activeElement === (ref === null || ref === void 0 ? void 0 : ref.current)) submenuRef.current.focus();
+            if (type === "menu" && !!(submenuRef === null || submenuRef === void 0 ? void 0 : submenuRef.current) && document.activeElement === (ref === null || ref === void 0 ? void 0 : ref.current)) $7215afc6de606d6b$export$de79e2c695e052f3(submenuRef.current);
           } else if (state.isOpen) onSubmenuClose();
           else e.continuePropagation();
         }
@@ -1339,15 +1386,13 @@ function $0065b146e7192841$export$7138b0d059a6e743(props, state, ref) {
       case "ArrowLeft":
         if (!isDisabled) {
           if (direction === "rtl") {
+            e.preventDefault();
             if (!state.isOpen) onSubmenuOpen("first");
-            if (type === "menu" && !!(submenuRef === null || submenuRef === void 0 ? void 0 : submenuRef.current) && document.activeElement === (ref === null || ref === void 0 ? void 0 : ref.current)) submenuRef.current.focus();
+            if (type === "menu" && !!(submenuRef === null || submenuRef === void 0 ? void 0 : submenuRef.current) && document.activeElement === (ref === null || ref === void 0 ? void 0 : ref.current)) $7215afc6de606d6b$export$de79e2c695e052f3(submenuRef.current);
           } else if (state.isOpen) onSubmenuClose();
           else e.continuePropagation();
         }
         break;
-      case "Escape":
-        state.closeAll();
-        break;
       default:
         e.continuePropagation();
         break;
@@ -1400,7 +1445,6 @@ function $0065b146e7192841$export$7138b0d059a6e743(props, state, ref) {
     submenuProps,
     popoverProps: {
       isNonModal: true,
-      disableFocusManagement: true,
       shouldCloseOnInteractOutside
     }
   };
@@ -1412,13 +1456,13 @@ function $40df3f8667284809$export$d55e7ee900f34e93(props, ref) {
   let isRefocusing = useRef(false);
   useEffect(() => {
     if (ref.current && !ref.current.contains(document.activeElement)) {
-      $6a99195332edec8b$export$80f3e147d781571c(ref.current);
+      $3ad3f6e1647bc98d$export$80f3e147d781571c(ref.current);
       let timeout = setTimeout(() => {
         if (document.activeElement === ref.current) {
           isRefocusing.current = true;
           if (ref.current) {
             ref.current.blur();
-            $6a99195332edec8b$export$80f3e147d781571c(ref.current);
+            $3ad3f6e1647bc98d$export$80f3e147d781571c(ref.current);
           }
           isRefocusing.current = false;
         }
@@ -1653,6 +1697,7 @@ function $875d6693e12af071$var$toggleKey(set, key) {
   return res;
 }
 const $07b14b47974efb58$export$9b9a0cd73afb7ca4 = /* @__PURE__ */ createContext(null);
+const $07b14b47974efb58$var$PopoverGroupContext = /* @__PURE__ */ createContext(null);
 const $07b14b47974efb58$export$5b6b19405a83ff9d = /* @__PURE__ */ forwardRef(function Popover(props, ref) {
   [props, ref] = $64fa3d84918910a7$export$29f1550f4b0d4415(props, ref, $07b14b47974efb58$export$9b9a0cd73afb7ca4);
   let contextState = useContext($de32f1b87079253c$export$d2f961adcb0afbe);
@@ -1660,6 +1705,7 @@ const $07b14b47974efb58$export$5b6b19405a83ff9d = /* @__PURE__ */ forwardRef(fun
   let state = props.isOpen != null || props.defaultOpen != null || !contextState ? localState : contextState;
   let isExiting = $d3f049242431219c$export$45fda7c47f93fd48(ref, state.isOpen) || props.isExiting || false;
   let isHidden = $f39a9eba43920ace$export$b5d7cc18bb8d2b59();
+  let { direction } = $18f2051aff69b9bf$export$43bb16f9c6d9e3f7();
   if (isHidden) {
     let children = props.children;
     if (typeof children === "function") children = children({
@@ -1677,12 +1723,16 @@ const $07b14b47974efb58$export$5b6b19405a83ff9d = /* @__PURE__ */ forwardRef(fun
     triggerRef: props.triggerRef,
     state,
     popoverRef: ref,
-    isExiting
+    isExiting,
+    dir: direction
   });
 });
 function $07b14b47974efb58$var$PopoverInner({ state, isExiting, UNSTABLE_portalContainer, ...props }) {
   let arrowRef = useRef(null);
   let [arrowWidth, setArrowWidth] = useState(0);
+  let containerRef = useRef(null);
+  let groupCtx = useContext($07b14b47974efb58$var$PopoverGroupContext);
+  let isSubPopover = groupCtx && props.trigger === "SubmenuTrigger";
   $f0a04ccd8dbdd83b$export$e5c5a5f917a5871c(() => {
     if (arrowRef.current && state.isOpen) setArrowWidth(arrowRef.current.getBoundingClientRect().width);
   }, [
@@ -1693,7 +1743,10 @@ function $07b14b47974efb58$var$PopoverInner({ state, isExiting, UNSTABLE_portalC
   let { popoverProps, underlayProps, arrowProps, placement } = $f2f8a6077418541e$export$542a6fd13ac93354({
     ...props,
     offset: (_props_offset = props.offset) !== null && _props_offset !== void 0 ? _props_offset : 8,
-    arrowSize: arrowWidth
+    arrowSize: arrowWidth,
+    // If this is a submenu/subdialog, use the root popover's container 
+    // to detect outside interaction and add aria-hidden.
+    groupRef: isSubPopover ? groupCtx : containerRef
   }, state);
   let ref = props.popoverRef;
   let isEntering = $d3f049242431219c$export$6d3443f2c48bfc20(ref, !!placement) || props.isEntering || false;
@@ -1707,27 +1760,35 @@ function $07b14b47974efb58$var$PopoverInner({ state, isExiting, UNSTABLE_portalC
       isExiting
     }
   });
+  let shouldBeDialog = !props.isNonModal || props.trigger === "SubmenuTrigger";
+  let [isDialog, setDialog] = useState(false);
+  $f0a04ccd8dbdd83b$export$e5c5a5f917a5871c(() => {
+    if (ref.current) setDialog(shouldBeDialog && !ref.current.querySelector("[role=dialog]"));
+  }, [
+    ref,
+    shouldBeDialog
+  ]);
+  useEffect(() => {
+    if (isDialog && ref.current && !ref.current.contains(document.activeElement)) $3ad3f6e1647bc98d$export$80f3e147d781571c(ref.current);
+  }, [
+    isDialog,
+    ref
+  ]);
   let style = {
     ...popoverProps.style,
     ...renderProps.style
   };
-  return /* @__PURE__ */ React__default.createElement($337b884510726a0d$export$c6fdb837b070b4ff, {
-    ...props,
-    isExiting,
-    portalContainer: UNSTABLE_portalContainer
-  }, !props.isNonModal && state.isOpen && /* @__PURE__ */ React__default.createElement("div", {
-    "data-testid": "underlay",
-    ...underlayProps,
-    style: {
-      position: "fixed",
-      inset: 0
-    }
-  }), /* @__PURE__ */ React__default.createElement("div", {
+  let overlay = /* @__PURE__ */ React__default.createElement("div", {
     ...$3ef42575df84b30b$export$9d1611c77c2fe928($65484d02dcb7eb3e$export$457c3d6518dd4c6f(props), popoverProps),
     ...renderProps,
+    role: isDialog ? "dialog" : void 0,
+    tabIndex: isDialog ? -1 : void 0,
+    "aria-label": props["aria-label"],
+    "aria-labelledby": props["aria-labelledby"],
     ref,
     slot: props.slot || void 0,
     style,
+    dir: props.dir,
     "data-trigger": props.trigger,
     "data-placement": placement,
     "data-entering": isEntering || void 0,
@@ -1742,7 +1803,34 @@ function $07b14b47974efb58$var$PopoverInner({ state, isExiting, UNSTABLE_portalC
     }
   }, renderProps.children), /* @__PURE__ */ React__default.createElement($86ea4cb521eb2e37$export$2317d149ed6f78c4, {
     onDismiss: state.close
-  })));
+  }));
+  if (!isSubPopover) return /* @__PURE__ */ React__default.createElement($337b884510726a0d$export$c6fdb837b070b4ff, {
+    ...props,
+    shouldContainFocus: isDialog,
+    isExiting,
+    portalContainer: UNSTABLE_portalContainer
+  }, !props.isNonModal && state.isOpen && /* @__PURE__ */ React__default.createElement("div", {
+    "data-testid": "underlay",
+    ...underlayProps,
+    style: {
+      position: "fixed",
+      inset: 0
+    }
+  }), /* @__PURE__ */ React__default.createElement("div", {
+    ref: containerRef,
+    style: {
+      display: "contents"
+    }
+  }, /* @__PURE__ */ React__default.createElement($07b14b47974efb58$var$PopoverGroupContext.Provider, {
+    value: containerRef
+  }, overlay)));
+  var _ref;
+  return /* @__PURE__ */ React__default.createElement($337b884510726a0d$export$c6fdb837b070b4ff, {
+    ...props,
+    shouldContainFocus: isDialog,
+    isExiting,
+    portalContainer: (_ref = UNSTABLE_portalContainer !== null && UNSTABLE_portalContainer !== void 0 ? UNSTABLE_portalContainer : groupCtx === null || groupCtx === void 0 ? void 0 : groupCtx.current) !== null && _ref !== void 0 ? _ref : void 0
+  }, overlay);
 }
 const $63df2425e2108aa8$export$744d98a3b8a94e1c = /* @__PURE__ */ createContext({});
 const $3674c52c6b3c5bce$export$c7e742effb1c51e2 = /* @__PURE__ */ createContext(null);
@@ -1793,7 +1881,8 @@ function $3674c52c6b3c5bce$export$27d2ad3c5815583e(props) {
           placement: "bottom start",
           style: {
             "--trigger-width": buttonWidth
-          }
+          },
+          "aria-labelledby": menuProps["aria-labelledby"]
         }
       ]
     ]
@@ -1813,11 +1902,12 @@ const $3674c52c6b3c5bce$export$ecabc99eeffab7ca = /* @__PURE__ */ $e1995378a1429
   }, rootMenuTriggerState);
   let submenuRef = useRef(null);
   let itemRef = $df56164dff5785e2$export$4338b53315abf666(ref);
-  let { parentMenuRef } = useContext($3674c52c6b3c5bce$var$SubmenuTriggerContext);
+  let { parentMenuRef, shouldUseVirtualFocus } = useContext($3674c52c6b3c5bce$var$SubmenuTriggerContext);
   let { submenuTriggerProps, submenuProps, popoverProps } = $0065b146e7192841$export$7138b0d059a6e743({
     parentMenuRef,
     submenuRef,
-    delay: props.delay
+    delay: props.delay,
+    shouldUseVirtualFocus
   }, submenuTriggerState, itemRef);
   return /* @__PURE__ */ React__default.createElement($64fa3d84918910a7$export$2881499e37b75b9a, {
     values: [
@@ -1844,9 +1934,7 @@ const $3674c52c6b3c5bce$export$ecabc99eeffab7ca = /* @__PURE__ */ $e1995378a1429
           trigger: "SubmenuTrigger",
           triggerRef: itemRef,
           placement: "end top",
-          // Prevent parent popover from hiding submenu.
-          // @ts-ignore
-          "data-react-aria-top-layer": true,
+          "aria-labelledby": submenuProps["aria-labelledby"],
           ...popoverProps
         }
       ]
@@ -1860,21 +1948,21 @@ const $3674c52c6b3c5bce$export$d9b273488cd8ce6f = /* @__PURE__ */ forwardRef(fun
   [props, ref] = $64fa3d84918910a7$export$29f1550f4b0d4415(props, ref, $3674c52c6b3c5bce$export$c7e742effb1c51e2);
   return /* @__PURE__ */ React__default.createElement($e1995378a142960e$export$bf788dd355e3a401, {
     content: /* @__PURE__ */ React__default.createElement($e1995378a142960e$export$fb8073518f34e6ec, props)
-  }, (collection) => collection.size > 0 && /* @__PURE__ */ React__default.createElement($3674c52c6b3c5bce$var$MenuInner, {
+  }, (collection) => /* @__PURE__ */ React__default.createElement($3674c52c6b3c5bce$var$MenuInner, {
     props,
     collection,
     menuRef: ref
   }));
 });
 function $3674c52c6b3c5bce$var$MenuInner({ props, collection, menuRef: ref }) {
-  let { filterFn, collectionProps: autocompleteMenuProps, collectionRef } = useContext($d2f53cda644affe3$export$65d2a03b8800d6e3) || {};
+  let { filter, collectionProps: autocompleteMenuProps, collectionRef } = useContext($d2f53cda644affe3$export$65d2a03b8800d6e3) || {};
   ref = $df56164dff5785e2$export$4338b53315abf666(useMemo(() => $5dc95899b306f630$export$c9058316764c140e(ref, collectionRef !== void 0 ? collectionRef : null), [
     collectionRef,
     ref
   ]));
-  let filteredCollection = useMemo(() => filterFn ? collection.filter(filterFn) : collection, [
+  let filteredCollection = useMemo(() => filter ? collection.UNSTABLE_filter(filter) : collection, [
     collection,
-    filterFn
+    filter
   ]);
   let state = $875d6693e12af071$export$728d6ba534403756({
     ...props,
@@ -1893,14 +1981,24 @@ function $3674c52c6b3c5bce$var$MenuInner({ props, collection, menuRef: ref }) {
     defaultClassName: "react-aria-Menu",
     className: props.className,
     style: props.style,
-    values: {}
+    values: {
+      isEmpty: state.collection.size === 0
+    }
   });
+  let emptyState = null;
+  if (state.collection.size === 0 && props.renderEmptyState) emptyState = /* @__PURE__ */ React__default.createElement("div", {
+    role: "menuitem",
+    style: {
+      display: "contents"
+    }
+  }, props.renderEmptyState());
   return /* @__PURE__ */ React__default.createElement($9bf71ea28793e738$export$20e40289641fbbb6, null, /* @__PURE__ */ React__default.createElement("div", {
     ...$65484d02dcb7eb3e$export$457c3d6518dd4c6f(props),
     ...menuProps,
     ...renderProps,
     ref,
     slot: props.slot || void 0,
+    "data-empty": state.collection.size === 0 || void 0,
     onScroll: props.onScroll
   }, /* @__PURE__ */ React__default.createElement($64fa3d84918910a7$export$2881499e37b75b9a, {
     values: [
@@ -1924,23 +2022,35 @@ function $3674c52c6b3c5bce$var$MenuInner({ props, collection, menuRef: ref }) {
       [
         $3674c52c6b3c5bce$var$SubmenuTriggerContext,
         {
-          parentMenuRef: ref
+          parentMenuRef: ref,
+          shouldUseVirtualFocus: autocompleteMenuProps === null || autocompleteMenuProps === void 0 ? void 0 : autocompleteMenuProps.shouldUseVirtualFocus
         }
       ],
       [
         $3674c52c6b3c5bce$var$MenuItemContext,
         null
       ],
+      [
+        $d2f53cda644affe3$export$65d2a03b8800d6e3,
+        null
+      ],
       [
         $3674c52c6b3c5bce$var$SelectionManagerContext,
         state.selectionManager
+      ],
+      /* Ensure root MenuTriggerState is defined, in case Menu is rendered outside a MenuTrigger. */
+      /* We assume the context can never change between defined and undefined. */
+      /* eslint-disable-next-line react-hooks/rules-of-hooks */
+      [
+        $3674c52c6b3c5bce$export$795aec4671cbae19,
+        triggerState !== null && triggerState !== void 0 ? triggerState : $a28c903ee9ad8dc5$export$79fefeb1c2091ac3({})
       ]
     ]
   }, /* @__PURE__ */ React__default.createElement(CollectionRoot, {
     collection: state.collection,
     persistedKeys: $7135fc7d473fd974$export$90e00781bc59d8f9(state.selectionManager.focusedKey),
     scrollRef: ref
-  }))));
+  })), emptyState));
 }
 class $3674c52c6b3c5bce$var$GroupSelectionManager extends $d496c0a20b6e58ec$export$6c8a5aaad13c9852 {
   get focusedKey() {
@@ -2021,7 +2131,6 @@ const $3674c52c6b3c5bce$export$2ce376c2cc3355c8 = /* @__PURE__ */ $e1995378a1429
     key: item.key,
     selectionManager
   }, state, ref);
-  let { isFocusVisible, focusProps } = $f7dceffc5ad7768b$export$4e328f61c538687f();
   let { hoverProps, isHovered } = $6179b936705e76d3$export$ae780daf29e6d456({
     isDisabled: states.isDisabled
   });
@@ -2033,7 +2142,7 @@ const $3674c52c6b3c5bce$export$2ce376c2cc3355c8 = /* @__PURE__ */ $e1995378a1429
     values: {
       ...states,
       isHovered,
-      isFocusVisible,
+      isFocusVisible: states.isFocusVisible,
       selectionMode: selectionManager.selectionMode,
       selectionBehavior: selectionManager.selectionBehavior,
       hasSubmenu: !!props["aria-haspopup"],
@@ -2042,13 +2151,13 @@ const $3674c52c6b3c5bce$export$2ce376c2cc3355c8 = /* @__PURE__ */ $e1995378a1429
   });
   let ElementType = props.href ? "a" : "div";
   return /* @__PURE__ */ React__default.createElement(ElementType, {
-    ...$3ef42575df84b30b$export$9d1611c77c2fe928(menuItemProps, focusProps, hoverProps),
+    ...$3ef42575df84b30b$export$9d1611c77c2fe928(menuItemProps, hoverProps),
     ...renderProps,
     ref,
     "data-disabled": states.isDisabled || void 0,
     "data-hovered": isHovered || void 0,
     "data-focused": states.isFocused || void 0,
-    "data-focus-visible": isFocusVisible || void 0,
+    "data-focus-visible": states.isFocusVisible || void 0,
     "data-pressed": states.isPressed || void 0,
     "data-selected": states.isSelected || void 0,
     "data-selection-mode": selectionManager.selectionMode === "none" ? void 0 : selectionManager.selectionMode,
@@ -2060,6 +2169,7 @@ const $3674c52c6b3c5bce$export$2ce376c2cc3355c8 = /* @__PURE__ */ $e1995378a1429
         $514c0188e459b4c0$export$9afb8bc826b033ea,
         {
           slots: {
+            [$64fa3d84918910a7$export$c62b8e45d58ddad9]: labelProps,
             label: labelProps,
             description: descriptionProps
           }
@@ -2100,7 +2210,8 @@ function $de32f1b87079253c$export$2e1e1122cf0cba88(props) {
         $07b14b47974efb58$export$9b9a0cd73afb7ca4,
         {
           trigger: "DialogTrigger",
-          triggerRef: buttonRef
+          triggerRef: buttonRef,
+          "aria-labelledby": overlayProps["aria-labelledby"]
         }
       ]
     ]

package/dist/{FieldError-D7A6s7O5.js → FieldError-52GVSGgC.js}

@@ -1,5 +1,5 @@
-import { $ as $d191a55c9702f145$export$8467354a121f1b9f } from "./useLabel-C85N3Hzw.js";
-import { k as $bdb11010cef70236$export$b4cc09c592e8fdb8, d as $3ef42575df84b30b$export$9d1611c77c2fe928 } from "./utils-39D0mStj.js";
+import { $ as $d191a55c9702f145$export$8467354a121f1b9f } from "./useLabel-D7HkNEHT.js";
+import { j as $bdb11010cef70236$export$b4cc09c592e8fdb8, d as $3ef42575df84b30b$export$9d1611c77c2fe928 } from "./utils-DkCSC521.js";
 import { createContext } from "react";
 function $2baaea4c71418dea$export$294aa081a6c6f55d(props) {
   let { description, errorMessage, isInvalid, validationState } = props;