Merge branch 'next' into docs/data-color

digdir · Nov 28, 2024 · 80f2704 · 80f2704
2 parents ea406ef + 99aa669
commit 80f2704
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/.changeset/ninety-jeans-punch.md b/.changeset/ninety-jeans-punch.md
@@ -0,0 +1,5 @@
+---
+"@digdir/designsystemet-react": patch
+---
+
+React: Set `"type": "module"` in `package.json`
diff --git a/.changeset/silver-penguins-occur.md b/.changeset/silver-penguins-occur.md
@@ -0,0 +1,6 @@
+---
+"@digdir/designsystemet-react": patch
+"@digdir/designsystemet-css": patch
+---
+
+Rename `Accordion` to `Details`
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,5 +1,6 @@
 {
   "name": "@digdir/designsystemet-react",
+  "type": "module",
   "version": "1.0.0-next.39",
   "description": "React components for Designsystemet",
   "author": "Designsystemet team",

diff --git a/packages/react/src/components/Details/Details.mdx b/packages/react/src/components/Details/Details.mdx
@@ -25,12 +25,24 @@ Med `Details` kan du presentere mye innhold på liten plass i en eller flere rad
 ## Bruk
 
 ```tsx
+/* Uten ramme */
 import { Details } from '@digdir/designsystemet-react';
 
 <Details>
   <Details.Summary>Details heading text</Details.Summary>
   <Details.Content>Details content</Details.Content>
 </Details>
+
+/* Med ramme */
+
+import { Details, Card } from '@digdir/designsystemet-react';
+
+<Card>
+  <Details>
+    <Details.Summary>Details heading text</Details.Summary>
+    <Details.Content>Details content</Details.Content>
+  </Details>
+</Card>
 ```
 
 ## Eksempler

diff --git a/packages/react/src/components/form/Fieldset/Fieldset.tsx b/packages/react/src/components/form/Fieldset/Fieldset.tsx
@@ -1,19 +1,11 @@
 import cl from 'clsx/lite';
-import type { FieldsetHTMLAttributes, ReactNode } from 'react';
+import type { FieldsetHTMLAttributes } from 'react';
 import { forwardRef } from 'react';
 
 import type { DefaultProps } from '../../../types';
-import type { MergeRight } from '../../../utilities';
 
-export type FieldsetProps = MergeRight<
-  DefaultProps & FieldsetHTMLAttributes<HTMLFieldSetElement>,
-  {
-    /** Toggle `disabled` all input fields within the fieldset. */
-    disabled?: boolean;
-    /** If set, this will diplay an error message at the bottom of the fieldset. */
-    error?: ReactNode;
-  }
->;
+export type FieldsetProps = DefaultProps &
+  FieldsetHTMLAttributes<HTMLFieldSetElement>;
 
 export const Fieldset = forwardRef<HTMLFieldSetElement, FieldsetProps>(
   function Fieldset({ className, ...rest }, ref) {