@ariakit/core 0.4.10 → 0.4.12

package/cjs/utils/dom.cjs

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
 
@@ -17,9 +17,9 @@
 
 
 
+var _WCFMOJKVcjs = require('../__chunks/WCFMOJKV.cjs');
+require('../__chunks/7EQBAZ46.cjs');
 
-var _7WYII4ANcjs = require('../__chunks/7WYII4AN.cjs');
-require('../__chunks/3IVNQNIV.cjs');
 
 
 
@@ -38,5 +38,4 @@ require('../__chunks/3IVNQNIV.cjs');
 
 
 
-
-exports.canUseDOM = _7WYII4ANcjs.canUseDOM; exports.contains = _7WYII4ANcjs.contains; exports.getActiveElement = _7WYII4ANcjs.getActiveElement; exports.getDocument = _7WYII4ANcjs.getDocument; exports.getPopupItemRole = _7WYII4ANcjs.getPopupItemRole; exports.getPopupRole = _7WYII4ANcjs.getPopupRole; exports.getScrollingElement = _7WYII4ANcjs.getScrollingElement; exports.getTextboxSelection = _7WYII4ANcjs.getTextboxSelection; exports.getTextboxValue = _7WYII4ANcjs.getTextboxValue; exports.getWindow = _7WYII4ANcjs.getWindow; exports.isButton = _7WYII4ANcjs.isButton; exports.isFrame = _7WYII4ANcjs.isFrame; exports.isPartiallyHidden = _7WYII4ANcjs.isPartiallyHidden; exports.isTextField = _7WYII4ANcjs.isTextField; exports.isTextbox = _7WYII4ANcjs.isTextbox; exports.isVisible = _7WYII4ANcjs.isVisible; exports.scrollIntoViewIfNeeded = _7WYII4ANcjs.scrollIntoViewIfNeeded; exports.setSelectionRange = _7WYII4ANcjs.setSelectionRange;
+exports.canUseDOM = _WCFMOJKVcjs.canUseDOM; exports.contains = _WCFMOJKVcjs.contains; exports.getActiveElement = _WCFMOJKVcjs.getActiveElement; exports.getDocument = _WCFMOJKVcjs.getDocument; exports.getPopupItemRole = _WCFMOJKVcjs.getPopupItemRole; exports.getPopupRole = _WCFMOJKVcjs.getPopupRole; exports.getScrollingElement = _WCFMOJKVcjs.getScrollingElement; exports.getTextboxSelection = _WCFMOJKVcjs.getTextboxSelection; exports.getTextboxValue = _WCFMOJKVcjs.getTextboxValue; exports.getWindow = _WCFMOJKVcjs.getWindow; exports.isButton = _WCFMOJKVcjs.isButton; exports.isFrame = _WCFMOJKVcjs.isFrame; exports.isPartiallyHidden = _WCFMOJKVcjs.isPartiallyHidden; exports.isTextField = _WCFMOJKVcjs.isTextField; exports.isTextbox = _WCFMOJKVcjs.isTextbox; exports.isVisible = _WCFMOJKVcjs.isVisible; exports.scrollIntoViewIfNeeded = _WCFMOJKVcjs.scrollIntoViewIfNeeded; exports.setSelectionRange = _WCFMOJKVcjs.setSelectionRange;

package/cjs/utils/events.cjs

@@ -1,19 +1,18 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
+var _TEPPO3KCcjs = require('../__chunks/TEPPO3KC.cjs');
 
-var _KCEXELK7cjs = require('../__chunks/KCEXELK7.cjs');
 
+var _WCFMOJKVcjs = require('../__chunks/WCFMOJKV.cjs');
 
-var _7WYII4ANcjs = require('../__chunks/7WYII4AN.cjs');
 
 
-
-var _3IVNQNIVcjs = require('../__chunks/3IVNQNIV.cjs');
+var _7EQBAZ46cjs = require('../__chunks/7EQBAZ46.cjs');
 
 // src/utils/events.ts
 function isPortalEvent(event) {
   return Boolean(
-    event.currentTarget && !_7WYII4ANcjs.contains.call(void 0, event.currentTarget, event.target)
+    event.currentTarget && !_WCFMOJKVcjs.contains.call(void 0, event.currentTarget, event.target)
   );
 }
 function isSelfTarget(event) {
@@ -22,7 +21,7 @@ function isSelfTarget(event) {
 function isOpeningInNewTab(event) {
   const element = event.currentTarget;
   if (!element) return false;
-  const isAppleDevice = _KCEXELK7cjs.isApple.call(void 0, );
+  const isAppleDevice = _TEPPO3KCcjs.isApple.call(void 0, );
   if (isAppleDevice && !event.metaKey) return false;
   if (!isAppleDevice && !event.ctrlKey) return false;
   const tagName = element.tagName.toLowerCase();
@@ -48,14 +47,14 @@ function fireEvent(element, type, eventInit) {
 function fireBlurEvent(element, eventInit) {
   const event = new FocusEvent("blur", eventInit);
   const defaultAllowed = element.dispatchEvent(event);
-  const bubbleInit = _3IVNQNIVcjs.__spreadProps.call(void 0, _3IVNQNIVcjs.__spreadValues.call(void 0, {}, eventInit), { bubbles: true });
+  const bubbleInit = _7EQBAZ46cjs.__spreadProps.call(void 0, _7EQBAZ46cjs.__spreadValues.call(void 0, {}, eventInit), { bubbles: true });
   element.dispatchEvent(new FocusEvent("focusout", bubbleInit));
   return defaultAllowed;
 }
 function fireFocusEvent(element, eventInit) {
   const event = new FocusEvent("focus", eventInit);
   const defaultAllowed = element.dispatchEvent(event);
-  const bubbleInit = _3IVNQNIVcjs.__spreadProps.call(void 0, _3IVNQNIVcjs.__spreadValues.call(void 0, {}, eventInit), { bubbles: true });
+  const bubbleInit = _7EQBAZ46cjs.__spreadProps.call(void 0, _7EQBAZ46cjs.__spreadValues.call(void 0, {}, eventInit), { bubbles: true });
   element.dispatchEvent(new FocusEvent("focusin", bubbleInit));
   return defaultAllowed;
 }
@@ -70,7 +69,7 @@ function fireClickEvent(element, eventInit) {
 function isFocusEventOutside(event, container) {
   const containerElement = container || event.currentTarget;
   const relatedTarget = event.relatedTarget;
-  return !relatedTarget || !_7WYII4ANcjs.contains.call(void 0, containerElement, relatedTarget);
+  return !relatedTarget || !_WCFMOJKVcjs.contains.call(void 0, containerElement, relatedTarget);
 }
 function getInputType(event) {
   const nativeEvent = "nativeEvent" in event ? event.nativeEvent : event;

package/cjs/utils/focus.cjs

@@ -1,13 +1,12 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
 
 
+var _WCFMOJKVcjs = require('../__chunks/WCFMOJKV.cjs');
 
-var _7WYII4ANcjs = require('../__chunks/7WYII4AN.cjs');
 
-
-var _3IVNQNIVcjs = require('../__chunks/3IVNQNIV.cjs');
+var _7EQBAZ46cjs = require('../__chunks/7EQBAZ46.cjs');
 
 // src/utils/focus.ts
 var selector = "input:not([type='hidden']):not([disabled]), select:not([disabled]), textarea:not([disabled]), a[href], button:not([disabled]), [tabindex], summary, iframe, object, embed, area[href], audio[controls], video[controls], [contenteditable]:not([contenteditable='false'])";
@@ -17,7 +16,7 @@ function hasNegativeTabIndex(element) {
 }
 function isFocusable(element) {
   if (!element.matches(selector)) return false;
-  if (!_7WYII4ANcjs.isVisible.call(void 0, element)) return false;
+  if (!_WCFMOJKVcjs.isVisible.call(void 0, element)) return false;
   if (element.closest("[inert]")) return false;
   return true;
 }
@@ -31,7 +30,7 @@ function isTabbable(element) {
   const radioGroup = element.form.elements.namedItem(element.name);
   if (!radioGroup) return true;
   if (!("length" in radioGroup)) return true;
-  const activeElement = _7WYII4ANcjs.getActiveElement.call(void 0, element);
+  const activeElement = _WCFMOJKVcjs.getActiveElement.call(void 0, element);
   if (!activeElement) return true;
   if (activeElement === element) return true;
   if (!("form" in activeElement)) return true;
@@ -48,7 +47,7 @@ function getAllFocusableIn(container, includeContainer) {
   }
   const focusableElements = elements.filter(isFocusable);
   focusableElements.forEach((element, i) => {
-    if (_7WYII4ANcjs.isFrame.call(void 0, element) && element.contentDocument) {
+    if (_WCFMOJKVcjs.isFrame.call(void 0, element) && element.contentDocument) {
       const frameBody = element.contentDocument.body;
       focusableElements.splice(i, 1, ...getAllFocusableIn(frameBody));
     }
@@ -74,7 +73,7 @@ function getAllTabbableIn(container, includeContainer, fallbackToFocusable) {
     tabbableElements.unshift(container);
   }
   tabbableElements.forEach((element, i) => {
-    if (_7WYII4ANcjs.isFrame.call(void 0, element) && element.contentDocument) {
+    if (_WCFMOJKVcjs.isFrame.call(void 0, element) && element.contentDocument) {
       const frameBody = element.contentDocument.body;
       const allFrameTabbable = getAllTabbableIn(
         frameBody,
@@ -115,7 +114,7 @@ function getLastTabbable(fallbackToFocusable) {
   return getLastTabbableIn(document.body, false, fallbackToFocusable);
 }
 function getNextTabbableIn(container, includeContainer, fallbackToFirst, fallbackToFocusable) {
-  const activeElement = _7WYII4ANcjs.getActiveElement.call(void 0, container);
+  const activeElement = _WCFMOJKVcjs.getActiveElement.call(void 0, container);
   const allFocusable = getAllFocusableIn(container, includeContainer);
   const activeIndex = allFocusable.indexOf(activeElement);
   const nextFocusableElements = allFocusable.slice(activeIndex + 1);
@@ -130,7 +129,7 @@ function getNextTabbable(fallbackToFirst, fallbackToFocusable) {
   );
 }
 function getPreviousTabbableIn(container, includeContainer, fallbackToLast, fallbackToFocusable) {
-  const activeElement = _7WYII4ANcjs.getActiveElement.call(void 0, container);
+  const activeElement = _WCFMOJKVcjs.getActiveElement.call(void 0, container);
   const allFocusable = getAllFocusableIn(container, includeContainer).reverse();
   const activeIndex = allFocusable.indexOf(activeElement);
   const previousFocusableElements = allFocusable.slice(activeIndex + 1);
@@ -151,7 +150,7 @@ function getClosestFocusable(element) {
   return element || null;
 }
 function hasFocus(element) {
-  const activeElement = _7WYII4ANcjs.getActiveElement.call(void 0, element);
+  const activeElement = _WCFMOJKVcjs.getActiveElement.call(void 0, element);
   if (!activeElement) return false;
   if (activeElement === element) return true;
   const activeDescendant = activeElement.getAttribute("aria-activedescendant");
@@ -159,9 +158,9 @@ function hasFocus(element) {
   return activeDescendant === element.id;
 }
 function hasFocusWithin(element) {
-  const activeElement = _7WYII4ANcjs.getActiveElement.call(void 0, element);
+  const activeElement = _WCFMOJKVcjs.getActiveElement.call(void 0, element);
   if (!activeElement) return false;
-  if (_7WYII4ANcjs.contains.call(void 0, element, activeElement)) return true;
+  if (_WCFMOJKVcjs.contains.call(void 0, element, activeElement)) return true;
   const activeDescendant = activeElement.getAttribute("aria-activedescendant");
   if (!activeDescendant) return false;
   if (!("id" in element)) return false;
@@ -208,7 +207,7 @@ function focusIntoView(element, options) {
     element.focus();
   } else {
     element.focus({ preventScroll: true });
-    element.scrollIntoView(_3IVNQNIVcjs.__spreadValues.call(void 0, { block: "nearest", inline: "nearest" }, options));
+    element.scrollIntoView(_7EQBAZ46cjs.__spreadValues.call(void 0, { block: "nearest", inline: "nearest" }, options));
   }
 }
 

package/cjs/utils/misc.cjs

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
 
@@ -20,9 +20,9 @@
 
 
 
+var _MLCPLY2Pcjs = require('../__chunks/MLCPLY2P.cjs');
+require('../__chunks/7EQBAZ46.cjs');
 
-var _BTUHABP4cjs = require('../__chunks/BTUHABP4.cjs');
-require('../__chunks/3IVNQNIV.cjs');
 
 
 
@@ -44,5 +44,4 @@ require('../__chunks/3IVNQNIV.cjs');
 
 
 
-
-exports.afterPaint = _BTUHABP4cjs.afterPaint; exports.applyState = _BTUHABP4cjs.applyState; exports.beforePaint = _BTUHABP4cjs.beforePaint; exports.chain = _BTUHABP4cjs.chain; exports.cx = _BTUHABP4cjs.cx; exports.defaultValue = _BTUHABP4cjs.defaultValue; exports.disabledFromProps = _BTUHABP4cjs.disabledFromProps; exports.getKeys = _BTUHABP4cjs.getKeys; exports.hasOwnProperty = _BTUHABP4cjs.hasOwnProperty; exports.identity = _BTUHABP4cjs.identity; exports.invariant = _BTUHABP4cjs.invariant; exports.isEmpty = _BTUHABP4cjs.isEmpty; exports.isFalsyBooleanCallback = _BTUHABP4cjs.isFalsyBooleanCallback; exports.isInteger = _BTUHABP4cjs.isInteger; exports.isObject = _BTUHABP4cjs.isObject; exports.noop = _BTUHABP4cjs.noop; exports.normalizeString = _BTUHABP4cjs.normalizeString; exports.omit = _BTUHABP4cjs.omit; exports.pick = _BTUHABP4cjs.pick; exports.removeUndefinedValues = _BTUHABP4cjs.removeUndefinedValues; exports.shallowEqual = _BTUHABP4cjs.shallowEqual;
+exports.afterPaint = _MLCPLY2Pcjs.afterPaint; exports.applyState = _MLCPLY2Pcjs.applyState; exports.beforePaint = _MLCPLY2Pcjs.beforePaint; exports.chain = _MLCPLY2Pcjs.chain; exports.cx = _MLCPLY2Pcjs.cx; exports.defaultValue = _MLCPLY2Pcjs.defaultValue; exports.disabledFromProps = _MLCPLY2Pcjs.disabledFromProps; exports.getKeys = _MLCPLY2Pcjs.getKeys; exports.hasOwnProperty = _MLCPLY2Pcjs.hasOwnProperty; exports.identity = _MLCPLY2Pcjs.identity; exports.invariant = _MLCPLY2Pcjs.invariant; exports.isEmpty = _MLCPLY2Pcjs.isEmpty; exports.isFalsyBooleanCallback = _MLCPLY2Pcjs.isFalsyBooleanCallback; exports.isInteger = _MLCPLY2Pcjs.isInteger; exports.isObject = _MLCPLY2Pcjs.isObject; exports.noop = _MLCPLY2Pcjs.noop; exports.normalizeString = _MLCPLY2Pcjs.normalizeString; exports.omit = _MLCPLY2Pcjs.omit; exports.pick = _MLCPLY2Pcjs.pick; exports.removeUndefinedValues = _MLCPLY2Pcjs.removeUndefinedValues; exports.shallowEqual = _MLCPLY2Pcjs.shallowEqual;

package/cjs/utils/platform.cjs

@@ -1,17 +1,16 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
 
 
 
+var _TEPPO3KCcjs = require('../__chunks/TEPPO3KC.cjs');
+require('../__chunks/WCFMOJKV.cjs');
+require('../__chunks/7EQBAZ46.cjs');
 
-var _KCEXELK7cjs = require('../__chunks/KCEXELK7.cjs');
-require('../__chunks/7WYII4AN.cjs');
-require('../__chunks/3IVNQNIV.cjs');
 
 
 
 
 
-
-exports.isApple = _KCEXELK7cjs.isApple; exports.isFirefox = _KCEXELK7cjs.isFirefox; exports.isMac = _KCEXELK7cjs.isMac; exports.isSafari = _KCEXELK7cjs.isSafari; exports.isTouchDevice = _KCEXELK7cjs.isTouchDevice;
+exports.isApple = _TEPPO3KCcjs.isApple; exports.isFirefox = _TEPPO3KCcjs.isFirefox; exports.isMac = _TEPPO3KCcjs.isMac; exports.isSafari = _TEPPO3KCcjs.isSafari; exports.isTouchDevice = _TEPPO3KCcjs.isTouchDevice;

package/cjs/utils/store.cjs

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
 
@@ -9,10 +9,10 @@
 
 
 
+var _BSLRW6E7cjs = require('../__chunks/BSLRW6E7.cjs');
+require('../__chunks/MLCPLY2P.cjs');
+require('../__chunks/7EQBAZ46.cjs');
 
-var _3QF3ODTRcjs = require('../__chunks/3QF3ODTR.cjs');
-require('../__chunks/BTUHABP4.cjs');
-require('../__chunks/3IVNQNIV.cjs');
 
 
 
@@ -23,5 +23,4 @@ require('../__chunks/3IVNQNIV.cjs');
 
 
 
-
-exports.batch = _3QF3ODTRcjs.batch; exports.createStore = _3QF3ODTRcjs.createStore; exports.init = _3QF3ODTRcjs.init; exports.mergeStore = _3QF3ODTRcjs.mergeStore; exports.omit = _3QF3ODTRcjs.omit; exports.pick = _3QF3ODTRcjs.pick; exports.setup = _3QF3ODTRcjs.setup; exports.subscribe = _3QF3ODTRcjs.subscribe; exports.sync = _3QF3ODTRcjs.sync; exports.throwOnConflictingProps = _3QF3ODTRcjs.throwOnConflictingProps;
+exports.batch = _BSLRW6E7cjs.batch; exports.createStore = _BSLRW6E7cjs.createStore; exports.init = _BSLRW6E7cjs.init; exports.mergeStore = _BSLRW6E7cjs.mergeStore; exports.omit = _BSLRW6E7cjs.omit; exports.pick = _BSLRW6E7cjs.pick; exports.setup = _BSLRW6E7cjs.setup; exports.subscribe = _BSLRW6E7cjs.subscribe; exports.sync = _BSLRW6E7cjs.sync; exports.throwOnConflictingProps = _BSLRW6E7cjs.throwOnConflictingProps;

package/cjs/utils/types.cjs

@@ -1 +1 @@
-"use strict";"use client";
+"use strict";

package/cjs/utils/undo.cjs

@@ -1,10 +1,9 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _SHOLYDNPcjs = require('../__chunks/SHOLYDNP.cjs');
+require('../__chunks/7EQBAZ46.cjs');
 
-var _7CES7GVEcjs = require('../__chunks/7CES7GVE.cjs');
-require('../__chunks/3IVNQNIV.cjs');
 
 
-
-exports.UndoManager = _7CES7GVEcjs.UndoManager; exports.createUndoManager = _7CES7GVEcjs.createUndoManager;
+exports.UndoManager = _SHOLYDNPcjs.UndoManager; exports.createUndoManager = _SHOLYDNPcjs.createUndoManager;

package/esm/__chunks/{US4USQPI.js → 3VBK76MS.js}

@@ -1,7 +1,7 @@
 "use client";
 import {
   canUseDOM
-} from "./HWOIWM4O.js";
+} from "./PQP5VPTV.js";
 
 // src/utils/platform.ts
 function isTouchDevice() {

package/esm/__chunks/{6DHTHWXD.js → 7DTP4AQO.js}

@@ -12,7 +12,7 @@ import {
 } from "./PBFD2E7P.js";
 import {
   getDocument
-} from "./HWOIWM4O.js";
+} from "./PQP5VPTV.js";
 import {
   __spreadProps,
   __spreadValues

package/esm/__chunks/{D7EIQZAU.js → IJ6VFLJG.js}

@@ -1,7 +1,7 @@
 "use client";
 import {
   createCollectionStore
-} from "./6DHTHWXD.js";
+} from "./7DTP4AQO.js";
 import {
   flatten2DArray,
   reverseArray
@@ -37,11 +37,6 @@ function getEnabledItems(items, excludeId) {
     return !item.disabled;
   });
 }
-function getOppositeOrientation(orientation) {
-  if (orientation === "vertical") return "horizontal";
-  if (orientation === "horizontal") return "vertical";
-  return;
-}
 function getItemsInRow(items, rowId) {
   return items.filter((item) => item.rowId === rowId);
 }
@@ -163,40 +158,50 @@ function createCompositeStore(props = {}) {
       });
     })
   );
-  const getNextId = (items, orientation, hasNullItem, skip) => {
+  const getNextId = (direction = "next", options = {}) => {
     var _a2, _b;
-    const { activeId: activeId2, rtl, focusLoop, focusWrap, includesBaseElement } = composite.getState();
-    const isHorizontal = orientation !== "vertical";
-    const isRTL = rtl && isHorizontal;
-    const allItems = isRTL ? reverseArray(items) : items;
+    const defaultState = composite.getState();
+    const {
+      skip = 0,
+      activeId: activeId2 = defaultState.activeId,
+      focusShift = defaultState.focusShift,
+      focusLoop = defaultState.focusLoop,
+      focusWrap = defaultState.focusWrap,
+      includesBaseElement = defaultState.includesBaseElement,
+      renderedItems = defaultState.renderedItems,
+      rtl = defaultState.rtl
+    } = options;
+    const isVerticalDirection = direction === "up" || direction === "down";
+    const isNextDirection = direction === "next" || direction === "down";
+    const canReverse = isNextDirection ? rtl && !isVerticalDirection : !rtl || isVerticalDirection;
+    const canShift = focusShift && !skip;
+    let items = !isVerticalDirection ? renderedItems : flatten2DArray(
+      normalizeRows(groupItemsByRows(renderedItems), activeId2, canShift)
+    );
+    items = canReverse ? reverseArray(items) : items;
+    items = isVerticalDirection ? verticalizeItems(items) : items;
     if (activeId2 == null) {
-      return (_a2 = findFirstEnabledItem(allItems)) == null ? void 0 : _a2.id;
+      return (_a2 = findFirstEnabledItem(items)) == null ? void 0 : _a2.id;
     }
-    const activeItem = allItems.find((item) => item.id === activeId2);
+    const activeItem = items.find((item) => item.id === activeId2);
     if (!activeItem) {
-      return (_b = findFirstEnabledItem(allItems)) == null ? void 0 : _b.id;
+      return (_b = findFirstEnabledItem(items)) == null ? void 0 : _b.id;
     }
-    const isGrid = !!activeItem.rowId;
-    const activeIndex = allItems.indexOf(activeItem);
-    const nextItems = allItems.slice(activeIndex + 1);
+    const isGrid = items.some((item) => item.rowId);
+    const activeIndex = items.indexOf(activeItem);
+    const nextItems = items.slice(activeIndex + 1);
     const nextItemsInRow = getItemsInRow(nextItems, activeItem.rowId);
-    if (skip !== void 0) {
+    if (skip) {
       const nextEnabledItemsInRow = getEnabledItems(nextItemsInRow, activeId2);
       const nextItem2 = nextEnabledItemsInRow.slice(skip)[0] || // If we can't find an item, just return the last one.
       nextEnabledItemsInRow[nextEnabledItemsInRow.length - 1];
       return nextItem2 == null ? void 0 : nextItem2.id;
     }
-    const oppositeOrientation = getOppositeOrientation(
-      // If it's a grid and orientation is not set, it's a next/previous call,
-      // which is inherently horizontal. up/down will call next with orientation
-      // set to vertical by default (see below on up/down methods).
-      isGrid ? orientation || "horizontal" : orientation
-    );
-    const canLoop = focusLoop && focusLoop !== oppositeOrientation;
-    const canWrap = isGrid && focusWrap && focusWrap !== oppositeOrientation;
-    hasNullItem = hasNullItem || !isGrid && canLoop && includesBaseElement;
+    const canLoop = focusLoop && (isVerticalDirection ? focusLoop !== "horizontal" : focusLoop !== "vertical");
+    const canWrap = isGrid && focusWrap && (isVerticalDirection ? focusWrap !== "horizontal" : focusWrap !== "vertical");
+    const hasNullItem = isNextDirection ? (!isGrid || isVerticalDirection) && canLoop && includesBaseElement : isVerticalDirection ? includesBaseElement : false;
     if (canLoop) {
-      const loopItems = canWrap && !hasNullItem ? allItems : getItemsInRow(allItems, activeItem.rowId);
+      const loopItems = canWrap && !hasNullItem ? items : getItemsInRow(items, activeItem.rowId);
       const sortedItems = flipItems(loopItems, activeId2, hasNullItem);
       const nextItem2 = findFirstEnabledItem(sortedItems, activeId2);
       return nextItem2 == null ? void 0 : nextItem2.id;
@@ -237,56 +242,29 @@ function createCompositeStore(props = {}) {
       var _a2;
       return (_a2 = findFirstEnabledItem(reverseArray(composite.getState().renderedItems))) == null ? void 0 : _a2.id;
     },
-    next: (skip) => {
-      const { renderedItems, orientation } = composite.getState();
-      return getNextId(renderedItems, orientation, false, skip);
+    next: (options) => {
+      if (options !== void 0 && typeof options === "number") {
+        options = { skip: options };
+      }
+      return getNextId("next", options);
     },
-    previous: (skip) => {
-      var _a2;
-      const { renderedItems, orientation, includesBaseElement } = composite.getState();
-      const isGrid = !!((_a2 = findFirstEnabledItem(renderedItems)) == null ? void 0 : _a2.rowId);
-      const hasNullItem = !isGrid && includesBaseElement;
-      return getNextId(
-        reverseArray(renderedItems),
-        orientation,
-        hasNullItem,
-        skip
-      );
+    previous: (options) => {
+      if (options !== void 0 && typeof options === "number") {
+        options = { skip: options };
+      }
+      return getNextId("previous", options);
     },
-    down: (skip) => {
-      const {
-        activeId: activeId2,
-        renderedItems,
-        focusShift,
-        focusLoop,
-        includesBaseElement
-      } = composite.getState();
-      const shouldShift = focusShift && !skip;
-      const verticalItems = verticalizeItems(
-        flatten2DArray(
-          normalizeRows(groupItemsByRows(renderedItems), activeId2, shouldShift)
-        )
-      );
-      const canLoop = focusLoop && focusLoop !== "horizontal";
-      const hasNullItem = canLoop && includesBaseElement;
-      return getNextId(verticalItems, "vertical", hasNullItem, skip);
+    down: (options) => {
+      if (options !== void 0 && typeof options === "number") {
+        options = { skip: options };
+      }
+      return getNextId("down", options);
     },
-    up: (skip) => {
-      const { activeId: activeId2, renderedItems, focusShift, includesBaseElement } = composite.getState();
-      const shouldShift = focusShift && !skip;
-      const verticalItems = verticalizeItems(
-        reverseArray(
-          flatten2DArray(
-            normalizeRows(
-              groupItemsByRows(renderedItems),
-              activeId2,
-              shouldShift
-            )
-          )
-        )
-      );
-      const hasNullItem = includesBaseElement;
-      return getNextId(verticalItems, "vertical", hasNullItem, skip);
+    up: (options) => {
+      if (options !== void 0 && typeof options === "number") {
+        options = { skip: options };
+      }
+      return getNextId("up", options);
     }
   });
 }

package/esm/__chunks/{HWOIWM4O.js → PQP5VPTV.js}

@@ -133,14 +133,17 @@ function scrollIntoViewIfNeeded(element, arg) {
 }
 function getScrollingElement(element) {
   if (!element) return null;
+  const isScrollableOverflow = (overflow) => {
+    if (overflow === "auto") return true;
+    if (overflow === "scroll") return true;
+    return false;
+  };
   if (element.clientHeight && element.scrollHeight > element.clientHeight) {
     const { overflowY } = getComputedStyle(element);
-    const isScrollable = overflowY !== "visible" && overflowY !== "hidden";
-    if (isScrollable) return element;
+    if (isScrollableOverflow(overflowY)) return element;
   } else if (element.clientWidth && element.scrollWidth > element.clientWidth) {
     const { overflowX } = getComputedStyle(element);
-    const isScrollable = overflowX !== "visible" && overflowX !== "hidden";
-    if (isScrollable) return element;
+    if (isScrollableOverflow(overflowX)) return element;
   }
   return getScrollingElement(element.parentElement) || document.scrollingElement || document.body;
 }

package/esm/__chunks/{PIWLWQMB.js → S22RJCNX.js}

@@ -1,7 +1,7 @@
 "use client";
 import {
   createCompositeStore
-} from "./D7EIQZAU.js";
+} from "./IJ6VFLJG.js";
 import {
   createStore
 } from "./EQQLU3CG.js";

package/esm/collection/collection-store.js

@@ -1,10 +1,10 @@
 "use client";
 import {
   createCollectionStore
-} from "../__chunks/6DHTHWXD.js";
+} from "../__chunks/7DTP4AQO.js";
 import "../__chunks/EQQLU3CG.js";
 import "../__chunks/PBFD2E7P.js";
-import "../__chunks/HWOIWM4O.js";
+import "../__chunks/PQP5VPTV.js";
 import "../__chunks/3YLGPPWQ.js";
 export {
   createCollectionStore

package/esm/combobox/combobox-store.js

@@ -1,8 +1,8 @@
 "use client";
 import {
   createCompositeStore
-} from "../__chunks/D7EIQZAU.js";
-import "../__chunks/6DHTHWXD.js";
+} from "../__chunks/IJ6VFLJG.js";
+import "../__chunks/7DTP4AQO.js";
 import "../__chunks/7PRQYBBV.js";
 import {
   createPopoverStore
@@ -25,8 +25,8 @@ import {
 import {
   isSafari,
   isTouchDevice
-} from "../__chunks/US4USQPI.js";
-import "../__chunks/HWOIWM4O.js";
+} from "../__chunks/3VBK76MS.js";
+import "../__chunks/PQP5VPTV.js";
 import {
   __objRest,
   __spreadProps,

package/esm/composite/composite-store.d.ts

@@ -2,6 +2,12 @@ import type { CollectionStoreFunctions, CollectionStoreItem, CollectionStoreOpti
 import type { Store, StoreOptions, StoreProps } from "../utils/store.ts";
 import type { SetState } from "../utils/types.ts";
 type Orientation = "horizontal" | "vertical" | "both";
+interface NextOptions extends Pick<Partial<CompositeStoreState>, "activeId" | "focusShift" | "focusLoop" | "focusWrap" | "includesBaseElement" | "renderedItems" | "rtl"> {
+    /**
+     * The number of items to skip.
+     */
+    skip?: number;
+}
 /**
  * Creates a composite store.
  */
@@ -229,39 +235,51 @@ export interface CompositeStoreFunctions<T extends CompositeStoreItem = Composit
     /**
      * Returns the id of the next enabled item based on the current
      * [`activeId`](https://ariakit.org/reference/composite-provider#activeid)
-     * state.
+     * state. You can pass additional options to override the current state.
      * @example
      * const nextId = store.next();
-     * const nextNextId = store.next(2);
      */
-    next: (skip?: number) => string | null | undefined;
+    next(options?: NextOptions): string | null | undefined;
+    /**
+     * @deprecated Use the object syntax instead: `next({ skip: 2 })`.
+     */
+    next(skip?: number): string | null | undefined;
     /**
      * Returns the id of the previous enabled item based on the current
      * [`activeId`](https://ariakit.org/reference/composite-provider#activeid)
-     * state.
+     * state. You can pass additional options to override the current state.
      * @example
      * const previousId = store.previous();
-     * const previousPreviousId = store.previous(2);
      */
-    previous: (skip?: number) => string | null | undefined;
+    previous(options?: NextOptions): string | null | undefined;
+    /**
+     * @deprecated Use the object syntax instead: `previous({ skip: 2 })`.
+     */
+    previous(skip?: number): string | null | undefined;
     /**
      * Returns the id of the enabled item above based on the current
      * [`activeId`](https://ariakit.org/reference/composite-provider#activeid)
-     * state.
+     * state. You can pass additional options to override the current state.
      * @example
      * const upId = store.up();
-     * const upUpId = store.up(2);
      */
-    up: (skip?: number) => string | null | undefined;
+    up(options?: NextOptions): string | null | undefined;
+    /**
+     * @deprecated Use the object syntax instead: `up({ skip: 2 })`.
+     */
+    up(skip?: number): string | null | undefined;
     /**
      * Returns the id of the enabled item below based on the current
      * [`activeId`](https://ariakit.org/reference/composite-provider#activeid)
-     * state.
+     * state. You can pass additional options to override the current state.
      * @example
      * const downId = store.down();
-     * const downDownId = store.down(2);
      */
-    down: (skip?: number) => string | null | undefined;
+    down(options?: NextOptions): string | null | undefined;
+    /**
+     * @deprecated Use the object syntax instead: `down({ skip: 2 })`.
+     */
+    down(skip?: number): string | null | undefined;
     /**
      * Returns the id of the first enabled item.
      */

package/esm/composite/composite-store.js

@@ -1,12 +1,12 @@
 "use client";
 import {
   createCompositeStore
-} from "../__chunks/D7EIQZAU.js";
-import "../__chunks/6DHTHWXD.js";
+} from "../__chunks/IJ6VFLJG.js";
+import "../__chunks/7DTP4AQO.js";
 import "../__chunks/7PRQYBBV.js";
 import "../__chunks/EQQLU3CG.js";
 import "../__chunks/PBFD2E7P.js";
-import "../__chunks/HWOIWM4O.js";
+import "../__chunks/PQP5VPTV.js";
 import "../__chunks/3YLGPPWQ.js";
 export {
   createCompositeStore