@digdir/designsystemet-react 1.0.0-next.34 → 1.0.0-next.35

package/dist/cjs/components/Pagination/Pagination.js

@@ -2,22 +2,17 @@
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');
+var reactSlot = require('@radix-ui/react-slot');
+var cl = require('clsx/lite');
 var react = require('react');
-var PaginationButton = require('./PaginationButton.js');
-var PaginationEllipsis = require('./PaginationEllipsis.js');
-var PaginationItem = require('./PaginationItem.js');
-var PaginationList = require('./PaginationList.js');
-var PaginationNextPrev = require('./PaginationNextPrev.js');
-var PaginationRoot = require('./PaginationRoot.js');
-var usePagination = require('./usePagination.js');
 
-const Pagination = react.forwardRef(function Pagination({ nextLabel = '', previousLabel = '', compact = false, hideLabels = false, currentPage = 1, totalPages, size = 'md', onChange, itemLabel = (num) => `Side ${num}`, ...rest }, ref) {
-    const { pages, showNextPage, showPreviousPage } = usePagination.usePagination({
-        compact,
-        currentPage,
-        totalPages,
-    });
-    return (jsxRuntime.jsx(PaginationRoot.PaginationRoot, { "aria-label": 'Pagination', compact: compact, ref: ref, size: size, ...rest, children: jsxRuntime.jsxs(PaginationList.PaginationList, { children: [jsxRuntime.jsx(PaginationItem.PaginationItem, { children: jsxRuntime.jsx(PaginationNextPrev.PaginationPrevious, { "aria-label": previousLabel, disabled: !showPreviousPage, onClick: () => onChange(currentPage - 1), children: !hideLabels && previousLabel }) }), pages.map((page, i) => (jsxRuntime.jsx(PaginationItem.PaginationItem, { children: page === 'ellipsis' ? (jsxRuntime.jsx(PaginationEllipsis.PaginationEllipsis, {})) : (jsxRuntime.jsx(PaginationButton.PaginationButton, { "aria-current": currentPage === page, "aria-label": itemLabel(page), isActive: currentPage === page, onClick: () => onChange(page), children: page })) }, `${page}${i}`))), jsxRuntime.jsx(PaginationItem.PaginationItem, { children: jsxRuntime.jsx(PaginationNextPrev.PaginationNext, { "aria-label": nextLabel, disabled: !showNextPage, onClick: () => onChange(currentPage + 1), children: !hideLabels && nextLabel }) })] }) }));
+const PaginationContext = react.createContext({
+    size: 'md',
+});
+const Pagination = react.forwardRef(function Pagination({ 'aria-label': ariaLabel = 'Sidenavigering', asChild, className, size = 'md', ...rest }, ref) {
+    const Component = asChild ? reactSlot.Slot : 'nav';
+    return (jsxRuntime.jsx(PaginationContext.Provider, { value: { size }, children: jsxRuntime.jsx(Component, { "aria-label": ariaLabel, className: cl('ds-pagination', className), ref: ref, ...rest }) }));
 });
 
 exports.Pagination = Pagination;
+exports.PaginationContext = PaginationContext;

package/dist/cjs/components/Pagination/PaginationButton.js

@@ -4,11 +4,11 @@
 var jsxRuntime = require('react/jsx-runtime');
 var react = require('react');
 var Button = require('../Button/Button.js');
-var PaginationRoot = require('./PaginationRoot.js');
+var Pagination = require('./Pagination.js');
 
-const PaginationButton = react.forwardRef(function PaginationButton({ isActive, ...rest }, ref) {
-    const { size } = react.useContext(PaginationRoot.PaginationContext);
-    return (jsxRuntime.jsx(Button.Button, { "aria-current": isActive, ref: ref, size: size, variant: isActive ? 'primary' : 'tertiary', ...rest }));
+const PaginationButton = react.forwardRef(function PaginationButton(rest, ref) {
+    const { size } = react.useContext(Pagination.PaginationContext);
+    return jsxRuntime.jsx(Button.Button, { ref: ref, size: size, ...rest });
 });
 
 exports.PaginationButton = PaginationButton;

package/dist/cjs/components/Pagination/PaginationItem.js

@@ -3,14 +3,11 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var reactSlot = require('@radix-ui/react-slot');
-var cl = require('clsx/lite');
 var react = require('react');
-var PaginationRoot = require('./PaginationRoot.js');
 
 const PaginationItem = react.forwardRef(function PaginationItem({ asChild, className, ...rest }, ref) {
     const Component = asChild ? reactSlot.Slot : 'li';
-    const { size, compact } = react.useContext(PaginationRoot.PaginationContext);
-    return (jsxRuntime.jsx(Component, { ref: ref, className: cl('ds-pagination__item', `ds-pagination--${size}`, compact && 'ds-pagination--compact', className), ...rest }));
+    return jsxRuntime.jsx(Component, { ref: ref, ...rest });
 });
 
 exports.PaginationItem = PaginationItem;

package/dist/cjs/components/Pagination/PaginationList.js

@@ -3,14 +3,11 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var reactSlot = require('@radix-ui/react-slot');
-var cl = require('clsx/lite');
 var react = require('react');
-var PaginationRoot = require('./PaginationRoot.js');
 
-const PaginationList = react.forwardRef(function PaginationList({ asChild, className, ...rest }, ref) {
-    const { size } = react.useContext(PaginationRoot.PaginationContext);
+const PaginationList = react.forwardRef(function PaginationList({ asChild, ...rest }, ref) {
     const Component = asChild ? reactSlot.Slot : 'ul';
-    return (jsxRuntime.jsx(Component, { className: cl('ds-pagination', className), "data-size": size, ref: ref, ...rest }));
+    return jsxRuntime.jsx(Component, { ref: ref, ...rest });
 });
 
 exports.PaginationList = PaginationList;

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

@@ -3,33 +3,19 @@
 
 var Pagination$1 = require('./Pagination.js');
 var PaginationButton = require('./PaginationButton.js');
-var PaginationEllipsis = require('./PaginationEllipsis.js');
 var PaginationItem = require('./PaginationItem.js');
 var PaginationList = require('./PaginationList.js');
-var PaginationNextPrev = require('./PaginationNextPrev.js');
-var PaginationRoot = require('./PaginationRoot.js');
 
-const Pagination = Pagination$1.Pagination;
-Pagination.Root = PaginationRoot.PaginationRoot;
-Pagination.List = PaginationList.PaginationList;
-Pagination.Item = PaginationItem.PaginationItem;
-Pagination.Button = PaginationButton.PaginationButton;
-Pagination.Ellipsis = PaginationEllipsis.PaginationEllipsis;
-Pagination.Previous = PaginationNextPrev.PaginationPrevious;
-Pagination.Next = PaginationNextPrev.PaginationNext;
-Pagination.Root.displayName = 'Pagination.Root';
+const Pagination = Object.assign(Pagination$1.Pagination, {
+    List: PaginationList.PaginationList,
+    Item: PaginationItem.PaginationItem,
+    Button: PaginationButton.PaginationButton,
+});
 Pagination.List.displayName = 'Pagination.List';
 Pagination.Item.displayName = 'Pagination.Item';
 Pagination.Button.displayName = 'Pagination.Button';
-Pagination.Ellipsis.displayName = 'Pagination.Ellipsis';
-Pagination.Previous.displayName = 'Pagination.Previous';
-Pagination.Next.displayName = 'Pagination.Next';
 
 exports.PaginationButton = PaginationButton.PaginationButton;
-exports.PaginationEllipsis = PaginationEllipsis.PaginationEllipsis;
 exports.PaginationItem = PaginationItem.PaginationItem;
 exports.PaginationList = PaginationList.PaginationList;
-exports.PaginationNext = PaginationNextPrev.PaginationNext;
-exports.PaginationPrevious = PaginationNextPrev.PaginationPrevious;
-exports.PaginationRoot = PaginationRoot.PaginationRoot;
 exports.Pagination = Pagination;

package/dist/cjs/components/Pagination/usePagination.js

@@ -3,63 +3,58 @@
 
 var react = require('react');
 
-const getSteps = ({ compact, currentPage, totalPages, }) => {
-    /**  Number of always visible pages at the start and end. */
-    const boundaryCount = 1;
-    /** Number of always visible pages before and after the current page. */
-    const siblingCount = compact ? 0 : 1;
-    const range = (start, end) => Array.from({ length: end - start + 1 }, (_, i) => start + i);
-    if (totalPages <= (boundaryCount + siblingCount) * 2 + 3)
-        return range(1, totalPages);
-    const startPages = range(1, boundaryCount);
-    const endPages = range(totalPages - boundaryCount + 1, totalPages);
-    const siblingsStart = Math.max(Math.min(currentPage - siblingCount, totalPages - boundaryCount - siblingCount * 2 - 1), boundaryCount + 2);
-    const siblingsEnd = siblingsStart + siblingCount * 2;
-    return [
-        ...startPages,
-        siblingsStart - (startPages[startPages.length - 1] ?? 0) === 2
-            ? siblingsStart - 1
-            : 'ellipsis',
-        ...range(siblingsStart, siblingsEnd),
-        (endPages[0] ?? totalPages + 1) - siblingsEnd === 2
-            ? siblingsEnd + 1
-            : 'ellipsis',
-        ...endPages,
-    ];
+const getSteps = (now, max, show) => {
+    const offset = (show - 1) / 2;
+    const start = Math.min(Math.max(now - Math.floor(offset), 1), max - show + 1);
+    const end = Math.min(Math.max(now + Math.ceil(offset), show), max);
+    const pages = Array.from({ length: end + 1 - start }, (_, i) => i + start);
+    if (show > 4 && start > 1)
+        pages.splice(0, 2, 1, 0);
+    if (show > 3 && end < max)
+        pages.splice(-2, 2, 0, max);
+    return pages;
 };
 /** Hook to help manage pagination state */
-const usePagination = ({ totalPages, currentPage: currentPageProps = 1, compact, }) => {
-    const [currentPage, setCurrentPage] = react.useState(currentPageProps);
-    react.useEffect(() => {
-        setCurrentPage(currentPageProps);
-    }, [currentPageProps]);
-    const pages = getSteps({ currentPage, totalPages, compact });
-    const showNextPage = currentPage < totalPages;
-    const showPreviousPage = currentPage !== 1;
-    const nextPage = () => {
-        setCurrentPage(currentPage + 1 <= totalPages ? currentPage + 1 : totalPages);
-    };
-    const previousPage = () => {
-        setCurrentPage(currentPage - 1 > 0 ? currentPage - 1 : 1);
+const usePagination = ({ currentPage = 1, setCurrentPage, onChange, totalPages, showPages = 7, }) => react.useMemo(() => {
+    const hasNext = currentPage < totalPages;
+    const hasPrev = currentPage !== 1;
+    const handleClick = (page) => (event) => {
+        if (page < 1 || page > totalPages)
+            return event.preventDefault(); // Prevent out of bounds navigation
+        onChange?.(event, page);
+        if (!event.defaultPrevented)
+            setCurrentPage?.(page); // Allow stopping change by calling event.preventDefault() in onChange
     };
     return {
         /** Number of steps */
-        pages,
-        /** Current active page  */
-        currentPage,
-        /** Set active page */
-        setCurrentPage,
-        /** Decrements active page by 1 */
-        previousPage,
-        /** Increments active page by 1 */
-        nextPage,
-        /** Total amount of pages */
-        totalPages,
-        /** Indication if next page action should be shown or not */
-        showNextPage,
+        pages: getSteps(currentPage, totalPages, showPages).map((page, index) => ({
+            page: page || '',
+            itemKey: page ? `page-${page}` : `ellipsis-${index}`, // React key utility
+            buttonProps: {
+                'aria-current': page === currentPage ? 'page' : undefined,
+                'aria-hidden': !page || undefined, // Hide ellipsis from screen reader
+                onClick: handleClick(page),
+                tabIndex: page ? undefined : -1, // Hide ellipsis keyboard
+                variant: page === currentPage ? 'primary' : 'tertiary',
+            },
+        })),
+        /** Properties to spread on Pagination.Button used for previous naviagation */
+        prevButtonProps: {
+            'aria-disabled': !hasPrev, // Using aria-disabled to support all HTML elements because of potential asChild
+            onClick: handleClick(currentPage - 1),
+            variant: 'tertiary',
+        },
+        /** Properties to spread on Pagination.Button used for next naviagation */
+        nextButtonProps: {
+            'aria-disabled': !hasNext, // Using aria-disabled to support all HTML elements because of potential asChild
+            onClick: handleClick(currentPage + 1),
+            variant: 'tertiary',
+        },
         /** Indication if previous page action should be shown or not */
-        showPreviousPage,
+        hasPrev,
+        /** Indication if next page action should be shown or not */
+        hasNext,
     };
-};
+}, [currentPage, totalPages, showPages]);
 
 exports.usePagination = usePagination;

package/dist/cjs/components/{Typography/Paragraph → Paragraph}/Paragraph.js

@@ -6,21 +6,15 @@ var reactSlot = require('@radix-ui/react-slot');
 var cl = require('clsx/lite');
 var react = require('react');
 
-const lineHeightMap = {
-    short: 'ds-line-height--sm',
-    default: 'ds-line-height--md',
-    long: 'ds-line-height--lg',
-};
 /**
  * Use `Paragraph` to display text with paragraph text styles.
  *
  * @example
  * <Paragraph size='lg'>Paragraph</Paragraph>
  */
-const Paragraph = react.forwardRef(({ className, spacing, size = 'md', asChild, variant, ...rest }, ref) => {
+const Paragraph = react.forwardRef(function Paragraph({ className, size = 'md', asChild, variant = 'default', ...rest }, ref) {
     const Component = asChild ? reactSlot.Slot : 'p';
-    return (jsxRuntime.jsx(Component, { ref: ref, className: cl('ds-paragraph', spacing && 'ds-paragraph--spacing', `ds-paragraph--${size}`, lineHeightMap[variant ?? 'default'], className), ...rest }));
+    return (jsxRuntime.jsx(Component, { ref: ref, className: cl(`ds-paragraph`, className), "data-size": size, "data-variant": variant, ...rest }));
 });
-Paragraph.displayName = 'Paragraph';
 
 exports.Paragraph = Paragraph;

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

@@ -8,7 +8,6 @@ var reactSlot = require('@radix-ui/react-slot');
 var cl = require('clsx/lite');
 var react = require('react');
 var PopoverContext = require('./PopoverContext.js');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
 const ARROW_HEIGHT = 7;
 const ARROW_GAP = 4;
@@ -76,9 +75,9 @@ const Popover = react.forwardRef(function Popover({ id, className, onClose, onOp
         if (id)
             setPopoverId?.(id);
     }, [id]);
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx(Component, { className: cl('ds-popover', className), "data-size": size, "data-variant": variant, id: id || popoverId, 
-            // @ts-ignore @types/react-dom does not understand popover yet
-            popover: 'manual', ref: mergedRefs, ...rest }) }));
+    return (jsxRuntime.jsx(Component, { className: cl('ds-popover', className), "data-size": size, "data-variant": variant, id: id || popoverId, 
+        // @ts-ignore @types/react-dom does not understand popover yet
+        popover: 'manual', ref: mergedRefs, ...rest }));
 });
 const arrowPseudoElement = {
     name: 'ArrowPseudoElement',

package/dist/cjs/components/SkipLink/SkipLink.js

@@ -3,10 +3,10 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var cl = require('clsx/lite');
+var react = require('react');
 
-const SkipLink = ({ href, children, className, ...rest }) => {
-    return (jsxRuntime.jsx("a", { href: href, className: cl(`ds-sr-only`, 'ds-skiplink', className), ...rest, children: jsxRuntime.jsx("p", { className: 'ds-skiplink__content', children: children }) }));
-};
-SkipLink.displayName = 'SkipLink';
+const SkipLink = react.forwardRef(function SkipLink({ children, className, ...rest }, ref) {
+    return (jsxRuntime.jsx("a", { className: cl('ds-skiplink', className), ...rest, ref: ref, children: children }));
+});
 
 exports.SkipLink = SkipLink;

package/dist/cjs/components/Table/Table.js

@@ -4,10 +4,9 @@
 var jsxRuntime = require('react/jsx-runtime');
 var cl = require('clsx/lite');
 var react = require('react');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
 const Table = react.forwardRef(function Table({ zebra = false, stickyHeader = false, border = false, hover = false, size = 'md', className, children, ...rest }, ref) {
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx("table", { className: cl('ds-table', className), "data-border": border || undefined, "data-hover": hover || undefined, "data-size": size, "data-sticky-header": stickyHeader || undefined, "data-zebra": zebra || undefined, ref: ref, ...rest, children: children }) }));
+    return (jsxRuntime.jsx("table", { className: cl('ds-table', className), "data-border": border || undefined, "data-hover": hover || undefined, "data-size": size, "data-sticky-header": stickyHeader || undefined, "data-zebra": zebra || undefined, ref: ref, ...rest, children: children }));
 });
 
 exports.Table = Table;

package/dist/cjs/components/Tabs/TabsPanel.js

@@ -5,7 +5,6 @@ var jsxRuntime = require('react/jsx-runtime');
 var cl = require('clsx/lite');
 var react = require('react');
 var Tabs = require('./Tabs.js');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
 /**
  * A single content item in a Tabs component.
@@ -17,7 +16,7 @@ var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 const TabsPanel = react.forwardRef(function TabsPanel({ children, value, className, ...rest }, ref) {
     const { value: tabsValue, size } = react.useContext(Tabs.Context);
     const active = value === tabsValue;
-    return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: active && (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, variant: 'short', size: size, children: jsxRuntime.jsx("div", { className: cl('ds-tabs__panel', className), ref: ref, ...rest, children: children }) })) }));
+    return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: active && (jsxRuntime.jsx("div", { className: cl('ds-tabs__panel', className), ref: ref, ...rest, children: children })) }));
 });
 
 exports.TabsPanel = TabsPanel;

package/dist/cjs/components/Tabs/TabsTab.js

@@ -6,7 +6,6 @@ var cl = require('clsx/lite');
 var react = require('react');
 var RovingFocusItem = require('../../utilities/RovingFocus/RovingFocusItem.js');
 var Tabs = require('./Tabs.js');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
 /**
  * A single item in a Tabs component.
@@ -16,7 +15,7 @@ var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 const TabsTab = react.forwardRef(function TabsTab({ className, value, ...rest }, ref) {
     const tabs = react.useContext(Tabs.Context);
     const buttonId = `tab-${react.useId()}`;
-    return (jsxRuntime.jsx(RovingFocusItem.RovingFocusItem, { value: value, ...rest, asChild: true, children: jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, variant: 'short', size: tabs.size, children: jsxRuntime.jsx("button", { ...rest, "aria-selected": tabs.value === value, className: cl('ds-tabs__tab', className), id: buttonId, onClick: () => tabs.onChange?.(value), ref: ref, role: 'tab', type: 'button' }) }) }));
+    return (jsxRuntime.jsx(RovingFocusItem.RovingFocusItem, { value: value, ...rest, asChild: true, children: jsxRuntime.jsx("button", { ...rest, "aria-selected": tabs.value === value, className: cl('ds-tabs__tab', className), id: buttonId, onClick: () => tabs.onChange?.(value), ref: ref, role: 'tab', type: 'button' }) }));
 });
 
 exports.TabsTab = TabsTab;

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

@@ -4,7 +4,6 @@
 var jsxRuntime = require('react/jsx-runtime');
 var cl = require('clsx/lite');
 var react = require('react');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
 /**
  * Use `Tag` to display a small piece of information.
@@ -12,7 +11,7 @@ var Paragraph = require('../Typography/Paragraph/Paragraph.js');
  * <Tag color='success'>Success</Tag>
  */
 const Tag = react.forwardRef(function Tag({ size = 'md', color = 'neutral', className, ...rest }, ref) {
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx("span", { className: cl('ds-tag', className), "data-color": color, "data-size": size, ref: ref, ...rest }) }));
+    return (jsxRuntime.jsx("span", { className: cl('ds-tag', className), "data-color": color, "data-size": size, ref: ref, ...rest }));
 });
 
 exports.Tag = Tag;

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

@@ -5,7 +5,6 @@ var jsxRuntime = require('react/jsx-runtime');
 var react$1 = require('@floating-ui/react');
 var cl = require('clsx/lite');
 var react = require('react');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
 const ARROW_HEIGHT = 7;
 const ARROW_GAP = 4;
@@ -63,11 +62,11 @@ const Tooltip = react.forwardRef(({ children, content, placement = 'top', delay
     }
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [react.cloneElement(children, getReferenceProps({
                 ref: childMergedRef,
-            })), internalOpen && (jsxRuntime.jsx(Container, { children: jsxRuntime.jsx(Paragraph.Paragraph, { size: 'xs', asChild: true, children: jsxRuntime.jsxs("div", { ref: refs.setFloating, style: { ...floatingStyles, ...animationStyles, ...style }, role: 'tooltip', ...getFloatingProps({
-                            className: cl('ds-tooltip', className),
-                            ref: mergedRef,
-                            ...rest,
-                        }), children: [content, jsxRuntime.jsx(react$1.FloatingArrow, { ref: arrowRef, context: context, className: 'ds-tooltip__arrow', height: ARROW_HEIGHT })] }) }) }))] }));
+            })), internalOpen && (jsxRuntime.jsx(Container, { children: jsxRuntime.jsxs("div", { ref: refs.setFloating, style: { ...floatingStyles, ...animationStyles, ...style }, role: 'tooltip', ...getFloatingProps({
+                        className: cl('ds-tooltip', className),
+                        ref: mergedRef,
+                        ...rest,
+                    }), children: [content, jsxRuntime.jsx(react$1.FloatingArrow, { ref: arrowRef, context: context, className: 'ds-tooltip__arrow', height: ARROW_HEIGHT })] }) }))] }));
 });
 Tooltip.displayName = 'Tooltip';
 

package/dist/cjs/components/{Typography/ValidationMessage → ValidationMessage}/ValidationMessage.js

@@ -7,9 +7,9 @@ var cl = require('clsx/lite');
 var react = require('react');
 
 /** Use `ValidationMessage` to display validation text */
-const ValidationMessage = react.forwardRef(function ValidationMessage({ size = 'md', className, spacing, asChild, error = true, ...rest }, ref) {
+const ValidationMessage = react.forwardRef(function ValidationMessage({ size = 'md', className, asChild, error = true, ...rest }, ref) {
     const Component = asChild ? reactSlot.Slot : 'div';
-    return (jsxRuntime.jsx(Component, { ref: ref, className: cl('ds-validation-message', `ds-error_message--${size}`, spacing && 'ds-validation-message--spacing', error && 'ds-validation-message--error', className), ...rest }));
+    return (jsxRuntime.jsx(Component, { className: cl(`ds-validation-message--${size}`, className), "data-error": error || undefined, ref: ref, ...rest }));
 });
 
 exports.ValidationMessage = ValidationMessage;

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

@@ -2,7 +2,7 @@
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');
-var ValidationMessage = require('../Typography/ValidationMessage/ValidationMessage.js');
+var ValidationMessage = require('../ValidationMessage/ValidationMessage.js');
 
 const defaultLabel = (count) => count > -1 ? `${count} tegn igjen` : `${Math.abs(count)} tegn for mye`;
 const defaultSrLabel = (maxCount) => `Tekstfelt med plass til ${maxCount} tegn`;

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

@@ -6,9 +6,9 @@ var react$1 = require('@floating-ui/react');
 var cl = require('clsx/lite');
 var react = require('react');
 var useCheckbox = require('./useCheckbox.js');
-var Paragraph = require('../../Typography/Paragraph/Paragraph.js');
+var Paragraph = require('../../Paragraph/Paragraph.js');
 var omit = require('../../../utilities/omit/omit.js');
-var Label = require('../../Typography/Label/Label.js');
+var Label = require('../../Label/Label.js');
 
 const Checkbox = react.forwardRef((props, ref) => {
     const { children, description, className, style, ...rest } = props;

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

@@ -26,7 +26,6 @@ const ComboboxComponent = react.forwardRef(({ value, initialValue = [], onValueC
     const inputRef = react.useRef(null);
     const portalRef = react.useRef(null);
     const listRef = react.useRef([]);
-    const listId = react.useId();
     const [inputValue, setInputValue] = react.useState(rest.inputValue || '');
     react.useEffect(() => {
         if (typeof rest.inputValue === 'string') {
@@ -179,7 +178,7 @@ const ComboboxComponent = react.forwardRef(({ value, initialValue = [], onValueC
             setListRef: (index, node) => {
                 listRef.current[index] = node;
             },
-        }, children: [jsxRuntime.jsxs("div", { className: cl('ds-combobox', `ds-combobox--${size}`, disabled && 'ds-combobox__disabled', className), style: style, ref: portalRef, children: [name && (jsxRuntime.jsx(ComboboxNative, { name: name, selectedOptions: selectedOptions, multiple: multiple })), jsxRuntime.jsx(ComboboxLabel, { label: label, description: description, size: size, readOnly: readOnly, hideLabel: hideLabel, formFieldProps: formFieldProps }), jsxRuntime.jsx(ComboboxInput, { ...omit.omit(['inputValue'], rest), hideClearButton: hideClearButton, listId: listId, error: error, hideChips: hideChips, handleKeyDown: handleKeyDown, "aria-busy": loading }), jsxRuntime.jsx(ComboboxError, { size: size, error: error, formFieldProps: formFieldProps })] }), open && (jsxRuntime.jsx(react$1.FloatingPortal, { root: portal ? null : portalRef, children: jsxRuntime.jsx(react$1.FloatingFocusManager, { context: context, initialFocus: -1, visuallyHiddenDismiss: true, children: jsxRuntime.jsxs("div", { id: listId, "aria-labelledby": formFieldProps.inputProps.id, "aria-autocomplete": 'list', tabIndex: -1, ...getFloatingProps({
+        }, children: [jsxRuntime.jsxs("div", { className: cl('ds-combobox', `ds-combobox--${size}`, disabled && 'ds-combobox__disabled', className), style: style, ref: portalRef, children: [name && (jsxRuntime.jsx(ComboboxNative, { name: name, selectedOptions: selectedOptions, multiple: multiple })), jsxRuntime.jsx(ComboboxLabel, { label: label, description: description, size: size, readOnly: readOnly, hideLabel: hideLabel, formFieldProps: formFieldProps }), jsxRuntime.jsx(ComboboxInput, { ...omit.omit(['inputValue'], rest), hideClearButton: hideClearButton, listId: context.floatingId, error: error, hideChips: hideChips, handleKeyDown: handleKeyDown, "aria-busy": loading }), jsxRuntime.jsx(ComboboxError, { size: size, error: error, formFieldProps: formFieldProps })] }), open && (jsxRuntime.jsx(react$1.FloatingPortal, { root: portal ? null : portalRef, children: jsxRuntime.jsx(react$1.FloatingFocusManager, { context: context, initialFocus: -1, visuallyHiddenDismiss: true, children: jsxRuntime.jsxs("div", { "aria-labelledby": formFieldProps.inputProps.id, "aria-autocomplete": 'list', tabIndex: -1, ...getFloatingProps({
                             ref: refs.setFloating,
                             style: {
                                 ...floatingStyles,

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

@@ -8,7 +8,7 @@ var cl = require('clsx/lite');
 var react = require('react');
 var ComboboxContext = require('./ComboboxContext.js');
 var ComboboxIdContext = require('./ComboboxIdContext.js');
-var Label = require('../../Typography/Label/Label.js');
+var Label = require('../../Label/Label.js');
 var omit = require('../../../utilities/omit/omit.js');
 
 const ComboboxCustom = react.forwardRef(({ asChild, interactive, id, className, ...rest }, ref) => {

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

@@ -5,7 +5,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var cl = require('clsx/lite');
 var react = require('react');
 var ComboboxContext = require('./ComboboxContext.js');
-var Label = require('../../Typography/Label/Label.js');
+var Label = require('../../Label/Label.js');
 
 const ComboboxEmpty = react.forwardRef(({ children, className, ...rest }, ref) => {
     const context = react.useContext(ComboboxContext.ComboboxContext);

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

@@ -9,7 +9,7 @@ var ComboboxContext = require('../ComboboxContext.js');
 var Description = require('./Description.js');
 var SelectedIcon = require('./SelectedIcon.js');
 var useComboboxOption = require('./useComboboxOption.js');
-var Label = require('../../../Typography/Label/Label.js');
+var Label = require('../../../Label/Label.js');
 
 const ComboboxOption = react.memo(react.forwardRef(({ value, description, children, className, ...rest }, forwardedRef) => {
     const labelId = react.useId();

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

@@ -5,7 +5,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var react = require('react');
 require('../../../Chip/index.js');
 var ComboboxContext = require('../ComboboxContext.js');
-var Removable = require('../../../Chip/Removable/Removable.js');
+var Chips = require('../../../Chip/Chips.js');
 
 const ComboboxChips = () => {
     const context = react.useContext(ComboboxContext.ComboboxContext);
@@ -14,7 +14,7 @@ const ComboboxChips = () => {
     }
     const { size, readOnly, disabled, selectedOptions, chipSrLabel, handleSelectOption, inputRef, } = context;
     return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: Object.keys(selectedOptions).map((value) => {
-            return (jsxRuntime.jsx(Removable.RemovableChip, { size: size, disabled: disabled, onKeyDown: (e) => {
+            return (jsxRuntime.jsx(Chips.ChipRemovable, { size: size, disabled: disabled, onKeyDown: (e) => {
                     if (readOnly)
                         return;
                     if (disabled)

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

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

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

@@ -11,7 +11,7 @@ var ComboboxIdContext = require('../ComboboxIdContext.js');
 var utilities = require('../utilities.js');
 var ComboboxChips = require('./ComboboxChips.js');
 var ComboboxClearButton = require('./ComboboxClearButton.js');
-var Paragraph = require('../../../Typography/Paragraph/Paragraph.js');
+var Paragraph = require('../../../Paragraph/Paragraph.js');
 var omit = require('../../../../utilities/omit/omit.js');
 
 const ComboboxInput = ({ hideClearButton, listId, error, hideChips, handleKeyDown, ...rest }) => {
@@ -70,7 +70,7 @@ const ComboboxInput = ({ hideClearButton, listId, error, hideChips, handleKeyDow
             }
         },
     });
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { size: size, asChild: true, children: jsxRuntime.jsxs("div", { ...props, "aria-disabled": disabled ? 'true' : undefined, className: cl('ds-textfield__input', 'ds-combobox__input__wrapper', readOnly && 'ds-combobox--readonly', error && 'ds-combobox--error'), children: [jsxRuntime.jsxs("div", { className: 'ds-combobox__chip-and-input', children: [multiple && !hideChips && jsxRuntime.jsx(ComboboxChips, {}), jsxRuntime.jsx(Paragraph.Paragraph, { size: size, asChild: true, children: jsxRuntime.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.omit(['style', 'className'], rest), ...formFieldProps.inputProps, className: 'ds-combobox__input', onChange: (e) => {
+    return (jsxRuntime.jsx(Paragraph.Paragraph, { size: size, asChild: true, children: jsxRuntime.jsxs("div", { ...props, "aria-disabled": disabled ? 'true' : undefined, className: cl('ds-textfield__input', 'ds-combobox__input__wrapper', readOnly && 'ds-combobox--readonly', error && 'ds-combobox--error'), children: [jsxRuntime.jsxs("div", { className: 'ds-combobox__chip-and-input', children: [multiple && !hideChips && jsxRuntime.jsx(ComboboxChips, {}), jsxRuntime.jsx(Paragraph.Paragraph, { size: size, asChild: true, children: jsxRuntime.jsx("input", { ref: mergedRefs, "aria-activedescendant": props['aria-activedescendant'], readOnly: readOnly, "aria-autocomplete": 'list', role: 'combobox', "aria-expanded": open, "aria-controls": open ? listId : undefined, autoComplete: 'off', size: htmlSize, value: inputValue, ...omit.omit(['style', 'className'], rest), ...formFieldProps.inputProps, className: 'ds-combobox__input', onChange: (e) => {
                                     onChange(e);
                                     !open && setOpen(true);
                                     rest.onChange?.(e);

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

@@ -4,8 +4,8 @@
 var jsxRuntime = require('react/jsx-runtime');
 var akselIcons = require('@navikt/aksel-icons');
 var cl = require('clsx/lite');
-var Label = require('../../../Typography/Label/Label.js');
-var Paragraph = require('../../../Typography/Paragraph/Paragraph.js');
+var Label = require('../../../Label/Label.js');
+var Paragraph = require('../../../Paragraph/Paragraph.js');
 
 const ComboboxLabel = ({ label, description, hideLabel, size, readOnly, formFieldProps, }) => {
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [label && (jsxRuntime.jsxs(Label.Label, { size: size, htmlFor: formFieldProps.inputProps.id, className: cl('ds-combobox__label', hideLabel && `ds-sr-only`), children: [readOnly && (jsxRuntime.jsx(akselIcons.PadlockLockedFillIcon, { "aria-hidden": true, className: 'ds-combobox__readonly__icon' })), label] })), description && (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx("div", { id: formFieldProps.descriptionId, className: cl('ds-combobox__description', hideLabel && `ds-sr-only`), children: description }) }))] }));

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

@@ -6,9 +6,9 @@ var cl = require('clsx/lite');
 var react = require('react');
 var useFormField = require('../useFormField.js');
 var FieldsetContext = require('./FieldsetContext.js');
-var Label = require('../../Typography/Label/Label.js');
-var Paragraph = require('../../Typography/Paragraph/Paragraph.js');
-var ValidationMessage = require('../../Typography/ValidationMessage/ValidationMessage.js');
+var Label = require('../../Label/Label.js');
+var Paragraph = require('../../Paragraph/Paragraph.js');
+var ValidationMessage = require('../../ValidationMessage/ValidationMessage.js');
 
 const Fieldset = react.forwardRef(function Fieldset(props, ref) {
     const { children, legend, description, error, hideLegend, className, ...rest } = props;

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

@@ -5,9 +5,9 @@ var jsxRuntime = require('react/jsx-runtime');
 var cl = require('clsx/lite');
 var react = require('react');
 var useRadio = require('./useRadio.js');
-var Paragraph = require('../../Typography/Paragraph/Paragraph.js');
+var Paragraph = require('../../Paragraph/Paragraph.js');
 var omit = require('../../../utilities/omit/omit.js');
-var Label = require('../../Typography/Label/Label.js');
+var Label = require('../../Label/Label.js');
 
 const Radio = react.forwardRef((props, ref) => {
     const { children, description, className, style, ...rest } = props;

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

@@ -8,8 +8,8 @@ var cl = require('clsx/lite');
 var react = require('react');
 var Button = require('../../Button/Button.js');
 var useSearch = require('./useSearch.js');
-var Paragraph = require('../../Typography/Paragraph/Paragraph.js');
-var Label = require('../../Typography/Label/Label.js');
+var Paragraph = require('../../Paragraph/Paragraph.js');
+var Label = require('../../Label/Label.js');
 var omit = require('../../../utilities/omit/omit.js');
 
 /** Search field

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

@@ -6,10 +6,10 @@ var akselIcons = require('@navikt/aksel-icons');
 var cl = require('clsx/lite');
 var react = require('react');
 var useSelect = require('./useSelect.js');
-var Label = require('../../Typography/Label/Label.js');
+var Paragraph = require('../../Paragraph/Paragraph.js');
+var Label = require('../../Label/Label.js');
 var omit = require('../../../utilities/omit/omit.js');
-var ValidationMessage = require('../../Typography/ValidationMessage/ValidationMessage.js');
-var Paragraph = require('../../Typography/Paragraph/Paragraph.js');
+var ValidationMessage = require('../../ValidationMessage/ValidationMessage.js');
 
 const Select = react.forwardRef(function Select(props, ref) {
     const { children, disabled = false, label, description, hideLabel = false, error, className, htmlSize = 0, ...rest } = props;