Merge ecd4cbd into 31d9a05

packages/react/src/Spinner/Spinner.dev.stories.tsx

@@ -0,0 +1,10 @@
+import React from 'react'
+import type {Meta} from '@storybook/react'
+import Spinner from './Spinner'
+
+export default {
+  title: 'Components/Spinner/Dev',
+  component: Spinner,
+} as Meta<typeof Spinner>
+
+export const Default = () => <Spinner sx={{border: '1px solid red'}} />

packages/react/src/Spinner/Spinner.module.css

@@ -0,0 +1,13 @@
+.Box {
+  display: inline-flex;
+}
+
+@keyframes rotate-keyframes {
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.SpinnerAnimation {
+  animation: rotate-keyframes 1s linear infinite;
+}

packages/react/src/Spinner/Spinner.tsx

@@ -3,8 +3,10 @@ import styled from 'styled-components'
 import sx, {type SxProp} from '../sx'
 import {VisuallyHidden} from '../VisuallyHidden'
 import type {HTMLDataAttributes} from '../internal/internal-types'
-import Box from '../Box'
 import {useId} from '../hooks'
+import {useFeatureFlag} from '../FeatureFlags'
+import classes from './Spinner.module.css'
+import Box from '../Box'
 
 const sizeMap = {
   small: '16px',
@@ -20,6 +22,7 @@ export type SpinnerProps = {
   /** @deprecated Use `srText` instead. */
   'aria-label'?: string
   className?: string
+  style?: React.CSSProperties
 } & HTMLDataAttributes &
   SxProp
 
@@ -28,6 +31,7 @@ function Spinner({
   srText = 'Loading',
   'aria-label': ariaLabel,
   className,
+  style,
   ...props
 }: SpinnerProps) {
   const size = sizeMap[sizeKey]
@@ -36,7 +40,7 @@ function Spinner({
 
   return (
     /* inline-flex removes the extra line height */
-    <Box as="span" sx={{display: 'inline-flex'}}>
+    <span className={classes.Box}>
       <svg
         height={size}
         width={size}
@@ -46,6 +50,7 @@ function Spinner({
         aria-label={ariaLabel ?? undefined}
         aria-labelledby={hasHiddenLabel ? labelId : undefined}
         className={className}
+        style={style}
         {...props}
       >
         <circle
@@ -66,11 +71,11 @@ function Spinner({
         />
       </svg>
       {hasHiddenLabel ? <VisuallyHidden id={labelId}>{srText}</VisuallyHidden> : null}
-    </Box>
+    </span>
   )
 }
 
-const StyledSpinner = styled(Spinner)`
+const StyledComponentSpinner = styled(Spinner)`
   @keyframes rotate-keyframes {
     100% {
       transform: rotate(360deg);
@@ -82,6 +87,19 @@ const StyledSpinner = styled(Spinner)`
   ${sx}
 `
 
+function StyledSpinner({sx, ...props}: SpinnerProps) {
+  const enabled = useFeatureFlag('primer_react_css_modules_team')
+  if (enabled) {
+    if (sx) {
+      return <Box sx={sx} as={Spinner} className={classes.SpinnerAnimation} {...props} />
+    }
+
+    return <Spinner className={classes.SpinnerAnimation} {...props} />
+  }
+
+  return <StyledComponentSpinner sx={sx} {...props} />
+}
+
 StyledSpinner.displayName = 'Spinner'
 
 export default StyledSpinner