@jobber/components 9.4.0 → 9.5.0

package/dist/ComboboxChipRemove-cjs.js

@@ -1,17 +1,14 @@
 'use strict';
 
 var React = require('react');
-var useButton = require('./useButton-cjs.js');
+var useScrollLock = require('./useScrollLock-cjs.js');
 var useRenderElement = require('./useRenderElement-cjs.js');
-var useLabelableId = require('./useLabelableId-cjs.js');
 var useCompositeListItem = require('./useCompositeListItem-cjs.js');
-var resolveAriaLabelledBy = require('./resolveAriaLabelledBy-cjs.js');
-var useScrollLock = require('./useScrollLock-cjs.js');
 var jsxRuntime = require('react/jsx-runtime');
 var ReactDOM = require('react-dom');
 var stringifyLocale = require('./stringifyLocale-cjs.js');
 var useLabel = require('./useLabel-cjs.js');
-var floatingUi_utils_dom = require('./floating-ui.utils.dom-cjs.js');
+var floatingUi_utils = require('./floating-ui.utils-cjs.js');
 
 function _interopNamespaceDefault(e) {
   var n = Object.create(null);
@@ -129,7 +126,7 @@ const selectors = {
     return true;
   }),
   hasNullItemLabel: useScrollLock.createSelector((state, enabled) => {
-    return enabled ? resolveAriaLabelledBy.hasNullItemLabel(state.items) : false;
+    return enabled ? useCompositeListItem.hasNullItemLabel(state.items) : false;
   }),
   open: useScrollLock.createSelector(state => state.open),
   mounted: useScrollLock.createSelector(state => state.mounted),
@@ -142,9 +139,9 @@ const selectors = {
     const comparer = state.isItemEqualToValue;
     const selectedValue = state.selectedValue;
     if (Array.isArray(selectedValue)) {
-      return selectedValue.some(selectedItem => resolveAriaLabelledBy.compareItemEquality(itemValue, selectedItem, comparer));
+      return selectedValue.some(selectedItem => useCompositeListItem.compareItemEquality(itemValue, selectedItem, comparer));
     }
-    return resolveAriaLabelledBy.compareItemEquality(itemValue, selectedValue, comparer);
+    return useCompositeListItem.compareItemEquality(itemValue, selectedValue, comparer);
   }),
   transitionStatus: useScrollLock.createSelector(state => state.transitionStatus),
   popupProps: useScrollLock.createSelector(state => state.popupProps),
@@ -196,7 +193,7 @@ function createCollatorItemFilter(collatorFilter, itemToStringLabel) {
     if (item == null) {
       return false;
     }
-    const itemString = resolveAriaLabelledBy.stringifyAsLabel(item, itemToStringLabel);
+    const itemString = useCompositeListItem.stringifyAsLabel(item, itemToStringLabel);
     return collatorFilter.contains(itemString, query);
   };
 }
@@ -213,8 +210,8 @@ function createSingleSelectionCollatorFilter(collatorFilter, itemToStringLabel,
     if (!query) {
       return true;
     }
-    const itemString = resolveAriaLabelledBy.stringifyAsLabel(item, itemToStringLabel);
-    const selectedString = selectedValue != null ? resolveAriaLabelledBy.stringifyAsLabel(selectedValue, itemToStringLabel) : '';
+    const itemString = useCompositeListItem.stringifyAsLabel(item, itemToStringLabel);
+    const selectedString = selectedValue != null ? useCompositeListItem.stringifyAsLabel(selectedValue, itemToStringLabel) : '';
 
     // Handle case-insensitive matching consistently
     if (selectedString && collatorFilter.contains(selectedString, query) && selectedString.length === query.length) {
@@ -243,7 +240,7 @@ function getFilter(options = {}) {
       if (!query) {
         return true;
       }
-      const itemString = resolveAriaLabelledBy.stringifyAsLabel(item, itemToString);
+      const itemString = useCompositeListItem.stringifyAsLabel(item, itemToString);
       for (let i = 0; i <= itemString.length - query.length; i += 1) {
         if (collator.compare(itemString.slice(i, i + query.length), query) === 0) {
           return true;
@@ -255,14 +252,14 @@ function getFilter(options = {}) {
       if (!query) {
         return true;
       }
-      const itemString = resolveAriaLabelledBy.stringifyAsLabel(item, itemToString);
+      const itemString = useCompositeListItem.stringifyAsLabel(item, itemToString);
       return collator.compare(itemString.slice(0, query.length), query) === 0;
     },
     endsWith(item, query, itemToString) {
       if (!query) {
         return true;
       }
-      const itemString = resolveAriaLabelledBy.stringifyAsLabel(item, itemToString);
+      const itemString = useCompositeListItem.stringifyAsLabel(item, itemToString);
       const queryLength = query.length;
       return itemString.length >= queryLength && collator.compare(itemString.slice(itemString.length - queryLength), query) === 0;
     }
@@ -334,7 +331,7 @@ function AriaCombobox(props) {
     loopFocus = true,
     itemToStringLabel,
     itemToStringValue,
-    isItemEqualToValue = resolveAriaLabelledBy.defaultItemEquality,
+    isItemEqualToValue = useCompositeListItem.defaultItemEquality,
     virtualized = false,
     inline: inlineProp = false,
     fillInputOnItemPress = true,
@@ -347,7 +344,7 @@ function AriaCombobox(props) {
   } = props;
   const {
     clearErrors
-  } = useLabelableId.useFormContext();
+  } = useCompositeListItem.useFormContext();
   const {
     setDirty,
     validityData,
@@ -358,9 +355,9 @@ function AriaCombobox(props) {
     setFocused,
     validationMode,
     validation
-  } = useLabelableId.useFieldRootContext();
+  } = useCompositeListItem.useFieldRootContext();
   const direction = useScrollLock.useDirection();
-  const id = useLabelableId.useLabelableId({
+  const id = useCompositeListItem.useLabelableId({
     id: idProp
   });
   const collatorFilter = useCoreFilter({
@@ -407,7 +404,7 @@ function AriaCombobox(props) {
   } else {
     autoHighlightMode = autoHighlight ? 'input-change' : false;
   }
-  const [selectedValue, setSelectedValueUnwrapped] = useButton.useControlled({
+  const [selectedValue, setSelectedValueUnwrapped] = useScrollLock.useControlled({
     controlled: selectedValueProp,
     default: multiple ? defaultSelectedValue ?? useRenderElement.EMPTY_ARRAY : defaultSelectedValue,
     name: 'Combobox',
@@ -433,25 +430,25 @@ function AriaCombobox(props) {
       return defaultInputValueProp ?? '';
     }
     if (single) {
-      return resolveAriaLabelledBy.stringifyAsLabel(selectedValue, itemToStringLabel);
+      return useCompositeListItem.stringifyAsLabel(selectedValue, itemToStringLabel);
     }
     return '';
   }).current;
-  const [inputValue, setInputValueUnwrapped] = useButton.useControlled({
+  const [inputValue, setInputValueUnwrapped] = useScrollLock.useControlled({
     controlled: inputValueProp,
     default: initialDefaultInputValue,
     name: 'Combobox',
     state: 'inputValue'
   });
-  const [open, setOpenUnwrapped] = useButton.useControlled({
+  const [open, setOpenUnwrapped] = useScrollLock.useControlled({
     controlled: openProp,
     default: defaultOpen,
     name: 'Combobox',
     state: 'open'
   });
-  const isGrouped = resolveAriaLabelledBy.isGroupedItems(items);
+  const isGrouped = useCompositeListItem.isGroupedItems(items);
   const query = closeQuery ?? (inputValue === '' ? '' : String(inputValue).trim());
-  const selectedLabelString = single ? resolveAriaLabelledBy.stringifyAsLabel(selectedValue, itemToStringLabel) : '';
+  const selectedLabelString = single ? useCompositeListItem.stringifyAsLabel(selectedValue, itemToStringLabel) : '';
   const shouldBypassFiltering = single && !queryChangedAfterOpen && query !== '' && selectedLabelString !== '' && selectedLabelString.length === query.length && collatorFilter.contains(selectedLabelString, query);
   const filterQuery = shouldBypassFiltering ? '' : query;
   const shouldIgnoreExternalFiltering = hasItems && hasFilteredItemsProp && shouldBypassFiltering;
@@ -600,12 +597,12 @@ function AriaCombobox(props) {
       return fieldRawValue;
     }
     if (Array.isArray(selectedValue)) {
-      return selectedValue.map(value => resolveAriaLabelledBy.stringifyAsValue(value, itemToStringValue));
+      return selectedValue.map(value => useCompositeListItem.stringifyAsValue(value, itemToStringValue));
     }
-    return resolveAriaLabelledBy.stringifyAsValue(selectedValue, itemToStringValue);
+    return useCompositeListItem.stringifyAsValue(selectedValue, itemToStringValue);
   }, [fieldRawValue, itemToStringValue, selectionMode, selectedValue]);
-  const onItemHighlighted = useButton.useStableCallback(onItemHighlightedProp);
-  const onOpenChangeComplete = useButton.useStableCallback(onOpenChangeCompleteProp);
+  const onItemHighlighted = useScrollLock.useStableCallback(onItemHighlightedProp);
+  const onOpenChangeComplete = useScrollLock.useStableCallback(onOpenChangeCompleteProp);
   const activeIndex = useScrollLock.useStore(store, selectors.activeIndex);
   const selectedIndex = useScrollLock.useStore(store, selectors.selectedIndex);
   const positionerElement = useScrollLock.useStore(store, selectors.positionerElement);
@@ -616,34 +613,34 @@ function AriaCombobox(props) {
   const inline = useScrollLock.useStore(store, selectors.inline);
   const inputInsidePopup = useScrollLock.useStore(store, selectors.inputInsidePopup);
   const inputOwnsFormValue = useScrollLock.useStore(store, selectors.inputOwnsFormValue);
-  const triggerRef = useButton.useValueAsRef(triggerElement);
+  const triggerRef = useScrollLock.useValueAsRef(triggerElement);
   const {
     mounted,
     setMounted,
     transitionStatus
-  } = useButton.useTransitionStatus(open);
+  } = useScrollLock.useTransitionStatus(open);
   const {
     openMethod,
     triggerProps
   } = useScrollLock.useOpenInteractionType(open);
-  const getStringifiedValueForForm = useButton.useStableCallback(() => fieldStringValue);
-  useLabelableId.useRegisterFieldControl(inputInsidePopup ? triggerRef : inputRef, id, fieldRawValue, getStringifiedValueForForm, !disabled, nameProp);
-  const forceMount = useButton.useStableCallback(() => {
+  const getStringifiedValueForForm = useScrollLock.useStableCallback(() => fieldStringValue);
+  useCompositeListItem.useRegisterFieldControl(inputInsidePopup ? triggerRef : inputRef, id, fieldRawValue, getStringifiedValueForForm, !disabled, nameProp);
+  const forceMount = useScrollLock.useStableCallback(() => {
     if (items) {
       // Ensure typeahead works on a closed list.
-      labelsRef.current = flatFilteredItems.map(item => resolveAriaLabelledBy.stringifyAsLabel(item, itemToStringLabel));
+      labelsRef.current = flatFilteredItems.map(item => useCompositeListItem.stringifyAsLabel(item, itemToStringLabel));
     } else {
       store.set('forceMounted', true);
     }
   });
   const initialSelectedValueRef = React__namespace.useRef(selectedValue);
-  useButton.useIsoLayoutEffect(() => {
+  useScrollLock.useIsoLayoutEffect(() => {
     // Ensure the values and labels are registered for programmatic value changes.
     if (selectedValue !== initialSelectedValueRef.current) {
       forceMount();
     }
   }, [forceMount, selectedValue]);
-  const setIndices = useButton.useStableCallback(options => {
+  const setIndices = useScrollLock.useStableCallback(options => {
     store.update(options);
     const type = options.type || 'none';
     if (options.activeIndex === undefined) {
@@ -652,7 +649,7 @@ function AriaCombobox(props) {
     if (options.activeIndex === null) {
       if (lastHighlightRef.current !== INITIAL_LAST_HIGHLIGHT) {
         lastHighlightRef.current = INITIAL_LAST_HIGHLIGHT;
-        onItemHighlighted(undefined, useButton.createGenericEventDetails(type, undefined, {
+        onItemHighlighted(undefined, useScrollLock.createGenericEventDetails(type, undefined, {
           index: -1
         }));
       }
@@ -662,13 +659,13 @@ function AriaCombobox(props) {
         value: activeValue,
         index: options.activeIndex
       };
-      onItemHighlighted(activeValue, useButton.createGenericEventDetails(type, undefined, {
+      onItemHighlighted(activeValue, useScrollLock.createGenericEventDetails(type, undefined, {
         index: options.activeIndex
       }));
     }
   });
-  const setInputValue = useButton.useStableCallback((next, eventDetails) => {
-    hadInputClearRef.current = eventDetails.reason === useButton.inputClear;
+  const setInputValue = useScrollLock.useStableCallback((next, eventDetails) => {
+    hadInputClearRef.current = eventDetails.reason === useScrollLock.inputClear;
     props.onInputValueChange?.(next, eventDetails);
     if (eventDetails.isCanceled) {
       return;
@@ -676,7 +673,7 @@ function AriaCombobox(props) {
 
     // If user is typing, ensure we don't auto-highlight on open due to a race
     // with the post-open effect that sets this flag.
-    if (eventDetails.reason === useButton.inputChange) {
+    if (eventDetails.reason === useScrollLock.inputChange) {
       const event = eventDetails.event;
       const inputType = event.inputType;
       // Treat composition commits as typed input; autofill may omit `inputType` or
@@ -699,7 +696,7 @@ function AriaCombobox(props) {
     }
     setInputValueUnwrapped(next);
   });
-  const setOpen = useButton.useStableCallback((nextOpen, eventDetails) => {
+  const setOpen = useScrollLock.useStableCallback((nextOpen, eventDetails) => {
     if (open === nextOpen) {
       return;
     }
@@ -721,7 +718,7 @@ function AriaCombobox(props) {
       setQueryChangedAfterOpen(false);
       setCloseQuery(null);
       if (inputValue !== '') {
-        setInputValue('', useButton.createChangeEventDetails(useButton.inputClear, eventDetails.event));
+        setInputValue('', useScrollLock.createChangeEventDetails(useScrollLock.inputClear, eventDetails.event));
       }
     }
     if (!nextOpen && queryChangedAfterOpen) {
@@ -748,12 +745,12 @@ function AriaCombobox(props) {
         // if the input is outside the popup. When the input is inside the popup, defer the clear until
         // unmount so the filtered list doesn't flash to unfiltered during the exit animation.
         if (!inputInsidePopup || inline) {
-          setInputValue('', useButton.createChangeEventDetails(useButton.inputClear, eventDetails.event));
+          setInputValue('', useScrollLock.createChangeEventDetails(useScrollLock.inputClear, eventDetails.event));
         }
       }
     }
     setOpenUnwrapped(nextOpen);
-    if (!nextOpen && inputInsidePopup && (eventDetails.reason === useButton.focusOut || eventDetails.reason === useButton.outsidePress)) {
+    if (!nextOpen && inputInsidePopup && (eventDetails.reason === useScrollLock.focusOut || eventDetails.reason === useScrollLock.outsidePress)) {
       setTouched(true);
       setFocused(false);
       if (validationMode === 'onBlur') {
@@ -762,7 +759,7 @@ function AriaCombobox(props) {
       }
     }
   });
-  const setSelectedValue = useButton.useStableCallback((nextValue, eventDetails) => {
+  const setSelectedValue = useScrollLock.useStableCallback((nextValue, eventDetails) => {
     // Cast to `any` due to conditional value type (single vs. multiple).
     // The runtime implementation already ensures the correct value shape.
     onSelectedValueChange?.(nextValue, eventDetails);
@@ -772,13 +769,13 @@ function AriaCombobox(props) {
     setSelectedValueUnwrapped(nextValue);
     const shouldFillInput = selectionMode === 'none' && popupRef.current && fillInputOnItemPress || single && !store.state.inputInsidePopup;
     if (shouldFillInput) {
-      setInputValue(resolveAriaLabelledBy.stringifyAsLabel(nextValue, itemToStringLabel), useButton.createChangeEventDetails(eventDetails.reason, eventDetails.event));
+      setInputValue(useCompositeListItem.stringifyAsLabel(nextValue, itemToStringLabel), useScrollLock.createChangeEventDetails(eventDetails.reason, eventDetails.event));
     }
-    if (single && nextValue != null && eventDetails.reason !== useButton.inputChange && queryChangedAfterOpen && !inline) {
+    if (single && nextValue != null && eventDetails.reason !== useScrollLock.inputChange && queryChangedAfterOpen && !inline) {
       setCloseQuery(query);
     }
   });
-  const handleSelection = useButton.useStableCallback((event, passedValue) => {
+  const handleSelection = useScrollLock.useStableCallback((event, passedValue) => {
     let itemValue = passedValue;
     if (itemValue === undefined) {
       if (activeIndex === null) {
@@ -786,10 +783,10 @@ function AriaCombobox(props) {
       }
       itemValue = valuesRef.current[activeIndex];
     }
-    const targetEl = useButton.getTarget(event);
+    const targetEl = useScrollLock.getTarget(event);
     const overrideEvent = selectionEventRef.current ?? event;
     selectionEventRef.current = null;
-    const eventDetails = useButton.createChangeEventDetails(useButton.itemPress, overrideEvent);
+    const eventDetails = useScrollLock.createChangeEventDetails(useScrollLock.itemPress, overrideEvent);
 
     // Let the link handle the click.
     const href = targetEl?.closest('a')?.getAttribute('href');
@@ -801,8 +798,8 @@ function AriaCombobox(props) {
     }
     if (multiple) {
       const currentSelectedValue = Array.isArray(selectedValue) ? selectedValue : [];
-      const isCurrentlySelected = resolveAriaLabelledBy.selectedValueIncludes(currentSelectedValue, itemValue, store.state.isItemEqualToValue);
-      const nextValue = isCurrentlySelected ? resolveAriaLabelledBy.removeItem(currentSelectedValue, itemValue, store.state.isItemEqualToValue) : [...currentSelectedValue, itemValue];
+      const isCurrentlySelected = useCompositeListItem.selectedValueIncludes(currentSelectedValue, itemValue, store.state.isItemEqualToValue);
+      const nextValue = isCurrentlySelected ? useCompositeListItem.removeItem(currentSelectedValue, itemValue, store.state.isItemEqualToValue) : [...currentSelectedValue, itemValue];
       setSelectedValue(nextValue, eventDetails);
       if (eventDetails.isCanceled) {
         return;
@@ -812,7 +809,7 @@ function AriaCombobox(props) {
         return;
       }
       if (store.state.inputInsidePopup) {
-        setInputValue('', useButton.createChangeEventDetails(useButton.inputClear, eventDetails.event));
+        setInputValue('', useScrollLock.createChangeEventDetails(useScrollLock.inputClear, eventDetails.event));
       } else {
         setOpen(false, eventDetails);
       }
@@ -824,7 +821,7 @@ function AriaCombobox(props) {
       setOpen(false, eventDetails);
     }
   });
-  const requestSubmit = useButton.useStableCallback(() => {
+  const requestSubmit = useScrollLock.useStableCallback(() => {
     if (!store.state.submitOnItemClick) {
       return;
     }
@@ -833,7 +830,7 @@ function AriaCombobox(props) {
       formElement.requestSubmit();
     }
   });
-  const handleUnmount = useButton.useStableCallback(() => {
+  const handleUnmount = useScrollLock.useStableCallback(() => {
     setMounted(false);
     onOpenChangeComplete?.(false);
     setQueryChangedAfterOpen(false);
@@ -853,7 +850,7 @@ function AriaCombobox(props) {
     // If the user typed a filter and didn't select in multiple mode, clear the input
     // after close completes to avoid mid-exit flicker and start fresh on next open.
     if (multiple && inputRef.current && inputRef.current.value !== '' && !hadInputClearRef.current) {
-      setInputValue('', useButton.createChangeEventDetails(useButton.inputClear));
+      setInputValue('', useScrollLock.createChangeEventDetails(useScrollLock.inputClear));
     }
 
     // Single selection mode:
@@ -862,14 +859,14 @@ function AriaCombobox(props) {
     if (single) {
       if (store.state.inputInsidePopup) {
         if (inputRef.current && inputRef.current.value !== '') {
-          setInputValue('', useButton.createChangeEventDetails(useButton.inputClear));
+          setInputValue('', useScrollLock.createChangeEventDetails(useScrollLock.inputClear));
         }
       } else {
-        const stringVal = resolveAriaLabelledBy.stringifyAsLabel(selectedValue, itemToStringLabel);
+        const stringVal = useCompositeListItem.stringifyAsLabel(selectedValue, itemToStringLabel);
         if (inputRef.current && inputRef.current.value !== stringVal) {
           // If no selection was made, treat this as clearing the typed filter.
-          const reason = stringVal === '' ? useButton.inputClear : useButton.none;
-          setInputValue(stringVal, useButton.createChangeEventDetails(reason));
+          const reason = stringVal === '' ? useScrollLock.inputClear : useScrollLock.none;
+          setInputValue(stringVal, useScrollLock.createChangeEventDetails(reason));
         }
       }
     }
@@ -887,7 +884,7 @@ function AriaCombobox(props) {
     }
     return popupRef;
   }, [inline, positionerElement]);
-  useButton.useOpenChangeComplete({
+  useScrollLock.useOpenChangeComplete({
     enabled: !props.actionsRef,
     open,
     ref: resolvedPopupRef,
@@ -900,7 +897,7 @@ function AriaCombobox(props) {
   React__namespace.useImperativeHandle(props.actionsRef, () => ({
     unmount: handleUnmount
   }), [handleUnmount]);
-  useButton.useIsoLayoutEffect(function syncSelectedIndex() {
+  useScrollLock.useIsoLayoutEffect(function syncSelectedIndex() {
     if (open || selectionMode === 'none') {
       return;
     }
@@ -908,24 +905,24 @@ function AriaCombobox(props) {
     if (multiple) {
       const currentValue = Array.isArray(selectedValue) ? selectedValue : [];
       const lastValue = currentValue[currentValue.length - 1];
-      const lastIndex = resolveAriaLabelledBy.findItemIndex(registry, lastValue, isItemEqualToValue);
+      const lastIndex = useCompositeListItem.findItemIndex(registry, lastValue, isItemEqualToValue);
       setIndices({
         selectedIndex: lastIndex === -1 ? null : lastIndex
       });
     } else {
-      const index = resolveAriaLabelledBy.findItemIndex(registry, selectedValue, isItemEqualToValue);
+      const index = useCompositeListItem.findItemIndex(registry, selectedValue, isItemEqualToValue);
       setIndices({
         selectedIndex: index === -1 ? null : index
       });
     }
   }, [open, selectedValue, items, selectionMode, flatItems, multiple, isItemEqualToValue, setIndices]);
-  useButton.useIsoLayoutEffect(() => {
+  useScrollLock.useIsoLayoutEffect(() => {
     if (items) {
       valuesRef.current = flatFilteredItems;
       listRef.current.length = flatFilteredItems.length;
     }
   }, [items, flatFilteredItems]);
-  useButton.useIsoLayoutEffect(() => {
+  useScrollLock.useIsoLayoutEffect(() => {
     const pendingHighlight = pendingQueryHighlightRef.current;
     if (pendingHighlight) {
       if (pendingHighlight.hasQuery) {
@@ -950,7 +947,7 @@ function AriaCombobox(props) {
       }
       if (lastHighlightRef.current !== INITIAL_LAST_HIGHLIGHT) {
         lastHighlightRef.current = INITIAL_LAST_HIGHLIGHT;
-        store.state.onItemHighlighted(undefined, useButton.createGenericEventDetails(useButton.none, undefined, {
+        store.state.onItemHighlighted(undefined, useScrollLock.createGenericEventDetails(useScrollLock.none, undefined, {
           index: -1
         }));
       }
@@ -959,7 +956,7 @@ function AriaCombobox(props) {
     if (storeActiveIndex >= candidateItems.length) {
       if (lastHighlightRef.current !== INITIAL_LAST_HIGHLIGHT) {
         lastHighlightRef.current = INITIAL_LAST_HIGHLIGHT;
-        store.state.onItemHighlighted(undefined, useButton.createGenericEventDetails(useButton.none, undefined, {
+        store.state.onItemHighlighted(undefined, useScrollLock.createGenericEventDetails(useScrollLock.none, undefined, {
           index: -1
         }));
       }
@@ -968,18 +965,18 @@ function AriaCombobox(props) {
     }
     const itemValue = candidateItems[storeActiveIndex];
     const previouslyHighlightedItemValue = lastHighlightRef.current.value;
-    const isSameItem = previouslyHighlightedItemValue !== NO_ACTIVE_VALUE && resolveAriaLabelledBy.compareItemEquality(itemValue, previouslyHighlightedItemValue, store.state.isItemEqualToValue);
+    const isSameItem = previouslyHighlightedItemValue !== NO_ACTIVE_VALUE && useCompositeListItem.compareItemEquality(itemValue, previouslyHighlightedItemValue, store.state.isItemEqualToValue);
     if (lastHighlightRef.current.index !== storeActiveIndex || !isSameItem) {
       lastHighlightRef.current = {
         value: itemValue,
         index: storeActiveIndex
       };
-      store.state.onItemHighlighted(itemValue, useButton.createGenericEventDetails(useButton.none, undefined, {
+      store.state.onItemHighlighted(itemValue, useScrollLock.createGenericEventDetails(useScrollLock.none, undefined, {
         index: storeActiveIndex
       }));
     }
   }, [activeIndex, autoHighlightMode, hasFilteredItemsProp, hasItems, flatFilteredItems, inline, open, store]);
-  useButton.useIsoLayoutEffect(() => {
+  useScrollLock.useIsoLayoutEffect(() => {
     if (selectionMode === 'none') {
       setFilled(String(inputValue) !== '');
       return;
@@ -999,17 +996,17 @@ function AriaCombobox(props) {
   function isSelectedValueDirty(value) {
     const initialValue = validityData.initialValue;
     if (Array.isArray(value) && Array.isArray(initialValue)) {
-      return !resolveAriaLabelledBy.areArraysEqual(value, initialValue, (itemValue, initialItemValue) => resolveAriaLabelledBy.compareItemEquality(itemValue, initialItemValue, isItemEqualToValue));
+      return !useCompositeListItem.areArraysEqual(value, initialValue, (itemValue, initialItemValue) => useCompositeListItem.compareItemEquality(itemValue, initialItemValue, isItemEqualToValue));
     }
     return value !== initialValue;
   }
-  useButton.useValueChanged(query, () => {
+  useScrollLock.useValueChanged(query, () => {
     if (!open || query === '' || query === String(initialDefaultInputValue)) {
       return;
     }
     setQueryChangedAfterOpen(true);
   });
-  useButton.useValueChanged(selectedValue, () => {
+  useScrollLock.useValueChanged(selectedValue, () => {
     if (selectionMode === 'none') {
       return;
     }
@@ -1017,13 +1014,13 @@ function AriaCombobox(props) {
     setDirty(isSelectedValueDirty(selectedValue));
     validation.change(selectedValue);
     if (single && !hasInputValue && !inputInsidePopup) {
-      const nextInputValue = resolveAriaLabelledBy.stringifyAsLabel(selectedValue, itemToStringLabel);
+      const nextInputValue = useCompositeListItem.stringifyAsLabel(selectedValue, itemToStringLabel);
       if (inputValue !== nextInputValue) {
-        setInputValue(nextInputValue, useButton.createChangeEventDetails(useButton.none));
+        setInputValue(nextInputValue, useScrollLock.createChangeEventDetails(useScrollLock.none));
       }
     }
   });
-  useButton.useValueChanged(inputValue, () => {
+  useScrollLock.useValueChanged(inputValue, () => {
     if (selectionMode !== 'none') {
       return;
     }
@@ -1031,13 +1028,13 @@ function AriaCombobox(props) {
     setDirty(inputValue !== validityData.initialValue);
     validation.change(inputValue);
   });
-  useButton.useValueChanged(items, () => {
+  useScrollLock.useValueChanged(items, () => {
     if (!single || hasInputValue || inputInsidePopup || queryChangedAfterOpen) {
       return;
     }
-    const nextInputValue = resolveAriaLabelledBy.stringifyAsLabel(selectedValue, itemToStringLabel);
+    const nextInputValue = useCompositeListItem.stringifyAsLabel(selectedValue, itemToStringLabel);
     if (inputValue !== nextInputValue) {
-      setInputValue(nextInputValue, useButton.createChangeEventDetails(useButton.none));
+      setInputValue(nextInputValue, useScrollLock.createChangeEventDetails(useScrollLock.none));
     }
   });
   const floatingRootContext = useCompositeListItem.useFloatingRootContext({
@@ -1087,7 +1084,7 @@ function AriaCombobox(props) {
     // Apply a small delay for touch to let mobile viewport/keyboard positioning settle.
     // This avoids top-bottom flip flickers if the preferred position is "top" when first tapping.
     touchOpenDelay: inputInsidePopup ? 0 : 100,
-    reason: useButton.inputPress
+    reason: useScrollLock.inputPress
   });
   const dismiss = useScrollLock.useDismiss(floatingRootContext, {
     enabled: !readOnly && !disabled && !inline,
@@ -1101,8 +1098,8 @@ function AriaCombobox(props) {
     // Without a popup, let the Escape key bubble the event up to other popups' handlers.
     bubbles: inline ? true : undefined,
     outsidePress(event) {
-      const target = useButton.getTarget(event);
-      return !useButton.contains(triggerElement, target) && !useButton.contains(clearRef.current, target) && !useButton.contains(chipsContainerRef.current, target) && !useButton.contains(inputGroupElement, target);
+      const target = useScrollLock.getTarget(event);
+      return !useScrollLock.contains(triggerElement, target) && !useScrollLock.contains(clearRef.current, target) && !useScrollLock.contains(chipsContainerRef.current, target) && !useScrollLock.contains(inputGroupElement, target);
     }
   });
   const listNavigation = useCompositeListItem.useListNavigation(floatingRootContext, {
@@ -1179,7 +1176,7 @@ function AriaCombobox(props) {
       requestSubmit
     });
   });
-  useButton.useIsoLayoutEffect(() => {
+  useScrollLock.useIsoLayoutEffect(() => {
     store.update({
       id,
       selectedValue,
@@ -1225,7 +1222,7 @@ function AriaCombobox(props) {
     if (Array.isArray(fieldRawValue)) {
       return '';
     }
-    return resolveAriaLabelledBy.stringifyAsValue(fieldRawValue, itemToStringValue);
+    return useCompositeListItem.stringifyAsValue(fieldRawValue, itemToStringValue);
   }, [fieldRawValue, itemToStringValue]);
   const hasMultipleSelection = multiple && Array.isArray(selectedValue) && selectedValue.length > 0;
   const hiddenInputName = multiple || selectionMode === 'none' && inputOwnsFormValue ? undefined : name;
@@ -1234,7 +1231,7 @@ function AriaCombobox(props) {
       return null;
     }
     return selectedValue.map(value => {
-      const currentSerializedValue = resolveAriaLabelledBy.stringifyAsValue(value, itemToStringValue);
+      const currentSerializedValue = useCompositeListItem.stringifyAsValue(value, itemToStringValue);
       return /*#__PURE__*/jsxRuntime.jsx("input", {
         type: "hidden",
         form: form,
@@ -1263,8 +1260,8 @@ function AriaCombobox(props) {
           }
           const nextValue = event.currentTarget.value;
           const nextValueLower = nextValue.toLowerCase();
-          const details = useButton.createChangeEventDetails(useButton.none, event.nativeEvent);
-          const findSerializedMatchIndex = () => valuesRef.current.findIndex(candidate => resolveAriaLabelledBy.stringifyAsValue(candidate, itemToStringValue).toLowerCase() === nextValueLower || resolveAriaLabelledBy.stringifyAsLabel(candidate, itemToStringLabel).toLowerCase() === nextValueLower);
+          const details = useScrollLock.createChangeEventDetails(useScrollLock.none, event.nativeEvent);
+          const findSerializedMatchIndex = () => valuesRef.current.findIndex(candidate => useCompositeListItem.stringifyAsValue(candidate, itemToStringValue).toLowerCase() === nextValueLower || useCompositeListItem.stringifyAsLabel(candidate, itemToStringLabel).toLowerCase() === nextValueLower);
           function handleChange() {
             // Browser autofill only writes a single scalar value.
             if (multiple) {
@@ -1317,7 +1314,7 @@ function AriaCombobox(props) {
       readOnly: readOnly,
       value: serializedValue,
       ref: hiddenInputRef,
-      style: hiddenInputName ? useButton.visuallyHiddenInput : useButton.visuallyHidden,
+      style: hiddenInputName ? useScrollLock.visuallyHiddenInput : useScrollLock.visuallyHidden,
       tabIndex: -1,
       "aria-hidden": true,
       suppressHydrationWarning: true
@@ -1343,7 +1340,7 @@ function AriaCombobox(props) {
 
 const triggerStateAttributesMapping = {
   ...useScrollLock.pressableTriggerOpenStateMapping,
-  ...useLabelableId.fieldValidityMapping,
+  ...useCompositeListItem.fieldValidityMapping,
   popupSide: side => side ? {
     'data-popup-side': side
   } : null,
@@ -1377,10 +1374,10 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
     setFocused,
     validationMode,
     validation
-  } = useLabelableId.useFieldRootContext();
+  } = useCompositeListItem.useFieldRootContext();
   const {
     labelId: fieldLabelId
-  } = useLabelableId.useLabelableContext();
+  } = useCompositeListItem.useLabelableContext();
   const store = useComboboxRootContext();
   const {
     filteredItems
@@ -1406,15 +1403,15 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
   const hasSelectedValue = useScrollLock.useStore(store, selectors.hasSelectedValue);
   const floatingRootContext = useComboboxFloatingContext();
   const inputValue = useComboboxInputValueContext();
-  const focusTimeout = useButton.useTimeout();
+  const focusTimeout = useScrollLock.useTimeout();
   const disabled = fieldDisabled || comboboxDisabled || disabledProp;
   const listEmpty = filteredItems.length === 0;
   const popupSide = mounted && positionerElement ? popupSideValue : null;
-  useLabelableId.useLabelableId({
+  useCompositeListItem.useLabelableId({
     id: inputInsidePopup ? idProp : undefined
   });
   const id = inputInsidePopup ? idProp ?? rootId : idProp;
-  const ariaLabelledBy = resolveAriaLabelledBy.resolveAriaLabelledBy(fieldLabelId, comboboxLabelId);
+  const ariaLabelledBy = useCompositeListItem.resolveAriaLabelledBy(fieldLabelId, comboboxLabelId);
   let ariaControls;
   if (open && inputInsidePopup) {
     // Fall back to the default id while the popup registers its own (custom ids are stored once the
@@ -1449,7 +1446,7 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
     onMatch(index) {
       const nextSelectedValue = store.state.valuesRef.current[index];
       if (nextSelectedValue !== undefined) {
-        store.state.setSelectedValue(nextSelectedValue, useButton.createChangeEventDetails('none'));
+        store.state.setSelectedValue(nextSelectedValue, useScrollLock.createChangeEventDetails('none'));
       }
     }
   });
@@ -1462,7 +1459,7 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
   const {
     buttonRef,
     getButtonProps
-  } = useButton.useButton({
+  } = useScrollLock.useButton({
     native: nativeButton,
     disabled
   });
@@ -1474,7 +1471,7 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
     listEmpty,
     placeholder: selectionMode === 'none' ? false : !hasSelectedValue
   };
-  const setTriggerElement = useButton.useStableCallback(element => {
+  const setTriggerElement = useScrollLock.useStableCallback(element => {
     store.set('triggerElement', element);
   });
   const element = useRenderElement.useRenderElement('button', componentProps, {
@@ -1500,7 +1497,7 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
       },
       onBlur(event) {
         // If focus is moving into the popup, don't count it as a blur.
-        if (useButton.contains(positionerElement, event.relatedTarget)) {
+        if (useScrollLock.contains(positionerElement, event.relatedTarget)) {
           return;
         }
         setTouched(true);
@@ -1529,15 +1526,15 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
         if (open) {
           return;
         }
-        const doc = useButton.ownerDocument(event.currentTarget);
+        const doc = useScrollLock.ownerDocument(event.currentTarget);
         function handleMouseUp(mouseEvent) {
           if (!triggerElement) {
             return;
           }
-          const mouseUpTarget = useButton.getTarget(mouseEvent);
+          const mouseUpTarget = useScrollLock.getTarget(mouseEvent);
           const positioner = store.state.positionerElement;
           const list = store.state.listElement;
-          if (useButton.contains(triggerElement, mouseUpTarget) || useButton.contains(positioner, mouseUpTarget) || useButton.contains(list, mouseUpTarget) || mouseUpTarget === triggerElement) {
+          if (useScrollLock.contains(triggerElement, mouseUpTarget) || useScrollLock.contains(positioner, mouseUpTarget) || useScrollLock.contains(list, mouseUpTarget) || mouseUpTarget === triggerElement) {
             return;
           }
           const bounds = useCompositeListItem.getPseudoElementBounds(triggerElement);
@@ -1546,7 +1543,7 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
           if (withinHorizontal && withinVertical) {
             return;
           }
-          store.state.setOpen(false, useButton.createChangeEventDetails('cancel-open', mouseEvent));
+          store.state.setOpen(false, useScrollLock.createChangeEventDetails('cancel-open', mouseEvent));
         }
         if (inputInsidePopup) {
           doc.addEventListener('mouseup', handleMouseUp, {
@@ -1559,8 +1556,8 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
           return;
         }
         if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
-          useButton.stopEvent(event);
-          store.state.setOpen(true, useButton.createChangeEventDetails(useButton.listNavigation, event.nativeEvent));
+          useScrollLock.stopEvent(event);
+          store.state.setOpen(true, useScrollLock.createChangeEventDetails(useScrollLock.listNavigation, event.nativeEvent));
           store.state.inputRef.current?.focus();
         }
       }
@@ -1595,12 +1592,12 @@ const ComboboxInternalDismissButton = /*#__PURE__*/React__namespace.forwardRef(f
   const {
     buttonRef,
     getButtonProps
-  } = useButton.useButton({
+  } = useScrollLock.useButton({
     native: false
   });
   const mergedRef = useRenderElement.useMergedRefs(forwardedRef, buttonRef);
   function handleDismiss(event) {
-    store.state.setOpen(false, useButton.createChangeEventDetails(useButton.closePress, event.nativeEvent, event.currentTarget));
+    store.state.setOpen(false, useScrollLock.createChangeEventDetails(useScrollLock.closePress, event.nativeEvent, event.currentTarget));
   }
   const dismissProps = getButtonProps({
     onClick: handleDismiss
@@ -1610,7 +1607,7 @@ const ComboboxInternalDismissButton = /*#__PURE__*/React__namespace.forwardRef(f
     ...dismissProps,
     "aria-label": "Dismiss",
     tabIndex: undefined,
-    style: useButton.visuallyHiddenInput
+    style: useScrollLock.visuallyHiddenInput
   });
 });
 if (process.env.NODE_ENV !== "production") ComboboxInternalDismissButton.displayName = "ComboboxInternalDismissButton";
@@ -1631,10 +1628,10 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
     setFocused,
     validationMode,
     validation
-  } = useLabelableId.useFieldRootContext();
+  } = useCompositeListItem.useFieldRootContext();
   const {
     labelId: fieldLabelId
-  } = useLabelableId.useLabelableContext();
+  } = useCompositeListItem.useLabelableContext();
   const comboboxChipsContext = useComboboxChipsContext();
   const positioning = useComboboxPositionerContext(true);
   const hasPositionerParent = Boolean(positioning);
@@ -1669,18 +1666,18 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
   const listEmpty = filteredItems.length === 0;
   const isInsidePopup = hasPositionerParent || inline;
   const focusManagerModal = !isInsidePopup || modal;
-  const id = useButton.useBaseUiId(idProp ?? (!isInsidePopup ? rootId : undefined));
-  const ariaLabelledBy = resolveAriaLabelledBy.resolveAriaLabelledBy(fieldLabelId, undefined);
-  const fieldStateForInput = hasPositionerParent ? useLabelableId.DEFAULT_FIELD_STATE_ATTRIBUTES : fieldState;
+  const id = useScrollLock.useBaseUiId(idProp ?? (!isInsidePopup ? rootId : undefined));
+  const ariaLabelledBy = useCompositeListItem.resolveAriaLabelledBy(fieldLabelId, undefined);
+  const fieldStateForInput = hasPositionerParent ? useCompositeListItem.DEFAULT_FIELD_STATE_ATTRIBUTES : fieldState;
   const [composingValue, setComposingValue] = React__namespace.useState(null);
   const isComposingRef = React__namespace.useRef(false);
   const lastActiveIndexRef = React__namespace.useRef(null);
   const shouldRestoreActiveIndexRef = React__namespace.useRef(false);
   const inputOwnsFormValue = selectionMode === 'none' && !hasPositionerParent;
-  const setInputElement = useButton.useStableCallback(element => {
+  const setInputElement = useScrollLock.useStableCallback(element => {
     const nextIsInsidePopup = hasPositionerParent || store.state.inline;
     if (nextIsInsidePopup && !store.state.hasInputValue) {
-      store.state.setInputValue('', useButton.createChangeEventDetails(useButton.none));
+      store.state.setInputValue('', useScrollLock.createChangeEventDetails(useScrollLock.none));
     }
     store.update({
       inputElement: element,
@@ -1803,7 +1800,7 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
         }
       },
       onCompositionStart(event) {
-        if (useButton.android) {
+        if (useScrollLock.android) {
           return;
         }
         isComposingRef.current = true;
@@ -1813,7 +1810,7 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
         isComposingRef.current = false;
         const next = event.currentTarget.value;
         setComposingValue(null);
-        store.state.setInputValue(next, useButton.createChangeEventDetails(useButton.inputChange, event.nativeEvent));
+        store.state.setInputValue(next, useScrollLock.createChangeEventDetails(useScrollLock.inputChange, event.nativeEvent));
       },
       onChange(event) {
         // Autofill may not provide `inputType` (Chrome) or may report
@@ -1832,13 +1829,13 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
           const nextVal = event.currentTarget.value;
           setComposingValue(nextVal);
           if (nextVal === '' && !store.state.openOnInputClick && !store.state.inputInsidePopup) {
-            store.state.setOpen(false, useButton.createChangeEventDetails(useButton.inputClear, event.nativeEvent));
+            store.state.setOpen(false, useScrollLock.createChangeEventDetails(useScrollLock.inputClear, event.nativeEvent));
           }
           const trimmed = nextVal.trim();
           const shouldMaintainHighlight = autoHighlightEnabled && trimmed !== '';
           if (!readOnly && !disabled && trimmed) {
             if (shouldOpenOnInput) {
-              store.state.setOpen(true, useButton.createChangeEventDetails(useButton.inputChange, event.nativeEvent));
+              store.state.setOpen(true, useScrollLock.createChangeEventDetails(useScrollLock.inputChange, event.nativeEvent));
               if (!autoHighlightEnabled) {
                 store.state.setIndices({
                   activeIndex: null,
@@ -1857,13 +1854,13 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
           }
           return;
         }
-        const inputChangeDetails = useButton.createChangeEventDetails(useButton.inputChange, event.nativeEvent);
+        const inputChangeDetails = useScrollLock.createChangeEventDetails(useScrollLock.inputChange, event.nativeEvent);
         store.state.setInputValue(event.currentTarget.value, inputChangeDetails);
         if (inputChangeDetails.isCanceled) {
           return;
         }
         const empty = event.currentTarget.value === '';
-        const clearDetails = useButton.createChangeEventDetails(useButton.inputClear, event.nativeEvent);
+        const clearDetails = useScrollLock.createChangeEventDetails(useScrollLock.inputClear, event.nativeEvent);
         if (empty && !store.state.inputInsidePopup) {
           if (selectionMode === 'single') {
             store.state.setSelectedValue(null, clearDetails);
@@ -1875,7 +1872,7 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
         const trimmed = event.currentTarget.value.trim();
         if (!readOnly && !disabled && trimmed) {
           if (shouldOpenOnInput) {
-            store.state.setOpen(true, useButton.createChangeEventDetails(useButton.inputChange, event.nativeEvent));
+            store.state.setOpen(true, useScrollLock.createChangeEventDetails(useScrollLock.inputChange, event.nativeEvent));
             // When autoHighlight is enabled, keep the highlight (will be set to 0 in root).
             if (!autoHighlightEnabled) {
               store.state.setIndices({
@@ -1910,14 +1907,14 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
         const scrollAmount = input.scrollWidth - input.clientWidth;
         const isRTL = direction === 'rtl';
         if (event.key === 'Home') {
-          useButton.stopEvent(event);
+          useScrollLock.stopEvent(event);
           const cursor = useScrollLock.gecko && isRTL ? input.value.length : 0;
           input.setSelectionRange(cursor, cursor);
           input.scrollLeft = 0;
           return;
         }
         if (event.key === 'End') {
-          useButton.stopEvent(event);
+          useScrollLock.stopEvent(event);
           const cursor = useScrollLock.gecko && isRTL ? 0 : input.value.length;
           input.setSelectionRange(cursor, cursor);
           input.scrollLeft = isRTL ? -scrollAmount : scrollAmount;
@@ -1925,7 +1922,7 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
         }
         if (!mounted && event.key === 'Escape') {
           const isClear = selectionMode === 'multiple' && Array.isArray(selectedValue) ? selectedValue.length === 0 : selectedValue === null;
-          const details = useButton.createChangeEventDetails(useButton.escapeKey, event.nativeEvent);
+          const details = useScrollLock.createChangeEventDetails(useScrollLock.escapeKey, event.nativeEvent);
           const value = selectionMode === 'multiple' ? [] : null;
           store.state.setInputValue('', details);
           store.state.setSelectedValue(value, details);
@@ -1946,7 +1943,7 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
             selectedIndex: null,
             type: store.state.keyboardActiveRef.current ? 'keyboard' : 'pointer'
           });
-          store.state.setSelectedValue(newValue, useButton.createChangeEventDetails(useButton.none, event.nativeEvent));
+          store.state.setSelectedValue(newValue, useScrollLock.createChangeEventDetails(useScrollLock.none, event.nativeEvent));
           return;
         }
         const hadHighlightedChip = comboboxChipsContext?.highlightedChipIndex !== undefined;
@@ -1971,10 +1968,10 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
             }
 
             // Allow form submission when no item is highlighted.
-            store.state.setOpen(false, useButton.createChangeEventDetails(useButton.none, nativeEvent));
+            store.state.setOpen(false, useScrollLock.createChangeEventDetails(useScrollLock.none, nativeEvent));
             return;
           }
-          useButton.stopEvent(event);
+          useScrollLock.stopEvent(event);
           const listItem = store.state.listRef.current[activeIndex];
           if (listItem) {
             store.state.selectionEventRef.current = nativeEvent;
@@ -1992,8 +1989,8 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
     }, validationProps],
     stateAttributesMapping: triggerStateAttributesMapping
   });
-  const renderedInput = hasPositionerParent ? /*#__PURE__*/jsxRuntime.jsx(useLabelableId.FieldRootContext.Provider, {
-    value: useLabelableId.DEFAULT_FIELD_ROOT_CONTEXT,
+  const renderedInput = hasPositionerParent ? /*#__PURE__*/jsxRuntime.jsx(useCompositeListItem.FieldRootContext.Provider, {
+    value: useCompositeListItem.DEFAULT_FIELD_ROOT_CONTEXT,
     children: element
   }) : element;
   return /*#__PURE__*/jsxRuntime.jsxs(React__namespace.Fragment, {
@@ -2008,8 +2005,8 @@ function handleInputPress(event, store, disabled, readOnly, shouldIgnoreTarget)
   if (event.baseUIHandlerPrevented || readOnly) {
     return;
   }
-  const target = useButton.getTarget(event.nativeEvent);
-  const targetElement = floatingUi_utils_dom.isElement(target) ? target : null;
+  const target = useScrollLock.getTarget(event.nativeEvent);
+  const targetElement = floatingUi_utils.isElement(target) ? target : null;
   if (targetElement !== event.currentTarget && (shouldIgnoreTarget?.(targetElement) || useScrollLock.isInteractiveElement(targetElement))) {
     return;
   }
@@ -2019,7 +2016,7 @@ function handleInputPress(event, store, disabled, readOnly, shouldIgnoreTarget)
   }
   store.state.inputRef.current?.focus();
   if (store.state.openOnInputClick) {
-    store.state.setOpen(true, useButton.createChangeEventDetails(useButton.inputPress, event.nativeEvent));
+    store.state.setOpen(true, useScrollLock.createChangeEventDetails(useScrollLock.inputPress, event.nativeEvent));
   }
 }
 
@@ -2038,7 +2035,7 @@ const ComboboxInputGroup = /*#__PURE__*/React__namespace.forwardRef(function Com
   } = componentProps;
   const {
     state: fieldState
-  } = useLabelableId.useFieldRootContext();
+  } = useCompositeListItem.useFieldRootContext();
   const store = useComboboxRootContext();
   const {
     filteredItems
@@ -2064,7 +2061,7 @@ const ComboboxInputGroup = /*#__PURE__*/React__namespace.forwardRef(function Com
     listEmpty,
     placeholder
   };
-  const setInputGroupElement = useButton.useStableCallback(element => {
+  const setInputGroupElement = useScrollLock.useStableCallback(element => {
     store.set('inputGroupElement', element);
   });
   return useRenderElement.useRenderElement('div', componentProps, {
@@ -2073,7 +2070,7 @@ const ComboboxInputGroup = /*#__PURE__*/React__namespace.forwardRef(function Com
       role: 'group',
       onMouseDown(event) {
         handleInputPress(event, store, disabled, readOnly, target => {
-          return useButton.contains(store.state.chipsContainerRef.current, target);
+          return useScrollLock.contains(store.state.chipsContainerRef.current, target);
         });
       }
     }, elementProps],
@@ -2108,7 +2105,7 @@ const ComboboxIcon = /*#__PURE__*/React__namespace.forwardRef(function ComboboxI
 if (process.env.NODE_ENV !== "production") ComboboxIcon.displayName = "ComboboxIcon";
 
 const stateAttributesMapping$2 = {
-  ...useButton.transitionStatusMapping,
+  ...useScrollLock.transitionStatusMapping,
   ...useScrollLock.triggerOpenStateMapping
 };
 
@@ -2130,7 +2127,7 @@ const ComboboxClear = /*#__PURE__*/React__namespace.forwardRef(function Combobox
   } = componentProps;
   const {
     disabled: fieldDisabled
-  } = useLabelableId.useFieldRootContext();
+  } = useCompositeListItem.useFieldRootContext();
   const store = useComboboxRootContext();
   const selectionMode = useScrollLock.useStore(store, selectors.selectionMode);
   const comboboxDisabled = useScrollLock.useStore(store, selectors.disabled);
@@ -2151,7 +2148,7 @@ const ComboboxClear = /*#__PURE__*/React__namespace.forwardRef(function Combobox
   const {
     buttonRef,
     getButtonProps
-  } = useButton.useButton({
+  } = useScrollLock.useButton({
     native: nativeButton,
     disabled
   });
@@ -2159,14 +2156,14 @@ const ComboboxClear = /*#__PURE__*/React__namespace.forwardRef(function Combobox
     mounted,
     transitionStatus,
     setMounted
-  } = useButton.useTransitionStatus(visible);
+  } = useScrollLock.useTransitionStatus(visible);
   const state = {
     disabled,
     visible,
     open,
     transitionStatus
   };
-  useButton.useOpenChangeComplete({
+  useScrollLock.useOpenChangeComplete({
     open: visible,
     ref: store.state.clearRef,
     onComplete() {
@@ -2190,9 +2187,9 @@ const ComboboxClear = /*#__PURE__*/React__namespace.forwardRef(function Combobox
           return;
         }
         const keyboardActiveRef = store.state.keyboardActiveRef;
-        store.state.setInputValue('', useButton.createChangeEventDetails(useButton.clearPress, event.nativeEvent));
+        store.state.setInputValue('', useScrollLock.createChangeEventDetails(useScrollLock.clearPress, event.nativeEvent));
         if (selectionMode !== 'none') {
-          store.state.setSelectedValue(Array.isArray(selectedValue) ? [] : null, useButton.createChangeEventDetails(useButton.clearPress, event.nativeEvent));
+          store.state.setSelectedValue(Array.isArray(selectedValue) ? [] : null, useScrollLock.createChangeEventDetails(useScrollLock.clearPress, event.nativeEvent));
           store.state.setIndices({
             activeIndex: null,
             selectedIndex: null,
@@ -2276,10 +2273,10 @@ const ComboboxList = /*#__PURE__*/React__namespace.forwardRef(function ComboboxL
   const forceMounted = useScrollLock.useStore(store, selectors.forceMounted);
   const multiple = selectionMode === 'multiple';
   const empty = filteredItems.length === 0;
-  const setPositionerElement = useButton.useStableCallback(element => {
+  const setPositionerElement = useScrollLock.useStableCallback(element => {
     store.set('positionerElement', element);
   });
-  const setListElement = useButton.useStableCallback(element => {
+  const setListElement = useScrollLock.useStableCallback(element => {
     store.set('listElement', element);
   });
 
@@ -2318,7 +2315,7 @@ const ComboboxList = /*#__PURE__*/React__namespace.forwardRef(function ComboboxL
             // Allow form submission when no item is highlighted.
             return;
           }
-          useButton.stopEvent(event);
+          useScrollLock.stopEvent(event);
           const nativeEvent = event.nativeEvent;
           const listItem = store.state.listRef.current[activeIndex];
           if (listItem) {
@@ -2368,12 +2365,12 @@ function findLastTextNode(root) {
   return lastTextNode;
 }
 function useInitialLiveRegionTextMutation() {
-  const timeout = useButton.useTimeout();
+  const timeout = useScrollLock.useTimeout();
   const rootRef = React__namespace.useRef(null);
 
   // Only the initial mounted announcement needs the marker; later text updates announce naturally.
   React__namespace.useEffect(() => {
-    if (useButton.ios) {
+    if (useScrollLock.ios) {
       return undefined;
     }
     const root = rootRef.current;
@@ -2468,7 +2465,7 @@ if (process.env.NODE_ENV !== "production") ComboboxPortal.displayName = "Combobo
 
 const stateAttributesMapping$1 = {
   ...useScrollLock.popupStateMapping,
-  ...useButton.transitionStatusMapping
+  ...useScrollLock.transitionStatusMapping
 };
 
 /**
@@ -2571,10 +2568,10 @@ const ComboboxPositioner = /*#__PURE__*/React__namespace.forwardRef(function Com
     anchorHidden: positioning.anchorHidden,
     empty
   };
-  useButton.useIsoLayoutEffect(() => {
+  useScrollLock.useIsoLayoutEffect(() => {
     store.set('popupSide', positioning.side);
   }, [store, positioning.side]);
-  const setPositionerElement = useButton.useStableCallback(element => {
+  const setPositionerElement = useScrollLock.useStableCallback(element => {
     store.set('positionerElement', element);
   });
   const element = useCompositeListItem.usePositioner(componentProps, state, {
@@ -2597,7 +2594,7 @@ if (process.env.NODE_ENV !== "production") ComboboxPositioner.displayName = "Com
 
 const stateAttributesMapping = {
   ...useScrollLock.popupStateMapping,
-  ...useButton.transitionStatusMapping
+  ...useScrollLock.transitionStatusMapping
 };
 
 /**
@@ -2631,14 +2628,14 @@ const ComboboxPopup = /*#__PURE__*/React__namespace.forwardRef(function Combobox
   const rootId = useScrollLock.useStore(store, selectors.id);
   const empty = filteredItems.length === 0;
   const popupId = elementProps.id ?? (inputInsidePopup ? getComboboxPopupId(rootId) : undefined);
-  useButton.useIsoLayoutEffect(() => {
+  useScrollLock.useIsoLayoutEffect(() => {
     // Prefer the rendered DOM id, which a `render` prop element or function may override.
     store.set('popupId', store.state.popupRef.current?.id || popupId);
     return () => {
       store.set('popupId', undefined);
     };
   }, [store, popupId]);
-  useButton.useOpenChangeComplete({
+  useScrollLock.useOpenChangeComplete({
     open,
     ref: store.state.popupRef,
     onComplete() {
@@ -2663,8 +2660,8 @@ const ComboboxPopup = /*#__PURE__*/React__namespace.forwardRef(function Combobox
       role: inputInsidePopup ? 'dialog' : 'presentation',
       tabIndex: -1,
       onFocus(event) {
-        const target = useButton.getTarget(event.nativeEvent);
-        if (openMethod !== 'touch' && (useButton.contains(store.state.listElement, target) || target === event.currentTarget)) {
+        const target = useScrollLock.getTarget(event.nativeEvent);
+        if (openMethod !== 'touch' && (useScrollLock.contains(store.state.listElement, target) || target === event.currentTarget)) {
           store.state.inputRef.current?.focus();
         }
       }
@@ -2804,8 +2801,8 @@ const ComboboxGroupLabel = /*#__PURE__*/React__namespace.forwardRef(function Com
   const {
     setLabelId
   } = useComboboxGroupContext();
-  const id = useButton.useBaseUiId(idProp);
-  useButton.useIsoLayoutEffect(() => {
+  const id = useScrollLock.useBaseUiId(idProp);
+  useScrollLock.useIsoLayoutEffect(() => {
     setLabelId(id);
     return () => {
       setLabelId(undefined);
@@ -2878,7 +2875,7 @@ function ComboboxItemInner(props) {
   const itemRef = React__namespace.useRef(null);
   const id = rootId != null && hasRegistered ? `${rootId}-${index}` : undefined;
   const selected = matchesSelectedValue && selectable;
-  useButton.useIsoLayoutEffect(() => {
+  useScrollLock.useIsoLayoutEffect(() => {
     const shouldRun = hasRegistered && (virtualized || indexProp != null);
     if (!shouldRun) {
       return undefined;
@@ -2889,7 +2886,7 @@ function ComboboxItemInner(props) {
       delete list[index];
     };
   }, [hasRegistered, virtualized, index, indexProp, store]);
-  useButton.useIsoLayoutEffect(() => {
+  useScrollLock.useIsoLayoutEffect(() => {
     if (!hasRegistered || hasItems) {
       return undefined;
     }
@@ -2906,7 +2903,7 @@ function ComboboxItemInner(props) {
       delete visibleMap[index];
     };
   }, [hasRegistered, hasItems, index, itemValue, store, selectionMode]);
-  useButton.useIsoLayoutEffect(() => {
+  useScrollLock.useIsoLayoutEffect(() => {
     if (!open) {
       didPointerDownRef.current = false;
       return;
@@ -2916,14 +2913,14 @@ function ComboboxItemInner(props) {
     }
     const selectedValue = store.state.selectedValue;
     const lastSelectedValue = Array.isArray(selectedValue) ? selectedValue[selectedValue.length - 1] : selectedValue;
-    if (resolveAriaLabelledBy.compareItemEquality(itemValue, lastSelectedValue, isItemEqualToValue)) {
+    if (useCompositeListItem.compareItemEquality(itemValue, lastSelectedValue, isItemEqualToValue)) {
       store.set('selectedIndex', index);
     }
   }, [hasRegistered, hasItems, open, store, index, itemValue, isItemEqualToValue]);
   const {
     getButtonProps,
     buttonRef
-  } = useButton.useButton({
+  } = useScrollLock.useButton({
     disabled,
     focusableWhenDisabled: true,
     native: nativeButton,
@@ -3009,7 +3006,7 @@ function ComboboxItemVirtualizedIndex(props) {
   const {
     flatFilteredItems
   } = useComboboxDerivedItemsContext();
-  const indexFromFilter = resolveAriaLabelledBy.findItemIndex(flatFilteredItems, componentProps.value ?? null, isItemEqualToValue);
+  const indexFromFilter = useCompositeListItem.findItemIndex(flatFilteredItems, componentProps.value ?? null, isItemEqualToValue);
 
   // Only reached when `virtualized` is true (see the wrapper below).
   return /*#__PURE__*/jsxRuntime.jsx(ComboboxItemInner, {
@@ -3149,13 +3146,13 @@ const ComboboxLabel = /*#__PURE__*/React__namespace.forwardRef(function Combobox
   // Keep label id derived from the root and ignore runtime `id` overrides from untyped consumers.
   const elementPropsWithoutId = elementProps;
   delete elementPropsWithoutId.id;
-  const fieldRootContext = useLabelableId.useFieldRootContext();
+  const fieldRootContext = useCompositeListItem.useFieldRootContext();
   const store = useComboboxRootContext();
   const inputInsidePopup = useScrollLock.useStore(store, selectors.inputInsidePopup);
   const triggerElement = useScrollLock.useStore(store, selectors.triggerElement);
   const inputElement = useScrollLock.useStore(store, selectors.inputElement);
   const rootId = useScrollLock.useStore(store, selectors.id);
-  const defaultLabelId = resolveAriaLabelledBy.getDefaultLabelId(rootId);
+  const defaultLabelId = useCompositeListItem.getDefaultLabelId(rootId);
   const localControlId = triggerElement?.id ?? (inputInsidePopup ? rootId : undefined);
   if (process.env.NODE_ENV !== 'production') {
     // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -3163,9 +3160,9 @@ const ComboboxLabel = /*#__PURE__*/React__namespace.forwardRef(function Combobox
       if (!inputElement || inputInsidePopup) {
         return;
       }
-      const ownerStackMessage = useButton.SafeReact.captureOwnerStack?.() || '';
+      const ownerStackMessage = useScrollLock.SafeReact.captureOwnerStack?.() || '';
       const message = '<Combobox.Label> labels <Combobox.Trigger> only. ' + 'When <Combobox.Input> is the form control, use a native <label> or <Field.Label> instead.';
-      useButton.error(`${message}${ownerStackMessage}`);
+      useScrollLock.error(`${message}${ownerStackMessage}`);
     }, [inputElement, inputInsidePopup]);
   }
   const labelProps = useLabel.useLabel({
@@ -3179,7 +3176,7 @@ const ComboboxLabel = /*#__PURE__*/React__namespace.forwardRef(function Combobox
     ref: forwardedRef,
     state: fieldRootContext.state,
     props: [labelProps, elementProps],
-    stateAttributesMapping: useLabelableId.fieldValidityMapping
+    stateAttributesMapping: useCompositeListItem.fieldValidityMapping
   });
 });
 if (process.env.NODE_ENV !== "production") ComboboxLabel.displayName = "ComboboxLabel";
@@ -3205,9 +3202,9 @@ function ComboboxValue(props) {
   } else if (!hasSelectedValue && placeholder != null && !hasNullLabel) {
     children = placeholder;
   } else if (multiple && Array.isArray(selectedValue)) {
-    children = resolveAriaLabelledBy.resolveMultipleLabels(selectedValue, items, itemToStringLabel);
+    children = useCompositeListItem.resolveMultipleLabels(selectedValue, items, itemToStringLabel);
   } else {
-    children = resolveAriaLabelledBy.resolveSelectedLabel(selectedValue, items, itemToStringLabel);
+    children = useCompositeListItem.resolveSelectedLabel(selectedValue, items, itemToStringLabel);
   }
   return /*#__PURE__*/jsxRuntime.jsx(React__namespace.Fragment, {
     children: children
@@ -3248,7 +3245,7 @@ const Inner = /*#__PURE__*/React__namespace.memo(/*#__PURE__*/React__namespace.f
   const {
     transitionStatus,
     setMounted
-  } = useButton.useTransitionStatus(selected);
+  } = useScrollLock.useTransitionStatus(selected);
   const state = {
     selected,
     transitionStatus
@@ -3260,9 +3257,9 @@ const Inner = /*#__PURE__*/React__namespace.memo(/*#__PURE__*/React__namespace.f
       'aria-hidden': true,
       children: '✔️'
     }, elementProps],
-    stateAttributesMapping: useButton.transitionStatusMapping
+    stateAttributesMapping: useScrollLock.transitionStatusMapping
   });
-  useButton.useOpenChangeComplete({
+  useScrollLock.useOpenChangeComplete({
     open: selected,
     ref: indicatorRef,
     onComplete() {
@@ -3369,19 +3366,19 @@ const ComboboxChip = /*#__PURE__*/React__namespace.forwardRef(function ComboboxC
     } else if (event.key === 'Backspace' || event.key === 'Delete') {
       const computedNextIndex = index >= selectedValue.length - 1 ? selectedValue.length - 2 : index;
       nextIndex = computedNextIndex >= 0 ? computedNextIndex : undefined;
-      useButton.stopEvent(event);
+      useScrollLock.stopEvent(event);
       store.state.setIndices({
         activeIndex: null,
         selectedIndex: null,
         type: 'keyboard'
       });
-      store.state.setSelectedValue(selectedValue.filter((_, i) => i !== index), useButton.createChangeEventDetails(useButton.none, event.nativeEvent));
+      store.state.setSelectedValue(selectedValue.filter((_, i) => i !== index), useScrollLock.createChangeEventDetails(useScrollLock.none, event.nativeEvent));
     } else if (event.key === 'Enter' || event.key === ' ') {
-      useButton.stopEvent(event);
+      useScrollLock.stopEvent(event);
       nextIndex = undefined;
     } else if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
-      useButton.stopEvent(event);
-      store.state.setOpen(true, useButton.createChangeEventDetails(useButton.listNavigation, event.nativeEvent));
+      useScrollLock.stopEvent(event);
+      store.state.setOpen(true, useScrollLock.createChangeEventDetails(useScrollLock.listNavigation, event.nativeEvent));
       nextIndex = undefined;
     } else if (
     // Check for printable characters (letters, numbers, symbols)
@@ -3453,7 +3450,7 @@ const ComboboxChipRemove = /*#__PURE__*/React__namespace.forwardRef(function Com
   const {
     buttonRef,
     getButtonProps
-  } = useButton.useButton({
+  } = useScrollLock.useButton({
     native: nativeButton,
     disabled: disabled || readOnly,
     focusableWhenDisabled: true
@@ -3469,7 +3466,7 @@ const ComboboxChipRemove = /*#__PURE__*/React__namespace.forwardRef(function Com
 
     // Try current visible list first; if not found, it's filtered out.
     // No need to clear highlight in that case since it can't equal activeIndex.
-    const removedIndex = resolveAriaLabelledBy.findItemIndex(store.state.valuesRef.current, removedItem, isItemEqualToValue);
+    const removedIndex = useCompositeListItem.findItemIndex(store.state.valuesRef.current, removedItem, isItemEqualToValue);
     if (removedIndex !== -1 && activeIndex === removedIndex) {
       store.state.setIndices({
         activeIndex: null,
@@ -3478,7 +3475,7 @@ const ComboboxChipRemove = /*#__PURE__*/React__namespace.forwardRef(function Com
     }
   }
   function removeChip(event) {
-    const eventDetails = useButton.createChangeEventDetails(useButton.chipRemovePress, event.nativeEvent);
+    const eventDetails = useScrollLock.createChangeEventDetails(useScrollLock.chipRemovePress, event.nativeEvent);
     const removedItem = selectedValue[index];
     clearActiveIndexForRemovedItem(removedItem);
     store.state.setSelectedValue(selectedValue.filter((_, i) => i !== index), eventDetails);
@@ -3509,7 +3506,7 @@ const ComboboxChipRemove = /*#__PURE__*/React__namespace.forwardRef(function Com
         if (event.key === 'Enter' || event.key === ' ') {
           const eventDetails = removeChip(event);
           if (!eventDetails.isPropagationAllowed) {
-            useButton.stopEvent(event);
+            useScrollLock.stopEvent(event);
           }
         }
       }