@digdir/designsystemet-react 0.61.0 → 0.63.0

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

@@ -2,7 +2,7 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { forwardRef } from 'react';
 import { clsx } from '../../../node_modules/clsx/dist/lite.js';
-import { useMergeRefs } from '../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js';
+import { useMergeRefs } from '../../../node_modules/@floating-ui/react/dist/floating-ui.react.js';
 import { useCheckbox } from './useCheckbox.js';
 import { Paragraph } from '../../Typography/Paragraph/Paragraph.js';
 import { omit } from '../../../utilities/objectUtils.js';
@@ -10,7 +10,7 @@ import { Label } from '../../Typography/Label/Label.js';
 
 const Checkbox = forwardRef((props, ref) => {
     const { children, description, className, style, ...rest } = props;
-    const { inputProps, descriptionId, hasError, size = 'medium', readOnly } = useCheckbox(props);
+    const { inputProps, descriptionId, hasError, size = 'md', readOnly, } = useCheckbox(props);
     const inputRef = useMergeRefs([
         ref,
         (el) => {
@@ -19,7 +19,7 @@ const Checkbox = forwardRef((props, ref) => {
             }
         },
     ]);
-    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { className: clsx('fds-checkbox', `fds-checkbox--${size}`, inputProps.disabled && `fds-checkbox--disabled`, hasError && `fds-checkbox--error`, readOnly && `fds-checkbox--readonly`, className), style: style, children: [jsx("input", { className: `fds-checkbox__input`, ref: inputRef, ...omit(['size', 'error', 'indeterminate'], rest), ...inputProps, type: 'checkbox', "aria-checked": rest.indeterminate ? 'mixed' : inputProps.checked }), children && (jsxs(Fragment, { children: [jsx(Label, { className: `fds-checkbox__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-checkbox__description`, children: description }) }))] }))] }) }));
+    return (jsx(Paragraph, { asChild: true, size: size, children: jsxs("div", { className: clsx('fds-checkbox', `fds-checkbox--${size}`, hasError && `fds-checkbox--error`, readOnly && `fds-checkbox--readonly`, className), style: style, children: [jsx("input", { className: `fds-checkbox__input`, ref: inputRef, ...omit(['size', 'error', 'indeterminate'], rest), ...inputProps, type: 'checkbox', disabled: inputProps.disabled, "aria-checked": rest.indeterminate ? 'mixed' : inputProps.checked }), children && (jsxs(Fragment, { children: [jsx(Label, { className: `fds-checkbox__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-checkbox__description`, children: description }) }))] }))] }) }));
 });
 Checkbox.displayName = 'Checkbox';
 

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

@@ -4,7 +4,7 @@ import { createContext, forwardRef, useState } from 'react';
 import { Fieldset } from '../../Fieldset/Fieldset.js';
 
 const CheckboxGroupContext = createContext(null);
-const CheckboxGroup = forwardRef(({ onChange, children, value, readOnly, defaultValue, size = 'medium', ...rest }, ref) => {
+const CheckboxGroup = forwardRef(({ onChange, children, value, readOnly, defaultValue, size = 'md', ...rest }, ref) => {
     const [internalValue, setInternalValue] = useState(defaultValue ?? []);
     const toggleValue = (checkboxValue) => {
         const currentValue = value ?? internalValue;

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

@@ -1,12 +1,13 @@
 'use client';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { forwardRef, useRef, useId, useState, useEffect } from 'react';
-import { FloatingPortal, FloatingFocusManager } from '../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js';
+import { FloatingPortal, FloatingFocusManager } from '../../../node_modules/@floating-ui/react/dist/floating-ui.react.js';
 import { clsx } from '../../../node_modules/clsx/dist/lite.js';
 import { useVirtualizer } from '../../../node_modules/@tanstack/react-virtual/dist/esm/index.js';
 import { useFormField } from '../useFormField.js';
 import useDebounce from '../../../utilities/useDebounce.js';
-import useCombobox from './useCombobox.js';
+import { getSize } from '../../../utilities/getSize.js';
+import useCombobox, { prefix, removePrefix } from './useCombobox.js';
 import ComboboxInput from './internal/ComboboxInput.js';
 import ComboboxLabel from './internal/ComboboxLabel.js';
 import ComboboxError from './internal/ComboboxError.js';
@@ -20,7 +21,8 @@ import { Box } from '../../Box/Box.js';
 import { Spinner } from '../../Spinner/Spinner.js';
 import { omit } from '../../../utilities/objectUtils.js';
 
-const ComboboxComponent = 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 ComboboxComponent = 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(rest.size || 'md');
     const inputRef = useRef(null);
     const portalRef = useRef(null);
     const listRef = useRef([]);
@@ -48,18 +50,18 @@ const ComboboxComponent = forwardRef(({ value, initialValue = [], onValueChange,
     // if value is set, set input value to the label of the value
     useEffect(() => {
         if (value && value.length > 0 && !multiple) {
-            const option = options[value[0]];
+            const option = options[prefix(value[0])];
             setInputValue(option?.label || '');
         }
     }, [multiple, value, options]);
     useEffect(() => {
         if (value && Object.keys(options).length >= 0) {
             const updatedSelectedOptions = value.map((option) => {
-                const value = options[option];
+                const value = options[prefix(option)];
                 return value;
             });
             setSelectedOptions(updatedSelectedOptions.reduce((acc, value) => {
-                acc[value.value] = value;
+                acc[prefix(value.value)] = value;
                 return acc;
             }, {}));
         }
@@ -77,18 +79,18 @@ const ComboboxComponent = forwardRef(({ value, initialValue = [], onValueChange,
             return;
         if (remove) {
             const newSelectedOptions = { ...selectedOptions };
-            delete newSelectedOptions[option.value];
+            delete newSelectedOptions[prefix(option.value)];
             setSelectedOptions(newSelectedOptions);
-            onValueChange?.(Object.keys(newSelectedOptions));
+            onValueChange?.(Object.keys(newSelectedOptions).map((key) => removePrefix(key)));
             return;
         }
         const newSelectedOptions = { ...selectedOptions };
         if (multiple) {
-            if (newSelectedOptions[option.value]) {
-                delete newSelectedOptions[option.value];
+            if (newSelectedOptions[prefix(option.value)]) {
+                delete newSelectedOptions[prefix(option.value)];
             }
             else {
-                newSelectedOptions[option.value] = option;
+                newSelectedOptions[prefix(option.value)] = option;
             }
             setInputValue('');
             inputRef.current?.focus();
@@ -98,7 +100,7 @@ const ComboboxComponent = forwardRef(({ value, initialValue = [], onValueChange,
             Object.keys(newSelectedOptions).forEach((key) => {
                 delete newSelectedOptions[key];
             });
-            newSelectedOptions[option.value] = option;
+            newSelectedOptions[prefix(option.value)] = option;
             setInputValue(option?.label || '');
             // move cursor to the end of the input
             setTimeout(() => {
@@ -106,7 +108,7 @@ const ComboboxComponent = forwardRef(({ value, initialValue = [], onValueChange,
             }, 0);
         }
         setSelectedOptions(newSelectedOptions);
-        onValueChange?.(Object.keys(newSelectedOptions));
+        onValueChange?.(Object.keys(newSelectedOptions).map((key) => removePrefix(key)));
         !multiple && setOpen(false);
         refs.domReference.current?.focus();
     };
@@ -132,7 +134,7 @@ const ComboboxComponent = forwardRef(({ value, initialValue = [], onValueChange,
         measureElement: (elem) => {
             return elem.getBoundingClientRect().height;
         },
-        overscan: 1,
+        overscan: 7,
     });
     return (jsxs(ComboboxContext.Provider, { value: {
             size,
@@ -160,14 +162,14 @@ const ComboboxComponent = forwardRef(({ value, initialValue = [], onValueChange,
                     return;
                 if (disabled)
                     return;
-                const option = options[value];
+                const option = options[prefix(value)];
                 debouncedHandleSelectOption({ option: option });
             },
             handleSelectOption: debouncedHandleSelectOption,
             chipSrLabel,
             listRef,
             forwareddRef,
-        }, children: [jsxs(Box, { className: clsx('fds-combobox', `fds-combobox--${size}`, disabled && 'fds-combobox__disabled', className), style: style, ref: portalRef, children: [name && (jsx(ComboboxNative, { name: name, selectedOptions: selectedOptions, multiple: multiple })), jsx(ComboboxLabel, { label: label, description: description, size: size, readOnly: readOnly, hideLabel: hideLabel, formFieldProps: formFieldProps }), jsx(ComboboxInput, { ...omit(['inputValue'], rest), hideClearButton: hideClearButton, listId: listId, error: error, hideChips: hideChips, handleKeyDown: handleKeyDown, "aria-busy": loading }), jsx(ComboboxError, { size: size, error: error, formFieldProps: formFieldProps })] }), open && (jsx(FloatingPortal, { root: portal ? null : portalRef, children: jsx(FloatingFocusManager, { context: context, initialFocus: -1, visuallyHiddenDismiss: true, children: jsxs(Box, { id: listId, shadow: 'medium', borderRadius: 'medium', borderColor: 'default', "aria-labelledby": formFieldProps.inputProps.id, "aria-autocomplete": 'list', tabIndex: -1, ...getFloatingProps({
+        }, children: [jsxs(Box, { className: clsx('fds-combobox', `fds-combobox--${size}`, disabled && 'fds-combobox__disabled', className), style: style, ref: portalRef, children: [name && (jsx(ComboboxNative, { name: name, selectedOptions: selectedOptions, multiple: multiple })), jsx(ComboboxLabel, { label: label, description: description, size: size, readOnly: readOnly, hideLabel: hideLabel, formFieldProps: formFieldProps }), jsx(ComboboxInput, { ...omit(['inputValue'], rest), hideClearButton: hideClearButton, listId: listId, error: error, hideChips: hideChips, handleKeyDown: handleKeyDown, "aria-busy": loading }), jsx(ComboboxError, { size: size, error: error, formFieldProps: formFieldProps })] }), open && (jsx(FloatingPortal, { root: portal ? null : portalRef, children: jsx(FloatingFocusManager, { context: context, initialFocus: -1, visuallyHiddenDismiss: true, children: jsxs(Box, { id: listId, shadow: 'md', borderRadius: 'md', borderColor: 'default', "aria-labelledby": formFieldProps.inputProps.id, "aria-autocomplete": 'list', tabIndex: -1, ...getFloatingProps({
                             ref: refs.setFloating,
                             style: {
                                 ...floatingStyles,
@@ -182,7 +184,7 @@ const ComboboxComponent = forwardRef(({ value, initialValue = [], onValueChange,
                                         left: 0,
                                         width: '100%',
                                         transform: `translateY(${virtualRow.start}px)`,
-                                    }, children: filteredOptionsChildren[virtualRow.index] }, virtualRow.index))) })), loading ? (jsxs(ComboboxCustom, { className: 'fds-combobox__loading', children: [jsx(Spinner, { title: 'Laster', size: 'small' }), loadingLabel] })) : (jsxs(Fragment, { children: [restChildren, !virtual && filteredOptionsChildren] }))] }) }) }))] }));
+                                    }, children: filteredOptionsChildren[virtualRow.index] }, virtualRow.index))) })), loading ? (jsxs(ComboboxCustom, { className: 'fds-combobox__loading', children: [jsx(Spinner, { title: 'Laster', size: 'sm' }), loadingLabel] })) : (jsxs(Fragment, { children: [restChildren, !virtual && filteredOptionsChildren] }))] }) }) }))] }));
 });
 const Combobox = forwardRef((props, ref) => (jsx(ComboboxIdProvider, { children: jsx(ComboboxComponent, { ...props, ref: ref }) })));
 Combobox.displayName = 'Combobox';

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

@@ -3,7 +3,7 @@ import { jsx } from 'react/jsx-runtime';
 import { forwardRef, useId, useContext, useMemo } from 'react';
 import { clsx } from '../../../node_modules/clsx/dist/lite.js';
 import { Slot as $5e63c961fc1ce211$export$8c6ed5c666ac1360 } from '../../../node_modules/@radix-ui/react-slot/dist/index.js';
-import { useMergeRefs } from '../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js';
+import { useMergeRefs } from '../../../node_modules/@floating-ui/react/dist/floating-ui.react.js';
 import { ComboboxContext } from './ComboboxContext.js';
 import { useComboboxId } from './ComboboxIdContext.js';
 import { omit } from '../../../utilities/objectUtils.js';

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

@@ -1,9 +1,10 @@
 'use client';
 import { useId, useContext, useMemo, useEffect } from 'react';
-import { useMergeRefs } from '../../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js';
+import { useMergeRefs } from '../../../../node_modules/@floating-ui/react/dist/floating-ui.react.js';
 import { ComboboxContext } from '../ComboboxContext.js';
 import useDebounce from '../../../../utilities/useDebounce.js';
 import { useComboboxId, useComboboxIdDispatch } from '../ComboboxIdContext.js';
+import { prefix } from '../useCombobox.js';
 
 function useComboboxOption({ id, ref, value, }) {
     const generatedId = useId();
@@ -15,7 +16,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 = useMemo(() => filteredOptions.indexOf(value) + customIds.length, [customIds.length, filteredOptions, value]);
+    const index = useMemo(() => filteredOptions.indexOf(prefix(String(value))) + customIds.length, [customIds.length, filteredOptions, value]);
     const combinedRef = useMergeRefs([
         (node) => {
             listRef.current[index] = node;
@@ -25,7 +26,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[prefix(value)];
     const active = activeIndex === index;
     useEffect(() => {
         if (active) {

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

@@ -3,9 +3,10 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { useContext } from 'react';
 import { clsx } from '../../../../node_modules/clsx/dist/lite.js';
 import { ChevronUpIcon, ChevronDownIcon } from '@navikt/aksel-icons';
-import { useMergeRefs } from '../../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js';
+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';
@@ -28,10 +29,10 @@ 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()];
+        const option = options[prefix(value.toLowerCase())];
         if (!option)
             return;
-        if (selectedOptions[option.value])
+        if (selectedOptions[prefix(option.value)])
             return;
         handleSelectOption({ option: option });
     };

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

@@ -1,10 +1,10 @@
 '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;

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

@@ -13,6 +13,18 @@ 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, }) {
@@ -60,8 +72,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 +81,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;
@@ -82,15 +96,15 @@ function useCombobox({ children, inputValue, multiple, filter = (inputValue, opt
         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);
+                filteredOptions.push(option);
                 return optionsChildren[index];
             }
         });
@@ -109,4 +123,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/useFloatingCombobox.js

@@ -1,9 +1,9 @@
 'use client';
-import { useFloating, useRole, useDismiss, useListNavigation, useInteractions } from '../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js';
+import { useFloating, useRole, useDismiss, useListNavigation, useInteractions } from '../../../node_modules/@floating-ui/react/dist/floating-ui.react.js';
 import { useState } from 'react';
 import { flushSync } from 'react-dom';
 import { useComboboxId, useComboboxIdDispatch } from './ComboboxIdContext.js';
-import { autoUpdate, flip, size } from '../../../packages/react/node_modules/@floating-ui/dom/dist/floating-ui.dom.js';
+import { autoUpdate, flip, size } from '../../../node_modules/@floating-ui/dom/dist/floating-ui.dom.js';
 import { offset } from '../../../node_modules/@floating-ui/core/dist/floating-ui.core.js';
 
 const useFloatingCombobox = ({ listRef }) => {

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

@@ -1,7 +1,7 @@
 'use client';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { forwardRef, useContext } from 'react';
-import { clsx } from '../../../node_modules/clsx/dist/clsx.js';
+import { clsx } from '../../../node_modules/clsx/dist/lite.js';
 import { PadlockLockedFillIcon } from '@navikt/aksel-icons';
 import { useFieldset } from './useFieldset.js';
 import { FieldsetContext } from './FieldsetContext.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('fds-fieldset', !hideLegend && 'fds-fieldset--spacing', readOnly && 'fds-fieldset--readonly', className), disabled: props?.disabled, 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 }) })] }) }));
 });
 Fieldset.displayName = 'Fieldset';
 

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

@@ -1,7 +1,7 @@
 'use client';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { forwardRef } from 'react';
-import { clsx } from '../../../node_modules/clsx/dist/clsx.js';
+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';
@@ -11,8 +11,8 @@ 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 = 'medium', } = 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 }) }))] }) }));
+    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', 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 }) }))] }) }));
 });
 NativeSelect.displayName = 'NativeSelect';
 

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

@@ -2,15 +2,17 @@
 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');
     return {
         ...rest,
         readOnly,
-        size: fieldset?.size ?? props.size,
+        size,
         selectProps: {
             ...selectProps,
             readOnly,

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

@@ -1,11 +1,11 @@
 'use client';
 import { jsx } from 'react/jsx-runtime';
 import { createContext, forwardRef, useId } from 'react';
-import { clsx } from '../../../../node_modules/clsx/dist/clsx.js';
+import { clsx } from '../../../../node_modules/clsx/dist/lite.js';
 import { Fieldset } from '../../Fieldset/Fieldset.js';
 
 const RadioGroupContext = createContext(null);
-const RadioGroup = forwardRef(({ onChange, children, value, readOnly, defaultValue, name, size = 'medium', required, inline, className, ...rest }, ref) => {
+const RadioGroup = forwardRef(({ onChange, children, value, readOnly, defaultValue, name, size = 'md', required, inline, className, ...rest }, ref) => {
     const nameId = useId();
     return (jsx(Fieldset, { readOnly: readOnly, size: size, className: className, ref: ref, ...rest, children: jsx(RadioGroupContext.Provider, { value: {
                 value,

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

@@ -1,7 +1,7 @@
 'use client';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { forwardRef } from 'react';
-import { clsx } from '../../../node_modules/clsx/dist/clsx.js';
+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';
@@ -9,8 +9,8 @@ import { Label } from '../../Typography/Label/Label.js';
 
 const Radio = forwardRef((props, ref) => {
     const { children, description, className, style, ...rest } = props;
-    const { inputProps, descriptionId, hasError, size = 'medium', 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 }) }))] }))] }) }));
+    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}`, hasError && `fds-radio--error`, readOnly && `fds-radio--readonly`, className), style: style, children: [jsx("input", { className: 'fds-radio__input', disabled: inputProps.disabled, 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 }) }))] }))] }) }));
 });
 Radio.displayName = 'Radio';
 

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

@@ -1,9 +1,9 @@
 'use client';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { forwardRef, useRef, useState, useCallback } from 'react';
-import { clsx } from '../../../node_modules/clsx/dist/clsx.js';
+import { clsx } from '../../../node_modules/clsx/dist/lite.js';
 import { MagnifyingGlassIcon, XMarkIcon } from '@navikt/aksel-icons';
-import { useMergeRefs } from '../../../packages/react/node_modules/@floating-ui/react/dist/floating-ui.react.js';
+import { useMergeRefs } from '../../../node_modules/@floating-ui/react/dist/floating-ui.react.js';
 import { useSearch } from './useSearch.js';
 import { Button } from '../../Button/Button.js';
 import { Paragraph } from '../../Typography/Paragraph/Paragraph.js';
@@ -20,7 +20,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 = 'medium' } = useSearch(props);
+    const { inputProps, hasError, errorId, size = 'md' } = useSearch(props);
     const inputRef = useRef();
     const mergedRef = useMergeRefs([ref, inputRef]);
     const [internalValue, setInternalValue] = useState(defaultValue ?? '');

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

@@ -2,21 +2,17 @@
 import { useContext } from 'react';
 import { useFormField } from '../useFormField.js';
 import { FieldsetContext } from '../Fieldset/FieldsetContext.js';
+import { getSize } from '../../../utilities/getSize.js';
 
-const sizeMap = {
-    small: 'small',
-    medium: 'medium',
-    large: 'large',
-};
 /** Handles props for `Search` in context with `Fieldset` */
 const useSearch = (props) => {
     const fieldset = useContext(FieldsetContext);
     const { inputProps, readOnly, ...rest } = useFormField(props, 'search');
-    const fieldSetSize = fieldset?.size ? sizeMap[fieldset?.size] : null;
+    const size = fieldset?.size ?? getSize(props.size || 'md');
     return {
         ...rest,
         readOnly,
-        size: fieldSetSize ?? props.size,
+        size,
         inputProps: {
             ...inputProps,
             type: 'search',

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

@@ -10,8 +10,8 @@ import { Label } from '../../Typography/Label/Label.js';
 
 const Switch = forwardRef((props, ref) => {
     const { children, description, position = 'left', className, ...rest } = props;
-    const { inputProps, descriptionId, size = 'medium', 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 }) }))] }) }));
+    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`, disabled: inputProps.disabled, 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 }) }))] }) }));
 });
 Switch.displayName = 'Switch';
 

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

@@ -1,7 +1,7 @@
 'use client';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { forwardRef, useState } from 'react';
-import { clsx } from '../../../node_modules/clsx/dist/clsx.js';
+import { clsx } from '../../../node_modules/clsx/dist/lite.js';
 import { PadlockLockedFillIcon } from '@navikt/aksel-icons';
 import { CharacterCounter } from '../CharacterCounter.js';
 import { useTextarea } from './useTextarea.js';
@@ -19,12 +19,12 @@ import { ErrorMessage } from '../../Typography/ErrorMessage/ErrorMessage.js';
  */
 const Textarea = forwardRef((props, ref) => {
     const { label, description, style, characterLimit, hideLabel, className, ...rest } = props;
-    const { textareaProps, descriptionId, hasError, errorId, size = 'medium', readOnly, } = useTextarea(props);
+    const { textareaProps, descriptionId, hasError, errorId, size = 'md', readOnly, } = useTextarea(props);
     const [value, setValue] = useState(props.defaultValue);
     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('fds-textarea', `fds-textarea--${size}`, 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, 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 }) })] }) }));

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

@@ -2,15 +2,17 @@
 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');
     return {
         ...rest,
         readOnly,
-        size: fieldset?.size ?? props.size,
+        size,
         textareaProps: {
             ...inputProps,
             readOnly,

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

@@ -1,7 +1,7 @@
 'use client';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { forwardRef, useState, useId } from 'react';
-import { clsx } from '../../../node_modules/clsx/dist/clsx.js';
+import { clsx } from '../../../node_modules/clsx/dist/lite.js';
 import { PadlockLockedFillIcon } from '@navikt/aksel-icons';
 import { CharacterCounter } from '../CharacterCounter.js';
 import { useTextfield } from './useTextfield.js';
@@ -19,12 +19,12 @@ import { ErrorMessage } from '../../Typography/ErrorMessage/ErrorMessage.js';
  */
 const Textfield = forwardRef((props, ref) => {
     const { label, description, suffix, prefix, style, characterLimit, hideLabel, type = 'text', htmlSize = 20, className, ...rest } = props;
-    const { inputProps, descriptionId, hasError, errorId, size = 'medium', readOnly, } = useTextfield(props);
-    const [inputValue, setInputValue] = useState(props.defaultValue);
+    const { inputProps, descriptionId, hasError, errorId, size = 'md', readOnly, } = useTextfield(props);
+    const [inputValue, setInputValue] = useState(props.value || props.defaultValue);
     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(`fds-textfield`, `fds-textfield--${size}`, 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, 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 }) })] }) }));

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

@@ -2,15 +2,17 @@
 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');
     return {
         ...rest,
         readOnly,
-        size: fieldset?.size ?? props.size,
+        size,
         inputProps: {
             ...inputProps,
             readOnly,