Add CircularProgressOwnerState type

mui · Aug 29, 2022 · c63fd9a · c63fd9a
1 parent 0da996f
commit c63fd9a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/packages/mui-joy/src/CircularProgress/CircularProgressProps.ts b/packages/mui-joy/src/CircularProgress/CircularProgressProps.ts
@@ -54,3 +54,5 @@ export type CircularProgressProps<
   D extends React.ElementType = CircularProgressTypeMap['defaultComponent'],
   P = { component?: React.ElementType },
 > = OverrideProps<CircularProgressTypeMap<P, D>, D>;
+
+export interface CircularProgressOwnerState extends CircularProgressProps {}
diff --git a/packages/mui-joy/src/styles/components.d.ts b/packages/mui-joy/src/styles/components.d.ts
@@ -40,6 +40,7 @@ import {
 } from '../ChipDelete/ChipDeleteProps';
 import {
   CircularProgressProps,
+  CircularProgressOwnerState,
   CircularProgressSlot,
 } from '../CircularProgress/CircularProgressProps';
 import { ContainerProps, ContainerSlot } from '../Container/ContainerProps';
@@ -157,7 +158,7 @@ export interface Components<Theme = unknown> {
   };
   JoyCircularProgress?: {
     defaultProps?: Partial<CircularProgressProps>;
-    styleOverrides?: OverridesStyleRules<CircularProgressSlot, CircularProgressProps, Theme>;
+    styleOverrides?: OverridesStyleRules<CircularProgressSlot, CircularProgressOwnerState, Theme>;
   };
   JoyCard?: {
     defaultProps?: Partial<CardProps>;

diff --git a/packages/mui-joy/src/styles/extendTheme.spec.ts b/packages/mui-joy/src/styles/extendTheme.spec.ts
@@ -14,6 +14,7 @@ import { CardOverflowOwnerState } from '@mui/joy/CardOverflow';
 import { CheckboxOwnerState } from '@mui/joy/Checkbox';
 import { ChipOwnerState } from '@mui/joy/Chip';
 import { ChipDeleteOwnerState } from '@mui/joy/ChipDelete';
+import { CircularProgressOwnerState } from '@mui/joy/CircularProgress';
 import { ContainerProps } from '@mui/joy/Container';
 import { FormHelperTextOwnerState } from '@mui/joy/FormHelperText';
 import { FormLabelOwnerState } from '@mui/joy/FormLabel';
@@ -275,6 +276,22 @@ extendTheme({
         },
       },
     },
+    JoyCircularProgress: {
+      defaultProps: {
+        variant: 'solid',
+        color: 'success',
+      },
+      styleOverrides: {
+        root: ({ ownerState }) => {
+          expectType<CircularProgressOwnerState & Record<string, unknown>, typeof ownerState>(ownerState);
+          return {};
+        },
+        progress: ({ ownerState }) => {
+          expectType<CircularProgressOwnerState & Record<string, unknown>, typeof ownerState>(ownerState);
+          return {};
+        },
+      },
+    },
     JoyContainer: {
       defaultProps: {
         disableGutters: true,