@digdir/designsystemet-react 0.59.0 → 0.59.1-alpha.0

package/dist/esm/components/form/Combobox/Combobox.js

@@ -1,150 +1,105 @@
 'use client';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
-import { forwardRef, useRef, useId, useState, useEffect, createContext } from 'react';
-import { useFloating, useRole, useDismiss, useListNavigation, useInteractions, FloatingPortal, FloatingFocusManager } from '../../../node_modules/@floating-ui/react/dist/floating-ui.react.js';
+import { forwardRef, useRef, useId, useState, useEffect } from 'react';
+import { FloatingPortal, FloatingFocusManager } from '../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js';
 import { clsx } from '../../../node_modules/clsx/dist/clsx.js';
 import { useVirtualizer } from '../../../node_modules/@tanstack/react-virtual/dist/esm/index.js';
-import { flushSync } from 'react-dom';
 import { useFormField } from '../useFormField.js';
 import useDebounce from '../../../utilities/useDebounce.js';
-import useCombobox, { isInteractiveComboboxCustom, isComboboxOption } from './useCombobox.js';
+import useCombobox from './useCombobox.js';
 import classes from './Combobox.module.css.js';
 import ComboboxInput from './internal/ComboboxInput.js';
 import ComboboxLabel from './internal/ComboboxLabel.js';
 import ComboboxError from './internal/ComboboxError.js';
 import ComboboxNative from './internal/ComboboxNative.js';
 import ComboboxCustom from './Custom/Custom.js';
+import { useFloatingCombobox } from './useFloatingCombobox.js';
+import { useComboboxKeyboard } from './useComboboxKeyboard.js';
+import { ComboboxIdProvider } from './ComboboxIdContext.js';
+import { ComboboxContext } from './ComboboxContext.js';
 import { Box } from '../../Box/Box.js';
 import { Spinner } from '../../Spinner/Spinner.js';
-import { autoUpdate } from '../../../node_modules/@floating-ui/dom/dist/floating-ui.dom.js';
-import { flip, size, offset } from '../../../node_modules/@floating-ui/core/dist/floating-ui.core.js';
 import { omit } from '../../../utilities/objectUtils.js';
 
-const Combobox = forwardRef(({ value, initialValue = [], onValueChange, label, hideLabel = false, description, multiple = false, size: size$1 = 'medium', disabled = false, readOnly = false, hideChips = false, cleanButtonLabel = 'Fjern alt', clearButtonLabel = 'Fjern alt', hideClearButton = false, error, errorId, id, name, portal = true, htmlSize = 0, virtual = false, children, style, loading, loadingLabel = 'Laster...', filter = (inputValue, option) => {
-    return option.label.toLowerCase().startsWith(inputValue.toLowerCase());
-}, chipSrLabel = (option) => 'Slett ' + option.label, className, ...rest }, forwareddRef) => {
+const ComboboxComponent = forwardRef(({ value, initialValue = [], onValueChange, label, hideLabel = false, description, multiple = false, size = 'medium', disabled = false, readOnly = false, hideChips = false, cleanButtonLabel = 'Fjern alt', clearButtonLabel = 'Fjern alt', hideClearButton = false, error, errorId, id, name, portal = true, htmlSize = 0, virtual = false, children, style, loading, loadingLabel = 'Laster...', filter, chipSrLabel = (option) => 'Slett ' + option.label, className, ...rest }, forwareddRef) => {
     const inputRef = useRef(null);
     const portalRef = useRef(null);
+    const listRef = useRef([]);
     const listId = useId();
-    const [open, setOpen] = useState(false);
     const [inputValue, setInputValue] = useState(rest.inputValue || '');
-    const [activeIndex, setActiveIndex] = useState(null);
-    const { selectedOptions, setSelectedOptions, options, optionsChildren, restChildren, optionValues, customIds, prevSelectedHash, setPrevSelectedHash, } = useCombobox({
+    /* const idDispatch = useComboboxIdDispatch(); */
+    const { selectedOptions, options, restChildren, interactiveChildren, optionValues, customIds, filteredOptionsChildren, filteredOptions, prevSelectedHash, setSelectedOptions, setPrevSelectedHash, } = useCombobox({
         children,
         inputValue,
         filter,
         multiple,
         initialValue,
     });
-    const [activeDescendant, setActiveDescendant] = useState(undefined);
-    useEffect(() => {
-        if (rest.inputValue !== undefined) {
-            setInputValue(rest.inputValue);
-        }
-    }, [rest.inputValue]);
+    const { open, setOpen, refs, floatingStyles, context, getReferenceProps, getFloatingProps, getItemProps, } = useFloatingCombobox({
+        listRef,
+    });
     const formFieldProps = useFormField({
         disabled,
         readOnly,
         error,
         errorId,
-        size: size$1,
+        size,
         description,
         id,
     }, 'combobox');
-    const listRef = useRef([]);
     // if value is set, set input value to the label of the value
     useEffect(() => {
-        if (value && value.length > 0 && !multiple) {
-            const option = options.find((option) => option.value === value[0]);
+        if (value && value.length >= 0 && !multiple) {
+            const option = options[value[0]];
             setInputValue(option?.label || '');
         }
     }, [multiple, value, options]);
-    // floating UI
-    const { refs, floatingStyles, context } = useFloating({
-        open,
-        onOpenChange: (newOpen) => {
-            flushSync(() => {
-                if (refs.floating.current && !newOpen) {
-                    refs.floating.current.scrollTop = 0;
-                }
-                setTimeout(() => {
-                    setOpen(newOpen);
-                }, 1);
-            });
-        },
-        whileElementsMounted: (reference, floating, update) => {
-            autoUpdate(reference, floating, update);
-            return () => {
-                floating.scrollTop = 0;
-            };
-        },
-        middleware: [
-            flip({ padding: 10 }),
-            size({
-                apply({ rects, elements }) {
-                    requestAnimationFrame(() => {
-                        Object.assign(elements.floating.style, {
-                            width: `calc(${rects.reference.width}px - calc(var(--fds-spacing-2) * 2))`,
-                            maxHeight: `200px`,
-                        });
-                    });
-                },
-            }),
-            offset(10),
-        ],
-    });
-    const role = useRole(context, { role: 'listbox' });
-    const dismiss = useDismiss(context);
-    const listNav = useListNavigation(context, {
-        listRef,
-        activeIndex,
-        virtual: true,
-        scrollItemIntoView: true,
-        enabled: open,
-    });
-    const { getReferenceProps, getFloatingProps } = useInteractions([
-        role,
-        dismiss,
-        listNav,
-    ]);
-    // remove active index if combobox is closed
-    useEffect(() => {
-        if (!open) {
-            setActiveIndex(null);
-        }
-    }, [open]);
     // Send new value if option was clicked
     useEffect(() => {
         const selectedHash = JSON.stringify(selectedOptions);
         if (prevSelectedHash === selectedHash)
             return;
-        const values = selectedOptions.map((option) => option.value);
+        const values = Object.keys(selectedOptions);
         onValueChange?.(values);
         setPrevSelectedHash(selectedHash);
     }, [onValueChange, selectedOptions, prevSelectedHash, setPrevSelectedHash]);
     useEffect(() => {
-        if (value && options.length > 0) {
+        if (value && Object.keys(options).length >= 0) {
             const updatedSelectedOptions = value.map((option) => {
-                const value = options.find((value) => value.value === option);
+                const value = options[option];
                 return value;
             });
-            setSelectedOptions(updatedSelectedOptions);
+            setSelectedOptions(updatedSelectedOptions.reduce((acc, value) => {
+                acc[value.value] = value;
+                return acc;
+            }, {}));
         }
     }, [multiple, prevSelectedHash, value, options, setSelectedOptions]);
     // handle click on option, either select or deselect - Handles single or multiple
     const handleSelectOption = (option) => {
         // if option is already selected, remove it
         if (value && value.includes(option.value)) {
-            setSelectedOptions((prev) => prev.filter((i) => i.value !== option.value));
+            setSelectedOptions((prev) => {
+                const updated = { ...prev };
+                delete updated[option.value];
+                return updated;
+            });
             return;
         }
         if (multiple) {
-            setSelectedOptions([...selectedOptions, option]);
+            /* setSelectedOptions([...selectedOptions, option]); */
+            setSelectedOptions((prev) => {
+                const updated = { ...prev };
+                updated[option.value] = option;
+                return updated;
+            });
             setInputValue('');
             inputRef.current?.focus();
         }
         else {
-            setSelectedOptions([option]);
+            setSelectedOptions({
+                [option.value]: option,
+            });
             setInputValue(option?.label || '');
             // move cursor to the end of the input
             setTimeout(() => {
@@ -155,87 +110,24 @@ const Combobox = forwardRef(({ value, initialValue = [], onValueChange, label, h
         refs.domReference.current?.focus();
     };
     const debouncedHandleSelectOption = useDebounce(handleSelectOption, 50);
-    // handle keyboard navigation in the list
-    const handleKeyDownFunc = (event) => {
-        const navigateable = customIds.length + optionsChildren.length;
-        if (formFieldProps.readOnly || disabled)
-            return;
-        if (!event)
-            return;
-        switch (event.key) {
-            case 'ArrowDown':
-                event.preventDefault();
-                if (!open)
-                    setOpen(true);
-                setActiveIndex((prevActiveIndex) => {
-                    if (prevActiveIndex === null) {
-                        return 0;
-                    }
-                    return Math.min(prevActiveIndex + 1, navigateable - 1);
-                });
-                break;
-            case 'ArrowUp':
-                event.preventDefault();
-                /* If we are on the first item, close */
-                setActiveIndex((prevActiveIndex) => {
-                    if (prevActiveIndex === 0) {
-                        setOpen(false);
-                        return null;
-                    }
-                    if (prevActiveIndex === null) {
-                        return null;
-                    }
-                    return Math.max(prevActiveIndex - 1, 0);
-                });
-                break;
-            case 'Enter':
-                event.preventDefault();
-                if (activeIndex !== null &&
-                    (optionsChildren[activeIndex] || customIds.length > 0)) {
-                    // check if we are in the custom components
-                    if (activeIndex <= customIds.length) {
-                        // send `onSelect` event to the custom component
-                        const selectedId = customIds[activeIndex];
-                        const selectedComponent = restChildren.find((component) => isInteractiveComboboxCustom(component) &&
-                            component.props?.id === selectedId);
-                        if (isInteractiveComboboxCustom(selectedComponent) &&
-                            selectedComponent.props.onSelect) {
-                            selectedComponent.props.onSelect();
-                        }
-                    }
-                    // if we are in the options, find the actual index
-                    const valueIndex = activeIndex - customIds.length;
-                    const child = optionsChildren[valueIndex];
-                    if (isComboboxOption(child)) {
-                        const props = child.props;
-                        const option = options.find((option) => option.value === props.value);
-                        if (!multiple) {
-                            // check if option is already selected, if so, deselect it
-                            if (selectedOptions.find((i) => i.value === option?.value)) {
-                                setSelectedOptions([]);
-                                setInputValue('');
-                                return;
-                            }
-                        }
-                        debouncedHandleSelectOption(option);
-                    }
-                }
-                break;
-            case 'Backspace':
-                if (inputValue === '' && multiple && selectedOptions.length > 0) {
-                    setSelectedOptions((prev) => prev.slice(0, prev.length - 1));
-                }
-                // if we are in single mode, we need to set activeValue to null
-                if (!multiple) {
-                    setSelectedOptions([]);
-                }
-                break;
-        }
-    };
-    const handleKeyDown = useDebounce(handleKeyDownFunc, 20);
+    const handleKeyDown = useComboboxKeyboard({
+        filteredOptions,
+        selectedOptions,
+        readOnly: formFieldProps.readOnly || false,
+        disabled: disabled,
+        multiple,
+        inputValue,
+        options,
+        open,
+        interactiveChildren,
+        setOpen,
+        setInputValue,
+        setSelectedOptions,
+        handleSelectOption: debouncedHandleSelectOption,
+    });
     const rowVirtualizer = useVirtualizer({
-        count: optionsChildren.length,
-        getScrollElement: () => refs.floating.current,
+        count: Object.keys(filteredOptionsChildren).length,
+        getScrollElement: () => (virtual ? refs.floating.current : null),
         estimateSize: () => 70,
         measureElement: (elem) => {
             return elem.getBoundingClientRect().height;
@@ -243,18 +135,16 @@ const Combobox = forwardRef(({ value, initialValue = [], onValueChange, label, h
         overscan: 1,
     });
     return (jsxs(ComboboxContext.Provider, { value: {
-            size: size$1,
+            size,
             options,
             selectedOptions,
             multiple,
-            activeIndex,
             disabled,
             readOnly,
             open,
             inputRef,
             refs,
             inputValue,
-            activeDescendant,
             error,
             formFieldProps,
             name,
@@ -264,40 +154,33 @@ const Combobox = forwardRef(({ value, initialValue = [], onValueChange, label, h
             clearButtonLabel: cleanButtonLabel || clearButtonLabel,
             hideClearButton,
             listId,
+            customIds,
+            filteredOptions,
             setInputValue,
-            setActiveIndex,
             handleKeyDown,
             setOpen,
             getReferenceProps,
+            getItemProps,
             setSelectedOptions,
-            /* Recieves index of option, and the ID of the button element */
-            setActiveOption: (index, id) => {
-                if (readOnly)
-                    return;
-                if (disabled)
-                    return;
-                setActiveIndex(index);
-                setActiveDescendant(id);
-            },
             /* Recieves the value of the option, and searches for it in our values lookup */
             onOptionClick: (value) => {
                 if (readOnly)
                     return;
                 if (disabled)
                     return;
-                const option = options.find((option) => option.value === value);
+                const option = options[value];
                 debouncedHandleSelectOption(option);
             },
             handleSelectOption: debouncedHandleSelectOption,
             chipSrLabel,
             listRef,
             forwareddRef,
-        }, children: [jsxs(Box, { className: clsx(classes.combobox, disabled && classes.disabled, className), style: style, ref: portalRef, children: [name && (jsx(ComboboxNative, { name: name, selectedOptions: selectedOptions, multiple: multiple })), jsx(ComboboxLabel, { label: label, description: description, size: size$1, readOnly: readOnly, hideLabel: hideLabel, formFieldProps: formFieldProps }), jsx(ComboboxInput, { ...omit(['inputValue'], rest), "aria-busy": loading }), jsx(ComboboxError, { size: size$1, error: error, formFieldProps: formFieldProps })] }), open && (jsx(FloatingPortal, { root: portal ? null : portalRef, children: jsx(FloatingFocusManager, { context: context, initialFocus: -1, visuallyHiddenDismiss: true, children: jsxs(Box, { id: listId, shadow: 'medium', borderRadius: 'medium', borderColor: 'default', "aria-labelledby": formFieldProps.inputProps.id, "aria-autocomplete": 'list', tabIndex: -1, ...getFloatingProps({
+        }, children: [jsxs(Box, { className: clsx(classes.combobox, disabled && classes.disabled, className), style: style, ref: portalRef, children: [name && (jsx(ComboboxNative, { name: name, selectedOptions: selectedOptions, multiple: multiple })), jsx(ComboboxLabel, { label: label, description: description, size: size, readOnly: readOnly, hideLabel: hideLabel, formFieldProps: formFieldProps }), jsx(ComboboxInput, { ...omit(['inputValue'], rest), "aria-busy": loading }), jsx(ComboboxError, { size: size, error: error, formFieldProps: formFieldProps })] }), open && (jsx(FloatingPortal, { root: portal ? null : portalRef, children: jsx(FloatingFocusManager, { context: context, initialFocus: -1, visuallyHiddenDismiss: true, children: jsxs(Box, { id: listId, shadow: 'medium', borderRadius: 'medium', borderColor: 'default', "aria-labelledby": formFieldProps.inputProps.id, "aria-autocomplete": 'list', tabIndex: -1, ...getFloatingProps({
                             ref: refs.setFloating,
                             style: {
                                 ...floatingStyles,
                             },
-                        }), className: clsx(classes.optionsWrapper, classes[size$1]), children: [virtual && (jsx("div", { style: {
+                        }), className: clsx(classes.optionsWrapper, classes[size]), children: [virtual && (jsx("div", { style: {
                                     height: `${rowVirtualizer.getTotalSize()}px`,
                                     width: '100%',
                                     position: 'relative',
@@ -307,9 +190,9 @@ const Combobox = forwardRef(({ value, initialValue = [], onValueChange, label, h
                                         left: 0,
                                         width: '100%',
                                         transform: `translateY(${virtualRow.start}px)`,
-                                    }, children: optionsChildren[virtualRow.index] }, virtualRow.index))) })), loading ? (jsxs(ComboboxCustom, { className: classes.loading, children: [jsx(Spinner, { title: 'Laster', size: 'small' }), loadingLabel] })) : (jsxs(Fragment, { children: [restChildren, !virtual && optionsChildren] }))] }) }) }))] }));
+                                    }, children: filteredOptionsChildren[virtualRow.index] }, virtualRow.index))) })), loading ? (jsxs(ComboboxCustom, { className: classes.loading, children: [jsx(Spinner, { title: 'Laster', size: 'small' }), loadingLabel] })) : (jsxs(Fragment, { children: [restChildren, !virtual && filteredOptionsChildren] }))] }) }) }))] }));
 });
-const ComboboxContext = createContext(undefined);
+const Combobox = forwardRef((props, ref) => (jsx(ComboboxIdProvider, { children: jsx(ComboboxComponent, { ...props, ref: ref }) })));
 Combobox.displayName = 'Combobox';
 
-export { Combobox, ComboboxContext };
+export { Combobox, ComboboxComponent };

package/dist/esm/components/form/Combobox/ComboboxContext.js

@@ -0,0 +1,6 @@
+'use client';
+import { createContext } from 'react';
+
+const ComboboxContext = createContext(undefined);
+
+export { ComboboxContext };

package/dist/esm/components/form/Combobox/ComboboxIdContext.js

@@ -0,0 +1,35 @@
+'use client';
+import { jsx } from 'react/jsx-runtime';
+import { createContext, useContext, useReducer } from 'react';
+
+const ComboboxIdContext = createContext({
+    activeIndex: 0,
+});
+const ComboboxIdReducer = (state, action) => {
+    switch (action.type) {
+        case 'SET_ACTIVE_INDEX':
+            return {
+                ...state,
+                activeIndex: action.payload,
+            };
+        default:
+            return state;
+    }
+};
+const ComboboxIdDispatch = createContext(() => {
+    throw new Error('ComboboxIdDispatch must be used within a provider');
+});
+const ComboboxIdProvider = ({ children, }) => {
+    const [state, dispatch] = useReducer(ComboboxIdReducer, {
+        activeIndex: 0,
+    });
+    return (jsx(ComboboxIdContext.Provider, { value: state, children: jsx(ComboboxIdDispatch.Provider, { value: dispatch, children: children }) }));
+};
+function useComboboxIdDispatch() {
+    return useContext(ComboboxIdDispatch);
+}
+function useComboboxId() {
+    return useContext(ComboboxIdContext);
+}
+
+export { ComboboxIdContext, ComboboxIdDispatch, ComboboxIdProvider, ComboboxIdReducer, useComboboxId, useComboboxIdDispatch };

package/dist/esm/components/form/Combobox/Custom/Custom.js

@@ -3,7 +3,9 @@ import { jsx } from 'react/jsx-runtime';
 import { forwardRef, useId, useContext, useMemo } from 'react';
 import { clsx } from '../../../../node_modules/clsx/dist/clsx.js';
 import { Slot as $5e63c961fc1ce211$export$8c6ed5c666ac1360 } from '../../../../node_modules/@radix-ui/react-slot/dist/index.js';
-import { ComboboxContext } from '../Combobox.js';
+import { useMergeRefs } from '../../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js';
+import { ComboboxContext } from '../ComboboxContext.js';
+import { useComboboxId } from '../ComboboxIdContext.js';
 import classes from './Custom.module.css.js';
 import { omit } from '../../../../utilities/objectUtils.js';
 
@@ -13,17 +15,20 @@ const ComboboxCustom = forwardRef(({ asChild, interactive, id, className, ...res
     }
     const Component = asChild ? $5e63c961fc1ce211$export$8c6ed5c666ac1360 : 'div';
     const randomId = useId();
+    const { activeIndex } = useComboboxId();
     const context = useContext(ComboboxContext);
     if (!context) {
         throw new Error('ComboboxCustom must be used within a Combobox');
     }
-    const { size, activeIndex, optionValues, setActiveIndex } = context;
-    const index = useMemo(() => id && optionValues.indexOf(id), [optionValues, id]);
-    return (jsx(Component, { ref: ref, tabIndex: -1, className: clsx(classes.custom, classes[size], className), id: id || randomId, role: 'option', "aria-selected": activeIndex === index, "data-active": activeIndex === index, onMouseEnter: () => {
-            typeof index === 'number' && setActiveIndex(index);
-        }, onFocus: () => {
-            typeof index === 'number' && setActiveIndex(index);
-        }, ...omit(['interactive'], rest) }));
+    const { size, customIds, listRef, getItemProps } = context;
+    const index = useMemo(() => (id && customIds.indexOf(id)) || 0, [id, customIds]);
+    const combinedRef = useMergeRefs([
+        (node) => {
+            listRef.current[index] = node;
+        },
+        ref,
+    ]);
+    return (jsx(Component, { ref: combinedRef, tabIndex: -1, className: clsx(classes.custom, classes[size], className), id: id || randomId, role: 'option', "aria-selected": activeIndex === index, "data-active": activeIndex === index, ...omit(['interactive'], rest), ...omit(['onClick', 'onPointerLeave'], getItemProps()) }));
 });
 var ComboboxCustom$1 = ComboboxCustom;
 

package/dist/esm/components/form/Combobox/Empty/Empty.js

@@ -2,7 +2,7 @@
 import { jsx } from 'react/jsx-runtime';
 import { forwardRef, useContext } from 'react';
 import { clsx } from '../../../../node_modules/clsx/dist/clsx.js';
-import { ComboboxContext } from '../Combobox.js';
+import { ComboboxContext } from '../ComboboxContext.js';
 import classes from './Empty.module.css.js';
 
 const ComboboxEmpty = forwardRef(({ children, className, ...rest }, ref) => {
@@ -10,8 +10,8 @@ const ComboboxEmpty = forwardRef(({ children, className, ...rest }, ref) => {
     if (!context) {
         throw new Error('ComboboxEmpty must be used within a Combobox');
     }
-    const { optionValues, size } = context;
-    return (optionValues.length === 0 && (jsx("div", { ref: ref, className: clsx(classes.empty, classes[size], className), ...rest, children: children })));
+    const { filteredOptions, size } = context;
+    return (filteredOptions.length === 0 && (jsx("div", { ref: ref, className: clsx(classes.empty, classes[size], className), ...rest, children: children })));
 });
 ComboboxEmpty.displayName = 'ComboboxEmpty';
 

package/dist/esm/components/form/Combobox/Option/Option.js

@@ -1,51 +1,33 @@
 'use client';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { forwardRef, useId, useContext, useMemo, useEffect } from 'react';
+import { memo, forwardRef, useId, useContext } from 'react';
 import { clsx } from '../../../../node_modules/clsx/dist/clsx.js';
-import { useMergeRefs } from '../../../../node_modules/@floating-ui/react/dist/floating-ui.react.js';
-import { ComboboxContext } from '../Combobox.js';
-import useDebounce from '../../../../utilities/useDebounce.js';
+import { ComboboxContext } from '../ComboboxContext.js';
 import { SelectedIcon } from './Icon/SelectedIcon.js';
 import classes from './Option.module.css.js';
 import ComboboxOptionDescription from './Description/Description.js';
+import useComboboxOption from './useComboboxOption.js';
 import { omit } from '../../../../utilities/objectUtils.js';
 import { Label } from '../../../Typography/Label/Label.js';
 
-const ComboboxOption = forwardRef(({ value, description, children, className, ...rest }, ref) => {
+const ComboboxOption = memo(forwardRef(({ value, description, children, className, ...rest }, forwardedRef) => {
     const labelId = useId();
-    const generatedId = useId();
+    const { id, ref, selected, active, onOptionClick } = useComboboxOption({
+        id: rest.id,
+        ref: forwardedRef,
+        value,
+    });
     const context = useContext(ComboboxContext);
     if (!context) {
         throw new Error('ComboboxOption must be used within a Combobox');
     }
-    const { selectedOptions, activeIndex, setActiveOption, onOptionClick, size, listRef, optionValues, multiple, } = context;
-    const index = useMemo(() => optionValues.indexOf(value), [optionValues, value]);
-    const combinedRef = useMergeRefs([
-        (node) => {
-            listRef.current[index] = node;
-        },
-        ref,
-    ]);
-    if (index === -1) {
-        throw new Error('Internal error: ComboboxOption did not find index');
-    }
-    const selected = selectedOptions.find((option) => option.value === value);
-    useEffect(() => {
-        if (activeIndex === index)
-            setActiveOption(index, rest.id || generatedId);
-    }, [activeIndex, generatedId, index, rest.id, setActiveOption]);
-    const onOptionClickDebounced = useDebounce(() => onOptionClick(value), 50);
-    return (jsxs("button", { id: rest.id || generatedId, role: 'option', type: 'button', "aria-selected": !!selected, "aria-labelledby": labelId, tabIndex: -1, onClick: (e) => {
-            onOptionClickDebounced();
+    const { size, multiple, getItemProps } = context;
+    const props = getItemProps();
+    return (jsxs("button", { ref: ref, id: id, role: 'option', type: 'button', "aria-selected": !!selected, "aria-labelledby": labelId, tabIndex: -1, onClick: (e) => {
+            onOptionClick();
             rest.onClick?.(e);
-        }, onMouseEnter: (e) => {
-            setActiveOption(index, labelId);
-            rest.onMouseEnter?.(e);
-        }, onFocus: (e) => {
-            setActiveOption(index, labelId);
-            rest.onFocus?.(e);
-        }, className: clsx(classes.option, classes[size], activeIndex === index && classes.active, multiple && classes.multiple, className), ref: combinedRef, ...omit(['displayValue'], rest), children: [jsx(Label, { asChild: true, size: size, children: jsx("span", { children: jsx(SelectedIcon, { multiple: multiple, selected: !!selected }) }) }), jsxs(Label, { className: classes.optionText, size: size, id: labelId, children: [children, description && (jsx(ComboboxOptionDescription, { children: description }))] })] }));
-});
+        }, className: clsx(classes.option, classes[size], active && classes.active, multiple && classes.multiple, className), ...omit(['displayValue'], rest), ...omit(['onClick', 'onPointerLeave'], props), children: [jsx(Label, { asChild: true, size: size, children: jsx("span", { children: jsx(SelectedIcon, { multiple: multiple, selected: !!selected }) }) }), jsxs(Label, { className: classes.optionText, size: size, id: labelId, children: [children, description && (jsx(ComboboxOptionDescription, { children: description }))] })] }));
+}));
 ComboboxOption.displayName = 'ComboboxOption';
 
 export { ComboboxOption };

package/dist/esm/components/form/Combobox/Option/useComboboxOption.js

@@ -0,0 +1,45 @@
+'use client';
+import { useId, useContext, useMemo, useEffect } from 'react';
+import { useMergeRefs } from '../../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js';
+import { ComboboxContext } from '../ComboboxContext.js';
+import useDebounce from '../../../../utilities/useDebounce.js';
+import { useComboboxId, useComboboxIdDispatch } from '../ComboboxIdContext.js';
+
+function useComboboxOption({ id, ref, value, }) {
+    const generatedId = useId();
+    const newId = id || generatedId;
+    const context = useContext(ComboboxContext);
+    const { activeIndex } = useComboboxId();
+    const dispatch = useComboboxIdDispatch();
+    if (!context) {
+        throw new Error('ComboboxOption must be used within a Combobox');
+    }
+    const { selectedOptions, onOptionClick, listRef, customIds, filteredOptions, } = context;
+    const index = useMemo(() => filteredOptions.indexOf(value) + customIds.length, [customIds.length, filteredOptions, value]);
+    const combinedRef = useMergeRefs([
+        (node) => {
+            listRef.current[index] = node;
+        },
+        ref,
+    ]);
+    if (index === -1) {
+        throw new Error('Internal error: ComboboxOption did not find index');
+    }
+    const selected = selectedOptions[value];
+    const active = activeIndex === index;
+    useEffect(() => {
+        if (active) {
+            dispatch?.({ type: 'SET_ACTIVE_INDEX', payload: index });
+        }
+    }, [generatedId, id, dispatch, active, index]);
+    const onOptionClickDebounced = useDebounce(() => onOptionClick(value), 50);
+    return {
+        id: newId,
+        ref: combinedRef,
+        selected,
+        active,
+        onOptionClick: onOptionClickDebounced,
+    };
+}
+
+export { useComboboxOption as default };

package/dist/esm/components/form/Combobox/internal/ComboboxChips.js

@@ -2,7 +2,7 @@
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { useContext } from 'react';
 import '../../../Chip/index.js';
-import { ComboboxContext } from '../Combobox.js';
+import { ComboboxContext } from '../ComboboxContext.js';
 import { RemovableChip } from '../../../Chip/Removable/Removable.js';
 
 const ComboboxChips = () => {
@@ -11,7 +11,7 @@ const ComboboxChips = () => {
         throw new Error('ComboboxContext is missing');
     }
     const { size, readOnly, disabled, selectedOptions, setSelectedOptions, chipSrLabel, inputRef, } = context;
-    return (jsx(Fragment, { children: selectedOptions.map((option) => {
+    return (jsx(Fragment, { children: Object.keys(selectedOptions).map((value) => {
             return (jsx(RemovableChip, { size: size, disabled: disabled, onKeyDown: (e) => {
                     if (readOnly)
                         return;
@@ -19,7 +19,11 @@ const ComboboxChips = () => {
                         return;
                     if (e.key === 'Enter') {
                         e.stopPropagation();
-                        setSelectedOptions(selectedOptions.filter((i) => i.value !== option.value));
+                        setSelectedOptions((prev) => {
+                            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                            const { [value]: _, ...rest } = prev;
+                            return rest;
+                        });
                         inputRef.current?.focus();
                     }
                 }, onClick: () => {
@@ -28,11 +32,15 @@ const ComboboxChips = () => {
                     if (disabled)
                         return;
                     /* If we click a chip, filter the active values and remove the one we clicked */
-                    setSelectedOptions(selectedOptions.filter((i) => i.value !== option.value));
+                    setSelectedOptions((prev) => {
+                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                        const { [value]: _, ...rest } = prev;
+                        return rest;
+                    });
                 }, style: {
                     /* We already set the opacity on Combobox */
                     opacity: 1,
-                }, "aria-label": chipSrLabel(option), children: option.label }, option.value));
+                }, "aria-label": chipSrLabel(selectedOptions[value]), children: selectedOptions[value].label }, value));
         }) }));
 };
 ComboboxChips.displayName = 'ComboboxChips';