fix(ButtonClose): update types for React 18 (#2658)

* fix(ButtonClose): update types for React 18 * chore: add changeset * chore: add lint ignore
primer · Dec 16, 2022 · 20e18c0 · 20e18c0
1 parent 1fb6ee9
commit 20e18c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.changeset/lazy-beans-move.md b/.changeset/lazy-beans-move.md
@@ -0,0 +1,5 @@
+---
+'@primer/react': patch
+---
+
+Update TypeScript types for deprecated ButtonClose to support React 18
diff --git a/src/deprecated/Button/ButtonClose.tsx b/src/deprecated/Button/ButtonClose.tsx
@@ -23,7 +23,13 @@ const StyledButton = styled.button<SxProp>`
   ${sx};
 `
 
-const ButtonClose = forwardRef<HTMLButtonElement, ComponentProps<typeof StyledButton>>((props, ref) => {
+const ButtonClose = forwardRef<
+  HTMLButtonElement,
+  // Include {theme?: any} in the intersection as it mirrors the generated type
+  // from styled-components
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  React.ButtonHTMLAttributes<HTMLButtonElement> & {theme?: any} & SxProp
+>((props, ref) => {
   return (
     <StyledButton ref={ref} aria-label="Close" {...props}>
       <XIcon />