@ariakit/react-core 0.1.5 → 0.1.7

package/esm/__chunks/{FXC76SFN.js → OY5YT7OV.js}

@@ -4,10 +4,10 @@ import {
   groupItemsByRows,
   isItem,
   silentlyFocused
-} from "./STKLF26R.js";
+} from "./OXPV2NBK.js";
 import {
   useFocusable
-} from "./5TGAWEHD.js";
+} from "./AGWM73EZ.js";
 import {
   CompositeContext
 } from "./Z3X3QN6P.js";
@@ -15,14 +15,19 @@ import {
   createComponent,
   createElement,
   createHook
-} from "./JE5NWDDX.js";
+} from "./5ETIGB6O.js";
 import {
   useBooleanEvent,
   useEvent,
   useForkRef,
   useSafeLayoutEffect,
   useWrapElement
-} from "./B7MIN7YT.js";
+} from "./ASYR66PQ.js";
+import {
+  __objRest,
+  __spreadProps,
+  __spreadValues
+} from "./4BKCJXBM.js";
 
 // src/composite/composite.tsx
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -67,17 +72,18 @@ function canProxyKeyboardEvent(event, state) {
 }
 function useKeyboardEventProxy(store, onKeyboardEvent, previousElementRef) {
   return useEvent((event) => {
-    onKeyboardEvent?.(event);
+    var _a;
+    onKeyboardEvent == null ? void 0 : onKeyboardEvent(event);
     if (event.defaultPrevented)
       return;
     const state = store.getState();
-    const activeElement = getEnabledItem(store, state.activeId)?.element;
+    const activeElement = (_a = getEnabledItem(store, state.activeId)) == null ? void 0 : _a.element;
     if (!activeElement)
       return;
     if (!canProxyKeyboardEvent(event, state))
       return;
-    const { view, ...eventInit } = event;
-    const previousElement = previousElementRef?.current;
+    const _b = event, { view } = _b, eventInit = __objRest(_b, ["view"]);
+    const previousElement = previousElementRef == null ? void 0 : previousElementRef.current;
     if (activeElement !== previousElement) {
       activeElement.focus();
     }
@@ -101,7 +107,7 @@ function useScheduleFocus(store) {
     (state) => getEnabledItem(store, state.activeId)
   );
   useEffect(() => {
-    const activeElement = activeItem?.element;
+    const activeElement = activeItem == null ? void 0 : activeItem.element;
     if (!scheduled)
       return;
     if (!activeElement)
@@ -112,17 +118,23 @@ function useScheduleFocus(store) {
   return schedule;
 }
 var useComposite = createHook(
-  ({
-    store,
-    composite = true,
-    focusOnMove = composite,
-    moveOnKeyPress = true,
-    ...props
-  }) => {
+  (_a) => {
+    var _b = _a, {
+      store,
+      composite = true,
+      focusOnMove = composite,
+      moveOnKeyPress = true
+    } = _b, props = __objRest(_b, [
+      "store",
+      "composite",
+      "focusOnMove",
+      "moveOnKeyPress"
+    ]);
     const previousElementRef = useRef(null);
     const scheduleFocus = useScheduleFocus(store);
     const moves = store.useState("moves");
     useSafeLayoutEffect(() => {
+      var _a2;
       if (!composite)
         return;
       if (!focusOnMove)
@@ -130,7 +142,7 @@ var useComposite = createHook(
       if (!moves)
         return;
       const { activeId: activeId2 } = store.getState();
-      const itemElement = getEnabledItem(store, activeId2)?.element;
+      const itemElement = (_a2 = getEnabledItem(store, activeId2)) == null ? void 0 : _a2.element;
       if (!itemElement)
         return;
       scheduleFocus();
@@ -160,6 +172,7 @@ var useComposite = createHook(
     const activeId = store.useState("activeId");
     const virtualFocus = store.useState("virtualFocus");
     useSafeLayoutEffect(() => {
+      var _a2;
       if (!composite)
         return;
       if (!virtualFocus)
@@ -168,7 +181,7 @@ var useComposite = createHook(
       previousElementRef.current = null;
       if (!previousElement)
         return;
-      const activeElement = getEnabledItem(store, activeId)?.element;
+      const activeElement = (_a2 = getEnabledItem(store, activeId)) == null ? void 0 : _a2.element;
       const relatedTarget = activeElement || getActiveElement(previousElement);
       fireBlurEvent(previousElement, { relatedTarget });
     }, [activeId, virtualFocus, composite]);
@@ -184,7 +197,7 @@ var useComposite = createHook(
     );
     const onFocusCaptureProp = props.onFocusCapture;
     const onFocusCapture = useEvent((event) => {
-      onFocusCaptureProp?.(event);
+      onFocusCaptureProp == null ? void 0 : onFocusCaptureProp(event);
       if (event.defaultPrevented)
         return;
       const { virtualFocus: virtualFocus2 } = store.getState();
@@ -199,7 +212,7 @@ var useComposite = createHook(
     });
     const onFocusProp = props.onFocus;
     const onFocus = useEvent((event) => {
-      onFocusProp?.(event);
+      onFocusProp == null ? void 0 : onFocusProp(event);
       if (event.defaultPrevented)
         return;
       if (!composite)
@@ -216,13 +229,14 @@ var useComposite = createHook(
     });
     const onBlurCaptureProp = props.onBlurCapture;
     const onBlurCapture = useEvent((event) => {
-      onBlurCaptureProp?.(event);
+      var _a2;
+      onBlurCaptureProp == null ? void 0 : onBlurCaptureProp(event);
       if (event.defaultPrevented)
         return;
       const { virtualFocus: virtualFocus2, activeId: activeId2 } = store.getState();
       if (!virtualFocus2)
         return;
-      const activeElement = getEnabledItem(store, activeId2)?.element;
+      const activeElement = (_a2 = getEnabledItem(store, activeId2)) == null ? void 0 : _a2.element;
       const nextActiveElement = event.relatedTarget;
       const nextActiveElementIsItem = isItem(store, nextActiveElement);
       const previousElement = previousElementRef.current;
@@ -246,7 +260,7 @@ var useComposite = createHook(
     const onKeyDownProp = props.onKeyDown;
     const moveOnKeyPressProp = useBooleanEvent(moveOnKeyPress);
     const onKeyDown = useEvent((event) => {
-      onKeyDownProp?.(event);
+      onKeyDownProp == null ? void 0 : onKeyDownProp(event);
       if (event.defaultPrevented)
         return;
       if (!isSelfTarget(event))
@@ -261,7 +275,7 @@ var useComposite = createHook(
       const up = () => {
         if (grid) {
           const item = items && findFirstEnabledItemInTheLastRow(items);
-          return item?.id;
+          return item == null ? void 0 : item.id;
         }
         return store.last();
       };
@@ -292,11 +306,14 @@ var useComposite = createHook(
       [store]
     );
     const activeDescendant = store.useState(
-      (state) => state.virtualFocus ? getEnabledItem(store, state.activeId)?.id : void 0
+      (state) => {
+        var _a2;
+        return state.virtualFocus ? (_a2 = getEnabledItem(store, state.activeId)) == null ? void 0 : _a2.id : void 0;
+      }
     );
-    props = {
-      "aria-activedescendant": activeDescendant,
-      ...props,
+    props = __spreadProps(__spreadValues({
+      "aria-activedescendant": activeDescendant
+    }, props), {
       ref: useForkRef(composite ? store.setBaseElement : null, props.ref),
       onKeyDownCapture,
       onKeyUpCapture,
@@ -304,11 +321,11 @@ var useComposite = createHook(
       onFocus,
       onBlurCapture,
       onKeyDown
-    };
+    });
     const focusable = store.useState(
       (state) => composite && (state.virtualFocus || state.activeId === null)
     );
-    props = useFocusable({ focusable, ...props });
+    props = useFocusable(__spreadValues({ focusable }, props));
     return props;
   }
 );

package/esm/__chunks/{B3AF63GK.js → PIRVQZZN.js}

@@ -1,11 +1,11 @@
 import {
   useDialogDismiss
-} from "./6THLPTJO.js";
+} from "./TSWOSEC5.js";
 import {
   createComponent,
   createElement,
   createHook
-} from "./JE5NWDDX.js";
+} from "./5ETIGB6O.js";
 
 // src/popover/popover-dismiss.ts
 var usePopoverDismiss = createHook((props) => {

package/esm/__chunks/{NMA53LJC.js → POSBQXS7.js}

@@ -1,6 +1,6 @@
 import {
   useSeparator
-} from "./HOVZF3TA.js";
+} from "./KPEUI6QX.js";
 import {
   CompositeContext
 } from "./Z3X3QN6P.js";
@@ -8,13 +8,19 @@ import {
   createComponent,
   createElement,
   createHook
-} from "./JE5NWDDX.js";
+} from "./5ETIGB6O.js";
+import {
+  __objRest,
+  __spreadProps,
+  __spreadValues
+} from "./4BKCJXBM.js";
 
 // src/composite/composite-separator.ts
 import { useContext } from "react";
 import { invariant } from "@ariakit/core/utils/misc";
 var useCompositeSeparator = createHook(
-  ({ store, ...props }) => {
+  (_a) => {
+    var _b = _a, { store } = _b, props = __objRest(_b, ["store"]);
     const context = useContext(CompositeContext);
     store = store || context;
     invariant(
@@ -24,7 +30,7 @@ var useCompositeSeparator = createHook(
     const orientation = store.useState(
       (state) => state.orientation === "horizontal" ? "vertical" : "horizontal"
     );
-    props = useSeparator({ ...props, orientation });
+    props = useSeparator(__spreadProps(__spreadValues({}, props), { orientation }));
     return props;
   }
 );

package/esm/__chunks/{HS4EASQI.js → PYEPYVON.js}

@@ -5,11 +5,15 @@ import {
   createComponent,
   createElement,
   createHook
-} from "./JE5NWDDX.js";
+} from "./5ETIGB6O.js";
 import {
   useForkRef,
   useTagName
-} from "./B7MIN7YT.js";
+} from "./ASYR66PQ.js";
+import {
+  __spreadProps,
+  __spreadValues
+} from "./4BKCJXBM.js";
 
 // src/heading/heading.ts
 import { useContext, useMemo, useRef } from "react";
@@ -22,13 +26,13 @@ var useHeading = createHook((props) => {
     () => !!tagName && /^h\d$/.test(tagName),
     [tagName]
   );
-  props = {
+  props = __spreadProps(__spreadValues({
     as,
     role: !isNativeHeading ? "heading" : void 0,
-    "aria-level": !isNativeHeading ? level : void 0,
-    ...props,
+    "aria-level": !isNativeHeading ? level : void 0
+  }, props), {
     ref: useForkRef(ref, props.ref)
-  };
+  });
   return props;
 });
 var Heading = createComponent((props) => {

package/esm/__chunks/{LZKGMRGC.js → PZK3B6LX.js}

@@ -1,38 +1,49 @@
 import {
   useCompositeTypeahead
-} from "./6OCAIYRY.js";
+} from "./KSVEVAMH.js";
 import {
   SelectContext
 } from "./EEVSGAZW.js";
 import {
   useComposite
-} from "./FXC76SFN.js";
+} from "./OY5YT7OV.js";
 import {
   createComponent,
   createElement,
   createHook
-} from "./JE5NWDDX.js";
+} from "./5ETIGB6O.js";
 import {
   useBooleanEvent,
   useEvent,
   useForkRef,
   useId,
   useWrapElement
-} from "./B7MIN7YT.js";
+} from "./ASYR66PQ.js";
+import {
+  __objRest,
+  __spreadProps,
+  __spreadValues
+} from "./4BKCJXBM.js";
 
 // src/select/select-list.tsx
 import { useEffect, useRef, useState } from "react";
 import { isSelfTarget } from "@ariakit/core/utils/events";
 import { jsx } from "react/jsx-runtime";
 var useSelectList = createHook(
-  ({
-    store,
-    resetOnEscape = true,
-    hideOnEnter = true,
-    focusOnMove = true,
-    composite = true,
-    ...props
-  }) => {
+  (_a) => {
+    var _b = _a, {
+      store,
+      resetOnEscape = true,
+      hideOnEnter = true,
+      focusOnMove = true,
+      composite = true
+    } = _b, props = __objRest(_b, [
+      "store",
+      "resetOnEscape",
+      "hideOnEnter",
+      "focusOnMove",
+      "composite"
+    ]);
     const ref = useRef(null);
     const id = useId(props.id);
     const value = store.useState("value");
@@ -49,7 +60,7 @@ var useSelectList = createHook(
     const resetOnEscapeProp = useBooleanEvent(resetOnEscape);
     const hideOnEnterProp = useBooleanEvent(hideOnEnter);
     const onKeyDown = useEvent((event) => {
-      onKeyDownProp?.(event);
+      onKeyDownProp == null ? void 0 : onKeyDownProp(event);
       if (event.defaultPrevented)
         return;
       if (event.key === "Escape" && resetOnEscapeProp(event)) {
@@ -67,34 +78,36 @@ var useSelectList = createHook(
       (element) => /* @__PURE__ */ jsx(SelectContext.Provider, { value: store, children: element }),
       [store]
     );
-    const labelId = store.useState((state) => state.labelElement?.id);
-    const style = mounted ? props.style : { ...props.style, display: "none" };
+    const labelId = store.useState((state) => {
+      var _a2;
+      return (_a2 = state.labelElement) == null ? void 0 : _a2.id;
+    });
+    const style = mounted ? props.style : __spreadProps(__spreadValues({}, props.style), { display: "none" });
     if (composite) {
-      props = {
+      props = __spreadValues({
         role: "listbox",
-        "aria-multiselectable": multiSelectable ? true : void 0,
-        ...props
-      };
+        "aria-multiselectable": multiSelectable ? true : void 0
+      }, props);
     }
-    props = {
+    props = __spreadProps(__spreadValues({
       id,
       hidden: !mounted,
-      "aria-labelledby": labelId,
-      ...props,
+      "aria-labelledby": labelId
+    }, props), {
       ref: useForkRef(id ? store.setContentElement : null, ref, props.ref),
       style,
       onKeyDown
-    };
+    });
     const canFocusOnMove = store.useState(
       (state) => state.open && !state.animating && focusOnMove
     );
-    props = useComposite({
-      store,
-      ...props,
+    props = useComposite(__spreadProps(__spreadValues({
+      store
+    }, props), {
       composite,
       focusOnMove: canFocusOnMove
-    });
-    props = useCompositeTypeahead({ store, ...props });
+    }));
+    props = useCompositeTypeahead(__spreadValues({ store }, props));
     return props;
   }
 );

package/esm/__chunks/{DVR5Q5UR.js → R3XRDDO7.js}

@@ -1,11 +1,11 @@
 import {
   usePopoverHeading
-} from "./SE2URGHN.js";
+} from "./MR7KGB6U.js";
 import {
   createComponent,
   createElement,
   createHook
-} from "./JE5NWDDX.js";
+} from "./5ETIGB6O.js";
 
 // src/hovercard/hovercard-heading.ts
 var useHovercardHeading = createHook(

package/esm/__chunks/{GWYHKM6Q.js → RBUEJWRA.js}

@@ -1,59 +1,32 @@
 import {
-  useChampionDialog
-} from "./FD7UP2TJ.js";
+  assignStyle,
+  setCSSProperty
+} from "./DJESYNLE.js";
 import {
   useSafeLayoutEffect
-} from "./B7MIN7YT.js";
+} from "./ASYR66PQ.js";
 
 // src/dialog/utils/use-prevent-body-scroll.ts
 import { getDocument, getWindow } from "@ariakit/core/utils/dom";
 import { chain } from "@ariakit/core/utils/misc";
 import { isApple, isMac } from "@ariakit/core/utils/platform";
-function assignStyle(element, style) {
-  if (!element)
-    return () => {
-    };
-  const previousStyle = element.style.cssText;
-  Object.assign(element.style, style);
-  return () => {
-    element.style.cssText = previousStyle;
-  };
-}
-function setCSSProperty(element, property, value) {
-  if (!element)
-    return () => {
-    };
-  const previousValue = element.style.getPropertyValue(property);
-  element.style.setProperty(property, value);
-  return () => {
-    if (previousValue) {
-      element.style.setProperty(property, previousValue);
-    } else {
-      element.style.removeProperty(property);
-    }
-  };
-}
 function getPaddingProperty(documentElement) {
   const documentLeft = documentElement.getBoundingClientRect().left;
   const scrollbarX = Math.round(documentLeft) + documentElement.scrollLeft;
   return scrollbarX ? "paddingLeft" : "paddingRight";
 }
 function usePreventBodyScroll(store, enabled) {
-  const isChampionDialog = useChampionDialog(
-    "data-dialog-body-scroll",
-    store,
-    enabled
-  );
   useSafeLayoutEffect(() => {
-    const dialog = store.getState().contentElement;
-    if (!dialog)
+    if (!enabled)
       return;
-    if (!isChampionDialog())
+    const { contentElement } = store.getState();
+    if (!contentElement)
       return;
-    const doc = getDocument(dialog);
-    const win = getWindow(dialog);
+    const doc = getDocument(contentElement);
+    const win = getWindow(contentElement);
     const { documentElement, body } = doc;
-    const scrollbarWidth = win.innerWidth - documentElement.clientWidth;
+    const cssScrollbarWidth = documentElement.style.getPropertyValue("--scrollbar-width");
+    const scrollbarWidth = cssScrollbarWidth ? parseInt(cssScrollbarWidth) : win.innerWidth - documentElement.clientWidth;
     const setScrollbarWidthProperty = () => setCSSProperty(
       documentElement,
       "--scrollbar-width",
@@ -65,9 +38,10 @@ function usePreventBodyScroll(store, enabled) {
       [paddingProperty]: `${scrollbarWidth}px`
     });
     const setIOSStyle = () => {
+      var _a, _b;
       const { scrollX, scrollY, visualViewport } = win;
-      const offsetLeft = visualViewport?.offsetLeft ?? 0;
-      const offsetTop = visualViewport?.offsetTop ?? 0;
+      const offsetLeft = (_a = visualViewport == null ? void 0 : visualViewport.offsetLeft) != null ? _a : 0;
+      const offsetTop = (_b = visualViewport == null ? void 0 : visualViewport.offsetTop) != null ? _b : 0;
       const restoreStyle = assignStyle(body, {
         position: "fixed",
         overflow: "hidden",
@@ -88,7 +62,7 @@ function usePreventBodyScroll(store, enabled) {
       setScrollbarWidthProperty(),
       isIOS ? setIOSStyle() : setStyle()
     );
-  }, [isChampionDialog]);
+  }, [enabled]);
 }
 
 export {

package/esm/__chunks/{KTHONFWV.js → RPJS3S4B.js}

@@ -4,25 +4,30 @@ import {
 } from "./HVBRRKV4.js";
 import {
   hasExpandedMenuButton
-} from "./SJEKLK5Q.js";
+} from "./W7JXAQKF.js";
 import {
   useCompositeHover
-} from "./DRSUYUM5.js";
+} from "./UGXJ5IN7.js";
 import {
   useCompositeItem
-} from "./JOV72LYK.js";
+} from "./M32DI6TL.js";
 import {
   createElement,
   createHook,
   createMemoComponent
-} from "./JE5NWDDX.js";
+} from "./5ETIGB6O.js";
 import {
   useStoreState
-} from "./LTH56VDS.js";
+} from "./AV5WE37O.js";
 import {
   useBooleanEvent,
   useEvent
-} from "./B7MIN7YT.js";
+} from "./ASYR66PQ.js";
+import {
+  __objRest,
+  __spreadProps,
+  __spreadValues
+} from "./4BKCJXBM.js";
 
 // src/menu/menu-item.ts
 import { useContext } from "react";
@@ -30,13 +35,18 @@ import { getPopupItemRole } from "@ariakit/core/utils/dom";
 import { isDownloading, isOpeningInNewTab } from "@ariakit/core/utils/events";
 import { invariant } from "@ariakit/core/utils/misc";
 var useMenuItem = createHook(
-  ({
-    store,
-    hideOnClick = true,
-    preventScrollOnKeyDown = true,
-    focusOnHover,
-    ...props
-  }) => {
+  (_a) => {
+    var _b = _a, {
+      store,
+      hideOnClick = true,
+      preventScrollOnKeyDown = true,
+      focusOnHover
+    } = _b, props = __objRest(_b, [
+      "store",
+      "hideOnClick",
+      "preventScrollOnKeyDown",
+      "focusOnHover"
+    ]);
     const menuContext = useContext(MenuContext);
     const menuBarContext = useContext(MenuBarContext);
     store = store || menuContext || menuBarContext;
@@ -49,7 +59,7 @@ var useMenuItem = createHook(
     const hideMenu = "hideAll" in store ? store.hideAll : void 0;
     const isWithinMenu = !!hideMenu;
     const onClick = useEvent((event) => {
-      onClickProp?.(event);
+      onClickProp == null ? void 0 : onClickProp(event);
       if (event.defaultPrevented)
         return;
       if (isDownloading(event))
@@ -70,15 +80,15 @@ var useMenuItem = createHook(
       (state) => "contentElement" in state ? state.contentElement : null
     );
     const role = getPopupItemRole(contentElement, "menuitem");
-    props = {
-      role,
-      ...props,
+    props = __spreadProps(__spreadValues({
+      role
+    }, props), {
       onClick
-    };
-    props = useCompositeItem({ store, preventScrollOnKeyDown, ...props });
-    props = useCompositeHover({
-      store,
-      ...props,
+    });
+    props = useCompositeItem(__spreadValues({ store, preventScrollOnKeyDown }, props));
+    props = useCompositeHover(__spreadProps(__spreadValues({
+      store
+    }, props), {
       focusOnHover: (event) => {
         if (typeof focusOnHover === "function")
           return focusOnHover(event);
@@ -86,19 +96,19 @@ var useMenuItem = createHook(
           return focusOnHover;
         if (event.type === "mouseleave")
           return isWithinMenu;
-        const state = store?.getState();
+        const state = store == null ? void 0 : store.getState();
         if (isWithinMenu) {
           if (event.currentTarget.hasAttribute("aria-expanded")) {
             event.currentTarget.focus();
           }
           return true;
-        } else if (hasExpandedMenuButton(state?.items, event.currentTarget)) {
+        } else if (hasExpandedMenuButton(state == null ? void 0 : state.items, event.currentTarget)) {
           event.currentTarget.focus();
           return true;
         }
         return false;
       }
-    });
+    }));
     return props;
   }
 );