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

package/dist/cjs/components/DropdownMenu/DropdownMenuContent.js

@@ -3,12 +3,12 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var floatingUi_react = require('../../node_modules/@floating-ui/react/dist/floating-ui.react.js');
+var floatingUi_react = require('../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js');
 var clsx = require('../../node_modules/clsx/dist/clsx.js');
 var DropdownMenu_module = require('./DropdownMenu.module.css.js');
 var DropdownMenu = require('./DropdownMenu.js');
-var floatingUi_dom = require('../../node_modules/@floating-ui/dom/dist/floating-ui.dom.js');
-var floatingUi_core = require('../../node_modules/@floating-ui/core/dist/floating-ui.core.js');
+var floatingUi_dom = require('../../packages/react/node_modules/@floating-ui/dom/dist/floating-ui.dom.js');
+var floatingUi_core = require('../../packages/react/node_modules/@floating-ui/core/dist/floating-ui.core.js');
 var useIsomorphicLayoutEffect = require('../../hooks/useIsomorphicLayoutEffect.js');
 
 function _interopNamespaceDefault(e) {
@@ -49,7 +49,7 @@ const DropdownMenuContent = React.forwardRef(({ className, children, ...rest },
             floating: floatingEl.current,
         },
         whileElementsMounted: floatingUi_dom.autoUpdate,
-        middleware: [floatingUi_core.offset(GAP), floatingUi_core.shift()],
+        middleware: [floatingUi_core.offset(GAP), floatingUi_dom.shift()],
     });
     const { getFloatingProps } = floatingUi_react.useInteractions([
         floatingUi_react.useFocus(context),

package/dist/cjs/components/DropdownMenu/DropdownMenuTrigger.js

@@ -3,7 +3,7 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var floatingUi_react = require('../../node_modules/@floating-ui/react/dist/floating-ui.react.js');
+var floatingUi_react = require('../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js');
 var index = require('../../node_modules/@radix-ui/react-slot/dist/index.js');
 var DropdownMenu = require('./DropdownMenu.js');
 var Button = require('../Button/Button.js');

package/dist/cjs/components/Modal/ModalDialog.js

@@ -2,7 +2,7 @@
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');
-var floatingUi_react = require('../../node_modules/@floating-ui/react/dist/floating-ui.react.js');
+var floatingUi_react = require('../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js');
 var React = require('react');
 var index = require('../../node_modules/@radix-ui/react-slot/dist/index.js');
 var clsx = require('../../node_modules/clsx/dist/clsx.js');

package/dist/cjs/components/Popover/PopoverContent.js

@@ -3,13 +3,13 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var floatingUi_react = require('../../node_modules/@floating-ui/react/dist/floating-ui.react.js');
+var floatingUi_react = require('../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js');
 var clsx = require('../../node_modules/clsx/dist/clsx.js');
 var Popover = require('./Popover.js');
 var Popover_module = require('./Popover.module.css.js');
-var floatingUi_dom = require('../../node_modules/@floating-ui/dom/dist/floating-ui.dom.js');
-var floatingUi_core = require('../../node_modules/@floating-ui/core/dist/floating-ui.core.js');
-var floatingUi_reactDom = require('../../node_modules/@floating-ui/react-dom/dist/floating-ui.react-dom.js');
+var floatingUi_dom = require('../../packages/react/node_modules/@floating-ui/dom/dist/floating-ui.dom.js');
+var floatingUi_core = require('../../packages/react/node_modules/@floating-ui/core/dist/floating-ui.core.js');
+var floatingUi_reactDom = require('../../packages/react/node_modules/@floating-ui/react-dom/dist/floating-ui.react-dom.js');
 var useIsomorphicLayoutEffect = require('../../hooks/useIsomorphicLayoutEffect.js');
 var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
@@ -65,10 +65,10 @@ const PopoverContent = React.forwardRef(({ className, children, style, id, ...re
         },
         middleware: [
             floatingUi_core.offset(ARROW_HEIGHT + ARROW_GAP),
-            floatingUi_core.flip({
+            floatingUi_dom.flip({
                 fallbackAxisSideDirection: 'start',
             }),
-            floatingUi_core.shift(),
+            floatingUi_dom.shift(),
             floatingUi_reactDom.arrow({
                 element: arrowRef,
             }),

package/dist/cjs/components/Popover/PopoverTrigger.js

@@ -3,7 +3,7 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var floatingUi_react = require('../../node_modules/@floating-ui/react/dist/floating-ui.react.js');
+var floatingUi_react = require('../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js');
 var index = require('../../node_modules/@radix-ui/react-slot/dist/index.js');
 var Popover = require('./Popover.js');
 var Button = require('../Button/Button.js');

package/dist/cjs/components/Tooltip/Tooltip.js

@@ -4,11 +4,11 @@
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var clsx = require('../../node_modules/clsx/dist/clsx.js');
-var floatingUi_react = require('../../node_modules/@floating-ui/react/dist/floating-ui.react.js');
+var floatingUi_react = require('../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js');
 var Tooltip_module = require('./Tooltip.module.css.js');
-var floatingUi_dom = require('../../node_modules/@floating-ui/dom/dist/floating-ui.dom.js');
-var floatingUi_core = require('../../node_modules/@floating-ui/core/dist/floating-ui.core.js');
-var floatingUi_reactDom = require('../../node_modules/@floating-ui/react-dom/dist/floating-ui.react-dom.js');
+var floatingUi_dom = require('../../packages/react/node_modules/@floating-ui/dom/dist/floating-ui.dom.js');
+var floatingUi_core = require('../../packages/react/node_modules/@floating-ui/core/dist/floating-ui.core.js');
+var floatingUi_reactDom = require('../../packages/react/node_modules/@floating-ui/react-dom/dist/floating-ui.react-dom.js');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -43,10 +43,10 @@ const Tooltip = React.forwardRef(({ children, content, placement = 'top', delay
         whileElementsMounted: floatingUi_dom.autoUpdate,
         middleware: [
             floatingUi_core.offset(ARROW_HEIGHT + ARROW_GAP),
-            floatingUi_core.flip({
+            floatingUi_dom.flip({
                 fallbackAxisSideDirection: 'start',
             }),
-            floatingUi_core.shift(),
+            floatingUi_dom.shift(),
             floatingUi_reactDom.arrow({
                 element: arrowRef,
             }),

package/dist/cjs/components/form/Checkbox/Checkbox.js

@@ -4,7 +4,7 @@
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var clsx = require('../../../node_modules/clsx/dist/clsx.js');
-var floatingUi_react = require('../../../node_modules/@floating-ui/react/dist/floating-ui.react.js');
+var floatingUi_react = require('../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js');
 var Checkbox_module = require('./Checkbox.module.css.js');
 var useCheckbox = require('./useCheckbox.js');
 var Paragraph = require('../../Typography/Paragraph/Paragraph.js');

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

@@ -3,10 +3,9 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var floatingUi_react = require('../../../node_modules/@floating-ui/react/dist/floating-ui.react.js');
+var floatingUi_react = require('../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js');
 var clsx = require('../../../node_modules/clsx/dist/clsx.js');
 var index = require('../../../node_modules/@tanstack/react-virtual/dist/esm/index.js');
-var ReactDOM = require('react-dom');
 var useFormField = require('../useFormField.js');
 var useDebounce = require('../../../utilities/useDebounce.js');
 var useCombobox = require('./useCombobox.js');
@@ -16,34 +15,31 @@ var ComboboxLabel = require('./internal/ComboboxLabel.js');
 var ComboboxError = require('./internal/ComboboxError.js');
 var ComboboxNative = require('./internal/ComboboxNative.js');
 var Custom = require('./Custom/Custom.js');
+var useFloatingCombobox = require('./useFloatingCombobox.js');
+var useComboboxKeyboard = require('./useComboboxKeyboard.js');
+var ComboboxIdContext = require('./ComboboxIdContext.js');
+var ComboboxContext = require('./ComboboxContext.js');
 var Box = require('../../Box/Box.js');
 var Spinner = require('../../Spinner/Spinner.js');
-var floatingUi_dom = require('../../../node_modules/@floating-ui/dom/dist/floating-ui.dom.js');
-var floatingUi_core = require('../../../node_modules/@floating-ui/core/dist/floating-ui.core.js');
 var objectUtils = require('../../../utilities/objectUtils.js');
 
-const Combobox = React.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 = (inputValue, option) => {
-    return option.label.toLowerCase().startsWith(inputValue.toLowerCase());
-}, chipSrLabel = (option) => 'Slett ' + option.label, className, ...rest }, forwareddRef) => {
+const ComboboxComponent = React.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 = React.useRef(null);
     const portalRef = React.useRef(null);
+    const listRef = React.useRef([]);
     const listId = React.useId();
-    const [open, setOpen] = React.useState(false);
     const [inputValue, setInputValue] = React.useState(rest.inputValue || '');
-    const [activeIndex, setActiveIndex] = React.useState(null);
-    const { selectedOptions, setSelectedOptions, options, optionsChildren, restChildren, optionValues, customIds, prevSelectedHash, setPrevSelectedHash, } = useCombobox.default({
+    /* const idDispatch = useComboboxIdDispatch(); */
+    const { selectedOptions, options, restChildren, interactiveChildren, optionValues, customIds, filteredOptionsChildren, filteredOptions, prevSelectedHash, setSelectedOptions, setPrevSelectedHash, } = useCombobox.default({
         children,
         inputValue,
         filter,
         multiple,
         initialValue,
     });
-    const [activeDescendant, setActiveDescendant] = React.useState(undefined);
-    React.useEffect(() => {
-        if (rest.inputValue !== undefined) {
-            setInputValue(rest.inputValue);
-        }
-    }, [rest.inputValue]);
+    const { open, setOpen, refs, floatingStyles, context, getReferenceProps, getFloatingProps, getItemProps, } = useFloatingCombobox.useFloatingCombobox({
+        listRef,
+    });
     const formFieldProps = useFormField.useFormField({
         disabled,
         readOnly,
@@ -53,100 +49,59 @@ const Combobox = React.forwardRef(({ value, initialValue = [], onValueChange, la
         description,
         id,
     }, 'combobox');
-    const listRef = React.useRef([]);
     // if value is set, set input value to the label of the value
     React.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 } = floatingUi_react.useFloating({
-        open,
-        onOpenChange: (newOpen) => {
-            ReactDOM.flushSync(() => {
-                if (refs.floating.current && !newOpen) {
-                    refs.floating.current.scrollTop = 0;
-                }
-                setTimeout(() => {
-                    setOpen(newOpen);
-                }, 1);
-            });
-        },
-        whileElementsMounted: (reference, floating, update) => {
-            floatingUi_dom.autoUpdate(reference, floating, update);
-            return () => {
-                floating.scrollTop = 0;
-            };
-        },
-        middleware: [
-            floatingUi_core.flip({ padding: 10 }),
-            floatingUi_core.size({
-                apply({ rects, elements }) {
-                    requestAnimationFrame(() => {
-                        Object.assign(elements.floating.style, {
-                            width: `calc(${rects.reference.width}px - calc(var(--fds-spacing-2) * 2))`,
-                            maxHeight: `200px`,
-                        });
-                    });
-                },
-            }),
-            floatingUi_core.offset(10),
-        ],
-    });
-    const role = floatingUi_react.useRole(context, { role: 'listbox' });
-    const dismiss = floatingUi_react.useDismiss(context);
-    const listNav = floatingUi_react.useListNavigation(context, {
-        listRef,
-        activeIndex,
-        virtual: true,
-        scrollItemIntoView: true,
-        enabled: open,
-    });
-    const { getReferenceProps, getFloatingProps } = floatingUi_react.useInteractions([
-        role,
-        dismiss,
-        listNav,
-    ]);
-    // remove active index if combobox is closed
-    React.useEffect(() => {
-        if (!open) {
-            setActiveIndex(null);
-        }
-    }, [open]);
     // Send new value if option was clicked
     React.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]);
     React.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(() => {
@@ -157,106 +112,41 @@ const Combobox = React.forwardRef(({ value, initialValue = [], onValueChange, la
         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) => useCombobox.isInteractiveComboboxCustom(component) &&
-                            component.props?.id === selectedId);
-                        if (useCombobox.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 (useCombobox.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.useComboboxKeyboard({
+        filteredOptions,
+        selectedOptions,
+        readOnly: formFieldProps.readOnly || false,
+        disabled: disabled,
+        multiple,
+        inputValue,
+        options,
+        open,
+        interactiveChildren,
+        setOpen,
+        setInputValue,
+        setSelectedOptions,
+        handleSelectOption: debouncedHandleSelectOption,
+    });
     const rowVirtualizer = index.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;
         },
         overscan: 1,
     });
-    return (jsxRuntime.jsxs(ComboboxContext.Provider, { value: {
+    return (jsxRuntime.jsxs(ComboboxContext.ComboboxContext.Provider, { value: {
             size,
             options,
             selectedOptions,
             multiple,
-            activeIndex,
             disabled,
             readOnly,
             open,
             inputRef,
             refs,
             inputValue,
-            activeDescendant,
             error,
             formFieldProps,
             name,
@@ -266,28 +156,21 @@ const Combobox = React.forwardRef(({ value, initialValue = [], onValueChange, la
             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,
@@ -309,10 +192,10 @@ const Combobox = React.forwardRef(({ value, initialValue = [], onValueChange, la
                                         left: 0,
                                         width: '100%',
                                         transform: `translateY(${virtualRow.start}px)`,
-                                    }, children: optionsChildren[virtualRow.index] }, virtualRow.index))) })), loading ? (jsxRuntime.jsxs(Custom.default, { className: Combobox_module.loading, children: [jsxRuntime.jsx(Spinner.Spinner, { title: 'Laster', size: 'small' }), loadingLabel] })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [restChildren, !virtual && optionsChildren] }))] }) }) }))] }));
+                                    }, children: filteredOptionsChildren[virtualRow.index] }, virtualRow.index))) })), loading ? (jsxRuntime.jsxs(Custom.default, { className: Combobox_module.loading, children: [jsxRuntime.jsx(Spinner.Spinner, { title: 'Laster', size: 'small' }), loadingLabel] })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [restChildren, !virtual && filteredOptionsChildren] }))] }) }) }))] }));
 });
-const ComboboxContext = React.createContext(undefined);
+const Combobox = React.forwardRef((props, ref) => (jsxRuntime.jsx(ComboboxIdContext.ComboboxIdProvider, { children: jsxRuntime.jsx(ComboboxComponent, { ...props, ref: ref }) })));
 Combobox.displayName = 'Combobox';
 
 exports.Combobox = Combobox;
-exports.ComboboxContext = ComboboxContext;
+exports.ComboboxComponent = ComboboxComponent;

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

@@ -0,0 +1,8 @@
+'use client';
+'use strict';
+
+var React = require('react');
+
+const ComboboxContext = React.createContext(undefined);
+
+exports.ComboboxContext = ComboboxContext;

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

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

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

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

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

@@ -6,16 +6,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var clsx = require('../../../../node_modules/clsx/dist/clsx.js');
-var Combobox = require('../Combobox.js');
+var ComboboxContext = require('../ComboboxContext.js');
 var Empty_module = require('./Empty.module.css.js');
 
 const ComboboxEmpty = React.forwardRef(({ children, className, ...rest }, ref) => {
-    const context = React.useContext(Combobox.ComboboxContext);
+    const context = React.useContext(ComboboxContext.ComboboxContext);
     if (!context) {
         throw new Error('ComboboxEmpty must be used within a Combobox');
     }
-    const { optionValues, size } = context;
-    return (optionValues.length === 0 && (jsxRuntime.jsx("div", { ref: ref, className: clsx.clsx(Empty_module.empty, Empty_module[size], className), ...rest, children: children })));
+    const { filteredOptions, size } = context;
+    return (filteredOptions.length === 0 && (jsxRuntime.jsx("div", { ref: ref, className: clsx.clsx(Empty_module.empty, Empty_module[size], className), ...rest, children: children })));
 });
 ComboboxEmpty.displayName = 'ComboboxEmpty';