@ariakit/react-core 0.2.6 → 0.2.7

package/esm/__chunks/{4GMZGYHX.js → CKSO3V6B.js}

@@ -1,6 +1,6 @@
 import {
   hideElementFromAccessibilityTree
-} from "./EKB2TUKR.js";
+} from "./265D6T7T.js";
 import {
   supportsInert
 } from "./KOVUJERF.js";
@@ -8,7 +8,7 @@ import {
   assignStyle,
   setAttribute,
   setProperty
-} from "./DJESYNLE.js";
+} from "./T6V23Y6E.js";
 import {
   walkTreeOutside
 } from "./FV23EKJL.js";

package/esm/__chunks/{LMWFU6EQ.js → EMR324FL.js}

@@ -1,7 +1,7 @@
 import {
   assignStyle,
   setCSSProperty
-} from "./DJESYNLE.js";
+} from "./T6V23Y6E.js";
 import {
   useSafeLayoutEffect
 } from "./JSNCZ2E2.js";
@@ -20,8 +20,6 @@ function usePreventBodyScroll(store, enabled) {
     if (!enabled)
       return;
     const { contentElement } = store.getState();
-    if (!contentElement)
-      return;
     const doc = getDocument(contentElement);
     const win = getWindow(contentElement);
     const { documentElement, body } = doc;

package/esm/__chunks/{4OUEWDQI.js → IZU5PNP2.js}

@@ -1,27 +1,28 @@
 import {
   DialogBackdrop
-} from "./3DWMKQHI.js";
+} from "./OJHPXVNR.js";
 import {
   disableTreeOutside
-} from "./4GMZGYHX.js";
+} from "./CKSO3V6B.js";
 import {
   disableAccessibilityTreeOutside
-} from "./EKB2TUKR.js";
+} from "./265D6T7T.js";
 import {
   usePreventBodyScroll
-} from "./LMWFU6EQ.js";
+} from "./EMR324FL.js";
 import {
   useNestedDialogs
-} from "./NOIOBRWH.js";
+} from "./4D3OGBNH.js";
 import {
   useHideOnInteractOutside
-} from "./H2CSFGIT.js";
+} from "./UPKA4QN5.js";
 import {
   prependHiddenDismiss
 } from "./62DFK33R.js";
 import {
+  isElementMarked,
   markTreeOutside
-} from "./ACAQG6DN.js";
+} from "./TJKNVC7W.js";
 import {
   useFocusableContainer
 } from "./URYSNCDU.js";
@@ -229,12 +230,15 @@ var useDialog = createHook(
       const dialog = ref.current;
       const persistentElements = getPersistentElementsProp() || [];
       const allElements = [
-        // In addition to the dialog element, we also include the portal node here
-        // so nested dialogs are considered as well.
+        // In addition to the dialog element, we also include the portal node
+        // here so nested dialogs are considered as well.
         dialog,
         portalNode,
-        ...nestedDialogs,
-        ...persistentElements
+        ...persistentElements,
+        // We still need to include nested dialogs here because they may be
+        // outside the portal node or the parent dialog may not be using a
+        // portal.
+        ...nestedDialogs.map((dialog2) => dialog2.getState().contentElement)
       ];
       if (!shouldDisableAccessibilityTree) {
         return markTreeOutside(id, disclosureElement, ...allElements);
@@ -368,6 +372,8 @@ var useDialog = createHook(
         const dialog = ref.current;
         if (!dialog)
           return;
+        if (isElementMarked(dialog))
+          return;
         const target = event.target;
         if (!target)
           return;
@@ -387,7 +393,6 @@ var useDialog = createHook(
           return;
         if (!hideOnEscapeProp(event))
           return;
-        event.stopImmediatePropagation();
         store.hide();
       };
       return addGlobalEventListener("keydown", onKeyDown);

package/esm/__chunks/{3DWMKQHI.js → OJHPXVNR.js}

@@ -1,6 +1,6 @@
 import {
   markAncestor
-} from "./ACAQG6DN.js";
+} from "./TJKNVC7W.js";
 import {
   Role
 } from "./R35SLIEE.js";
@@ -58,13 +58,15 @@ function DialogBackdrop({
   backdropProps = isValidElement(backdrop) ? __spreadValues(__spreadValues({
     ref: "ref" in backdrop ? backdrop.ref : void 0
   }, backdrop.props), backdropProps) : backdropProps;
+  if (hidden != null) {
+    backdropProps = __spreadProps(__spreadValues({}, backdropProps), { hidden });
+  }
   const props = useDisclosureContent(__spreadProps(__spreadValues({
     store,
     id: void 0,
     role: "presentation",
     "data-backdrop": (contentElement == null ? void 0 : contentElement.id) || "",
-    alwaysVisible,
-    hidden
+    alwaysVisible
   }, backdropProps), {
     ref: useForkRef(backdropProps == null ? void 0 : backdropProps.ref, ref),
     style: __spreadValues({

package/esm/__chunks/T6V23Y6E.js

@@ -0,0 +1,96 @@
+// src/dialog/utils/orchestrate.ts
+var cleanups = Symbol();
+function orchestrate(element, key, setup) {
+  if (!element[cleanups]) {
+    element[cleanups] = /* @__PURE__ */ new Map();
+  }
+  const elementCleanups = element[cleanups];
+  const prevCleanup = elementCleanups.get(key);
+  if (!prevCleanup) {
+    elementCleanups.set(key, setup());
+    return () => {
+      var _a;
+      (_a = elementCleanups.get(key)) == null ? void 0 : _a();
+      elementCleanups.delete(key);
+    };
+  }
+  const cleanup = setup();
+  const nextCleanup = () => {
+    cleanup();
+    prevCleanup();
+    elementCleanups.delete(key);
+  };
+  elementCleanups.set(key, nextCleanup);
+  return () => {
+    if (elementCleanups.get(key) !== nextCleanup)
+      return;
+    cleanup();
+    elementCleanups.set(key, prevCleanup);
+  };
+}
+function setAttribute(element, attr, value) {
+  const setup = () => {
+    const previousValue = element.getAttribute(attr);
+    element.setAttribute(attr, value);
+    return () => {
+      if (previousValue == null) {
+        element.removeAttribute(attr);
+      } else {
+        element.setAttribute(attr, previousValue);
+      }
+    };
+  };
+  return orchestrate(element, attr, setup);
+}
+function setProperty(element, property, value) {
+  const setup = () => {
+    const exists = property in element;
+    const previousValue = element[property];
+    element[property] = value;
+    return () => {
+      if (!exists) {
+        delete element[property];
+      } else {
+        element[property] = previousValue;
+      }
+    };
+  };
+  return orchestrate(element, property, setup);
+}
+function assignStyle(element, style) {
+  if (!element)
+    return () => {
+    };
+  const setup = () => {
+    const prevStyle = element.style.cssText;
+    Object.assign(element.style, style);
+    return () => {
+      element.style.cssText = prevStyle;
+    };
+  };
+  return orchestrate(element, "style", setup);
+}
+function setCSSProperty(element, property, value) {
+  if (!element)
+    return () => {
+    };
+  const setup = () => {
+    const previousValue = element.style.getPropertyValue(property);
+    element.style.setProperty(property, value);
+    return () => {
+      if (previousValue) {
+        element.style.setProperty(property, previousValue);
+      } else {
+        element.style.removeProperty(property);
+      }
+    };
+  };
+  return orchestrate(element, property, setup);
+}
+
+export {
+  setAttribute,
+  setProperty,
+  assignStyle,
+  setCSSProperty
+};

package/esm/__chunks/{ACAQG6DN.js → TJKNVC7W.js}

@@ -1,6 +1,6 @@
 import {
   setProperty
-} from "./DJESYNLE.js";
+} from "./T6V23Y6E.js";
 import {
   walkTreeOutside
 } from "./FV23EKJL.js";

package/esm/__chunks/{H2CSFGIT.js → UPKA4QN5.js}

@@ -1,6 +1,6 @@
 import {
   isElementMarked
-} from "./ACAQG6DN.js";
+} from "./TJKNVC7W.js";
 import {
   usePreviousMouseDownRef
 } from "./7JNF6I52.js";

package/esm/combobox/combobox-popover.js

@@ -4,18 +4,18 @@ import {
 import "../__chunks/5VGBBGF5.js";
 import {
   usePopover
-} from "../__chunks/ZWS67PVZ.js";
-import "../__chunks/4OUEWDQI.js";
-import "../__chunks/3DWMKQHI.js";
-import "../__chunks/4GMZGYHX.js";
-import "../__chunks/EKB2TUKR.js";
-import "../__chunks/LMWFU6EQ.js";
-import "../__chunks/NOIOBRWH.js";
-import "../__chunks/H2CSFGIT.js";
+} from "../__chunks/4V6VYUH3.js";
+import "../__chunks/IZU5PNP2.js";
+import "../__chunks/OJHPXVNR.js";
+import "../__chunks/CKSO3V6B.js";
+import "../__chunks/265D6T7T.js";
+import "../__chunks/EMR324FL.js";
+import "../__chunks/4D3OGBNH.js";
+import "../__chunks/UPKA4QN5.js";
 import "../__chunks/KOVUJERF.js";
 import "../__chunks/62DFK33R.js";
-import "../__chunks/ACAQG6DN.js";
-import "../__chunks/DJESYNLE.js";
+import "../__chunks/TJKNVC7W.js";
+import "../__chunks/T6V23Y6E.js";
 import "../__chunks/URYSNCDU.js";
 import "../__chunks/FV23EKJL.js";
 import "../__chunks/7JNF6I52.js";

package/esm/composite/composite-overflow.js

@@ -1,17 +1,17 @@
 import {
   usePopover
-} from "../__chunks/ZWS67PVZ.js";
-import "../__chunks/4OUEWDQI.js";
-import "../__chunks/3DWMKQHI.js";
-import "../__chunks/4GMZGYHX.js";
-import "../__chunks/EKB2TUKR.js";
-import "../__chunks/LMWFU6EQ.js";
-import "../__chunks/NOIOBRWH.js";
-import "../__chunks/H2CSFGIT.js";
+} from "../__chunks/4V6VYUH3.js";
+import "../__chunks/IZU5PNP2.js";
+import "../__chunks/OJHPXVNR.js";
+import "../__chunks/CKSO3V6B.js";
+import "../__chunks/265D6T7T.js";
+import "../__chunks/EMR324FL.js";
+import "../__chunks/4D3OGBNH.js";
+import "../__chunks/UPKA4QN5.js";
 import "../__chunks/KOVUJERF.js";
 import "../__chunks/62DFK33R.js";
-import "../__chunks/ACAQG6DN.js";
-import "../__chunks/DJESYNLE.js";
+import "../__chunks/TJKNVC7W.js";
+import "../__chunks/T6V23Y6E.js";
 import "../__chunks/URYSNCDU.js";
 import "../__chunks/FV23EKJL.js";
 import "../__chunks/7JNF6I52.js";

package/esm/dialog/dialog-backdrop.js

@@ -1,8 +1,8 @@
 import {
   DialogBackdrop
-} from "../__chunks/3DWMKQHI.js";
-import "../__chunks/ACAQG6DN.js";
-import "../__chunks/DJESYNLE.js";
+} from "../__chunks/OJHPXVNR.js";
+import "../__chunks/TJKNVC7W.js";
+import "../__chunks/T6V23Y6E.js";
 import "../__chunks/FV23EKJL.js";
 import "../__chunks/R35SLIEE.js";
 import "../__chunks/YJZ2FEUT.js";

package/esm/dialog/dialog.js

@@ -1,17 +1,17 @@
 import {
   Dialog,
   useDialog
-} from "../__chunks/4OUEWDQI.js";
-import "../__chunks/3DWMKQHI.js";
-import "../__chunks/4GMZGYHX.js";
-import "../__chunks/EKB2TUKR.js";
-import "../__chunks/LMWFU6EQ.js";
-import "../__chunks/NOIOBRWH.js";
-import "../__chunks/H2CSFGIT.js";
+} from "../__chunks/IZU5PNP2.js";
+import "../__chunks/OJHPXVNR.js";
+import "../__chunks/CKSO3V6B.js";
+import "../__chunks/265D6T7T.js";
+import "../__chunks/EMR324FL.js";
+import "../__chunks/4D3OGBNH.js";
+import "../__chunks/UPKA4QN5.js";
 import "../__chunks/KOVUJERF.js";
 import "../__chunks/62DFK33R.js";
-import "../__chunks/ACAQG6DN.js";
-import "../__chunks/DJESYNLE.js";
+import "../__chunks/TJKNVC7W.js";
+import "../__chunks/T6V23Y6E.js";
 import "../__chunks/URYSNCDU.js";
 import "../__chunks/FV23EKJL.js";
 import "../__chunks/7JNF6I52.js";

package/esm/dialog/utils/disable-accessibility-tree-outside.js

@@ -1,8 +1,8 @@
 import {
   disableAccessibilityTreeOutside,
   hideElementFromAccessibilityTree
-} from "../../__chunks/EKB2TUKR.js";
-import "../../__chunks/DJESYNLE.js";
+} from "../../__chunks/265D6T7T.js";
+import "../../__chunks/T6V23Y6E.js";
 import "../../__chunks/FV23EKJL.js";
 import "../../__chunks/4BKCJXBM.js";
 export {

package/esm/dialog/utils/disable-tree-outside.js

@@ -1,9 +1,9 @@
 import {
   disableTreeOutside
-} from "../../__chunks/4GMZGYHX.js";
-import "../../__chunks/EKB2TUKR.js";
+} from "../../__chunks/CKSO3V6B.js";
+import "../../__chunks/265D6T7T.js";
 import "../../__chunks/KOVUJERF.js";
-import "../../__chunks/DJESYNLE.js";
+import "../../__chunks/T6V23Y6E.js";
 import "../../__chunks/FV23EKJL.js";
 import "../../__chunks/4BKCJXBM.js";
 export {

package/esm/dialog/utils/mark-tree-outside.js

@@ -3,8 +3,8 @@ import {
   markAncestor,
   markElement,
   markTreeOutside
-} from "../../__chunks/ACAQG6DN.js";
-import "../../__chunks/DJESYNLE.js";
+} from "../../__chunks/TJKNVC7W.js";
+import "../../__chunks/T6V23Y6E.js";
 import "../../__chunks/FV23EKJL.js";
 import "../../__chunks/4BKCJXBM.js";
 export {

package/esm/dialog/utils/orchestrate.d.ts

@@ -1,6 +1,6 @@
-declare const setups: unique symbol;
+declare const cleanups: unique symbol;
 type Element$ = Element & {
-    [setups]?: Map<string, () => void>;
+    [cleanups]?: Map<string, () => void>;
 };
 export declare function setAttribute(element: Element$, attr: string, value: string): () => void;
 export declare function setProperty<T extends Element$, K extends keyof T & string>(element: T, property: K, value: T[K]): () => void;

package/esm/dialog/utils/orchestrate.js

@@ -3,7 +3,7 @@ import {
   setAttribute,
   setCSSProperty,
   setProperty
-} from "../../__chunks/DJESYNLE.js";
+} from "../../__chunks/T6V23Y6E.js";
 import "../../__chunks/4BKCJXBM.js";
 export {
   assignStyle,

package/esm/dialog/utils/use-hide-on-interact-outside.js

@@ -1,8 +1,8 @@
 import {
   useHideOnInteractOutside
-} from "../../__chunks/H2CSFGIT.js";
-import "../../__chunks/ACAQG6DN.js";
-import "../../__chunks/DJESYNLE.js";
+} from "../../__chunks/UPKA4QN5.js";
+import "../../__chunks/TJKNVC7W.js";
+import "../../__chunks/T6V23Y6E.js";
 import "../../__chunks/FV23EKJL.js";
 import "../../__chunks/7JNF6I52.js";
 import "../../__chunks/JSNCZ2E2.js";

package/esm/dialog/utils/use-nested-dialogs.d.ts

@@ -2,5 +2,5 @@ import type { WrapElement } from "../../utils/types.js";
 import type { DialogStore } from "../dialog-store.js";
 export declare function useNestedDialogs(store: DialogStore): {
     wrapElement: WrapElement;
-    nestedDialogs: HTMLElement[];
+    nestedDialogs: DialogStore[];
 };

package/esm/dialog/utils/use-nested-dialogs.js

@@ -1,6 +1,6 @@
 import {
   useNestedDialogs
-} from "../../__chunks/NOIOBRWH.js";
+} from "../../__chunks/4D3OGBNH.js";
 import "../../__chunks/JSNCZ2E2.js";
 import "../../__chunks/SXC6BPOF.js";
 import "../../__chunks/4BKCJXBM.js";

package/esm/dialog/utils/use-prevent-body-scroll.js

@@ -1,7 +1,7 @@
 import {
   usePreventBodyScroll
-} from "../../__chunks/LMWFU6EQ.js";
-import "../../__chunks/DJESYNLE.js";
+} from "../../__chunks/EMR324FL.js";
+import "../../__chunks/T6V23Y6E.js";
 import "../../__chunks/JSNCZ2E2.js";
 import "../../__chunks/SXC6BPOF.js";
 import "../../__chunks/4BKCJXBM.js";

package/esm/hovercard/hovercard.js

@@ -1,20 +1,20 @@
 import {
   Hovercard,
   useHovercard
-} from "../__chunks/HIZJQGB5.js";
+} from "../__chunks/5VTQ6DZF.js";
 import "../__chunks/X7FKJQME.js";
-import "../__chunks/ZWS67PVZ.js";
-import "../__chunks/4OUEWDQI.js";
-import "../__chunks/3DWMKQHI.js";
-import "../__chunks/4GMZGYHX.js";
-import "../__chunks/EKB2TUKR.js";
-import "../__chunks/LMWFU6EQ.js";
-import "../__chunks/NOIOBRWH.js";
-import "../__chunks/H2CSFGIT.js";
+import "../__chunks/4V6VYUH3.js";
+import "../__chunks/IZU5PNP2.js";
+import "../__chunks/OJHPXVNR.js";
+import "../__chunks/CKSO3V6B.js";
+import "../__chunks/265D6T7T.js";
+import "../__chunks/EMR324FL.js";
+import "../__chunks/4D3OGBNH.js";
+import "../__chunks/UPKA4QN5.js";
 import "../__chunks/KOVUJERF.js";
 import "../__chunks/62DFK33R.js";
-import "../__chunks/ACAQG6DN.js";
-import "../__chunks/DJESYNLE.js";
+import "../__chunks/TJKNVC7W.js";
+import "../__chunks/T6V23Y6E.js";
 import "../__chunks/URYSNCDU.js";
 import "../__chunks/FV23EKJL.js";
 import "../__chunks/7JNF6I52.js";

package/esm/menu/menu.js

@@ -11,20 +11,20 @@ import "../__chunks/OXPV2NBK.js";
 import "../__chunks/Z3X3QN6P.js";
 import {
   useHovercard
-} from "../__chunks/HIZJQGB5.js";
+} from "../__chunks/5VTQ6DZF.js";
 import "../__chunks/X7FKJQME.js";
-import "../__chunks/ZWS67PVZ.js";
-import "../__chunks/4OUEWDQI.js";
-import "../__chunks/3DWMKQHI.js";
-import "../__chunks/4GMZGYHX.js";
-import "../__chunks/EKB2TUKR.js";
-import "../__chunks/LMWFU6EQ.js";
-import "../__chunks/NOIOBRWH.js";
-import "../__chunks/H2CSFGIT.js";
+import "../__chunks/4V6VYUH3.js";
+import "../__chunks/IZU5PNP2.js";
+import "../__chunks/OJHPXVNR.js";
+import "../__chunks/CKSO3V6B.js";
+import "../__chunks/265D6T7T.js";
+import "../__chunks/EMR324FL.js";
+import "../__chunks/4D3OGBNH.js";
+import "../__chunks/UPKA4QN5.js";
 import "../__chunks/KOVUJERF.js";
 import "../__chunks/62DFK33R.js";
-import "../__chunks/ACAQG6DN.js";
-import "../__chunks/DJESYNLE.js";
+import "../__chunks/TJKNVC7W.js";
+import "../__chunks/T6V23Y6E.js";
 import "../__chunks/URYSNCDU.js";
 import "../__chunks/FV23EKJL.js";
 import "../__chunks/7JNF6I52.js";

package/esm/popover/popover.js

@@ -1,18 +1,18 @@
 import {
   Popover,
   usePopover
-} from "../__chunks/ZWS67PVZ.js";
-import "../__chunks/4OUEWDQI.js";
-import "../__chunks/3DWMKQHI.js";
-import "../__chunks/4GMZGYHX.js";
-import "../__chunks/EKB2TUKR.js";
-import "../__chunks/LMWFU6EQ.js";
-import "../__chunks/NOIOBRWH.js";
-import "../__chunks/H2CSFGIT.js";
+} from "../__chunks/4V6VYUH3.js";
+import "../__chunks/IZU5PNP2.js";
+import "../__chunks/OJHPXVNR.js";
+import "../__chunks/CKSO3V6B.js";
+import "../__chunks/265D6T7T.js";
+import "../__chunks/EMR324FL.js";
+import "../__chunks/4D3OGBNH.js";
+import "../__chunks/UPKA4QN5.js";
 import "../__chunks/KOVUJERF.js";
 import "../__chunks/62DFK33R.js";
-import "../__chunks/ACAQG6DN.js";
-import "../__chunks/DJESYNLE.js";
+import "../__chunks/TJKNVC7W.js";
+import "../__chunks/T6V23Y6E.js";
 import "../__chunks/URYSNCDU.js";
 import "../__chunks/FV23EKJL.js";
 import "../__chunks/7JNF6I52.js";

package/esm/select/select-popover.js

@@ -8,18 +8,18 @@ import "../__chunks/OXPV2NBK.js";
 import "../__chunks/Z3X3QN6P.js";
 import {
   usePopover
-} from "../__chunks/ZWS67PVZ.js";
-import "../__chunks/4OUEWDQI.js";
-import "../__chunks/3DWMKQHI.js";
-import "../__chunks/4GMZGYHX.js";
-import "../__chunks/EKB2TUKR.js";
-import "../__chunks/LMWFU6EQ.js";
-import "../__chunks/NOIOBRWH.js";
-import "../__chunks/H2CSFGIT.js";
+} from "../__chunks/4V6VYUH3.js";
+import "../__chunks/IZU5PNP2.js";
+import "../__chunks/OJHPXVNR.js";
+import "../__chunks/CKSO3V6B.js";
+import "../__chunks/265D6T7T.js";
+import "../__chunks/EMR324FL.js";
+import "../__chunks/4D3OGBNH.js";
+import "../__chunks/UPKA4QN5.js";
 import "../__chunks/KOVUJERF.js";
 import "../__chunks/62DFK33R.js";
-import "../__chunks/ACAQG6DN.js";
-import "../__chunks/DJESYNLE.js";
+import "../__chunks/TJKNVC7W.js";
+import "../__chunks/T6V23Y6E.js";
 import "../__chunks/URYSNCDU.js";
 import "../__chunks/FV23EKJL.js";
 import "../__chunks/7JNF6I52.js";

package/esm/tooltip/tooltip.js

@@ -1,19 +1,19 @@
 import {
   useHovercard
-} from "../__chunks/HIZJQGB5.js";
+} from "../__chunks/5VTQ6DZF.js";
 import "../__chunks/X7FKJQME.js";
-import "../__chunks/ZWS67PVZ.js";
-import "../__chunks/4OUEWDQI.js";
-import "../__chunks/3DWMKQHI.js";
-import "../__chunks/4GMZGYHX.js";
-import "../__chunks/EKB2TUKR.js";
-import "../__chunks/LMWFU6EQ.js";
-import "../__chunks/NOIOBRWH.js";
-import "../__chunks/H2CSFGIT.js";
+import "../__chunks/4V6VYUH3.js";
+import "../__chunks/IZU5PNP2.js";
+import "../__chunks/OJHPXVNR.js";
+import "../__chunks/CKSO3V6B.js";
+import "../__chunks/265D6T7T.js";
+import "../__chunks/EMR324FL.js";
+import "../__chunks/4D3OGBNH.js";
+import "../__chunks/UPKA4QN5.js";
 import "../__chunks/KOVUJERF.js";
 import "../__chunks/62DFK33R.js";
-import "../__chunks/ACAQG6DN.js";
-import "../__chunks/DJESYNLE.js";
+import "../__chunks/TJKNVC7W.js";
+import "../__chunks/T6V23Y6E.js";
 import "../__chunks/URYSNCDU.js";
 import "../__chunks/FV23EKJL.js";
 import "../__chunks/7JNF6I52.js";