Merge 74aa001 into 434f542

primer · May 17, 2023 · 706b701 · 706b701
2 parents 434f542 + 74aa001
commit 706b701
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.changeset/spicy-shoes-press.md b/.changeset/spicy-shoes-press.md
@@ -0,0 +1,5 @@
+---
+'@primer/react': patch
+---
+
+Octicons (previously known StyledOcticons) to use React.forwardRef()
diff --git a/src/Octicon/Octicon.tsx b/src/Octicon/Octicon.tsx
@@ -6,9 +6,10 @@ import {ComponentProps} from '../utils/types'
 
 type StyledOcticonProps = {icon: React.ElementType; color?: string} & IconProps
 
-function Icon({icon: IconComponent, ...rest}: StyledOcticonProps) {
-  return <IconComponent {...rest} />
-}
+const Icon = React.forwardRef((props: StyledOcticonProps, ref: React.Ref<SVGSVGElement>) => {
+  const {icon: IconComponent, ...rest} = props
+  return <IconComponent {...rest} ref={ref} />
+})
 
 const Octicon = styled(Icon)<SxProp>`
   ${({color, sx: sxProp}) => sx({sx: {color, ...sxProp}})}