@jobber/components 8.21.1 → 8.23.0

package/dist/ComboboxChipRemove-cjs.js

@@ -3,11 +3,13 @@
 var React = require('react');
 var useButton = require('./useButton-cjs.js');
 var useRenderElement = require('./useRenderElement-cjs.js');
-var useLabel = require('./useLabel-cjs.js');
+var useLabelableId = require('./useLabelableId-cjs.js');
 var useCompositeListItem = require('./useCompositeListItem-cjs.js');
+var resolveAriaLabelledBy = require('./resolveAriaLabelledBy-cjs.js');
 var InternalBackdrop = require('./InternalBackdrop-cjs.js');
 var jsxRuntime = require('react/jsx-runtime');
 var ReactDOM = require('react-dom');
+var useLabel = require('./useLabel-cjs.js');
 
 function _interopNamespaceDefault(e) {
   var n = Object.create(null);
@@ -64,157 +66,6 @@ function useComboboxInputValueContext() {
   return React__namespace.useContext(ComboboxInputValueContext);
 }
 
-const defaultItemEquality = (itemValue, selectedValue) => Object.is(itemValue, selectedValue);
-function compareItemEquality(itemValue, selectedValue, comparer) {
-  if (itemValue == null || selectedValue == null) {
-    return Object.is(itemValue, selectedValue);
-  }
-  return comparer(itemValue, selectedValue);
-}
-function selectedValueIncludes(selectedValues, itemValue, comparer) {
-  if (!selectedValues || selectedValues.length === 0) {
-    return false;
-  }
-  return selectedValues.some(selectedValue => {
-    if (selectedValue === undefined) {
-      return false;
-    }
-    return compareItemEquality(itemValue, selectedValue, comparer);
-  });
-}
-function findItemIndex(itemValues, selectedValue, comparer) {
-  if (!itemValues || itemValues.length === 0) {
-    return -1;
-  }
-  return itemValues.findIndex(itemValue => {
-    if (itemValue === undefined) {
-      return false;
-    }
-    return compareItemEquality(itemValue, selectedValue, comparer);
-  });
-}
-function removeItem(selectedValues, itemValue, comparer) {
-  return selectedValues.filter(selectedValue => !compareItemEquality(itemValue, selectedValue, comparer));
-}
-
-function serializeValue(value) {
-  if (value == null) {
-    return '';
-  }
-  if (typeof value === 'string') {
-    return value;
-  }
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return String(value);
-  }
-}
-
-function isGroupedItems(items) {
-  return items != null && items.length > 0 && typeof items[0] === 'object' && items[0] != null && 'items' in items[0];
-}
-
-/**
- * Checks if the items array contains an item with a null value that has a non-null label.
- */
-function hasNullItemLabel(items) {
-  if (!Array.isArray(items)) {
-    return items != null && 'null' in items;
-  }
-  const arrayItems = items;
-  if (isGroupedItems(arrayItems)) {
-    for (const group of arrayItems) {
-      for (const item of group.items) {
-        if (item && item.value == null && item.label != null) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-  for (const item of arrayItems) {
-    if (item && item.value == null && item.label != null) {
-      return true;
-    }
-  }
-  return false;
-}
-function stringifyAsLabel(item, itemToStringLabel) {
-  if (itemToStringLabel && item != null) {
-    return itemToStringLabel(item) ?? '';
-  }
-  if (item && typeof item === 'object') {
-    if ('label' in item && item.label != null) {
-      return String(item.label);
-    }
-    if ('value' in item) {
-      return String(item.value);
-    }
-  }
-  return serializeValue(item);
-}
-function stringifyAsValue(item, itemToStringValue) {
-  if (itemToStringValue && item != null) {
-    return itemToStringValue(item) ?? '';
-  }
-  if (item && typeof item === 'object' && 'value' in item && 'label' in item) {
-    return serializeValue(item.value);
-  }
-  return serializeValue(item);
-}
-function resolveSelectedLabel(value, items, itemToStringLabel) {
-  function fallback() {
-    return stringifyAsLabel(value, itemToStringLabel);
-  }
-  if (itemToStringLabel && value != null) {
-    return itemToStringLabel(value);
-  }
-
-  // Custom object with explicit label takes precedence
-  if (value && typeof value === 'object' && 'label' in value && value.label != null) {
-    return value.label;
-  }
-
-  // Items provided as plain record map
-  if (items && !Array.isArray(items)) {
-    return items[value] ?? fallback();
-  }
-
-  // Items provided as array (flat or grouped)
-  if (Array.isArray(items)) {
-    const arrayItems = items;
-    const flatItems = isGroupedItems(arrayItems) ? arrayItems.flatMap(group => group.items) : arrayItems;
-    if (value == null || typeof value !== 'object') {
-      const match = flatItems.find(item => item.value === value);
-      if (match && match.label != null) {
-        return match.label;
-      }
-      return fallback();
-    }
-
-    // Object without explicit label: try matching by its `value` property
-    if ('value' in value) {
-      const match = flatItems.find(item => item && item.value === value.value);
-      if (match && match.label != null) {
-        return match.label;
-      }
-    }
-  }
-  return fallback();
-}
-function resolveMultipleLabels(values, items, itemToStringLabel) {
-  return values.reduce((acc, value, index) => {
-    if (index > 0) {
-      acc.push(', ');
-    }
-    acc.push(/*#__PURE__*/jsxRuntime.jsx(React__namespace.Fragment, {
-      children: resolveSelectedLabel(value, items, itemToStringLabel)
-    }, index));
-    return acc;
-  }, []);
-}
-
 const selectors = {
   id: InternalBackdrop.createSelector(state => state.id),
   labelId: InternalBackdrop.createSelector(state => state.labelId),
@@ -239,7 +90,7 @@ const selectors = {
     return true;
   }),
   hasNullItemLabel: InternalBackdrop.createSelector((state, enabled) => {
-    return enabled ? hasNullItemLabel(state.items) : false;
+    return enabled ? resolveAriaLabelledBy.hasNullItemLabel(state.items) : false;
   }),
   open: InternalBackdrop.createSelector(state => state.open),
   mounted: InternalBackdrop.createSelector(state => state.mounted),
@@ -252,9 +103,9 @@ const selectors = {
     const comparer = state.isItemEqualToValue;
     const selectedValue = state.selectedValue;
     if (Array.isArray(selectedValue)) {
-      return selectedValue.some(selectedItem => compareItemEquality(itemValue, selectedItem, comparer));
+      return selectedValue.some(selectedItem => resolveAriaLabelledBy.compareItemEquality(itemValue, selectedItem, comparer));
     }
-    return compareItemEquality(itemValue, selectedValue, comparer);
+    return resolveAriaLabelledBy.compareItemEquality(itemValue, selectedValue, comparer);
   }),
   transitionStatus: InternalBackdrop.createSelector(state => state.transitionStatus),
   popupProps: InternalBackdrop.createSelector(state => state.popupProps),
@@ -307,7 +158,7 @@ function createCollatorItemFilter(collatorFilter, itemToStringLabel) {
     if (item == null) {
       return false;
     }
-    const itemString = stringifyAsLabel(item, itemToStringLabel);
+    const itemString = resolveAriaLabelledBy.stringifyAsLabel(item, itemToStringLabel);
     return collatorFilter.contains(itemString, query);
   };
 }
@@ -324,8 +175,8 @@ function createSingleSelectionCollatorFilter(collatorFilter, itemToStringLabel,
     if (!query) {
       return true;
     }
-    const itemString = stringifyAsLabel(item, itemToStringLabel);
-    const selectedString = selectedValue != null ? stringifyAsLabel(selectedValue, itemToStringLabel) : '';
+    const itemString = resolveAriaLabelledBy.stringifyAsLabel(item, itemToStringLabel);
+    const selectedString = selectedValue != null ? resolveAriaLabelledBy.stringifyAsLabel(selectedValue, itemToStringLabel) : '';
 
     // Handle case-insensitive matching consistently
     if (selectedString && collatorFilter.contains(selectedString, query) && selectedString.length === query.length) {
@@ -363,7 +214,7 @@ function getFilter(options = {}) {
       if (!query) {
         return true;
       }
-      const itemString = stringifyAsLabel(item, itemToString);
+      const itemString = resolveAriaLabelledBy.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;
@@ -375,14 +226,14 @@ function getFilter(options = {}) {
       if (!query) {
         return true;
       }
-      const itemString = stringifyAsLabel(item, itemToString);
+      const itemString = resolveAriaLabelledBy.stringifyAsLabel(item, itemToString);
       return collator.compare(itemString.slice(0, query.length), query) === 0;
     },
     endsWith(item, query, itemToString) {
       if (!query) {
         return true;
       }
-      const itemString = stringifyAsLabel(item, itemToString);
+      const itemString = resolveAriaLabelledBy.stringifyAsLabel(item, itemToString);
       const queryLength = query.length;
       return itemString.length >= queryLength && collator.compare(itemString.slice(itemString.length - queryLength), query) === 0;
     }
@@ -451,7 +302,7 @@ function AriaCombobox(props) {
     loopFocus = true,
     itemToStringLabel,
     itemToStringValue,
-    isItemEqualToValue = defaultItemEquality,
+    isItemEqualToValue = resolveAriaLabelledBy.defaultItemEquality,
     virtualized = false,
     inline: inlineProp = false,
     fillInputOnItemPress = true,
@@ -464,7 +315,7 @@ function AriaCombobox(props) {
   } = props;
   const {
     clearErrors
-  } = useLabel.useFormContext();
+  } = useLabelableId.useFormContext();
   const {
     setDirty,
     validityData,
@@ -476,8 +327,8 @@ function AriaCombobox(props) {
     setFocused,
     validationMode,
     validation
-  } = useLabel.useFieldRootContext();
-  const id = useLabel.useLabelableId({
+  } = useLabelableId.useFieldRootContext();
+  const id = useLabelableId.useLabelableId({
     id: idProp
   });
   const collatorFilter = useCoreFilter({
@@ -550,7 +401,7 @@ function AriaCombobox(props) {
       return defaultInputValueProp ?? '';
     }
     if (single) {
-      return stringifyAsLabel(selectedValue, itemToStringLabel);
+      return resolveAriaLabelledBy.stringifyAsLabel(selectedValue, itemToStringLabel);
     }
     return '';
   }).current;
@@ -566,9 +417,9 @@ function AriaCombobox(props) {
     name: 'Combobox',
     state: 'open'
   });
-  const isGrouped = isGroupedItems(items);
+  const isGrouped = resolveAriaLabelledBy.isGroupedItems(items);
   const query = closeQuery ?? (inputValue === '' ? '' : String(inputValue).trim());
-  const selectedLabelString = single ? stringifyAsLabel(selectedValue, itemToStringLabel) : '';
+  const selectedLabelString = single ? resolveAriaLabelledBy.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;
@@ -712,9 +563,9 @@ function AriaCombobox(props) {
       return fieldRawValue;
     }
     if (Array.isArray(selectedValue)) {
-      return selectedValue.map(value => stringifyAsValue(value, itemToStringValue));
+      return selectedValue.map(value => resolveAriaLabelledBy.stringifyAsValue(value, itemToStringValue));
     }
-    return stringifyAsValue(selectedValue, itemToStringValue);
+    return resolveAriaLabelledBy.stringifyAsValue(selectedValue, itemToStringValue);
   }, [fieldRawValue, itemToStringValue, selectionMode, selectedValue]);
   const onItemHighlighted = useButton.useStableCallback(onItemHighlightedProp);
   const onOpenChangeComplete = useButton.useStableCallback(onOpenChangeCompleteProp);
@@ -737,7 +588,7 @@ function AriaCombobox(props) {
     openMethod,
     triggerProps
   } = InternalBackdrop.useOpenInteractionType(open);
-  useLabel.useField({
+  useLabelableId.useField({
     id,
     name,
     commit: validation.commit,
@@ -748,7 +599,7 @@ function AriaCombobox(props) {
   const forceMount = useButton.useStableCallback(() => {
     if (items) {
       // Ensure typeahead works on a closed list.
-      labelsRef.current = flatFilteredItems.map(item => stringifyAsLabel(item, itemToStringLabel));
+      labelsRef.current = flatFilteredItems.map(item => resolveAriaLabelledBy.stringifyAsLabel(item, itemToStringLabel));
     } else {
       store.set('forceMounted', true);
     }
@@ -874,7 +725,7 @@ function AriaCombobox(props) {
     setSelectedValueUnwrapped(nextValue);
     const shouldFillInput = selectionMode === 'none' && popupRef.current && fillInputOnItemPress || single && !store.state.inputInsidePopup;
     if (shouldFillInput) {
-      setInputValue(stringifyAsLabel(nextValue, itemToStringLabel), useButton.createChangeEventDetails(eventDetails.reason, eventDetails.event));
+      setInputValue(resolveAriaLabelledBy.stringifyAsLabel(nextValue, itemToStringLabel), useButton.createChangeEventDetails(eventDetails.reason, eventDetails.event));
     }
     if (single && nextValue != null && eventDetails.reason !== useButton.inputChange && queryChangedAfterOpen && !inline) {
       setCloseQuery(query);
@@ -903,8 +754,8 @@ function AriaCombobox(props) {
     }
     if (multiple) {
       const currentSelectedValue = Array.isArray(selectedValue) ? selectedValue : [];
-      const isCurrentlySelected = selectedValueIncludes(currentSelectedValue, itemValue, store.state.isItemEqualToValue);
-      const nextValue = isCurrentlySelected ? removeItem(currentSelectedValue, itemValue, store.state.isItemEqualToValue) : [...currentSelectedValue, itemValue];
+      const isCurrentlySelected = resolveAriaLabelledBy.selectedValueIncludes(currentSelectedValue, itemValue, store.state.isItemEqualToValue);
+      const nextValue = isCurrentlySelected ? resolveAriaLabelledBy.removeItem(currentSelectedValue, itemValue, store.state.isItemEqualToValue) : [...currentSelectedValue, itemValue];
       setSelectedValue(nextValue, eventDetails);
       const wasFiltering = inputRef.current ? inputRef.current.value.trim() !== '' : false;
       if (!wasFiltering) {
@@ -961,7 +812,7 @@ function AriaCombobox(props) {
           setInputValue('', useButton.createChangeEventDetails(useButton.inputClear));
         }
       } else {
-        const stringVal = stringifyAsLabel(selectedValue, itemToStringLabel);
+        const stringVal = resolveAriaLabelledBy.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;
@@ -1004,12 +855,12 @@ function AriaCombobox(props) {
     if (multiple) {
       const currentValue = Array.isArray(selectedValue) ? selectedValue : [];
       const lastValue = currentValue[currentValue.length - 1];
-      const lastIndex = findItemIndex(registry, lastValue, isItemEqualToValue);
+      const lastIndex = resolveAriaLabelledBy.findItemIndex(registry, lastValue, isItemEqualToValue);
       setIndices({
         selectedIndex: lastIndex === -1 ? null : lastIndex
       });
     } else {
-      const index = findItemIndex(registry, selectedValue, isItemEqualToValue);
+      const index = resolveAriaLabelledBy.findItemIndex(registry, selectedValue, isItemEqualToValue);
       setIndices({
         selectedIndex: index === -1 ? null : index
       });
@@ -1064,7 +915,7 @@ function AriaCombobox(props) {
     }
     const itemValue = candidateItems[storeActiveIndex];
     const previouslyHighlightedItemValue = lastHighlightRef.current.value;
-    const isSameItem = previouslyHighlightedItemValue !== NO_ACTIVE_VALUE && compareItemEquality(itemValue, previouslyHighlightedItemValue, store.state.isItemEqualToValue);
+    const isSameItem = previouslyHighlightedItemValue !== NO_ACTIVE_VALUE && resolveAriaLabelledBy.compareItemEquality(itemValue, previouslyHighlightedItemValue, store.state.isItemEqualToValue);
     if (lastHighlightRef.current.index !== storeActiveIndex || !isSameItem) {
       lastHighlightRef.current = {
         value: itemValue,
@@ -1110,7 +961,7 @@ function AriaCombobox(props) {
       validation.commit(selectedValue, true);
     }
     if (single && !hasInputValue && !inputInsidePopup) {
-      const nextInputValue = stringifyAsLabel(selectedValue, itemToStringLabel);
+      const nextInputValue = resolveAriaLabelledBy.stringifyAsLabel(selectedValue, itemToStringLabel);
       if (inputValue !== nextInputValue) {
         setInputValue(nextInputValue, useButton.createChangeEventDetails(useButton.none));
       }
@@ -1132,7 +983,7 @@ function AriaCombobox(props) {
     if (!single || hasInputValue || inputInsidePopup || queryChangedAfterOpen) {
       return;
     }
-    const nextInputValue = stringifyAsLabel(selectedValue, itemToStringLabel);
+    const nextInputValue = resolveAriaLabelledBy.stringifyAsLabel(selectedValue, itemToStringLabel);
     if (inputValue !== nextInputValue) {
       setInputValue(nextInputValue, useButton.createChangeEventDetails(useButton.none));
     }
@@ -1304,7 +1155,7 @@ function AriaCombobox(props) {
     if (Array.isArray(fieldRawValue)) {
       return '';
     }
-    return stringifyAsValue(fieldRawValue, itemToStringValue);
+    return resolveAriaLabelledBy.stringifyAsValue(fieldRawValue, itemToStringValue);
   }, [fieldRawValue, itemToStringValue]);
   const hasMultipleSelection = multiple && Array.isArray(selectedValue) && selectedValue.length > 0;
   const hiddenInputName = multiple || selectionMode === 'none' ? undefined : name;
@@ -1313,7 +1164,7 @@ function AriaCombobox(props) {
       return null;
     }
     return selectedValue.map(value => {
-      const currentSerializedValue = stringifyAsValue(value, itemToStringValue);
+      const currentSerializedValue = resolveAriaLabelledBy.stringifyAsValue(value, itemToStringValue);
       return /*#__PURE__*/jsxRuntime.jsx("input", {
         type: "hidden",
         name: name,
@@ -1354,7 +1205,7 @@ function AriaCombobox(props) {
               return;
             }
             const matchingValue = valuesRef.current.find(v => {
-              const candidate = stringifyAsValue(v, itemToStringValue);
+              const candidate = resolveAriaLabelledBy.stringifyAsValue(v, itemToStringValue);
               if (candidate.toLowerCase() === nextValue.toLowerCase()) {
                 return true;
               }
@@ -1406,7 +1257,7 @@ function AriaCombobox(props) {
 
 const triggerStateAttributesMapping = {
   ...InternalBackdrop.pressableTriggerOpenStateMapping,
-  ...useLabel.fieldValidityMapping,
+  ...useLabelableId.fieldValidityMapping,
   popupSide: side => side ? {
     'data-popup-side': side
   } : null,
@@ -1415,13 +1266,6 @@ const triggerStateAttributesMapping = {
   } : null
 };
 
-function getDefaultLabelId(id) {
-  return id == null ? undefined : `${id}-label`;
-}
-function resolveAriaLabelledBy(fieldLabelId, localLabelId) {
-  return fieldLabelId ?? localLabelId;
-}
-
 const BOUNDARY_OFFSET = 2;
 
 /**
@@ -1444,10 +1288,10 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
     setFocused,
     validationMode,
     validation
-  } = useLabel.useFieldRootContext();
+  } = useLabelableId.useFieldRootContext();
   const {
     labelId: fieldLabelId
-  } = useLabel.useLabelableContext();
+  } = useLabelableId.useLabelableContext();
   const store = useComboboxRootContext();
   const {
     filteredItems
@@ -1476,11 +1320,11 @@ const ComboboxTrigger = /*#__PURE__*/React__namespace.forwardRef(function Combob
   const disabled = fieldDisabled || comboboxDisabled || disabledProp;
   const listEmpty = filteredItems.length === 0;
   const popupSide = mounted && positionerElement ? popupSideValue : null;
-  useLabel.useLabelableId({
+  useLabelableId.useLabelableId({
     id: inputInsidePopup ? idProp : undefined
   });
   const id = inputInsidePopup ? idProp ?? rootId : idProp;
-  const ariaLabelledBy = resolveAriaLabelledBy(fieldLabelId, comboboxLabelId);
+  const ariaLabelledBy = resolveAriaLabelledBy.resolveAriaLabelledBy(fieldLabelId, comboboxLabelId);
   const currentPointerTypeRef = React__namespace.useRef('');
   function trackPointerType(event) {
     currentPointerTypeRef.current = event.pointerType;
@@ -1688,10 +1532,10 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
     setFocused,
     validationMode,
     validation
-  } = useLabel.useFieldRootContext();
+  } = useLabelableId.useFieldRootContext();
   const {
     labelId: fieldLabelId
-  } = useLabel.useLabelableContext();
+  } = useLabelableId.useLabelableContext();
   const comboboxChipsContext = useComboboxChipsContext();
   const positioning = useComboboxPositionerContext(true);
   const hasPositionerParent = Boolean(positioning);
@@ -1726,8 +1570,8 @@ const ComboboxInput = /*#__PURE__*/React__namespace.forwardRef(function Combobox
   const isInsidePopup = hasPositionerParent || inline;
   const focusManagerModal = !isInsidePopup || modal;
   const id = useButton.useBaseUiId(idProp ?? (!isInsidePopup ? rootId : undefined));
-  const ariaLabelledBy = resolveAriaLabelledBy(fieldLabelId, undefined);
-  const fieldStateForInput = hasPositionerParent ? useLabel.DEFAULT_FIELD_STATE_ATTRIBUTES : fieldState;
+  const ariaLabelledBy = resolveAriaLabelledBy.resolveAriaLabelledBy(fieldLabelId, undefined);
+  const fieldStateForInput = hasPositionerParent ? useLabelableId.DEFAULT_FIELD_STATE_ATTRIBUTES : fieldState;
   const [composingValue, setComposingValue] = React__namespace.useState(null);
   const isComposingRef = React__namespace.useRef(false);
   const lastActiveIndexRef = React__namespace.useRef(null);
@@ -2057,7 +1901,7 @@ const ComboboxInputGroup = /*#__PURE__*/React__namespace.forwardRef(function Com
   const {
     state: fieldState,
     disabled: fieldDisabled
-  } = useLabel.useFieldRootContext();
+  } = useLabelableId.useFieldRootContext();
   const store = useComboboxRootContext();
   const {
     filteredItems
@@ -2138,7 +1982,7 @@ const ComboboxClear = /*#__PURE__*/React__namespace.forwardRef(function Combobox
   } = componentProps;
   const {
     disabled: fieldDisabled
-  } = useLabel.useFieldRootContext();
+  } = useLabelableId.useFieldRootContext();
   const store = useComboboxRootContext();
   const selectionMode = InternalBackdrop.useStore(store, selectors.selectionMode);
   const comboboxDisabled = InternalBackdrop.useStore(store, selectors.disabled);
@@ -2805,7 +2649,7 @@ const ComboboxItem = /*#__PURE__*/React__namespace.memo(/*#__PURE__*/React__name
   const virtualized = InternalBackdrop.useStore(store, selectors.virtualized);
   const isItemEqualToValue = InternalBackdrop.useStore(store, selectors.isItemEqualToValue);
   const selectable = selectionMode !== 'none';
-  const index = indexProp ?? (virtualized ? findItemIndex(flatFilteredItems, itemValue, isItemEqualToValue) : listItem.index);
+  const index = indexProp ?? (virtualized ? resolveAriaLabelledBy.findItemIndex(flatFilteredItems, itemValue, isItemEqualToValue) : listItem.index);
   const hasRegistered = listItem.index !== -1;
   const rootId = InternalBackdrop.useStore(store, selectors.id);
   const highlighted = InternalBackdrop.useStore(store, selectors.isActive, index);
@@ -2852,7 +2696,7 @@ const ComboboxItem = /*#__PURE__*/React__namespace.memo(/*#__PURE__*/React__name
     }
     const selectedValue = store.state.selectedValue;
     const lastSelectedValue = Array.isArray(selectedValue) ? selectedValue[selectedValue.length - 1] : selectedValue;
-    if (compareItemEquality(itemValue, lastSelectedValue, isItemEqualToValue)) {
+    if (resolveAriaLabelledBy.compareItemEquality(itemValue, lastSelectedValue, isItemEqualToValue)) {
       store.set('selectedIndex', index);
     }
   }, [hasRegistered, hasItems, open, store, index, itemValue, isItemEqualToValue]);
@@ -3021,13 +2865,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 = useLabel.useFieldRootContext();
+  const fieldRootContext = useLabelableId.useFieldRootContext();
   const store = useComboboxRootContext();
   const inputInsidePopup = InternalBackdrop.useStore(store, selectors.inputInsidePopup);
   const triggerElement = InternalBackdrop.useStore(store, selectors.triggerElement);
   const inputElement = InternalBackdrop.useStore(store, selectors.inputElement);
   const rootId = InternalBackdrop.useStore(store, selectors.id);
-  const defaultLabelId = getDefaultLabelId(rootId);
+  const defaultLabelId = resolveAriaLabelledBy.getDefaultLabelId(rootId);
   const localControlId = triggerElement?.id ?? (inputInsidePopup ? rootId : undefined);
   if (process.env.NODE_ENV !== 'production') {
     // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -3051,7 +2895,7 @@ const ComboboxLabel = /*#__PURE__*/React__namespace.forwardRef(function Combobox
     ref: forwardedRef,
     state: fieldRootContext.state,
     props: [labelProps, elementProps],
-    stateAttributesMapping: useLabel.fieldValidityMapping
+    stateAttributesMapping: useLabelableId.fieldValidityMapping
   });
 });
 if (process.env.NODE_ENV !== "production") ComboboxLabel.displayName = "ComboboxLabel";
@@ -3077,9 +2921,9 @@ function ComboboxValue(props) {
   } else if (!hasSelectedValue && placeholder != null && !hasNullLabel) {
     children = placeholder;
   } else if (multiple && Array.isArray(selectedValue)) {
-    children = resolveMultipleLabels(selectedValue, items, itemToStringLabel);
+    children = resolveAriaLabelledBy.resolveMultipleLabels(selectedValue, items, itemToStringLabel);
   } else {
-    children = resolveSelectedLabel(selectedValue, items, itemToStringLabel);
+    children = resolveAriaLabelledBy.resolveSelectedLabel(selectedValue, items, itemToStringLabel);
   }
   return /*#__PURE__*/jsxRuntime.jsx(React__namespace.Fragment, {
     children: children
@@ -3338,7 +3182,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 = findItemIndex(store.state.valuesRef.current, removedItem, isItemEqualToValue);
+    const removedIndex = resolveAriaLabelledBy.findItemIndex(store.state.valuesRef.current, removedItem, isItemEqualToValue);
     if (removedIndex !== -1 && activeIndex === removedIndex) {
       store.state.setIndices({
         activeIndex: null,
@@ -3411,7 +3255,6 @@ exports.ComboboxRow = ComboboxRow;
 exports.ComboboxStatus = ComboboxStatus;
 exports.ComboboxTrigger = ComboboxTrigger;
 exports.ComboboxValue = ComboboxValue;
-exports.stringifyAsLabel = stringifyAsLabel;
 exports.useComboboxFilter = useComboboxFilter;
 exports.useComboboxInputValueContext = useComboboxInputValueContext;
 exports.useCoreFilter = useCoreFilter;