@digdir/designsystemet-react 0.62.0 → 1.0.0-next.14

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

@@ -1,17 +1,17 @@
 'use client';
 import { jsx } from 'react/jsx-runtime';
-import { useContext } from 'react';
+import { forwardRef, useContext } from 'react';
 import { XMarkIcon } from '@navikt/aksel-icons';
 import { clsx } from '../../../../node_modules/clsx/dist/lite.js';
 import { ComboboxContext } from '../ComboboxContext.js';
 
-const ComboboxClearButton = () => {
+const ComboboxClearButton = forwardRef((props, ref) => {
     const context = useContext(ComboboxContext);
     if (!context) {
         throw new Error('ComboboxContext is missing');
     }
     const { readOnly, disabled, clearButtonLabel, handleSelectOption } = context;
-    return (jsx("button", { disabled: disabled, className: clsx('fds-combobox__clear-button', `fds-focus`), onClick: () => {
+    return (jsx("button", { ...props, ref: ref, disabled: disabled, className: clsx('ds-combobox__clear-button', `ds-focus`), onClick: () => {
             if (readOnly)
                 return;
             if (disabled)
@@ -27,8 +27,8 @@ const ComboboxClearButton = () => {
                 handleSelectOption({ option: null, clear: true });
             }
         }, type: 'button', "aria-label": clearButtonLabel, children: jsx(XMarkIcon, { fontSize: '1.5em', title: 'Clear selection' }) }));
-};
+});
 ComboboxClearButton.displayName = 'ComboboxClearButton';
 var ComboboxClearButton$1 = ComboboxClearButton;
 
-export { ComboboxClearButton, ComboboxClearButton$1 as default };
+export { ComboboxClearButton$1 as default };

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

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

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

@@ -1,26 +1,29 @@
 'use client';
-import { jsxs, jsx } from 'react/jsx-runtime';
-import { useContext } from 'react';
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { useContext, useRef } from 'react';
 import { clsx } from '../../../../node_modules/clsx/dist/lite.js';
 import { ChevronUpIcon, ChevronDownIcon } from '@navikt/aksel-icons';
 import { useMergeRefs } from '../../../../node_modules/@floating-ui/react/dist/floating-ui.react.js';
 import { ComboboxContext } from '../ComboboxContext.js';
 import { useComboboxIdDispatch } from '../ComboboxIdContext.js';
+import { prefix } from '../useCombobox.js';
 import ComboboxChips from './ComboboxChips.js';
 import ComboboxClearButton from './ComboboxClearButton.js';
 import { Box } from '../../../Box/Box.js';
-import { omit } from '../../../../utilities/objectUtils.js';
+import { Paragraph } from '../../../Typography/Paragraph/Paragraph.js';
+import { omit } from '../../../../utilities/omit/omit.js';
 
 const ComboboxInput = ({ hideClearButton, listId, error, hideChips, handleKeyDown, ...rest }) => {
     const context = useContext(ComboboxContext);
     const idDispatch = useComboboxIdDispatch();
+    const clearButtonRef = useRef(null);
     if (!context) {
         throw new Error('ComboboxContext is missing');
     }
     const setActiveIndex = (id) => {
         idDispatch?.({ type: 'SET_ACTIVE_INDEX', payload: id });
     };
-    const { forwareddRef, readOnly, disabled, open, inputRef, refs, inputValue, multiple, selectedOptions, formFieldProps, htmlSize, options, setOpen, getReferenceProps, setInputValue, handleSelectOption, } = context;
+    const { forwareddRef, readOnly, disabled, open, inputRef, refs, inputValue, multiple, selectedOptions, formFieldProps, htmlSize, options, setOpen, getReferenceProps, setInputValue, handleSelectOption, size, } = context;
     const mergedRefs = useMergeRefs([forwareddRef, inputRef]);
     // onChange function for the input
     const onChange = (event) => {
@@ -28,14 +31,16 @@ const ComboboxInput = ({ hideClearButton, listId, error, hideChips, handleKeyDow
         setInputValue(value);
         setActiveIndex(0);
         // check if input value is the same as a label, if so, select it
-        const option = options[value.toLowerCase()];
-        if (!option)
-            return;
-        if (selectedOptions[option.value])
-            return;
-        handleSelectOption({ option: option });
+        Object.values(options).forEach((option) => {
+            if (option.label.toLowerCase() === value.toLowerCase()) {
+                /* if option is already selected, discard selecting it, since it would de-select */
+                if (selectedOptions[prefix(option.value)])
+                    return;
+                handleSelectOption({ option: option });
+            }
+        });
     };
-    const showClearButton = multiple && !hideClearButton && Object.keys(selectedOptions).length > 0;
+    const showClearButton = !hideClearButton && Object.keys(selectedOptions).length > 0;
     /* Props from floating-ui */
     const props = getReferenceProps({
         ref: refs?.setReference,
@@ -43,13 +48,15 @@ const ComboboxInput = ({ hideClearButton, listId, error, hideChips, handleKeyDow
         'aria-controls': null,
         'aria-expanded': null,
         'aria-haspopup': null,
-        /* If we click the wrapper, open the list, set index to first option, and focus the input */
-        onClick() {
+        /* If we click the wrapper, toggle open, set index to first option, and focus the input */
+        onClick(event) {
             if (disabled)
                 return;
             if (readOnly)
                 return;
-            setOpen(true);
+            if (clearButtonRef.current?.contains(event.target))
+                return;
+            setOpen(!open);
             setActiveIndex(0);
             inputRef.current?.focus();
         },
@@ -62,13 +69,13 @@ const ComboboxInput = ({ hideClearButton, listId, error, hideChips, handleKeyDow
             }
         },
     });
-    return (jsxs(Box, { ...props, "aria-disabled": disabled, className: clsx('fds-textfield__input', 'fds-combobox__input__wrapper', readOnly && 'fds-combobox--readonly', error && 'fds-combobox--error'), children: [jsxs("div", { className: 'fds-combobox__chip-and-input', children: [multiple && !hideChips && jsx(ComboboxChips, {}), jsx("input", { ref: mergedRefs, "aria-activedescendant": props['aria-activedescendant'], readOnly: readOnly, "aria-autocomplete": 'list', role: 'combobox', "aria-expanded": open, "aria-controls": listId, autoComplete: 'off', size: htmlSize, value: inputValue, ...omit(['style', 'className'], rest), ...formFieldProps.inputProps, className: 'fds-combobox__input', onChange: (e) => {
-                            onChange(e);
-                            !open && setOpen(true);
-                            rest.onChange && rest.onChange(e);
-                        } })] }), showClearButton && jsx(ComboboxClearButton, {}), jsx("div", { className: 'fds-combobox__arrow', children: open ? (jsx(ChevronUpIcon, { title: 'arrow up', fontSize: '1.5em' })) : (jsx(ChevronDownIcon, { title: 'arrow down', fontSize: '1.5em' })) })] }));
+    return (jsx(Paragraph, { size: size, asChild: true, children: jsxs(Box, { ...props, "aria-disabled": disabled ? 'true' : undefined, className: clsx('ds-textfield__input', 'ds-combobox__input__wrapper', readOnly && 'ds-combobox--readonly', error && 'ds-combobox--error'), children: [jsxs("div", { className: 'ds-combobox__chip-and-input', children: [multiple && !hideChips && jsx(ComboboxChips, {}), jsx(Paragraph, { size: size, asChild: true, children: jsx("input", { ref: mergedRefs, "aria-activedescendant": props['aria-activedescendant'], readOnly: readOnly, "aria-autocomplete": 'list', role: 'combobox', "aria-expanded": open, "aria-controls": listId, autoComplete: 'off', size: htmlSize, value: inputValue, ...omit(['style', 'className'], rest), ...formFieldProps.inputProps, className: 'ds-combobox__input', onChange: (e) => {
+                                    onChange(e);
+                                    !open && setOpen(true);
+                                    rest.onChange && rest.onChange(e);
+                                } }) })] }), showClearButton && jsx(ComboboxClearButton, { ref: clearButtonRef }), jsx("div", { className: 'ds-combobox__arrow', children: open ? (jsx(ChevronUpIcon, { title: 'arrow up', fontSize: '1.5em' })) : (jsx(ChevronDownIcon, { title: 'arrow down', fontSize: '1.5em' })) })] }) }));
 };
 ComboboxInput.displayName = 'ComboboxInput';
 var ComboboxInput$1 = ComboboxInput;
 
-export { ComboboxInput, ComboboxInput$1 as default };
+export { ComboboxInput$1 as default };

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

@@ -6,9 +6,9 @@ import { Label } from '../../../Typography/Label/Label.js';
 import { Paragraph } from '../../../Typography/Paragraph/Paragraph.js';
 
 const ComboboxLabel = ({ label, description, hideLabel, size, readOnly, formFieldProps, }) => {
-    return (jsxs(Fragment, { children: [label && (jsxs(Label, { size: size, htmlFor: formFieldProps.inputProps.id, className: clsx('fds-combobox__label', hideLabel && `fds-sr-only`), children: [readOnly && (jsx(PadlockLockedFillIcon, { "aria-hidden": true, className: 'fds-combobox__readonly__icon' })), label] })), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: formFieldProps.descriptionId, className: clsx('fds-combobox__description', hideLabel && `fds-sr-only`), children: description }) }))] }));
+    return (jsxs(Fragment, { children: [label && (jsxs(Label, { size: size, htmlFor: formFieldProps.inputProps.id, className: clsx('ds-combobox__label', hideLabel && `ds-sr-only`), children: [readOnly && (jsx(PadlockLockedFillIcon, { "aria-hidden": true, className: 'ds-combobox__readonly__icon' })), label] })), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: formFieldProps.descriptionId, className: clsx('ds-combobox__description', hideLabel && `ds-sr-only`), children: description }) }))] }));
 };
 ComboboxLabel.displayName = 'ComboboxLabel';
 var ComboboxLabel$1 = ComboboxLabel;
 
-export { ComboboxLabel, ComboboxLabel$1 as default };
+export { ComboboxLabel$1 as default };

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

@@ -1,12 +1,12 @@
 'use client';
 import { jsx } from 'react/jsx-runtime';
+import { removePrefix } from '../useCombobox.js';
 
 const ComboboxNative = ({ selectedOptions, multiple, name, }) => {
-    return (jsx("select", { name: name, multiple: multiple, style: { display: 'none' }, value: multiple
-            ? Object.keys(selectedOptions)
-            : Object.keys(selectedOptions)[0], onChange: () => { }, children: Object.keys(selectedOptions).map((value) => (jsx("option", { value: value }, value))) }));
+    const VALUE = Object.keys(selectedOptions).map((key) => removePrefix(key));
+    return (jsx("select", { name: name, multiple: multiple, style: { display: 'none' }, value: multiple ? VALUE : VALUE[0], onChange: () => { }, children: VALUE.map((value) => (jsx("option", { value: value }, value))) }));
 };
 ComboboxNative.displayName = 'ComboboxNative';
 var ComboboxNative$1 = ComboboxNative;
 
-export { ComboboxNative, ComboboxNative$1 as default };
+export { ComboboxNative$1 as default };

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

@@ -1,7 +1,7 @@
 'use client';
-import { useMemo, Children, useState, isValidElement } from 'react';
+import { useCallback, useMemo, Children, useState, isValidElement } from 'react';
 import { ComboboxOption } from './Option/Option.js';
-import ComboboxCustom from './Custom.js';
+import { ComboboxCustom } from './Custom.js';
 
 const isOption = (option) => !!option;
 function isComboboxOption(child) {
@@ -13,9 +13,22 @@ function isComboboxCustom(child) {
 function isInteractiveComboboxCustom(child) {
     return isComboboxCustom(child) && child.props.interactive === true;
 }
+const INTERNAL_OPTION_PREFIX = 'internal-option-';
+/**
+ * We use this function to prefix the value of the options so we can make sure numbers as strings are not parsed as numbers in objects
+ * @param value
+ * @returns
+ */
+const prefix = (value) => {
+    return INTERNAL_OPTION_PREFIX + value;
+};
+const removePrefix = (value) => {
+    return value.slice(INTERNAL_OPTION_PREFIX.length);
+};
 function useCombobox({ children, inputValue, multiple, filter = (inputValue, option) => {
     return option.label.toLowerCase().startsWith(inputValue.toLowerCase());
 }, initialValue, }) {
+    const filterCallback = useCallback(filter, [filter]);
     const { optionsChildren, customIds, restChildren, interactiveChildren } = useMemo(() => {
         const allChildren = Children.toArray(children);
         const result = allChildren.reduce((acc, child) => {
@@ -60,8 +73,8 @@ function useCombobox({ children, inputValue, multiple, filter = (inputValue, opt
                 });
                 label = childrenLabel;
             }
-            allOptions[props.value] = {
-                value: props.value,
+            allOptions[prefix(String(props.value))] = {
+                value: String(props.value),
                 label,
                 displayValue: props.displayValue,
                 description: props.description,
@@ -69,7 +82,9 @@ function useCombobox({ children, inputValue, multiple, filter = (inputValue, opt
         });
         return allOptions;
     }, [optionsChildren]);
-    const preSelectedOptions = useMemo(() => (initialValue || []).reduce((acc, value) => {
+    const preSelectedOptions = useMemo(() => (initialValue?.map((key) => {
+        return prefix(key);
+    }) || []).reduce((acc, value) => {
         const option = options[value];
         if (isOption(option)) {
             acc[value] = option;
@@ -79,24 +94,33 @@ function useCombobox({ children, inputValue, multiple, filter = (inputValue, opt
     const [selectedOptions, setSelectedOptions] = useState(preSelectedOptions);
     const { filteredOptions, filteredOptionsChildren } = useMemo(() => {
         const filteredOptions = [];
-        const filteredOptionsChildren = Object.keys(options).map((option, index) => {
+        const filteredOptionsChildren = Object.keys(options)
+            .map((option, index) => {
             /* If we have a selected value in single mode and the input matches an option, return all children */
             if (!multiple && Object.keys(selectedOptions).length === 1) {
-                filteredOptions.push(options[option].value);
+                filteredOptions.push(option);
                 return optionsChildren[index];
             }
             if (multiple && selectedOptions[option]) {
-                filteredOptions.push(options[option].value);
+                filteredOptions.push(option);
                 return optionsChildren[index];
             }
-            if (filter(inputValue, options[option])) {
-                filteredOptions.push(options[option].value);
+            if (filterCallback(inputValue, options[option])) {
+                filteredOptions.push(option);
                 return optionsChildren[index];
             }
-        });
+            return;
+        })
+            .filter((child) => child);
         return { filteredOptions, filteredOptionsChildren };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [inputValue, multiple, options, optionsChildren, selectedOptions]);
+    }, [
+        filterCallback,
+        inputValue,
+        multiple,
+        options,
+        optionsChildren,
+        selectedOptions,
+    ]);
     return {
         filteredOptionsChildren,
         filteredOptions,
@@ -109,4 +133,4 @@ function useCombobox({ children, inputValue, multiple, filter = (inputValue, opt
     };
 }
 
-export { useCombobox as default, isComboboxCustom, isComboboxOption, isInteractiveComboboxCustom };
+export { useCombobox as default, isComboboxCustom, isComboboxOption, isInteractiveComboboxCustom, prefix, removePrefix };

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

@@ -1,6 +1,6 @@
 'use client';
-import useDebounce from '../../../utilities/useDebounce.js';
 import { useComboboxId } from './ComboboxIdContext.js';
+import { useDebounceCallback } from '../../../utilities/hooks/useDebounceCallback/useDebounceCallback.js';
 
 const useComboboxKeyboard = ({ readOnly, disabled, interactiveChildren, filteredOptions, inputValue, selectedOptions, multiple, open, options, setOpen, handleSelectOption, }) => {
     const { activeIndex } = useComboboxId();
@@ -67,7 +67,7 @@ const useComboboxKeyboard = ({ readOnly, disabled, interactiveChildren, filtered
                 break;
         }
     };
-    const handleKeyDown = useDebounce(handleKeyDownFunc, 20);
+    const handleKeyDown = useDebounceCallback(handleKeyDownFunc, 20);
     return handleKeyDown;
 };
 

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

@@ -37,7 +37,7 @@ const useFloatingCombobox = ({ listRef }) => {
                 apply({ rects, elements }) {
                     requestAnimationFrame(() => {
                         Object.assign(elements.floating.style, {
-                            width: `calc(${rects.reference.width}px - calc(var(--fds-spacing-2) * 2))`,
+                            width: `${rects.reference.width}px`,
                             maxHeight: `200px`,
                         });
                     });

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

@@ -19,7 +19,7 @@ const Fieldset = forwardRef((props, ref) => {
             size,
             disabled: props?.disabled,
             readOnly,
-        }, children: jsxs("fieldset", { ...fieldsetProps, className: clsx('fds-fieldset', !hideLegend && 'fds-fieldset--spacing', readOnly && 'fds-fieldset--readonly', props?.disabled && 'fds-fieldset--disabled', className), ref: ref, ...rest, children: [jsx(Label, { asChild: true, size: size, children: jsx("legend", { className: 'fds-fieldset__legend', children: jsxs("span", { className: clsx('fds-fieldset__legend__content', hideLegend && `fds-sr-only`), children: [readOnly && (jsx(PadlockLockedFillIcon, { className: 'fds-fieldset__readonly__icon', "aria-hidden": true })), legend] }) }) }), description && (jsx(Paragraph, { size: size, variant: 'short', asChild: true, children: jsx("div", { id: descriptionId, className: clsx('fds-fieldset__description', hideLegend && `fds-sr-only`), children: description }) })), children, jsx("div", { id: errorId, "aria-live": 'polite', "aria-relevant": 'additions removals', className: 'fds-fieldset__error-message', children: hasError && jsx(ErrorMessage, { size: size, children: error }) })] }) }));
+        }, children: jsxs("fieldset", { ...fieldsetProps, className: clsx('ds-fieldset', !hideLegend && 'ds-fieldset--spacing', readOnly && 'ds-fieldset--readonly', className), disabled: props?.disabled, ref: ref, ...rest, children: [jsx(Label, { asChild: true, size: size, children: jsx("legend", { className: 'ds-fieldset__legend', children: jsxs("span", { className: clsx('ds-fieldset__legend__content', hideLegend && `ds-sr-only`), children: [readOnly && (jsx(PadlockLockedFillIcon, { className: 'ds-fieldset__readonly__icon', "aria-hidden": true })), legend] }) }) }), description && (jsx(Paragraph, { size: size, variant: 'short', asChild: true, children: jsx("div", { id: descriptionId, className: clsx('ds-fieldset__description', 'ds-font-weight--regular', hideLegend && `ds-sr-only`), children: description }) })), children, jsx("div", { id: errorId, "aria-live": 'polite', "aria-relevant": 'additions removals', className: 'ds-fieldset__error-message', children: hasError && jsx(ErrorMessage, { size: size, children: error }) })] }) }));
 });
 Fieldset.displayName = 'Fieldset';
 

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

@@ -5,14 +5,14 @@ import { clsx } from '../../../node_modules/clsx/dist/lite.js';
 import { PadlockLockedFillIcon } from '@navikt/aksel-icons';
 import { useNativeSelect } from './useNativeSelect.js';
 import { Label } from '../../Typography/Label/Label.js';
-import { omit } from '../../../utilities/objectUtils.js';
+import { omit } from '../../../utilities/omit/omit.js';
 import { ErrorMessage } from '../../Typography/ErrorMessage/ErrorMessage.js';
 import { Paragraph } from '../../Typography/Paragraph/Paragraph.js';
 
 const NativeSelect = forwardRef((props, ref) => {
     const { children, disabled = false, label, description, hideLabel = false, error, className, htmlSize = 0, ...rest } = props;
     const { selectProps, descriptionId, errorId, readOnly = false, size = 'md', } = useNativeSelect(props);
-    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { className: clsx('fds-native-select--container', disabled && 'fds-native-select--disabled', readOnly && 'fds-native-select--readonly', error && 'fds-native-select--error'), children: [label && (jsxs(Label, { weight: 'medium', size: size, htmlFor: selectProps.id, className: clsx('fds-native-select__label', hideLabel && 'fds-sr-only'), children: [readOnly && (jsx(PadlockLockedFillIcon, { "aria-hidden": true, className: 'fds-native-select__readonly__icon' })), label] })), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: descriptionId, className: clsx(`fds-native-select__description`, hideLabel && `fds-sr-only`), children: description }) })), jsx("select", { disabled: disabled || readOnly, ref: ref, size: htmlSize, className: clsx('fds-native-select', `fds-native-select--${size}`, `fds-focus`, props.multiple && 'fds-native-select--multiple', className), ...omit(['size', 'error', 'errorId'], rest), ...omit(['readOnly', 'disabled'], selectProps), children: children }), error && (jsx("div", { id: errorId, className: 'fds-native-select__error-message', "aria-live": 'polite', "aria-relevant": 'additions removals', children: jsx(ErrorMessage, { size: size, children: error }) }))] }) }));
+    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { className: clsx('ds-native-select--container', readOnly && 'ds-native-select--readonly', error && 'ds-native-select--error'), children: [label && (jsxs(Label, { weight: 'medium', size: size, htmlFor: selectProps.id, className: clsx('ds-native-select__label', hideLabel && 'ds-sr-only'), children: [readOnly && (jsx(PadlockLockedFillIcon, { "aria-hidden": true, className: 'ds-native-select__readonly__icon' })), label] })), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: descriptionId, className: clsx(`ds-native-select__description`, hideLabel && `ds-sr-only`), children: description }) })), jsx("div", { className: 'ds-native-select__wrapper', children: jsx("select", { disabled: disabled || readOnly, ref: ref, size: htmlSize, className: clsx('ds-native-select', `ds-native-select--${size}`, `ds-focus`, props.multiple && 'ds-native-select--multiple', className), ...omit(['size', 'error', 'errorId'], rest), ...omit(['readOnly', 'disabled'], selectProps), children: children }) }), error && (jsx("div", { id: errorId, className: 'ds-native-select__error-message', "aria-live": 'polite', "aria-relevant": 'additions removals', children: jsx(ErrorMessage, { size: size, children: error }) }))] }) }));
 });
 NativeSelect.displayName = 'NativeSelect';
 

package/dist/esm/components/form/NativeSelect/useNativeSelect.js

@@ -2,13 +2,11 @@
 import { useContext } from 'react';
 import { useFormField } from '../useFormField.js';
 import { FieldsetContext } from '../Fieldset/FieldsetContext.js';
-import { getSize } from '../../../utilities/getSize.js';
 
 /** Handles props for `NativeSelect` in context with `Fieldset` */
 const useNativeSelect = (props) => {
     const fieldset = useContext(FieldsetContext);
-    const { inputProps: selectProps, readOnly, ...rest } = useFormField(props, 'select');
-    const size = getSize(fieldset?.size ?? props.size ?? 'md');
+    const { inputProps: selectProps, readOnly, size = fieldset?.size ?? 'md', ...rest } = useFormField(props, 'select');
     return {
         ...rest,
         readOnly,

package/dist/esm/components/form/Radio/Group/Group.js

@@ -13,7 +13,7 @@ const RadioGroup = forwardRef(({ onChange, children, value, readOnly, defaultVal
                 name: name ?? `radiogroup-name-${nameId}`,
                 onChange,
                 required,
-            }, children: jsx("div", { className: clsx('fds-radio-group', inline && 'fds-radio-group--horizontal'), children: children }) }) }));
+            }, children: jsx("div", { className: clsx('ds-radio-group', inline && 'ds-radio-group--horizontal'), children: children }) }) }));
 });
 RadioGroup.displayName = 'RadioGroup';
 

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

@@ -4,13 +4,13 @@ import { forwardRef } from 'react';
 import { clsx } from '../../../node_modules/clsx/dist/lite.js';
 import { useRadio } from './useRadio.js';
 import { Paragraph } from '../../Typography/Paragraph/Paragraph.js';
-import { omit } from '../../../utilities/objectUtils.js';
+import { omit } from '../../../utilities/omit/omit.js';
 import { Label } from '../../Typography/Label/Label.js';
 
 const Radio = forwardRef((props, ref) => {
     const { children, description, className, style, ...rest } = props;
     const { inputProps, descriptionId, hasError, size = 'md', readOnly, } = useRadio(props);
-    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { className: clsx('fds-radio', `fds-radio--${size}`, inputProps.disabled && `fds-radio--disabled`, hasError && `fds-radio--error`, readOnly && `fds-radio--readonly`, className), style: style, children: [jsx("input", { className: 'fds-radio__input', ref: ref, ...omit(['size', 'error'], rest), ...inputProps }), children && (jsxs(Fragment, { children: [jsx(Label, { className: 'fds-radio__label', htmlFor: inputProps.id, size: size, weight: 'regular', children: jsx("span", { children: children }) }), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: descriptionId, className: 'fds-radio__description', children: description }) }))] }))] }) }));
+    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { className: clsx('ds-radio', `ds-radio--${size}`, hasError && `ds-radio--error`, readOnly && `ds-radio--readonly`, className), style: style, children: [jsx("input", { className: 'ds-radio__input', disabled: inputProps.disabled, ref: ref, ...omit(['size', 'error'], rest), ...inputProps }), children && (jsxs(Fragment, { children: [jsx(Label, { className: clsx('ds-radio__label'), htmlFor: inputProps.id, size: size, weight: 'regular', children: jsx("span", { children: children }) }), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: descriptionId, className: 'ds-radio__description', children: description }) }))] }))] }) }));
 });
 Radio.displayName = 'Radio';
 

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

@@ -8,8 +8,7 @@ import { useSearch } from './useSearch.js';
 import { Button } from '../../Button/Button.js';
 import { Paragraph } from '../../Typography/Paragraph/Paragraph.js';
 import { Label } from '../../Typography/Label/Label.js';
-import { omit } from '../../../utilities/objectUtils.js';
-import { ErrorMessage } from '../../Typography/ErrorMessage/ErrorMessage.js';
+import { omit } from '../../../utilities/omit/omit.js';
 
 /** Search field
  *
@@ -20,7 +19,7 @@ import { ErrorMessage } from '../../Typography/ErrorMessage/ErrorMessage.js';
  */
 const Search = forwardRef((props, ref) => {
     const { label, style, hideLabel = true, variant = 'simple', searchButtonLabel = 'Søk', clearButtonLabel = 'Tøm', defaultValue, value, onChange, onClear, disabled, onSearchClick, htmlSize = 27, className, ...rest } = props;
-    const { inputProps, hasError, errorId, size = 'md' } = useSearch(props);
+    const { inputProps, size = 'md' } = useSearch(props);
     const inputRef = useRef();
     const mergedRef = useMergeRefs([ref, inputRef]);
     const [internalValue, setInternalValue] = useState(defaultValue ?? '');
@@ -39,9 +38,9 @@ const Search = forwardRef((props, ref) => {
     };
     const isSimple = variant === 'simple';
     const showClearButton = Boolean(value ?? internalValue) && !disabled;
-    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { style: style, className: clsx('fds-search', inputProps.disabled && 'fds-search--disabled', `fds-search--${size}`, className), children: [label && (jsx(Label, { size: size, weight: 'medium', htmlFor: inputProps.id, className: clsx('fds-search__label', hideLabel && 'fds-sr-only'), children: jsx("span", { children: label }) })), jsxs("div", { className: 'fds-search__field', children: [jsxs("div", { className: clsx('fds-search__field', `fds-search--${size}`), children: [isSimple && (jsx(MagnifyingGlassIcon, { className: 'fds-search__icon', "aria-hidden": true })), jsx("input", { ref: mergedRef, size: htmlSize, value: value ?? internalValue, disabled: disabled, className: clsx('fds-search__input', `fds-focus`, isSimple
-                                        ? 'fds-search__input--simple'
-                                        : 'fds-search__input--with-search-button'), ...omit(['size', 'error', 'errorId', 'readOnly'], rest), ...inputProps, onChange: handleChange }), showClearButton && (jsxs("button", { className: clsx('fds-search__clear-button', `fds-focus`), type: 'button', onClick: handleClear, disabled: disabled, children: [jsx("span", { className: `fds-sr-only`, children: clearButtonLabel }), jsx(XMarkIcon, { "aria-hidden": true })] }))] }), !isSimple && (jsx(Button, { className: 'fds-search__search-button', size: size, variant: variant, type: 'submit', onClick: handleSearchClick, disabled: disabled, children: searchButtonLabel }))] }), jsx("div", { className: 'fds-search__error-message', id: errorId, "aria-live": 'polite', "aria-relevant": 'additions removals', children: hasError && jsx(ErrorMessage, { size: size, children: props.error }) })] }) }));
+    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { style: style, className: clsx('ds-search', inputProps.disabled && 'ds-search--disabled', `ds-search--${size}`, className), children: [label && (jsx(Label, { size: size, weight: 'medium', htmlFor: inputProps.id, className: clsx('ds-search__label', hideLabel && 'ds-sr-only'), children: jsx("span", { children: label }) })), jsxs("div", { className: 'ds-search__field', children: [jsxs("div", { className: clsx('ds-search__field', `ds-search--${size}`), children: [isSimple && (jsx(MagnifyingGlassIcon, { className: 'ds-search__icon', "aria-hidden": true })), jsx("input", { ref: mergedRef, size: htmlSize, value: value ?? internalValue, disabled: disabled, className: clsx('ds-search__input', `ds-focus`, isSimple
+                                        ? 'ds-search__input--simple'
+                                        : 'ds-search__input--with-search-button'), ...omit(['size', 'error', 'errorId', 'readOnly'], rest), ...inputProps, onChange: handleChange }), showClearButton && (jsxs("button", { className: clsx('ds-search__clear-button', `ds-focus`), type: 'button', onClick: handleClear, disabled: disabled, children: [jsx("span", { className: `ds-sr-only`, children: clearButtonLabel }), jsx(XMarkIcon, { "aria-hidden": true })] }))] }), !isSimple && (jsx(Button, { className: 'ds-search__search-button', size: size, variant: variant, type: 'submit', onClick: handleSearchClick, disabled: disabled, children: searchButtonLabel }))] })] }) }));
 });
 Search.displayName = 'Search';
 

package/dist/esm/components/form/Search/useSearch.js

@@ -2,13 +2,11 @@
 import { useContext } from 'react';
 import { useFormField } from '../useFormField.js';
 import { FieldsetContext } from '../Fieldset/FieldsetContext.js';
-import { getSize } from '../../../utilities/getSize.js';
 
 /** Handles props for `Search` in context with `Fieldset` */
 const useSearch = (props) => {
     const fieldset = useContext(FieldsetContext);
-    const { inputProps, readOnly, ...rest } = useFormField(props, 'search');
-    const size = fieldset?.size ?? getSize(props.size || 'md');
+    const { inputProps, readOnly, size = fieldset?.size ?? 'md', ...rest } = useFormField(props, 'search');
     return {
         ...rest,
         readOnly,

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

@@ -5,13 +5,13 @@ import { clsx } from '../../../node_modules/clsx/dist/lite.js';
 import { PadlockLockedFillIcon } from '@navikt/aksel-icons';
 import { useSwitch } from './useSwitch.js';
 import { Paragraph } from '../../Typography/Paragraph/Paragraph.js';
-import { omit } from '../../../utilities/objectUtils.js';
+import { omit } from '../../../utilities/omit/omit.js';
 import { Label } from '../../Typography/Label/Label.js';
 
 const Switch = forwardRef((props, ref) => {
     const { children, description, position = 'left', className, ...rest } = props;
     const { inputProps, descriptionId, size = 'md', readOnly, } = useSwitch(props);
-    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { className: clsx(`fds-switch`, `fds-switch--${size}`, inputProps.disabled && `fds-switch--disabled`, readOnly && `fds-switch--readonly`, className), children: [jsx("input", { className: `fds-switch__input`, ref: ref, ...omit(['size', 'error'], rest), ...inputProps }), jsxs(Label, { className: clsx(`fds-switch__label`, position === 'right' && `fds-switch__label--right`), htmlFor: inputProps.id, size: size, weight: 'regular', children: [jsx("span", { className: `fds-switch__track`, children: jsx("span", { className: `fds-switch__thumb` }) }), readOnly && (jsx(PadlockLockedFillIcon, { "aria-hidden": true, className: `fds-switch__readonly__icon` })), children && jsx("span", { children: children })] }), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: descriptionId, className: `fds-switch__description`, children: description }) }))] }) }));
+    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { className: clsx(`ds-switch`, `ds-switch--${size}`, inputProps.disabled && `ds-switch--disabled`, readOnly && `ds-switch--readonly`, className), children: [jsx("input", { className: `ds-switch__input`, disabled: inputProps.disabled, ref: ref, ...omit(['size', 'error'], rest), ...inputProps }), jsxs(Label, { className: clsx(`ds-switch__label`, position === 'right' && `ds-switch__label--right`), htmlFor: inputProps.id, size: size, weight: 'regular', children: [jsx("span", { className: `ds-switch__track`, children: jsx("span", { className: `ds-switch__thumb` }) }), readOnly && (jsx(PadlockLockedFillIcon, { "aria-hidden": true, className: `ds-switch__readonly__icon` })), children && jsx("span", { children: children })] }), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: descriptionId, className: `ds-switch__description`, children: description }) }))] }) }));
 });
 Switch.displayName = 'Switch';
 

package/dist/esm/components/form/Switch/useSwitch.js

@@ -15,6 +15,7 @@ const useSwitch = (props) => {
             ...inputProps,
             readOnly,
             type: 'checkbox',
+            role: 'switch',
             defaultChecked: checkboxGroup?.defaultValue
                 ? checkboxGroup?.defaultValue.includes(propsValue)
                 : props.defaultChecked,

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

@@ -7,7 +7,7 @@ import { CharacterCounter } from '../CharacterCounter.js';
 import { useTextarea } from './useTextarea.js';
 import { Paragraph } from '../../Typography/Paragraph/Paragraph.js';
 import { Label } from '../../Typography/Label/Label.js';
-import { omit } from '../../../utilities/objectUtils.js';
+import { omit } from '../../../utilities/omit/omit.js';
 import { ErrorMessage } from '../../Typography/ErrorMessage/ErrorMessage.js';
 
 /** Textarea field
@@ -24,10 +24,10 @@ const Textarea = forwardRef((props, ref) => {
     const characterLimitId = `${textareaProps.id}-charactercount}`;
     const hasCharacterLimit = characterLimit != null;
     const describedBy = clsx(textareaProps['aria-describedby'], hasCharacterLimit && characterLimitId) || undefined;
-    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { style: style, className: clsx('fds-textarea', `fds-textarea--${size}`, textareaProps.disabled && 'fds-textarea--disabled', readOnly && `fds-textarea--readonly`, hasError && `fds-textarea--error`, className), children: [label && (jsxs(Label, { size: size, weight: 'medium', htmlFor: textareaProps.id, className: clsx('fds-textarea__label', hideLabel && `fds-sr-only`), children: [readOnly && (jsx(PadlockLockedFillIcon, { "aria-hidden": true, className: 'fds-textarea__readonly__icon' })), jsx("span", { children: label })] })), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: descriptionId, className: clsx('fds-textarea__description', hideLabel && `fds-sr-only`), children: description }) })), jsx("textarea", { className: clsx('fds-textarea__input', `fds-focus`), ref: ref, "aria-describedby": describedBy, ...omit(['size', 'error', 'errorId'], rest), ...textareaProps, onChange: (e) => {
+    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { style: style, className: clsx('ds-textarea', `ds-textarea--${size}`, hasError && `ds-textarea--error`, className), children: [label && (jsxs(Label, { size: size, weight: 'medium', htmlFor: textareaProps.id, className: clsx('ds-textarea__label', hideLabel && `ds-sr-only`), children: [readOnly && (jsx(PadlockLockedFillIcon, { "aria-hidden": true, className: 'ds-textarea__readonly-icon' })), jsx("span", { children: label })] })), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: descriptionId, className: clsx('ds-textarea__description', hideLabel && `ds-sr-only`), children: description }) })), jsx("textarea", { className: clsx('ds-textarea__input', `ds-focus`), ref: ref, "aria-describedby": describedBy, disabled: textareaProps.disabled, readOnly: readOnly, ...omit(['size', 'error', 'errorId'], rest), ...textareaProps, onChange: (e) => {
                         textareaProps?.onChange?.(e);
                         setValue(e.target.value);
-                    } }), hasCharacterLimit && (jsx(CharacterCounter, { size: size, value: value ? value.toString() : '', id: characterLimitId, ...characterLimit })), jsx("div", { className: 'fds-textarea__error-message', id: errorId, "aria-live": 'polite', "aria-relevant": 'additions removals', children: hasError && jsx(ErrorMessage, { size: size, children: props.error }) })] }) }));
+                    } }), hasCharacterLimit && (jsx(CharacterCounter, { size: size, value: value ? value.toString() : '', id: characterLimitId, ...characterLimit })), jsx("div", { className: 'ds-textarea__error-message', id: errorId, "aria-live": 'polite', "aria-relevant": 'additions removals', children: hasError && jsx(ErrorMessage, { size: size, children: props.error }) })] }) }));
 });
 Textarea.displayName = 'Textarea';
 

package/dist/esm/components/form/Textarea/useTextarea.js

@@ -2,13 +2,11 @@
 import { useContext } from 'react';
 import { useFormField } from '../useFormField.js';
 import { FieldsetContext } from '../Fieldset/FieldsetContext.js';
-import { getSize } from '../../../utilities/getSize.js';
 
 /** Handles props for `Textarea` in context with `Fieldset` */
 const useTextarea = (props) => {
     const fieldset = useContext(FieldsetContext);
-    const { inputProps, readOnly, ...rest } = useFormField(props, 'textarea');
-    const size = fieldset?.size ?? getSize(props.size ?? 'md');
+    const { inputProps, readOnly, size = fieldset?.size ?? 'md', ...rest } = useFormField(props, 'textarea');
     return {
         ...rest,
         readOnly,

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

@@ -7,7 +7,7 @@ import { CharacterCounter } from '../CharacterCounter.js';
 import { useTextfield } from './useTextfield.js';
 import { Paragraph } from '../../Typography/Paragraph/Paragraph.js';
 import { Label } from '../../Typography/Label/Label.js';
-import { omit } from '../../../utilities/objectUtils.js';
+import { omit } from '../../../utilities/omit/omit.js';
 import { ErrorMessage } from '../../Typography/ErrorMessage/ErrorMessage.js';
 
 /** Text input field
@@ -24,10 +24,10 @@ const Textfield = forwardRef((props, ref) => {
     const characterLimitId = `textfield-charactercount-${useId()}`;
     const hasCharacterLimit = characterLimit != null;
     const describedBy = clsx(inputProps['aria-describedby'], hasCharacterLimit && characterLimitId) || undefined;
-    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { style: style, className: clsx(`fds-textfield`, `fds-textfield--${size}`, inputProps.disabled && `fds-textfield--disabled`, readOnly && `fds-textfield--readonly`, hasError && `fds-textfield--error`, className), children: [label && (jsxs(Label, { size: size, weight: 'medium', htmlFor: inputProps.id, className: clsx(`fds-textfield__label`, hideLabel && `fds-sr-only`), children: [readOnly && (jsx(PadlockLockedFillIcon, { "aria-hidden": true, className: 'fds-textfield__readonly__icon' })), jsx("span", { children: label })] })), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: descriptionId, className: clsx(`fds-textfield__description`, hideLabel && `fds-sr-only`), children: description }) })), jsxs("div", { className: 'fds-textfield__field', children: [prefix && (jsx(Paragraph, { asChild: true, size: size, variant: 'short', children: jsx("div", { className: clsx(`fds-textfield__adornment`, `fds-textfield__prefix`), "aria-hidden": 'true', children: prefix }) })), jsx("input", { className: clsx(`fds-textfield__input`, `fds-focus`, prefix && `fds-textfield__input--with-prefix`, suffix && `fds-textfield__input--with-suffix`), ref: ref, type: type, "aria-describedby": describedBy, size: htmlSize, ...omit(['size', 'error', 'errorId'], rest), ...inputProps, onChange: (e) => {
+    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { style: style, className: clsx(`ds-textfield`, `ds-textfield--${size}`, readOnly && `ds-textfield--readonly`, hasError && `ds-textfield--error`, className), children: [label && (jsxs(Label, { size: size, weight: 'medium', htmlFor: inputProps.id, className: clsx(`ds-textfield__label`, hideLabel && `ds-sr-only`), children: [readOnly && (jsx(PadlockLockedFillIcon, { "aria-hidden": true, className: 'ds-textfield__readonly__icon' })), jsx("span", { children: label })] })), description && (jsx(Paragraph, { asChild: true, size: size, children: jsx("div", { id: descriptionId, className: clsx(`ds-textfield__description`, hideLabel && `ds-sr-only`), children: description }) })), jsxs("div", { className: 'ds-textfield__field', children: [prefix && (jsx(Paragraph, { asChild: true, size: size, variant: 'short', children: jsx("div", { className: clsx(`ds-textfield__adornment`, `ds-textfield__prefix`), "aria-hidden": 'true', children: prefix }) })), jsx("input", { className: clsx(`ds-textfield__input`, `ds-focus`, prefix && `ds-textfield__input--with-prefix`, suffix && `ds-textfield__input--with-suffix`), ref: ref, type: type, disabled: inputProps.disabled, "aria-describedby": describedBy, size: htmlSize, ...omit(['size', 'error', 'errorId'], rest), ...inputProps, onChange: (e) => {
                                 inputProps?.onChange?.(e);
                                 setInputValue(e.target.value);
-                            } }), suffix && (jsx(Paragraph, { asChild: true, size: size, variant: 'short', children: jsx("div", { className: clsx(`fds-textfield__adornment`, `fds-textfield__suffix`), "aria-hidden": 'true', children: suffix }) }))] }), hasCharacterLimit && (jsx(CharacterCounter, { size: size, value: inputValue ? inputValue.toString() : '', id: characterLimitId, ...characterLimit })), jsx("div", { className: 'fds-textfield__error-message', id: errorId, "aria-live": 'polite', "aria-relevant": 'additions removals', children: hasError && jsx(ErrorMessage, { size: size, children: props.error }) })] }) }));
+                            } }), suffix && (jsx(Paragraph, { asChild: true, size: size, variant: 'short', children: jsx("div", { className: clsx(`ds-textfield__adornment`, `ds-textfield__suffix`), "aria-hidden": 'true', children: suffix }) }))] }), hasCharacterLimit && (jsx(CharacterCounter, { size: size, value: inputValue ? inputValue.toString() : '', id: characterLimitId, ...characterLimit })), jsx("div", { className: 'ds-textfield__error-message', id: errorId, "aria-live": 'polite', "aria-relevant": 'additions removals', children: hasError && jsx(ErrorMessage, { size: size, children: props.error }) })] }) }));
 });
 Textfield.displayName = 'Textfield';
 

package/dist/esm/components/form/Textfield/useTextfield.js

@@ -2,13 +2,11 @@
 import { useContext } from 'react';
 import { useFormField } from '../useFormField.js';
 import { FieldsetContext } from '../Fieldset/FieldsetContext.js';
-import { getSize } from '../../../utilities/getSize.js';
 
 /** Handles props for `Textfield` in context with `Fieldset` */
 const useTextfield = (props) => {
     const fieldset = useContext(FieldsetContext);
-    const { inputProps, readOnly, ...rest } = useFormField(props, 'textfield');
-    const size = getSize(fieldset?.size ?? props.size ?? 'md');
+    const { inputProps, readOnly, size = fieldset?.size ?? 'md', ...rest } = useFormField(props, 'textfield');
     return {
         ...rest,
         readOnly,

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

@@ -1,7 +1,6 @@
 'use client';
 import { useContext, useId } from 'react';
 import { clsx } from '../../node_modules/clsx/dist/lite.js';
-import { getSize } from '../../utilities/getSize.js';
 import { FieldsetContext } from './Fieldset/FieldsetContext.js';
 
 /**
@@ -13,10 +12,10 @@ const useFormField = (props, prefix) => {
     const id = props.id ?? `${prefix}-${randomId}`;
     const errorId = props.errorId ?? `${prefix}-error-${randomId}`;
     const descriptionId = `${prefix}-description-${randomId}`;
+    const size = props.size ?? fieldset?.size ?? 'md';
     const disabled = fieldset?.disabled || props?.disabled;
     const readOnly = ((fieldset?.readOnly || props?.readOnly) && !disabled) || undefined;
     const hasError = !disabled && !readOnly && !!(props.error || fieldset?.error);
-    const size = getSize(props.size || fieldset?.size || 'md');
     return {
         readOnly,
         hasError,
@@ -27,7 +26,9 @@ const useFormField = (props, prefix) => {
             id,
             disabled,
             'aria-invalid': hasError ? true : undefined,
-            'aria-describedby': clsx(props['aria-describedby'], (!!props?.description && typeof props?.description === 'string') && descriptionId, (hasError && !fieldset?.error) && errorId, (hasError && !!fieldset?.error) && fieldset?.errorId) || undefined,
+            'aria-describedby': clsx(props['aria-describedby'], !!props?.description &&
+                typeof props?.description === 'string' &&
+                descriptionId, hasError && !fieldset?.error && errorId, hasError && !!fieldset?.error && fieldset?.errorId) || undefined,
         },
     };
 };