@digdir/designsystemet-react 1.0.0-rc.1 → 1.0.0-rc.11

package/dist/cjs/components/Tag/Tag.js

@@ -4,14 +4,10 @@
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var lite = require('../../node_modules/clsx/dist/lite.js');
-var getSize = require('../../utilities/getSize.js');
-var getColor = require('../../utilities/getColor.js');
 var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
-const Tag = React.forwardRef(({ children, className, ...rest }, ref) => {
-    const size = getSize.getSize(rest.size || 'md');
-    const color = getColor.getColor(rest.color || 'neutral');
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx("span", { className: lite.clsx('fds-tag', `fds-tag--${color}`, `fds-tag--${size}`, className), ref: ref, ...rest, children: children }) }));
+const Tag = React.forwardRef(({ size = 'md', color = 'neutral', children, className, ...rest }, ref) => {
+    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx("span", { className: lite.clsx('ds-tag', `ds-tag--${color}`, `ds-tag--${size}`, className), ref: ref, ...rest, children: children }) }));
 });
 Tag.displayName = 'Tag';
 

package/dist/cjs/components/ToggleGroup/ToggleGroupItem/ToggleGroupItem.js

@@ -11,7 +11,7 @@ var Button = require('../../Button/Button.js');
 const ToggleGroupItem = React.forwardRef((props, ref) => {
     const { children, icon, className, ...rest } = props;
     const { active, size = 'md', buttonProps } = useToggleGroupitem.useToggleGroupItem(props);
-    return (jsxRuntime.jsx(RovingTabindexItem.RovingTabindexItem, { asChild: true, value: rest.value, children: jsxRuntime.jsx(Button.Button, { className: lite.clsx('fds-togglegroup__item', className), icon: icon, variant: active ? 'primary' : 'tertiary', size: size, ref: ref, ...rest, ...buttonProps, children: children }) }));
+    return (jsxRuntime.jsx(RovingTabindexItem.RovingTabindexItem, { asChild: true, value: rest.value, children: jsxRuntime.jsx(Button.Button, { className: lite.clsx('ds-togglegroup__item', className), icon: icon, variant: active ? 'primary' : 'tertiary', size: size, ref: ref, ...rest, ...buttonProps, children: children }) }));
 });
 ToggleGroupItem.displayName = 'ToggleGroupItem';
 

package/dist/cjs/components/ToggleGroup/ToggleGroupItem/useToggleGroupitem.js

@@ -2,12 +2,12 @@
 'use strict';
 
 var React = require('react');
-var ToggleGroup = require('../ToggleGroup.js');
+var ToggleGroupRoot = require('../ToggleGroupRoot.js');
 
 /** Handles props for `ToggleGroup.Item` in context with `ToggleGroup` and `RovingTabIndex` */
 const useToggleGroupItem = (props) => {
     const { ...rest } = props;
-    const toggleGroup = React.useContext(ToggleGroup.ToggleGroupContext);
+    const toggleGroup = React.useContext(ToggleGroupRoot.ToggleGroupContext);
     const itemValue = props.value ?? (typeof props.children === 'string' ? props.children : '');
     const active = toggleGroup.value == itemValue;
     const buttonId = `togglegroup-item-${React.useId()}`;

package/dist/cjs/components/ToggleGroup/{ToggleGroup.js → ToggleGroupRoot.js}

@@ -4,22 +4,20 @@
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var lite = require('../../node_modules/clsx/dist/lite.js');
-var getSize = require('../../utilities/getSize.js');
 var RovingTabindexRoot = require('../../utilities/RovingTabIndex/RovingTabindexRoot.js');
 
 const ToggleGroupContext = React.createContext({});
 /** `ToggleGroup` component.
  * @example
  * ```tsx
- * <ToggleGroup onChange={(value) => console.log(value)}>
+ * <ToggleGroup.Root onChange={(value) => console.log(value)}>
  *   <ToggleGroup.Item value='1'>Toggle 1</ToggleGroup.Item>
  *   <ToggleGroup.Item value='2'>Toggle 2</ToggleGroup.Item>
  *   <ToggleGroup.Item value='3'>Toggle 3</ToggleGroup.Item>
- * </ToggleGroup>
+ * </ToggleGroup.Root>
  * ```
  */
-const ToggleGroup = React.forwardRef(({ children, value, defaultValue, onChange, name, className, ...rest }, ref) => {
-    const size = getSize.getSize(rest.size || 'md');
+const ToggleGroupRoot = React.forwardRef(({ size = 'md', children, value, defaultValue, onChange, name, className, ...rest }, ref) => {
     const nameId = React.useId();
     const isControlled = value !== undefined;
     const [uncontrolledValue, setUncontrolledValue] = React.useState(defaultValue);
@@ -31,15 +29,15 @@ const ToggleGroup = React.forwardRef(({ children, value, defaultValue, onChange,
         };
         value = uncontrolledValue;
     }
-    return (jsxRuntime.jsx("div", { className: lite.clsx('fds-togglegroup', className), ref: ref, ...rest, children: jsxRuntime.jsxs(ToggleGroupContext.Provider, { value: {
+    return (jsxRuntime.jsx("div", { className: lite.clsx('ds-togglegroup', className), ref: ref, ...rest, children: jsxRuntime.jsxs(ToggleGroupContext.Provider, { value: {
                 value,
                 defaultValue,
                 name: name ?? `togglegroup-name-${nameId}`,
                 onChange: onValueChange,
                 size,
-            }, children: [name && (jsxRuntime.jsx("input", { className: 'fds-togglegroup__input', name: name, value: value })), jsxRuntime.jsx(RovingTabindexRoot.RovingTabindexRoot, { asChild: true, valueId: value, children: jsxRuntime.jsx("div", { className: 'fds-togglegroup__content', role: 'radiogroup', children: children }) })] }) }));
+            }, children: [name && (jsxRuntime.jsx("input", { className: 'ds-togglegroup__input', name: name, value: value })), jsxRuntime.jsx(RovingTabindexRoot.RovingTabindexRoot, { asChild: true, valueId: value, children: jsxRuntime.jsx("div", { className: 'ds-togglegroup__content', role: 'radiogroup', children: children }) })] }) }));
 });
-ToggleGroup.displayName = 'ToggleGroup';
+ToggleGroupRoot.displayName = 'ToggleGroupRoot';
 
-exports.ToggleGroup = ToggleGroup;
 exports.ToggleGroupContext = ToggleGroupContext;
+exports.ToggleGroupRoot = ToggleGroupRoot;

package/dist/cjs/components/ToggleGroup/index.js

@@ -1,12 +1,15 @@
 'use client';
 'use strict';
 
-var ToggleGroup$1 = require('./ToggleGroup.js');
+var ToggleGroupRoot = require('./ToggleGroupRoot.js');
 var ToggleGroupItem = require('./ToggleGroupItem/ToggleGroupItem.js');
 
-const ToggleGroup = ToggleGroup$1.ToggleGroup;
+const ToggleGroup = {};
+ToggleGroup.Root = ToggleGroupRoot.ToggleGroupRoot;
 ToggleGroup.Item = ToggleGroupItem.ToggleGroupItem;
+ToggleGroup.Root.displayName = 'ToggleGroup.Root';
 ToggleGroup.Item.displayName = 'ToggleGroup.Item';
 
+exports.ToggleGroupRoot = ToggleGroupRoot.ToggleGroupRoot;
 exports.ToggleGroupItem = ToggleGroupItem.ToggleGroupItem;
 exports.ToggleGroup = ToggleGroup;

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

@@ -5,9 +5,10 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var lite = require('../../node_modules/clsx/dist/lite.js');
 var floatingUi_react = require('../../node_modules/@floating-ui/react/dist/floating-ui.react.js');
-var floatingUi_dom = require('../../node_modules/@floating-ui/dom/dist/floating-ui.dom.js');
+var floatingUi_dom = require('../../node_modules/@floating-ui/react-dom/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 Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -30,7 +31,7 @@ var React__namespace = /*#__PURE__*/_interopNamespaceDefault(React);
 
 const ARROW_HEIGHT = 7;
 const ARROW_GAP = 4;
-const Tooltip = React.forwardRef(({ children, content, placement = 'top', delay = 150, open: userOpen, defaultOpen = false, portal = true, inverted, className, style, ...rest }, ref) => {
+const Tooltip = React.forwardRef(({ children, content, placement = 'top', delay = 150, open: userOpen, defaultOpen = false, portal = false, className, style, ...rest }, ref) => {
     const [isOpen, setIsOpen] = React.useState(defaultOpen);
     const Container = portal ? floatingUi_react.FloatingPortal : React__namespace.Fragment;
     const arrowRef = React__namespace.useRef(null);
@@ -77,11 +78,11 @@ const Tooltip = React.forwardRef(({ children, content, placement = 'top', delay
     }
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [React.cloneElement(children, getReferenceProps({
                 ref: childMergedRef,
-            })), internalOpen && (jsxRuntime.jsx(Container, { children: jsxRuntime.jsxs("div", { ref: refs.setFloating, style: { ...floatingStyles, ...animationStyles, ...style }, role: 'tooltip', "data-ds-theme": inverted ? 'light' : 'dark', ...getFloatingProps({
-                        className: lite.clsx('fds-tooltip', className),
-                        ref: mergedRef,
-                        ...rest,
-                    }), children: [content, jsxRuntime.jsx(floatingUi_react.FloatingArrow, { ref: arrowRef, context: context, className: 'fds-tooltip__arrow', height: ARROW_HEIGHT })] }) }))] }));
+            })), internalOpen && (jsxRuntime.jsx(Container, { children: jsxRuntime.jsx(Paragraph.Paragraph, { size: 'xs', asChild: true, children: jsxRuntime.jsxs("div", { ref: refs.setFloating, style: { ...floatingStyles, ...animationStyles, ...style }, role: 'tooltip', ...getFloatingProps({
+                            className: lite.clsx('ds-tooltip', className),
+                            ref: mergedRef,
+                            ...rest,
+                        }), children: [content, jsxRuntime.jsx(floatingUi_react.FloatingArrow, { ref: arrowRef, context: context, className: 'ds-tooltip__arrow', height: ARROW_HEIGHT })] }) }) }))] }));
 });
 Tooltip.displayName = 'Tooltip';
 

package/dist/cjs/components/Typography/ErrorMessage/ErrorMessage.js

@@ -5,13 +5,11 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var lite = require('../../../node_modules/clsx/dist/lite.js');
 var index = require('../../../node_modules/@radix-ui/react-slot/dist/index.js');
-var getSize = require('../../../utilities/getSize.js');
 
 /** Use `ErrorMessage` to display text as error message. */
-const ErrorMessage = React.forwardRef(({ className, spacing, asChild, error = true, ...rest }, ref) => {
+const ErrorMessage = React.forwardRef(({ size = 'md', className, spacing, asChild, error = true, ...rest }, ref) => {
     const Component = asChild ? index.Slot : 'div';
-    const size = getSize.getSize(rest.size || 'md');
-    return (jsxRuntime.jsx(Component, { ref: ref, className: lite.clsx('fds-error-message', `fds-error-message--${size}`, spacing && 'fds-error-message--spacing', error && 'fds-error-message--error', className), ...rest }));
+    return (jsxRuntime.jsx(Component, { ref: ref, className: lite.clsx('ds-error-message', `ds-error_message--${size}`, spacing && 'ds-error-message--spacing', error && 'ds-error-message--error', className), ...rest }));
 });
 ErrorMessage.displayName = 'ErrorMessage';
 

package/dist/cjs/components/Typography/Heading/Heading.js

@@ -5,13 +5,11 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var lite = require('../../../node_modules/clsx/dist/lite.js');
 var index = require('../../../node_modules/@radix-ui/react-slot/dist/index.js');
-var getSize = require('../../../utilities/getSize.js');
 
 /** Use `Heading` to render h1-6 elements with heading text styles.  */
-const Heading = React.forwardRef(({ level = 1, spacing = false, className, asChild, ...rest }, ref) => {
+const Heading = React.forwardRef(({ size = 'xl', level = 1, spacing = false, className, asChild, ...rest }, ref) => {
     const Component = asChild ? index.Slot : `h${level ?? 1}`;
-    const size = getSize.getSize(rest.size || 'xl');
-    return (jsxRuntime.jsx(Component, { ref: ref, className: lite.clsx('fds-heading', `fds-heading--${size}`, spacing && 'fds-heading--spacing', className), ...rest }));
+    return (jsxRuntime.jsx(Component, { ref: ref, className: lite.clsx('ds-heading', `ds-heading--${size}`, spacing && 'ds-heading--spacing', className), ...rest }));
 });
 Heading.displayName = 'Heading';
 

package/dist/cjs/components/Typography/Ingress/Ingress.js

@@ -5,13 +5,11 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var lite = require('../../../node_modules/clsx/dist/lite.js');
 var index = require('../../../node_modules/@radix-ui/react-slot/dist/index.js');
-var getSize = require('../../../utilities/getSize.js');
 
 /** Use `Ingress` to display text as ingress. */
-const Ingress = React.forwardRef(({ className, spacing, asChild, ...rest }, ref) => {
+const Ingress = React.forwardRef(({ size = 'md', className, spacing, asChild, ...rest }, ref) => {
     const Component = asChild ? index.Slot : 'p';
-    const size = getSize.getSize(rest.size || 'md');
-    return (jsxRuntime.jsx(Component, { ref: ref, className: lite.clsx(`fds-ingress`, `fds-ingress--${size}`, spacing && 'fds-ingress--spacing', className), ...rest }));
+    return (jsxRuntime.jsx(Component, { ref: ref, className: lite.clsx(`ds-ingress`, `ds-ingress--${size}`, spacing && 'ds-ingress--spacing', className), ...rest }));
 });
 Ingress.displayName = 'Ingress';
 

package/dist/cjs/components/Typography/Label/Label.js

@@ -5,13 +5,11 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var lite = require('../../../node_modules/clsx/dist/lite.js');
 var index = require('../../../node_modules/@radix-ui/react-slot/dist/index.js');
-var getSize = require('../../../utilities/getSize.js');
 
 /** Use `Label` for labels. */
-const Label = React.forwardRef(({ className, spacing, weight = 'medium', asChild, ...rest }, ref) => {
+const Label = React.forwardRef(({ className, spacing, size = 'md', weight = 'medium', asChild, ...rest }, ref) => {
     const Component = asChild ? index.Slot : 'label';
-    const size = getSize.getSize(rest.size || 'md');
-    return (jsxRuntime.jsx(Component, { ref: ref, className: lite.clsx('fds-label', `fds-label--${size}`, spacing && 'fds-label--spacing', weight && `fds-label--${weight}-weight`, className), ...rest }));
+    return (jsxRuntime.jsx(Component, { ref: ref, className: lite.clsx('ds-label', `ds-label--${size}`, spacing && 'ds-label--spacing', weight && `ds-font-weight--${weight}`, className), ...rest }));
 });
 Label.displayName = 'Label';
 

package/dist/cjs/components/Typography/Paragraph/Paragraph.js

@@ -5,13 +5,16 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var lite = require('../../../node_modules/clsx/dist/lite.js');
 var index = require('../../../node_modules/@radix-ui/react-slot/dist/index.js');
-var getSize = require('../../../utilities/getSize.js');
 
+const lineHeightMap = {
+    short: 'ds-line-height--sm',
+    default: 'ds-line-height--md',
+    long: 'ds-line-height--lg',
+};
 /** Use `Paragraph` to display text with paragraph text styles. */
-const Paragraph = React.forwardRef(({ className, spacing, asChild, variant, ...rest }, ref) => {
+const Paragraph = React.forwardRef(({ className, spacing, size = 'md', asChild, variant, ...rest }, ref) => {
     const Component = asChild ? index.Slot : 'p';
-    const size = getSize.getSize(rest.size || 'md');
-    return (jsxRuntime.jsx(Component, { ref: ref, className: lite.clsx('fds-paragraph', `fds-paragraph--${size}`, spacing && 'fds-paragraph--spacing', variant && `fds-paragraph--${variant}`, className), ...rest }));
+    return (jsxRuntime.jsx(Component, { ref: ref, className: lite.clsx('ds-paragraph', spacing && 'ds-paragraph--spacing', `ds-paragraph--${size}`, lineHeightMap[variant ?? 'default'], className), ...rest }));
 });
 Paragraph.displayName = 'Paragraph';
 

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

@@ -10,7 +10,7 @@ const CharacterCounter = ({ label = defaultLabel, srLabel: propsSrLabel, maxCoun
     const currentCount = maxCount - value.length;
     const hasExceededLimit = value.length > maxCount;
     const srLabel = propsSrLabel ? propsSrLabel : defaultSrLabel(maxCount);
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("span", { className: `fds-sr-only`, id: id, children: srLabel }), jsxRuntime.jsx(ErrorMessage.ErrorMessage, { asChild: true, size: size, error: hasExceededLimit, children: jsxRuntime.jsx("span", { "aria-live": hasExceededLimit ? 'polite' : 'off', children: label(currentCount) }) })] }));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("span", { className: `ds-sr-only`, id: id, children: srLabel }), jsxRuntime.jsx(ErrorMessage.ErrorMessage, { asChild: true, size: size, error: hasExceededLimit, children: jsxRuntime.jsx("span", { "aria-live": hasExceededLimit ? 'polite' : 'off', children: label(currentCount) }) })] }));
 };
 CharacterCounter.displayName = 'CharacterCounter';
 

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

@@ -21,7 +21,7 @@ const Checkbox = React.forwardRef((props, ref) => {
             }
         },
     ]);
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsxs("div", { className: lite.clsx('fds-checkbox', `fds-checkbox--${size}`, inputProps.disabled && `fds-checkbox--disabled`, hasError && `fds-checkbox--error`, readOnly && `fds-checkbox--readonly`, className), style: style, children: [jsxRuntime.jsx("input", { className: `fds-checkbox__input`, ref: inputRef, ...objectUtils.omit(['size', 'error', 'indeterminate'], rest), ...inputProps, type: 'checkbox', "aria-checked": rest.indeterminate ? 'mixed' : inputProps.checked }), children && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Label.Label, { className: `fds-checkbox__label`, htmlFor: inputProps.id, size: size, weight: 'regular', children: jsxRuntime.jsx("span", { children: children }) }), description && (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx("div", { id: descriptionId, className: `fds-checkbox__description`, children: description }) }))] }))] }) }));
+    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsxs("div", { className: lite.clsx('ds-checkbox', `ds-checkbox--${size}`, hasError && `ds-checkbox--error`, readOnly && `ds-checkbox--readonly`, className), style: style, children: [jsxRuntime.jsx("input", { className: `ds-checkbox__input`, ref: inputRef, ...objectUtils.omit(['size', 'error', 'indeterminate'], rest), ...inputProps, type: 'checkbox', disabled: inputProps.disabled, "aria-checked": rest.indeterminate ? 'mixed' : inputProps.checked }), children && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Label.Label, { className: lite.clsx(`ds-checkbox__label`), htmlFor: inputProps.id, size: size, weight: 'regular', children: jsxRuntime.jsx("span", { children: children }) }), description && (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx("div", { id: descriptionId, className: `ds-checkbox__description`, children: description }) }))] }))] }) }));
 });
 Checkbox.displayName = 'Checkbox';
 

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

@@ -22,7 +22,7 @@ const CheckboxGroup = React.forwardRef(({ onChange, children, value, readOnly, d
                 value,
                 defaultValue,
                 toggleValue,
-            }, children: jsxRuntime.jsx("div", { children: children }) }) }));
+            }, children: jsxRuntime.jsx("div", { className: 'ds-checkbox__group', children: children }) }) }));
 });
 CheckboxGroup.displayName = 'CheckboxGroup';
 

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

@@ -8,7 +8,6 @@ var lite = require('../../../node_modules/clsx/dist/lite.js');
 var index = require('../../../node_modules/@tanstack/react-virtual/dist/esm/index.js');
 var useFormField = require('../useFormField.js');
 var useDebounce = require('../../../utilities/useDebounce.js');
-var getSize = require('../../../utilities/getSize.js');
 var useCombobox = require('./useCombobox.js');
 var ComboboxInput = require('./internal/ComboboxInput.js');
 var ComboboxLabel = require('./internal/ComboboxLabel.js');
@@ -23,8 +22,7 @@ var Box = require('../../Box/Box.js');
 var Spinner = require('../../Spinner/Spinner.js');
 var objectUtils = require('../../../utilities/objectUtils.js');
 
-const ComboboxComponent = React.forwardRef(({ value, initialValue = [], onValueChange, label, hideLabel = false, description, multiple = false, 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 size = getSize.getSize(rest.size || 'md');
+const ComboboxComponent = React.forwardRef(({ value, initialValue = [], onValueChange, label, hideLabel = false, description, multiple = false, disabled = false, readOnly = false, hideChips = false, clearButtonLabel = 'Fjern alt', hideClearButton = false, error, errorId, id, name, portal = true, htmlSize = 0, virtual = false, children, style, size = 'md', 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([]);
@@ -52,18 +50,18 @@ const ComboboxComponent = React.forwardRef(({ value, initialValue = [], onValueC
     // if value is set, set input value to the label of the value
     React.useEffect(() => {
         if (value && value.length > 0 && !multiple) {
-            const option = options[value[0]];
+            const option = options[useCombobox.prefix(value[0])];
             setInputValue(option?.label || '');
         }
     }, [multiple, value, options]);
     React.useEffect(() => {
         if (value && Object.keys(options).length >= 0) {
             const updatedSelectedOptions = value.map((option) => {
-                const value = options[option];
+                const value = options[useCombobox.prefix(option)];
                 return value;
             });
             setSelectedOptions(updatedSelectedOptions.reduce((acc, value) => {
-                acc[value.value] = value;
+                acc[useCombobox.prefix(value.value)] = value;
                 return acc;
             }, {}));
         }
@@ -81,18 +79,18 @@ const ComboboxComponent = React.forwardRef(({ value, initialValue = [], onValueC
             return;
         if (remove) {
             const newSelectedOptions = { ...selectedOptions };
-            delete newSelectedOptions[option.value];
+            delete newSelectedOptions[useCombobox.prefix(option.value)];
             setSelectedOptions(newSelectedOptions);
-            onValueChange?.(Object.keys(newSelectedOptions));
+            onValueChange?.(Object.keys(newSelectedOptions).map((key) => useCombobox.removePrefix(key)));
             return;
         }
         const newSelectedOptions = { ...selectedOptions };
         if (multiple) {
-            if (newSelectedOptions[option.value]) {
-                delete newSelectedOptions[option.value];
+            if (newSelectedOptions[useCombobox.prefix(option.value)]) {
+                delete newSelectedOptions[useCombobox.prefix(option.value)];
             }
             else {
-                newSelectedOptions[option.value] = option;
+                newSelectedOptions[useCombobox.prefix(option.value)] = option;
             }
             setInputValue('');
             inputRef.current?.focus();
@@ -102,7 +100,7 @@ const ComboboxComponent = React.forwardRef(({ value, initialValue = [], onValueC
             Object.keys(newSelectedOptions).forEach((key) => {
                 delete newSelectedOptions[key];
             });
-            newSelectedOptions[option.value] = option;
+            newSelectedOptions[useCombobox.prefix(option.value)] = option;
             setInputValue(option?.label || '');
             // move cursor to the end of the input
             setTimeout(() => {
@@ -110,7 +108,7 @@ const ComboboxComponent = React.forwardRef(({ value, initialValue = [], onValueC
             }, 0);
         }
         setSelectedOptions(newSelectedOptions);
-        onValueChange?.(Object.keys(newSelectedOptions));
+        onValueChange?.(Object.keys(newSelectedOptions).map((key) => useCombobox.removePrefix(key)));
         !multiple && setOpen(false);
         refs.domReference.current?.focus();
     };
@@ -136,7 +134,7 @@ const ComboboxComponent = React.forwardRef(({ value, initialValue = [], onValueC
         measureElement: (elem) => {
             return elem.getBoundingClientRect().height;
         },
-        overscan: 1,
+        overscan: 7,
     });
     return (jsxRuntime.jsxs(ComboboxContext.ComboboxContext.Provider, { value: {
             size,
@@ -164,19 +162,22 @@ const ComboboxComponent = React.forwardRef(({ value, initialValue = [], onValueC
                     return;
                 if (disabled)
                     return;
-                const option = options[value];
+                const option = options[useCombobox.prefix(value)];
                 debouncedHandleSelectOption({ option: option });
             },
             handleSelectOption: debouncedHandleSelectOption,
             chipSrLabel,
             listRef,
             forwareddRef,
-        }, children: [jsxRuntime.jsxs(Box.Box, { className: lite.clsx('fds-combobox', `fds-combobox--${size}`, disabled && 'fds-combobox__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: 'md', borderRadius: 'md', borderColor: 'default', "aria-labelledby": formFieldProps.inputProps.id, "aria-autocomplete": 'list', tabIndex: -1, ...getFloatingProps({
+            setListRef: (index, node) => {
+                listRef.current[index] = node;
+            },
+        }, children: [jsxRuntime.jsxs(Box.Box, { className: lite.clsx('ds-combobox', `ds-combobox--${size}`, disabled && 'ds-combobox__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: 'md', borderRadius: 'md', borderColor: 'default', "aria-labelledby": formFieldProps.inputProps.id, "aria-autocomplete": 'list', tabIndex: -1, ...getFloatingProps({
                             ref: refs.setFloating,
                             style: {
                                 ...floatingStyles,
                             },
-                        }), className: lite.clsx('fds-combobox__options-wrapper', `fds-combobox--${size}`), children: [virtual && (jsxRuntime.jsx("div", { style: {
+                        }), className: lite.clsx('ds-combobox__options-wrapper', `ds-combobox--${size}`), children: [virtual && (jsxRuntime.jsx("div", { style: {
                                     height: `${rowVirtualizer.getTotalSize()}px`,
                                     width: '100%',
                                     position: 'relative',
@@ -186,7 +187,7 @@ const ComboboxComponent = React.forwardRef(({ value, initialValue = [], onValueC
                                         left: 0,
                                         width: '100%',
                                         transform: `translateY(${virtualRow.start}px)`,
-                                    }, children: filteredOptionsChildren[virtualRow.index] }, virtualRow.index))) })), loading ? (jsxRuntime.jsxs(Custom.default, { className: 'fds-combobox__loading', children: [jsxRuntime.jsx(Spinner.Spinner, { title: 'Laster', size: 'sm' }), loadingLabel] })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [restChildren, !virtual && filteredOptionsChildren] }))] }) }) }))] }));
+                                    }, children: filteredOptionsChildren[virtualRow.index] }, virtualRow.index))) })), loading ? (jsxRuntime.jsxs(Custom.default, { className: 'ds-combobox__loading', children: [jsxRuntime.jsx(Spinner.Spinner, { title: 'Laster', size: 'sm' }), loadingLabel] })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [restChildren, !virtual && filteredOptionsChildren] }))] }) }) }))] }));
 });
 const Combobox = React.forwardRef((props, ref) => (jsxRuntime.jsx(ComboboxIdContext.ComboboxIdProvider, { children: jsxRuntime.jsx(ComboboxComponent, { ...props, ref: ref }) })));
 Combobox.displayName = 'Combobox';

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

@@ -10,6 +10,7 @@ var index = require('../../../node_modules/@radix-ui/react-slot/dist/index.js');
 var floatingUi_react = require('../../../node_modules/@floating-ui/react/dist/floating-ui.react.js');
 var ComboboxContext = require('./ComboboxContext.js');
 var ComboboxIdContext = require('./ComboboxIdContext.js');
+var Label = require('../../Typography/Label/Label.js');
 var objectUtils = require('../../../utilities/objectUtils.js');
 
 const ComboboxCustom = React.forwardRef(({ asChild, interactive, id, className, ...rest }, ref) => {
@@ -23,15 +24,15 @@ const ComboboxCustom = React.forwardRef(({ asChild, interactive, id, className,
     if (!context) {
         throw new Error('ComboboxCustom must be used within a Combobox');
     }
-    const { customIds, listRef, getItemProps } = context;
+    const { customIds, setListRef, getItemProps, size } = context;
     const index$1 = React.useMemo(() => (id && customIds.indexOf(id)) || 0, [id, customIds]);
     const combinedRef = floatingUi_react.useMergeRefs([
         (node) => {
-            listRef.current[index$1] = node;
+            setListRef(index$1, node);
         },
         ref,
     ]);
-    return (jsxRuntime.jsx(Component, { ref: combinedRef, tabIndex: -1, className: lite.clsx('fds-combobox__custom', 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()) }));
+    return (jsxRuntime.jsx(Label.Label, { size: size, asChild: true, children: jsxRuntime.jsx(Component, { ref: combinedRef, tabIndex: -1, className: lite.clsx('ds-combobox__custom', 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.js

@@ -7,14 +7,15 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var lite = require('../../../node_modules/clsx/dist/lite.js');
 var ComboboxContext = require('./ComboboxContext.js');
+var Label = require('../../Typography/Label/Label.js');
 
 const ComboboxEmpty = React.forwardRef(({ children, className, ...rest }, ref) => {
     const context = React.useContext(ComboboxContext.ComboboxContext);
     if (!context) {
         throw new Error('ComboboxEmpty must be used within a Combobox');
     }
-    const { filteredOptions } = context;
-    return (filteredOptions.length === 0 && (jsxRuntime.jsx("div", { ref: ref, className: lite.clsx('fds-combobox__empty', className), ...rest, children: children })));
+    const { filteredOptions, size } = context;
+    return (filteredOptions.length === 0 && (jsxRuntime.jsx(Label.Label, { size: size, asChild: true, children: jsxRuntime.jsx("div", { ref: ref, className: lite.clsx('ds-combobox__empty', className), ...rest, children: children }) })));
 });
 ComboboxEmpty.displayName = 'ComboboxEmpty';
 

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

@@ -8,7 +8,7 @@ var React = require('react');
 var lite = require('../../../../node_modules/clsx/dist/lite.js');
 
 const ComboboxOptionDescription = React.forwardRef(({ children, className, ...rest }, ref) => {
-    return (jsxRuntime.jsx("span", { className: lite.clsx('fds-combobox__option__description', className), ref: ref, ...rest, children: children }));
+    return (jsxRuntime.jsx("span", { className: lite.clsx('ds-combobox__option__description', className), ref: ref, ...rest, children: children }));
 });
 ComboboxOptionDescription.displayName = 'ComboboxOptionDescription';
 var ComboboxOptionDescription$1 = ComboboxOptionDescription;

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

@@ -8,8 +8,8 @@ var ComboboxContext = require('../ComboboxContext.js');
 var SelectedIcon = require('./SelectedIcon.js');
 var Description = require('./Description.js');
 var useComboboxOption = require('./useComboboxOption.js');
-var objectUtils = require('../../../../utilities/objectUtils.js');
 var Label = require('../../../Typography/Label/Label.js');
+var objectUtils = require('../../../../utilities/objectUtils.js');
 
 const ComboboxOption = React.memo(React.forwardRef(({ value, description, children, className, ...rest }, forwardedRef) => {
     const labelId = React.useId();
@@ -24,10 +24,10 @@ const ComboboxOption = React.memo(React.forwardRef(({ value, description, childr
     }
     const { size, multiple, getItemProps } = context;
     const props = getItemProps();
-    return (jsxRuntime.jsxs("button", { ref: ref, id: id, role: 'option', type: 'button', "aria-selected": !!selected, "aria-labelledby": labelId, tabIndex: -1, onClick: (e) => {
-            onOptionClick();
-            rest.onClick?.(e);
-        }, className: lite.clsx('fds-combobox__option', active && 'fds-combobox__option--active', multiple && 'fds-combobox__option--multiple', className), ...objectUtils.omit(['displayValue'], rest), ...objectUtils.omit(['onClick', 'onPointerLeave'], props), children: [jsxRuntime.jsx(Label.Label, { asChild: true, size: size, children: jsxRuntime.jsx("span", { children: jsxRuntime.jsx(SelectedIcon.SelectedIcon, { multiple: multiple, selected: !!selected }) }) }), jsxRuntime.jsxs(Label.Label, { className: 'fds-combobox__option__label', size: size, id: labelId, children: [children, description && (jsxRuntime.jsx(Description.default, { children: description }))] })] }));
+    return (jsxRuntime.jsx(Label.Label, { size: 'md', asChild: true, children: jsxRuntime.jsxs("button", { ref: ref, id: id, role: 'option', type: 'button', "aria-selected": !!selected, "aria-labelledby": labelId, tabIndex: -1, onClick: (e) => {
+                onOptionClick();
+                rest.onClick?.(e);
+            }, className: lite.clsx('ds-combobox__option', active && 'ds-combobox__option--active', multiple && 'ds-combobox__option--multiple', className), ...objectUtils.omit(['displayValue'], rest), ...objectUtils.omit(['onClick', 'onPointerLeave'], props), children: [jsxRuntime.jsx(Label.Label, { asChild: true, size: size, children: jsxRuntime.jsx("span", { children: jsxRuntime.jsx(SelectedIcon.SelectedIcon, { multiple: multiple, selected: !!selected }) }) }), jsxRuntime.jsxs(Label.Label, { className: 'ds-combobox__option__label', size: size, id: labelId, children: [children, description && (jsxRuntime.jsx(Description.default, { children: description }))] })] }) }));
 }));
 ComboboxOption.displayName = 'ComboboxOption';
 

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

@@ -8,7 +8,7 @@ var akselIcons = require('@navikt/aksel-icons');
 var lite = require('../../../../node_modules/clsx/dist/lite.js');
 
 const SelectedIcon = ({ multiple, selected }) => {
-    return (jsxRuntime.jsx("div", { className: lite.clsx(multiple && 'fds-combobox__option__icon-wrapper', selected && 'fds-combobox__option__icon-wrapper--selected'), children: selected && (jsxRuntime.jsx(akselIcons.CheckmarkIcon, { className: 'fds-combobox__option__icon-wrapper__icon', "aria-hidden": true })) }));
+    return (jsxRuntime.jsx("div", { className: lite.clsx(multiple && 'ds-combobox__option__icon-wrapper', selected && 'ds-combobox__option__icon-wrapper--selected'), children: selected && (jsxRuntime.jsx(akselIcons.CheckmarkIcon, { className: 'ds-combobox__option__icon-wrapper__icon', "aria-hidden": true })) }));
 };
 SelectedIcon.displayName = 'SelectedIcon';
 

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

@@ -6,6 +6,7 @@ var floatingUi_react = require('../../../../node_modules/@floating-ui/react/dist
 var ComboboxContext = require('../ComboboxContext.js');
 var useDebounce = require('../../../../utilities/useDebounce.js');
 var ComboboxIdContext = require('../ComboboxIdContext.js');
+var useCombobox = require('../useCombobox.js');
 
 function useComboboxOption({ id, ref, value, }) {
     const generatedId = React.useId();
@@ -17,7 +18,7 @@ function useComboboxOption({ id, ref, value, }) {
         throw new Error('ComboboxOption must be used within a Combobox');
     }
     const { selectedOptions, onOptionClick, listRef, customIds, filteredOptions, } = context;
-    const index = React.useMemo(() => filteredOptions.indexOf(value) + customIds.length, [customIds.length, filteredOptions, value]);
+    const index = React.useMemo(() => filteredOptions.indexOf(useCombobox.prefix(String(value))) + customIds.length, [customIds.length, filteredOptions, value]);
     const combinedRef = floatingUi_react.useMergeRefs([
         (node) => {
             listRef.current[index] = node;
@@ -27,7 +28,7 @@ function useComboboxOption({ id, ref, value, }) {
     if (index === -1) {
         throw new Error('Internal error: ComboboxOption did not find index');
     }
-    const selected = selectedOptions[value];
+    const selected = selectedOptions[useCombobox.prefix(value)];
     const active = activeIndex === index;
     React.useEffect(() => {
         if (active) {

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

@@ -15,7 +15,7 @@ const ComboboxClearButton = () => {
         throw new Error('ComboboxContext is missing');
     }
     const { readOnly, disabled, clearButtonLabel, handleSelectOption } = context;
-    return (jsxRuntime.jsx("button", { disabled: disabled, className: lite.clsx('fds-combobox__clear-button', `fds-focus`), onClick: () => {
+    return (jsxRuntime.jsx("button", { disabled: disabled, className: lite.clsx('ds-combobox__clear-button', `ds-focus`), onClick: () => {
             if (readOnly)
                 return;
             if (disabled)

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

@@ -7,7 +7,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var ErrorMessage = require('../../../Typography/ErrorMessage/ErrorMessage.js');
 
 const ComboboxError = ({ size, error, formFieldProps, }) => {
-    return (jsxRuntime.jsx("div", { className: 'fds-combobox__error-message', id: formFieldProps.errorId, "aria-live": 'polite', "aria-relevant": 'additions removals', children: error && jsxRuntime.jsx(ErrorMessage.ErrorMessage, { size: size, children: error }) }));
+    return (jsxRuntime.jsx("div", { className: 'ds-combobox__error-message', id: formFieldProps.errorId, "aria-live": 'polite', "aria-relevant": 'additions removals', children: error && jsxRuntime.jsx(ErrorMessage.ErrorMessage, { size: size, children: error }) }));
 };
 ComboboxError.displayName = 'ComboboxError';
 var ComboboxError$1 = ComboboxError;