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

package/dist/cjs/components/Accordion/Accordion.js

@@ -4,11 +4,8 @@
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var clsx = require('../../node_modules/clsx/dist/clsx.js');
-var Accordion_module = require('./Accordion.module.css.js');
 
-const Accordion = React.forwardRef(({ border = false, color = 'neutral', className, ...rest }, ref) => (jsxRuntime.jsx("div", { className: clsx.clsx(Accordion_module.accordion, Accordion_module[color], {
-        [Accordion_module.border]: border,
-    }, className), ref: ref, ...rest })));
+const Accordion = React.forwardRef(({ border = false, color = 'neutral', className, ...rest }, ref) => (jsxRuntime.jsx("div", { className: clsx.clsx('fds-accordion', border && 'fds-accordion--border', color && `fds-accordion--${color}`, className), ref: ref, ...rest })));
 Accordion.displayName = 'Accordion';
 
 exports.Accordion = Accordion;

package/dist/cjs/components/Accordion/AccordionContent/AccordionContent.js

@@ -4,7 +4,6 @@
 var jsxRuntime = require('react/jsx-runtime');
 var clsx = require('../../../node_modules/clsx/dist/clsx.js');
 var React = require('react');
-var Accordion_module = require('../Accordion.module.css.js');
 var AccordionItem = require('../AccordionItem/AccordionItem.js');
 var AnimateHeight = require('../../../utilities/AnimateHeight/AnimateHeight.js');
 var Paragraph = require('../../Typography/Paragraph/Paragraph.js');
@@ -15,7 +14,7 @@ const AccordionContent = React.forwardRef(({ children, className, ...rest }, ref
         console.error('<Accordion.Content> has to be used within an <Accordion.Item>');
         return null;
     }
-    return (jsxRuntime.jsx(AnimateHeight.AnimateHeight, { id: context.contentId, open: context.open, children: jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: 'small', children: jsxRuntime.jsx("div", { ref: ref, className: clsx.clsx(Accordion_module.content, className), ...rest, children: children }) }) }));
+    return (jsxRuntime.jsx(AnimateHeight.AnimateHeight, { id: context.contentId, open: context.open, children: jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: 'small', children: jsxRuntime.jsx("div", { ref: ref, className: clsx.clsx('fds-accordion__content', className), ...rest, children: children }) }) }));
 });
 AccordionContent.displayName = 'AccordionContent';
 

package/dist/cjs/components/Accordion/AccordionHeader/AccordionHeader.js

@@ -5,7 +5,6 @@ var jsxRuntime = require('react/jsx-runtime');
 var akselIcons = require('@navikt/aksel-icons');
 var clsx = require('../../../node_modules/clsx/dist/clsx.js');
 var React = require('react');
-var Accordion_module = require('../Accordion.module.css.js');
 var AccordionItem = require('../AccordionItem/AccordionItem.js');
 var Heading = require('../../Typography/Heading/Heading.js');
 var Paragraph = require('../../Typography/Paragraph/Paragraph.js');
@@ -20,7 +19,7 @@ const AccordionHeader = React.forwardRef(({ level = 1, children, className, onHe
         context.toggleOpen();
         onHeaderClick && onHeaderClick(e);
     };
-    return (jsxRuntime.jsx(Heading.Heading, { ref: ref, size: 'xsmall', level: level, className: clsx.clsx(Accordion_module.header, className), ...rest, children: jsxRuntime.jsxs("button", { type: 'button', className: clsx.clsx(Accordion_module.accordionButton, `fds-focus`), onClick: handleClick, "aria-expanded": context.open, "aria-controls": context.contentId, children: [jsxRuntime.jsx(akselIcons.ChevronDownIcon, { "aria-hidden": true, className: Accordion_module.expandIcon, fontSize: '1.5rem' }), jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: 'small', children: jsxRuntime.jsx("span", { children: children }) })] }) }));
+    return (jsxRuntime.jsx(Heading.Heading, { ref: ref, size: 'xsmall', level: level, className: clsx.clsx('fds-accordion__header', className), ...rest, children: jsxRuntime.jsxs("button", { type: 'button', className: clsx.clsx('fds-accordion__button', `fds-focus`), onClick: handleClick, "aria-expanded": context.open, "aria-controls": context.contentId, children: [jsxRuntime.jsx(akselIcons.ChevronDownIcon, { "aria-hidden": true, className: 'fds-accordion__expand-icon', fontSize: '1.5rem' }), jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: 'small', children: jsxRuntime.jsx("span", { children: children }) })] }) }));
 });
 AccordionHeader.displayName = 'AccordionHeader';
 

package/dist/cjs/components/Accordion/AccordionItem/AccordionItem.js

@@ -4,15 +4,12 @@
 var jsxRuntime = require('react/jsx-runtime');
 var clsx = require('../../../node_modules/clsx/dist/clsx.js');
 var React = require('react');
-var Accordion_module = require('../Accordion.module.css.js');
 
 const AccordionItemContext = React.createContext(null);
 const AccordionItem = React.forwardRef(({ children, className, open, defaultOpen = false, ...rest }, ref) => {
     const [internalOpen, setInternalOpen] = React.useState(defaultOpen);
     const contentId = React.useId();
-    return (jsxRuntime.jsx("div", { className: clsx.clsx(Accordion_module.item, {
-            [Accordion_module.open]: open ?? internalOpen,
-        }, className), ref: ref, ...rest, children: jsxRuntime.jsx(AccordionItemContext.Provider, { value: {
+    return (jsxRuntime.jsx("div", { className: clsx.clsx('fds-accordion__item', (open ?? internalOpen) && 'fds-accordion__item--open', className), ref: ref, ...rest, children: jsxRuntime.jsx(AccordionItemContext.Provider, { value: {
                 open: open ?? internalOpen,
                 toggleOpen: () => {
                     if (open === undefined) {

package/dist/cjs/components/Button/Button.js

@@ -3,7 +3,7 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var clsx = require('../../node_modules/clsx/dist/clsx.js');
+var lite = require('../../node_modules/clsx/dist/lite.js');
 var index = require('../../node_modules/@radix-ui/react-slot/dist/index.js');
 
 /**
@@ -11,7 +11,7 @@ var index = require('../../node_modules/@radix-ui/react-slot/dist/index.js');
  */
 const Button = React.forwardRef(({ children, color = 'first', variant = 'primary', size = 'medium', fullWidth = false, icon = false, type = 'button', className, as = 'button', asChild, ...rest }, ref) => {
     const Component = asChild ? index.Slot : as;
-    return (jsxRuntime.jsx(Component, { ref: ref, type: type, className: clsx.clsx('fds-btn', `fds-focus`, `fds-btn--${size}`, `fds-btn--${variant}`, `fds-btn--${color}`, { 'fds-btn--full-width': fullWidth }, { 'fds-btn--icon-only': icon }, className), ...rest, children: children }));
+    return (jsxRuntime.jsx(Component, { ref: ref, type: type, className: lite.clsx('fds-btn', `fds-focus`, `fds-btn--${size}`, `fds-btn--${variant}`, `fds-btn--${color}`, fullWidth && 'fds-btn--full-width', icon && 'fds-btn--icon-only', className), ...rest, children: children }));
 });
 Button.displayName = 'Button';
 

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/Modal/ModalHeader/ModalHeader.js

@@ -15,7 +15,7 @@ var Heading = require('../../Typography/Heading/Heading.js');
 const ModalHeader = React.forwardRef(({ closeButton = true, children, subtitle, asChild, className, ...rest }, ref) => {
     const Component = asChild ? index.Slot : 'div';
     const context = React.useContext(ModalRoot.ModalContext);
-    return (jsxRuntime.jsxs(Component, { ref: ref, className: clsx.clsx(ModalHeader_module.modalHeader, !closeButton && ModalHeader_module.noCloseButton, className), ...rest, children: [subtitle && (jsxRuntime.jsx(Paragraph.Paragraph, { size: 'small', variant: 'short', children: subtitle })), jsxRuntime.jsx(Heading.Heading, { level: 2, size: 'xsmall', children: children }), closeButton && (jsxRuntime.jsx(Button.Button, { name: 'close', variant: 'tertiary', color: 'second', size: 'medium', onClick: context?.closeModal, autoFocus: true, icon: true, children: jsxRuntime.jsx(akselIcons.XMarkIcon, { title: 'close modal', fontSize: '1.5em' }) }))] }));
+    return (jsxRuntime.jsxs(Component, { ref: ref, className: clsx.clsx(ModalHeader_module.modalHeader, !closeButton && ModalHeader_module.noCloseButton, className), ...rest, children: [subtitle && (jsxRuntime.jsx(Paragraph.Paragraph, { size: 'small', variant: 'short', children: subtitle })), jsxRuntime.jsx(Heading.Heading, { level: 2, size: 'xsmall', children: children }), closeButton && (jsxRuntime.jsx(Button.Button, { name: 'close', variant: 'tertiary', color: 'second', size: 'medium', onClick: context?.closeModal, autoFocus: true, icon: true, className: ModalHeader_module.modalHeaderButton, children: jsxRuntime.jsx(akselIcons.XMarkIcon, { title: 'close modal', fontSize: '1.5em' }) }))] }));
 });
 ModalHeader.displayName = 'ModalHeader';
 

package/dist/cjs/components/Modal/ModalHeader/ModalHeader.module.css.js

@@ -1,6 +1,6 @@
 'use client';
 'use strict';
 
-var classes = {"modalHeader":"fds-modalheader-modalHeader-47e4ee5b","noCloseButton":"fds-modalheader-noCloseButton-47e4ee5b"};
+var classes = {"modalHeader":"fds-modalheader-modalHeader-47e4ee5b","modalHeaderButton":"fds-modalheader-modalHeaderButton-47e4ee5b","noCloseButton":"fds-modalheader-noCloseButton-47e4ee5b"};
 
 module.exports = classes;

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,30 @@ 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, 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 { selectedOptions, options, restChildren, interactiveChildren, customIds, filteredOptionsChildren, filteredOptions, setSelectedOptions, } = 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,248 +48,126 @@ 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]);
+            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);
-        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]);
+    }, [multiple, 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));
+    const handleSelectOption = (args) => {
+        const { option, clear, remove } = args;
+        if (clear) {
+            setSelectedOptions({});
+            setInputValue('');
+            onValueChange?.([]);
             return;
         }
+        if (!option)
+            return;
+        if (remove) {
+            const newSelectedOptions = { ...selectedOptions };
+            delete newSelectedOptions[option.value];
+            setSelectedOptions(newSelectedOptions);
+            onValueChange?.(Object.keys(newSelectedOptions));
+            return;
+        }
+        const newSelectedOptions = { ...selectedOptions };
         if (multiple) {
-            setSelectedOptions([...selectedOptions, option]);
+            if (newSelectedOptions[option.value]) {
+                delete newSelectedOptions[option.value];
+            }
+            else {
+                newSelectedOptions[option.value] = option;
+            }
             setInputValue('');
             inputRef.current?.focus();
         }
         else {
-            setSelectedOptions([option]);
+            newSelectedOptions[option.value] = option;
             setInputValue(option?.label || '');
             // move cursor to the end of the input
             setTimeout(() => {
                 inputRef.current?.setSelectionRange(option?.label?.length || 0, option?.label?.length || 0);
             }, 0);
         }
+        setSelectedOptions(newSelectedOptions);
+        console.log('calling new value with: ', Object.keys(newSelectedOptions));
+        onValueChange?.(Object.keys(newSelectedOptions));
         !multiple && setOpen(false);
         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,
+        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,
             htmlSize,
-            optionValues,
-            hideChips,
-            clearButtonLabel: cleanButtonLabel || clearButtonLabel,
-            hideClearButton,
-            listId,
+            clearButtonLabel,
+            customIds,
+            filteredOptions,
             setInputValue,
-            setActiveIndex,
-            handleKeyDown,
             setOpen,
             getReferenceProps,
-            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);
-            },
+            getItemProps,
             /* 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);
-                debouncedHandleSelectOption(option);
+                const option = options[value];
+                debouncedHandleSelectOption({ option: option });
             },
             handleSelectOption: debouncedHandleSelectOption,
             chipSrLabel,
             listRef,
             forwareddRef,
-        }, children: [jsxRuntime.jsxs(Box.Box, { className: clsx.clsx(Combobox_module.combobox, disabled && Combobox_module.disabled, className), style: style, ref: portalRef, children: [name && (jsxRuntime.jsx(ComboboxNative.default, { name: name, selectedOptions: selectedOptions, multiple: multiple })), jsxRuntime.jsx(ComboboxLabel.default, { label: label, description: description, size: size, readOnly: readOnly, hideLabel: hideLabel, formFieldProps: formFieldProps }), jsxRuntime.jsx(ComboboxInput.default, { ...objectUtils.omit(['inputValue'], rest), "aria-busy": loading }), jsxRuntime.jsx(ComboboxError.default, { size: size, error: error, formFieldProps: formFieldProps })] }), open && (jsxRuntime.jsx(floatingUi_react.FloatingPortal, { root: portal ? null : portalRef, children: jsxRuntime.jsx(floatingUi_react.FloatingFocusManager, { context: context, initialFocus: -1, visuallyHiddenDismiss: true, children: jsxRuntime.jsxs(Box.Box, { id: listId, shadow: 'medium', borderRadius: 'medium', borderColor: 'default', "aria-labelledby": formFieldProps.inputProps.id, "aria-autocomplete": 'list', tabIndex: -1, ...getFloatingProps({
+        }, children: [jsxRuntime.jsxs(Box.Box, { className: clsx.clsx(Combobox_module.combobox, disabled && Combobox_module.disabled, className), style: style, ref: portalRef, children: [name && (jsxRuntime.jsx(ComboboxNative.default, { name: name, selectedOptions: selectedOptions, multiple: multiple })), jsxRuntime.jsx(ComboboxLabel.default, { label: label, description: description, size: size, readOnly: readOnly, hideLabel: hideLabel, formFieldProps: formFieldProps }), jsxRuntime.jsx(ComboboxInput.default, { ...objectUtils.omit(['inputValue'], rest), hideClearButton: hideClearButton, listId: listId, error: error, hideChips: hideChips, handleKeyDown: handleKeyDown, "aria-busy": loading }), jsxRuntime.jsx(ComboboxError.default, { size: size, error: error, formFieldProps: formFieldProps })] }), open && (jsxRuntime.jsx(floatingUi_react.FloatingPortal, { root: portal ? null : portalRef, children: jsxRuntime.jsx(floatingUi_react.FloatingFocusManager, { context: context, initialFocus: -1, visuallyHiddenDismiss: true, children: jsxRuntime.jsxs(Box.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,
@@ -309,10 +182,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/Combobox.module.css.js

@@ -1,6 +1,6 @@
 'use client';
 'use strict';
 
-var classes = {"combobox":"fds-combobox-combobox-249a725c","optionsWrapper":"fds-combobox-optionsWrapper-249a725c","readOnly":"fds-combobox-readOnly-249a725c","inputWrapper":"fds-combobox-inputWrapper-249a725c","small":"fds-combobox-small-249a725c","medium":"fds-combobox-medium-249a725c","large":"fds-combobox-large-249a725c","error":"fds-combobox-error-249a725c","chipAndInput":"fds-combobox-chipAndInput-249a725c","chips":"fds-combobox-chips-249a725c","arrow":"fds-combobox-arrow-249a725c","readonly":"fds-combobox-readonly-249a725c","label":"fds-combobox-label-249a725c","description":"fds-combobox-description-249a725c","clearButton":"fds-combobox-clearButton-249a725c","disabled":"fds-combobox-disabled-249a725c","padlock":"fds-combobox-padlock-249a725c","errorMessage":"fds-combobox-errorMessage-249a725c","loading":"fds-combobox-loading-249a725c","inFocus":"fds-combobox-inFocus-249a725c","showChecked":"fds-combobox-showChecked-249a725c"};
+var classes = {"combobox":"fds-combobox-combobox-249a725c","optionsWrapper":"fds-combobox-optionsWrapper-249a725c","readOnly":"fds-combobox-readOnly-249a725c","inputWrapper":"fds-combobox-inputWrapper-249a725c","small":"fds-combobox-small-249a725c","medium":"fds-combobox-medium-249a725c","large":"fds-combobox-large-249a725c","error":"fds-combobox-error-249a725c","chipAndInput":"fds-combobox-chipAndInput-249a725c","chips":"fds-combobox-chips-249a725c","arrow":"fds-combobox-arrow-249a725c","readonly":"fds-combobox-readonly-249a725c","label":"fds-combobox-label-249a725c","description":"fds-combobox-description-249a725c","clearButton":"fds-combobox-clearButton-249a725c","disabled":"fds-combobox-disabled-249a725c","padlock":"fds-combobox-padlock-249a725c","errorMessage":"fds-combobox-errorMessage-249a725c","loading":"fds-combobox-loading-249a725c","showChecked":"fds-combobox-showChecked-249a725c"};
 
 module.exports = classes;