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

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

@@ -3,7 +3,6 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var react = require('react');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
 /**
  * Accordion content component, contains the content of the accordion item.
@@ -11,7 +10,7 @@ var Paragraph = require('../Typography/Paragraph/Paragraph.js');
  * <AccordionContent>Content</AccordionContent>
  */
 const AccordionContent = react.forwardRef(function AccordionContent(rest, ref) {
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: 'sm', children: jsxRuntime.jsx("div", { ref: ref, ...rest }) }));
+    return jsxRuntime.jsx("div", { ref: ref, ...rest });
 });
 
 exports.AccordionContent = AccordionContent;

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

@@ -2,18 +2,16 @@
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');
-var cl = require('clsx/lite');
 var react = require('react');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
 /**
- * Accordion header component, contains a button to toggle the content.
+ * Accordion heading component, contains a button to toggle the content.
  * @example
- * <AccordionHeader>Header</AccordionHeader>
+ * <AccordionHeading>Heading</AccordionHeading>
  */
 const AccordionHeading = react.forwardRef(function AccordionHeading({ className, ...rest }, ref) {
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: 'sm', children: jsxRuntime.jsx("u-summary", { class: cl('ds-focus ds-paragraph ds-paragraph--sm ds-line-height--md', // Very TMP fix awaiting CSS modules
-            className), ref: ref, ...rest }) }));
+    /* Set `className` as `class` so react is happy */
+    return jsxRuntime.jsx("u-summary", { ref: ref, class: className, ...rest });
 });
 
 exports.AccordionHeading = AccordionHeading;

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

@@ -8,71 +8,35 @@ var react = require('react');
 require('@u-elements/u-details');
 
 /**
- * Accordion item component, contains `Accordion.Header` and `Accordion.Content` components.
+ * Accordion item component, contains `Accordion.Heading` and `Accordion.Content` components.
  * @example
  * <AccordionItem>
- *  <AccordionHeader>Header</AccordionHeader>
+ *  <AccordionHeading>Header</AccordionHeading>
  *  <AccordionContent>Content</AccordionContent>
  * </AccordionItem>
  */
-const AccordionItem = react.forwardRef(function AccordionItem({ className, open, defaultOpen = false, onFound, ...rest }, ref) {
-    const [internalOpen, setInternalOpen] = react.useState(open ?? defaultOpen);
-    const initialOpen = react.useRef(internalOpen); // Allow rendering initial open state on server, but animate in browser
-    const controlledOpen = react.useRef(internalOpen); // Using ref so we can access it inside useEffect without unbinding/binding event listeners
+const AccordionItem = react.forwardRef(function AccordionItem({ className, open, defaultOpen = false, onToggle, ...rest }, ref) {
     const detailsRef = react.useRef(null);
+    const initialOpen = react.useRef(defaultOpen); // Allow rendering defaultOpen on server, but only render once on client
     const mergedRefs = react$1.useMergeRefs([detailsRef, ref]);
-    controlledOpen.current = open ?? internalOpen; // Update controlledOpen on prop change
-    // Control state with a useEffect to animate on prop change and prevent native <details> toggle
+    const onToggleRef = react.useRef(onToggle); // Using ref to enable access inside useEffect without re-binding event listeners
+    const openRef = react.useRef(open);
+    onToggleRef.current = onToggle;
+    openRef.current = open;
+    // Provide onToggle event and controlled state
     react.useEffect(() => {
         const details = detailsRef.current;
-        const summary = details?.querySelector(':scope > :is(summary,u-summary)');
-        const handleSummaryClick = (event) => {
-            event?.preventDefault(); // Prevent native <details> toggle so we can animate
-            setInternalOpen((open) => !open);
-        };
-        const handleToggle = () => {
-            if (!details || details.open === controlledOpen.current)
+        const handleToggle = (event) => {
+            if (!details || details?.open === openRef.current)
                 return;
-            onFound?.();
-            setInternalOpen(details?.open || false);
-            window.requestAnimationFrame(() => {
-                details.open = controlledOpen.current;
-            }); // Let onFound run before correcting state
+            onToggleRef.current?.(event);
+            if (openRef.current !== undefined)
+                details.open = openRef.current; // Don't update DOM unless controlled state changes
         };
         details?.addEventListener('toggle', handleToggle, true);
-        summary?.addEventListener('click', handleSummaryClick);
-        return () => {
-            details?.removeEventListener('toggle', handleToggle, true);
-            summary?.removeEventListener('click', handleSummaryClick);
-        };
+        return () => details?.removeEventListener('toggle', handleToggle, true);
     }, []);
-    react.useEffect(() => {
-        animateHeight(detailsRef.current, controlledOpen.current);
-    }, [controlledOpen.current]);
-    return (jsxRuntime.jsx("u-details", { class: cl('ds-accordion__item', className), open: initialOpen.current || undefined, ref: mergedRefs, ...rest }));
+    return (jsxRuntime.jsx("u-details", { class: cl('ds-accordion__item', className), open: (open ?? initialOpen.current) || undefined, ref: mergedRefs, ...rest }));
 });
-const animateHeight = (details, open) => {
-    const content = details?.querySelector(':scope > :not(summary, u-summary)');
-    const hasContent = content instanceof HTMLElement;
-    const hasAnimate = details && 'animate' in details;
-    const hasReducedMotion = window.matchMedia?.('(prefers-reduced-motion: reduce)').matches;
-    details?.setAttribute('data-chevron-open', `${open}`); // Make flip on click
-    if (hasReducedMotion || !hasAnimate || !hasContent) {
-        if (details)
-            details.open = open;
-    }
-    else if (details.open !== open) {
-        details.open = true;
-        const opened = `${content.scrollHeight}px`;
-        content.style.overflow = 'clip'; // Clip content while animating
-        content.animate({
-            height: [open ? '0px' : opened, open ? opened : '0px'],
-            paddingBlock: [open ? '0px' : '', open ? '' : '0px'],
-        }, { duration: 400, easing: 'ease-in-out' }).onfinish = () => {
-            content.style.removeProperty('overflow'); // Restore overlow
-            details.open = open;
-        };
-    }
-};
 
 exports.AccordionItem = AccordionItem;

package/dist/cjs/components/Alert/Alert.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');
 
 /**
  * Alerts are used to inform users about important information, warnings, errors, or success.
@@ -12,7 +11,7 @@ var Paragraph = require('../Typography/Paragraph/Paragraph.js');
  * <Alert color='info'>Dette er en informasjonsmelding</Alert>
  */
 const Alert = react.forwardRef(function Alert({ color = 'info', size = 'md', className, ...rest }, ref) {
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx("div", { className: cl('ds-alert', className), "data-color": color, "data-size": size, ref: ref, ...rest }) }));
+    return (jsxRuntime.jsx("div", { className: cl('ds-alert', className), "data-color": color, "data-size": size, ref: ref, ...rest }));
 });
 
 exports.Alert = Alert;

package/dist/cjs/components/Avatar/Avatar.js

@@ -6,12 +6,6 @@ var reactSlot = require('@radix-ui/react-slot');
 var cl = require('clsx/lite');
 var react = require('react');
 
-const fontSizeMap = {
-    xs: 'ds-paragraph--xs',
-    sm: 'ds-heading--2xs',
-    md: 'ds-heading--sm',
-    lg: 'ds-heading--md',
-};
 /**
  * Avatars are used to represent people or entities.
  *
@@ -30,7 +24,7 @@ const fontSizeMap = {
  */
 const Avatar = react.forwardRef(function Avatar({ 'aria-label': ariaLabel, color = 'accent', size = 'md', variant = 'circle', className, children, ...rest }, ref) {
     const Component = children && typeof children !== 'string' ? reactSlot.Slot : react.Fragment;
-    return (jsxRuntime.jsx("span", { ref: ref, className: cl('ds-avatar', fontSizeMap[size], className), "data-variant": variant, "data-color": color, "data-size": size, role: 'img', "aria-label": ariaLabel, ...rest, children: jsxRuntime.jsx(Component, { ...(children ? { 'aria-hidden': true } : {}), children: children }) }));
+    return (jsxRuntime.jsx("span", { ref: ref, className: cl('ds-avatar', className), "data-variant": variant, "data-color": color, "data-size": size, role: 'img', "aria-label": ariaLabel, ...rest, children: jsxRuntime.jsx(Component, { ...(children ? { 'aria-hidden': true } : {}), children: children }) }));
 });
 
 exports.Avatar = Avatar;

package/dist/cjs/components/Badge/Badge.js

@@ -4,13 +4,7 @@
 var jsxRuntime = require('react/jsx-runtime');
 var cl = require('clsx/lite');
 var react = require('react');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
-const paragraphSizeMap = {
-    sm: 'xs',
-    md: 'sm',
-    lg: 'md',
-};
 /**
  * `Badge` is a non-interactive component for displaying status with or without numbers.
  *
@@ -27,7 +21,7 @@ const paragraphSizeMap = {
  * ```
  */
 const Badge = react.forwardRef(function Badge({ className, color = 'accent', count, maxCount, overlap = 'rectangle', placement = 'top-right', size = 'md', ...rest }, ref) {
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, variant: 'short', size: paragraphSizeMap[size], children: jsxRuntime.jsx("span", { className: cl('ds-badge', className), "data-color": color, "data-count": count && maxCount && count > maxCount ? `${maxCount}+` : count, "data-overlap": rest.children ? overlap : null, "data-placement": rest.children ? placement : null, "data-size": size, ref: ref, ...rest }) }));
+    return (jsxRuntime.jsx("span", { className: cl('ds-badge', className), "data-color": color, "data-count": count && maxCount && count > maxCount ? `${maxCount}+` : count, "data-overlap": rest.children ? overlap : null, "data-placement": rest.children ? placement : null, "data-size": size, ref: ref, ...rest }));
 });
 
 exports.Badge = Badge;

package/dist/cjs/components/Breadcrumbs/Breadcrumbs.js

@@ -4,8 +4,7 @@
 var jsxRuntime = require('react/jsx-runtime');
 var cl = require('clsx/lite');
 var react = require('react');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
-const Breadcrumbs = react.forwardRef(({ 'aria-label': ariaLabel = 'Du er her:', className, size, ...rest }, ref) => (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx("nav", { "aria-label": ariaLabel, className: cl('ds-breadcrumbs', className), "data-size": size, ref: ref, ...rest }) })));
+const Breadcrumbs = react.forwardRef(({ 'aria-label': ariaLabel = 'Du er her:', className, size, ...rest }, ref) => (jsxRuntime.jsx("nav", { "aria-label": ariaLabel, className: cl('ds-breadcrumbs', className), "data-size": size, ref: ref, ...rest })));
 
 exports.Breadcrumbs = Breadcrumbs;

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

@@ -5,7 +5,6 @@ var jsxRuntime = require('react/jsx-runtime');
 var reactSlot = require('@radix-ui/react-slot');
 var cl = require('clsx/lite');
 var react = require('react');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 var Spinner = require('../loaders/Spinner/Spinner.js');
 
 /**
@@ -17,8 +16,10 @@ const Button = react.forwardRef(function Button({ asChild, className, children,
     const Component = asChild ? reactSlot.Slot : 'button';
     const spinnerColor = color === 'accent' ? color : 'neutral';
     // Fallbacks to undefined to prevent rendering attribute="false"
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { variant: 'short', size: size, asChild: true, children: jsxRuntime.jsxs(Component, { "aria-busy": Boolean(loading) || undefined, className: cl('ds-button', className), "data-color": color, "data-icon": icon || undefined, "data-size": size, "data-variant": variant, ref: ref, ...(asChild ? { asChild: true } : { type: 'button' }), ...rest, children: [loading === true ? (jsxRuntime.jsx(Spinner.Spinner, { "aria-hidden": 'true', color: spinnerColor, size: 'sm', title: '' })) : (loading // Allow custom loading spinner
-                ), jsxRuntime.jsx(reactSlot.Slottable, { children: children })] }) }));
+    return (jsxRuntime.jsxs(Component, { "aria-busy": Boolean(loading) || undefined, className: cl('ds-button', className), "data-color": color, "data-icon": icon || undefined, "data-size": size, "data-variant": variant, ref: ref, 
+        /* don't set type when we use `asChild` */
+        type: asChild ? undefined : 'button', ...rest, children: [loading === true ? (jsxRuntime.jsx(Spinner.Spinner, { "aria-hidden": 'true', color: spinnerColor, size: 'sm', title: '' })) : (loading // Allow custom loading spinner
+            ), jsxRuntime.jsx(reactSlot.Slottable, { children: children })] }));
 });
 
 exports.Button = Button;

package/dist/cjs/components/Card/Card.js

@@ -2,6 +2,7 @@
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');
+var react$1 = require('@floating-ui/react');
 var reactSlot = require('@radix-ui/react-slot');
 var cl = require('clsx/lite');
 var react = require('react');
@@ -10,15 +11,32 @@ var react = require('react');
  * Card component to present content in a structured way.
  * @example
  * <Card>
- *  <Card.Header>Header</Card.Header>
- *  <Card.Content>Content</Card.Content>
- *  <Card.Footer>Footer</Card.Footer>
+ *  <Card.Block>Header</Card.Block>
+ *  <Card.Block>Content</Card.Block>
+ *  <Card.Block>Footer</Card.Block>
  * </Card>
  */
-const Card = react.forwardRef(({ isLink = false, asChild = false, color = 'neutral', className, ...rest }, ref) => {
+const Card = react.forwardRef(function Card({ asChild = false, color = 'neutral', className, ...rest }, ref) {
     const Component = asChild ? reactSlot.Slot : 'div';
-    return (jsxRuntime.jsx(Component, { ref: ref, className: cl(`ds-card`, isLink && `ds-focus`, className), "data-color": color, "data-link": isLink ? '' : undefined, ...rest }));
+    const cardRef = react.useRef(null);
+    const mergedRefs = react$1.useMergeRefs([cardRef, ref]);
+    // Forward click on card to heading links for better accessibility
+    // https://adrianroselli.com/2020/02/block-links-cards-clickable-regions-etc.html
+    react.useEffect(() => {
+        const card = cardRef.current;
+        const handleClick = ({ ctrlKey, metaKey, target }) => {
+            const link = card?.querySelector(':is(h1,h2,h3,h4,h5,h6) a');
+            if (!link || link?.contains(target))
+                return; // Let links handle their own clicks
+            if (ctrlKey || metaKey)
+                window.open(link.href, '', 'noreferrer');
+            else
+                link.click(); // Using link.click instead of window.location.href as this will trigger the browser's handling of rel=, target=, etc.
+        };
+        card?.addEventListener('click', handleClick);
+        return () => card?.removeEventListener('click', handleClick);
+    }, []);
+    return (jsxRuntime.jsx(Component, { className: cl(`ds-card`, className), "data-color": color, ref: mergedRefs, ...rest }));
 });
-Card.displayName = 'Card';
 
 exports.Card = Card;

package/dist/cjs/components/Card/{CardMedia.js → CardBlock.js}

@@ -6,10 +6,9 @@ var reactSlot = require('@radix-ui/react-slot');
 var cl = require('clsx/lite');
 var react = require('react');
 
-const CardMedia = react.forwardRef(({ asChild, className, ...rest }, ref) => {
+const CardBlock = react.forwardRef(function CardBlock({ asChild, className, ...rest }, ref) {
     const Component = asChild ? reactSlot.Slot : 'div';
-    return (jsxRuntime.jsx(Component, { className: cl(`ds-card__media`, className), ref: ref, ...rest }));
+    return (jsxRuntime.jsx(Component, { className: cl(`ds-card__block`, className), ref: ref, ...rest }));
 });
-CardMedia.displayName = 'CardMedia';
 
-exports.CardMedia = CardMedia;
+exports.CardBlock = CardBlock;

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

@@ -2,23 +2,12 @@
 'use strict';
 
 var Card$1 = require('./Card.js');
-var CardContent = require('./CardContent.js');
-var CardFooter = require('./CardFooter.js');
-var CardHeader = require('./CardHeader.js');
-var CardMedia = require('./CardMedia.js');
+var CardBlock = require('./CardBlock.js');
 
-const Card = Card$1.Card;
-Card.Header = CardHeader.CardHeader;
-Card.Content = CardContent.CardContent;
-Card.Footer = CardFooter.CardFooter;
-Card.Media = CardMedia.CardMedia;
-Card.Header.displayName = 'Card.Header';
-Card.Content.displayName = 'Card.Content';
-Card.Footer.displayName = 'Card.Footer';
-Card.Media.displayName = 'Card.Media';
+const Card = Object.assign(Card$1.Card, {
+    Block: CardBlock.CardBlock,
+});
+Card.Block.displayName = 'Card.Block';
 
-exports.CardContent = CardContent.CardContent;
-exports.CardFooter = CardFooter.CardFooter;
-exports.CardHeader = CardHeader.CardHeader;
-exports.CardMedia = CardMedia.CardMedia;
+exports.CardBlock = CardBlock.CardBlock;
 exports.Card = Card;

package/dist/cjs/components/Chip/Chips.js

@@ -0,0 +1,50 @@
+'use client';
+'use strict';
+
+var jsxRuntime = require('react/jsx-runtime');
+var reactSlot = require('@radix-ui/react-slot');
+var cl = require('clsx/lite');
+var react = require('react');
+
+/**
+ * Chip.Button used for interaction
+ * @example
+ * <Chip.Button>Click me</Chip.Button>
+ */
+const ChipButton = react.forwardRef(function ChipButton({ asChild, className, size, ...rest }, ref) {
+    const Component = asChild ? reactSlot.Slot : 'button';
+    return (jsxRuntime.jsx(Component, { className: cl('ds-chip', className), "data-size": size, type: asChild ? undefined : 'button', ref: ref, ...rest }));
+});
+/**
+ * Chip.Removable used for interaction
+ * @example
+ * <Chip.Removable>Click to remove me</Chip.Removable>
+ */
+const ChipRemovable = react.forwardRef(function ChipRemovable(props, ref) {
+    return jsxRuntime.jsx(ChipButton, { "data-removable": true, ref: ref, ...props });
+});
+/**
+ * Chip.Checkbox used for multiselection
+ * @example
+ * <Chip.Checkbox name="language" value="nynorsk">Nynorsk</Chip.Checkbox>
+ * <Chip.Checkbox name="language" value="bokmål">Bokmål</Chip.Checkbox>
+ */
+const ChipCheckbox = react.forwardRef(function ChipCheckbox({ asChild, children, className, size, ...rest }, ref) {
+    const inputType = rest.type ?? 'checkbox';
+    const Component = asChild ? reactSlot.Slot : 'label';
+    return (jsxRuntime.jsxs(Component, { className: cl('ds-chip', className), "data-size": size, ref: ref, children: [jsxRuntime.jsx("input", { ...rest, type: inputType }), jsxRuntime.jsx(reactSlot.Slottable, { children: children })] }));
+});
+/**
+ * Chip.Radio used for single selection
+ * @example
+ * <Chip.Radio name="language" value="nynorsk">Nynorsk</Chip.Radio>
+ * <Chip.Radio name="language" value="bokmål">Bokmål</Chip.Radio>
+ */
+const ChipRadio = react.forwardRef(function ChipRadio(props, ref) {
+    return jsxRuntime.jsx(ChipCheckbox, { ref, type: 'radio', ...props });
+});
+
+exports.ChipButton = ChipButton;
+exports.ChipCheckbox = ChipCheckbox;
+exports.ChipRadio = ChipRadio;
+exports.ChipRemovable = ChipRemovable;

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

@@ -1,20 +1,21 @@
 'use client';
 'use strict';
 
-var Group = require('./Group/Group.js');
-var Removable = require('./Removable/Removable.js');
-var Toggle = require('./Toggle/Toggle.js');
+var Chips = require('./Chips.js');
 
 const Chip = {
-    Group: Group.Group,
-    Removable: Removable.RemovableChip,
-    Toggle: Toggle.ToggleChip,
+    Button: Chips.ChipButton,
+    Checkbox: Chips.ChipCheckbox,
+    Radio: Chips.ChipRadio,
+    Removable: Chips.ChipRemovable,
 };
-Chip.Group.displayName = 'Chip.Group';
+Chip.Button.displayName = 'Chip.Button';
+Chip.Checkbox.displayName = 'Chip.Checkbox';
+Chip.Radio.displayName = 'Chip.Radio';
 Chip.Removable.displayName = 'Chip.Removable';
-Chip.Toggle.displayName = 'Chip.Toggle';
 
-exports.ChipGroup = Group.Group;
-exports.ChipRemovable = Removable.RemovableChip;
-exports.ChipToggle = Toggle.ToggleChip;
+exports.ChipButton = Chips.ChipButton;
+exports.ChipCheckbox = Chips.ChipCheckbox;
+exports.ChipRadio = Chips.ChipRadio;
+exports.ChipRemovable = Chips.ChipRemovable;
 exports.Chip = Chip;

package/dist/cjs/components/Dropdown/DropdownHeading.js

@@ -4,12 +4,9 @@
 var jsxRuntime = require('react/jsx-runtime');
 var cl = require('clsx/lite');
 var react = require('react');
-var Dropdown = require('./Dropdown.js');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
-const DropdownHeading = react.forwardRef(function DropdownHeading({ children, className, ...rest }, ref) {
-    const { size } = react.useContext(Dropdown.DropdownCtx);
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { asChild: true, size: size, children: jsxRuntime.jsx("h2", { ref: ref, className: cl('ds-dropdown__heading', className), ...rest, children: children }) }));
+const DropdownHeading = react.forwardRef(function DropdownHeading({ className, ...rest }, ref) {
+    return (jsxRuntime.jsx("h2", { ref: ref, className: cl('ds-dropdown__heading', className), ...rest }));
 });
 
 exports.DropdownHeading = DropdownHeading;

package/dist/cjs/components/ErrorSummary/ErrorSummaryHeading.js

@@ -4,7 +4,7 @@
 var jsxRuntime = require('react/jsx-runtime');
 var react = require('react');
 var ErrorSummary = require('./ErrorSummary.js');
-var Heading = require('../Typography/Heading/Heading.js');
+var Heading = require('../Heading/Heading.js');
 
 const HEADING_SIZE_MAP = {
     sm: '2xs',
@@ -17,7 +17,7 @@ const ErrorSummaryHeading = react.forwardRef(function ErrorSummaryHeading({ clas
         if (id && headingId !== id)
             setHeadingId(id);
     }, [headingId, id, setHeadingId]);
-    return (jsxRuntime.jsx(Heading.Heading, { id: headingId, size: HEADING_SIZE_MAP[size ?? 'md'], spacing: true, ref: ref, ...rest }));
+    return (jsxRuntime.jsx(Heading.Heading, { id: headingId, size: HEADING_SIZE_MAP[size ?? 'md'], ref: ref, ...rest }));
 });
 
 exports.ErrorSummaryHeading = ErrorSummaryHeading;

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

@@ -12,10 +12,9 @@ var react = require('react');
  * @example
  * <Heading size='lg' level={2}>Heading</Heading>
  */
-const Heading = react.forwardRef(({ size = 'xl', level = 2, spacing = false, className, asChild, ...rest }, ref) => {
+const Heading = react.forwardRef(function Heading({ size = 'xl', level = 2, className, asChild, ...rest }, ref) {
     const Component = asChild ? reactSlot.Slot : `h${level}`;
-    return (jsxRuntime.jsx(Component, { ref: ref, className: cl('ds-heading', `ds-heading--${size}`, spacing && 'ds-heading--spacing', className), ...rest }));
+    return (jsxRuntime.jsx(Component, { className: cl(`ds-heading`, className), "data-size": size, ref: ref, ...rest }));
 });
-Heading.displayName = 'Heading';
 
 exports.Heading = Heading;

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

@@ -12,10 +12,9 @@ var react = require('react');
  * @example
  * <Label size='lg'>Label</Label>
  */
-const Label = react.forwardRef(({ className, spacing, size = 'md', weight = 'medium', asChild, ...rest }, ref) => {
+const Label = react.forwardRef(function Label({ className, size = 'md', weight = 'medium', asChild, ...rest }, ref) {
     const Component = asChild ? reactSlot.Slot : 'label';
-    return (jsxRuntime.jsx(Component, { ref: ref, className: cl('ds-label', `ds-label--${size}`, spacing && 'ds-label--spacing', weight && `ds-font-weight--${weight}`, className), ...rest }));
+    return (jsxRuntime.jsx(Component, { ref: ref, className: cl(`ds-label--${size}`, weight && `ds-font-weight--${weight}`, className), ...rest }));
 });
-Label.displayName = 'Label';
 
 exports.Label = Label;

package/dist/cjs/components/List/Lists.js

@@ -5,11 +5,10 @@ var jsxRuntime = require('react/jsx-runtime');
 var reactSlot = require('@radix-ui/react-slot');
 var cl = require('clsx/lite');
 var react = require('react');
-var Paragraph = require('../Typography/Paragraph/Paragraph.js');
 
 const render = (tagName, { asChild, className, size = 'md', ...rest }, ref) => {
     const Component = asChild ? reactSlot.Slot : tagName;
-    return (jsxRuntime.jsx(Paragraph.Paragraph, { size: size, asChild: true, children: jsxRuntime.jsx(Component, { className: cl(`ds-list`, className), "data-size": size, ref: ref, ...rest }) }));
+    return (jsxRuntime.jsx(Component, { className: cl(`ds-list`, className), "data-size": size, ref: ref, ...rest }));
 };
 const ListUnordered = react.forwardRef(function ListUnordered(props, ref) {
     return render('ul', props, ref);

package/dist/cjs/components/Modal/Modal.js

@@ -0,0 +1,45 @@
+'use client';
+'use strict';
+
+var jsxRuntime = require('react/jsx-runtime');
+var react$1 = require('@floating-ui/react');
+var reactSlot = require('@radix-ui/react-slot');
+var cl = require('clsx/lite');
+var react = require('react');
+var ModalContext = require('./ModalContext.js');
+var Button = require('../Button/Button.js');
+
+const Modal = react.forwardRef(function Modal({ asChild, children, className, closeButton = 'Lukk dialogvindu', onClose, open, backdropClose = false, ...rest }, ref) {
+    const contextRef = react.useContext(ModalContext.Context);
+    const modalRef = react.useRef(null); // This local ref is used to make sure the modal works without a ModalContext
+    const Component = asChild ? reactSlot.Slot : 'dialog';
+    const mergedRefs = react$1.useMergeRefs([contextRef, ref, modalRef]);
+    react.useEffect(() => modalRef.current?.[open ? 'showModal' : 'close'](), [open]); // Toggle open based on prop
+    react.useEffect(() => {
+        const modal = modalRef.current;
+        const handleBackdropClick = ({ clientY: y, clientX: x, target, }) => {
+            if (window.getSelection()?.toString())
+                return; // Fix bug where if you select text spanning two divs it thinks you clicked outside
+            if (modal && target === modal && backdropClose) {
+                const { top, left, right, bottom } = modal.getBoundingClientRect();
+                const isInDialog = top <= y && y <= bottom && left <= x && x <= right;
+                if (!isInDialog)
+                    modal?.close(); // Both <dialog> and ::backdrop is considered same event.target
+            }
+        };
+        const handleAutoFocus = () => {
+            const autofocus = modal?.querySelector('[autofocus]');
+            if (document.activeElement !== autofocus)
+                autofocus?.focus();
+        };
+        modal?.addEventListener('animationend', handleAutoFocus);
+        modal?.addEventListener('click', handleBackdropClick);
+        return () => {
+            modal?.removeEventListener('animationend', handleAutoFocus);
+            modal?.removeEventListener('click', handleBackdropClick);
+        };
+    }, [backdropClose]);
+    return (jsxRuntime.jsxs(Component, { className: cl('ds-modal', className), ref: mergedRefs, ...rest, children: [closeButton !== false && (jsxRuntime.jsx("form", { method: 'dialog', children: jsxRuntime.jsx(Button.Button, { "aria-label": closeButton, autoFocus: true, color: 'neutral', icon: true, name: 'close', size: 'md', type: 'submit', variant: 'tertiary' }) })), children] }));
+});
+
+exports.Modal = Modal;

package/dist/cjs/components/Modal/ModalBlock.js

@@ -0,0 +1,14 @@
+'use client';
+'use strict';
+
+var jsxRuntime = require('react/jsx-runtime');
+var reactSlot = require('@radix-ui/react-slot');
+var cl = require('clsx/lite');
+var react = require('react');
+
+const ModalBlock = react.forwardRef(function ModalBlock({ asChild, className, ...rest }, ref) {
+    const Component = asChild ? reactSlot.Slot : 'div';
+    return (jsxRuntime.jsx(Component, { className: cl('ds-modal__block', className), ref: ref, ...rest }));
+});
+
+exports.ModalBlock = ModalBlock;

package/dist/cjs/components/Modal/ModalContext.js

@@ -0,0 +1,17 @@
+'use client';
+'use strict';
+
+var jsxRuntime = require('react/jsx-runtime');
+var react = require('react');
+
+const Context = react.createContext({
+    current: null,
+});
+const ModalContext = ({ children }) => {
+    const contextRef = react.useRef(null);
+    return jsxRuntime.jsx(Context.Provider, { value: contextRef, children: children });
+};
+ModalContext.displayName = 'ModalContext';
+
+exports.Context = Context;
+exports.ModalContext = ModalContext;

package/dist/cjs/components/Modal/ModalTrigger.js

@@ -5,13 +5,12 @@ var jsxRuntime = require('react/jsx-runtime');
 var reactSlot = require('@radix-ui/react-slot');
 var react = require('react');
 var Button = require('../Button/Button.js');
-var ModalRoot = require('./ModalRoot.js');
+var ModalContext = require('./ModalContext.js');
 
-const ModalTrigger = react.forwardRef(({ asChild, ...rest }, ref) => {
-    const { modalRef, open } = react.useContext(ModalRoot.ModalContext);
+const ModalTrigger = react.forwardRef(function ModalTrigger({ asChild, ...rest }, ref) {
+    const contextRef = react.useContext(ModalContext.Context);
     const Component = asChild ? reactSlot.Slot : Button.Button;
-    return (jsxRuntime.jsx(Component, { ref: ref, onClick: () => modalRef?.current?.showModal(), "aria-expanded": open, "aria-haspopup": 'dialog', ...rest }));
+    return (jsxRuntime.jsx(Component, { "aria-haspopup": 'dialog', onClick: () => contextRef?.current?.showModal(), ref: ref, ...rest }));
 });
-ModalTrigger.displayName = 'ModalTrigger';
 
 exports.ModalTrigger = ModalTrigger;

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

@@ -1,31 +1,21 @@
 'use client';
 'use strict';
 
-var ModaContent = require('./ModaContent.js');
-var ModalDialog = require('./ModalDialog.js');
-var ModalFooter = require('./ModalFooter.js');
-var ModalHeader = require('./ModalHeader.js');
-var ModalRoot = require('./ModalRoot.js');
+var Modal$1 = require('./Modal.js');
+var ModalBlock = require('./ModalBlock.js');
+var ModalContext = require('./ModalContext.js');
 var ModalTrigger = require('./ModalTrigger.js');
 
-const Modal = {};
-Modal.Root = ModalRoot.ModalRoot;
-Modal.Content = ModaContent.ModalContent;
-Modal.Footer = ModalFooter.ModalFooter;
-Modal.Header = ModalHeader.ModalHeader;
-Modal.Trigger = ModalTrigger.ModalTrigger;
-Modal.Dialog = ModalDialog.ModalDialog;
-Modal.Root.displayName = 'Modal.Root';
-Modal.Dialog.displayName = 'Modal.Dialog';
-Modal.Footer.displayName = 'Modal.Footer';
-Modal.Header.displayName = 'Modal.Header';
-Modal.Content.displayName = 'Modal.Content';
+const Modal = Object.assign(Modal$1.Modal, {
+    Block: ModalBlock.ModalBlock,
+    Context: ModalContext.ModalContext,
+    Trigger: ModalTrigger.ModalTrigger,
+});
+Modal.Block.displayName = 'Modal.Block';
+Modal.Context.displayName = 'Modal.Context';
 Modal.Trigger.displayName = 'Modal.Trigger';
 
-exports.ModalContent = ModaContent.ModalContent;
-exports.ModalDialog = ModalDialog.ModalDialog;
-exports.ModalFooter = ModalFooter.ModalFooter;
-exports.ModalHeader = ModalHeader.ModalHeader;
-exports.ModalRoot = ModalRoot.ModalRoot;
+exports.ModalBlock = ModalBlock.ModalBlock;
+exports.ModalContext = ModalContext.ModalContext;
 exports.ModalTrigger = ModalTrigger.ModalTrigger;
 exports.Modal = Modal;