Merge 339e8c4 into 7c17e40

navikt · Jun 15, 2023 · f3f2bcb · f3f2bcb
2 parents 7c17e40 + 339e8c4
commit f3f2bcb
Show file tree

Hide file tree

Showing 3 changed files with 1,378 additions and 1,265 deletions.
diff --git a/.changeset/big-shoes-flow.md b/.changeset/big-shoes-flow.md
@@ -0,0 +1,5 @@
+---
+"@navikt/ds-react": patch
+---
+
+:bug: OverridableComponent fungerer nå med komponenter som allerede bruker 'as'-prop
diff --git a/@navikt/core/react/src/util/OverridableComponent.ts b/@navikt/core/react/src/util/OverridableComponent.ts
@@ -7,6 +7,6 @@ export interface OverridableComponent<Component, Element extends HTMLElement> {
     props: {
       as: As;
     } & Component &
-      Omit<React.ComponentPropsWithRef<As>, keyof Component>
+      Omit<React.ComponentPropsWithRef<As>, keyof Component | "as">
   ): ReturnType<React.FC>;
 }