fix(Avatar): merge style when style prop is provided (#5963)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: joshblack

.changeset/soft-cases-own.md

@@ -0,0 +1,5 @@
+---
+'@primer/react': patch
+---
+
+Update Avatar component to correctly merge style when style prop is provided

packages/react/src/__tests__/Avatar.test.tsx renamed to packages/react/src/Avatar/Avatar.test.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import {Avatar} from '..'
 import theme from '../theme'
 import {px, render, behavesAsComponent, checkExports} from '../utils/testing'
-import {render as HTMLRender} from '@testing-library/react'
+import {render as HTMLRender, screen} from '@testing-library/react'
 import axe from 'axe-core'
 
 describe('Avatar', () => {
@@ -48,4 +48,21 @@ describe('Avatar', () => {
   it('respects margin props', () => {
     expect(render(<Avatar src="primer.png" alt="" sx={{m: 2}} />)).toHaveStyleRule('margin', px(theme.space[2]))
   })
+
+  it('should support the `style` prop without overriding internal styles', () => {
+    HTMLRender(
+      <Avatar
+        data-testid="avatar"
+        src="primer.png"
+        style={{
+          background: 'black',
+        }}
+      />,
+    )
+
+    expect(screen.getByTestId('avatar')).toHaveStyle({
+      background: 'black',
+      ['--avatarSize-regular']: '20px',
+    })
+  })
 })

packages/react/src/Avatar/Avatar.tsx

@@ -1,10 +1,10 @@
 import {clsx} from 'clsx'
 import React from 'react'
-import Box from '../Box'
 import type {SxProp} from '../sx'
 import type {ResponsiveValue} from '../hooks/useResponsiveValue'
 import {isResponsiveValue} from '../hooks/useResponsiveValue'
 import {defaultSxProp} from '../utils/defaultSxProp'
+import {BoxWithFallback} from '../internal/components/BoxWithFallback'
 import classes from './Avatar.module.css'
 
 export const DEFAULT_AVATAR_SIZE = 20
@@ -24,7 +24,7 @@ export type AvatarProps = {
   React.ComponentPropsWithoutRef<'img'>
 
 const Avatar = React.forwardRef<HTMLImageElement, AvatarProps>(function Avatar(
-  {alt = '', size = DEFAULT_AVATAR_SIZE, square = false, sx: sxProp = defaultSxProp, className, ...rest},
+  {alt = '', size = DEFAULT_AVATAR_SIZE, square = false, sx: sxProp = defaultSxProp, className, style, ...rest},
   ref,
 ) {
   const isResponsive = isResponsiveValue(size)
@@ -38,27 +38,9 @@ const Avatar = React.forwardRef<HTMLImageElement, AvatarProps>(function Avatar(
     cssSizeVars['--avatarSize-regular'] = `${size}px`
   }
 
-  if (sxProp !== defaultSxProp) {
-    return (
-      <Box
-        as={'img'}
-        data-component="Avatar"
-        className={clsx(className, classes.Avatar)}
-        ref={ref}
-        alt={alt}
-        data-responsive={isResponsive ? '' : undefined}
-        data-square={square ? '' : undefined}
-        width={isResponsive ? undefined : size}
-        height={isResponsive ? undefined : size}
-        style={cssSizeVars as React.CSSProperties}
-        sx={sxProp}
-        {...rest}
-      />
-    )
-  }
-
   return (
-    <img
+    <BoxWithFallback
+      as="img"
       data-component="Avatar"
       className={clsx(className, classes.Avatar)}
       ref={ref}
@@ -67,7 +49,15 @@ const Avatar = React.forwardRef<HTMLImageElement, AvatarProps>(function Avatar(
       data-square={square ? '' : undefined}
       width={isResponsive ? undefined : size}
       height={isResponsive ? undefined : size}
-      style={cssSizeVars as React.CSSProperties}
+      style={
+        style
+          ? {
+              ...cssSizeVars,
+              ...style,
+            }
+          : (cssSizeVars as React.CSSProperties)
+      }
+      sx={sxProp}
       {...rest}
     />
   )