From c91f973f9097ba710bbc92484dc632302196cca7 Mon Sep 17 00:00:00 2001
From: Albert Yu <albert@albertyu.co>
Date: Wed, 27 Sep 2023 15:59:09 +0800
Subject: [PATCH] Fix review comments

---
 packages/mui-base/src/FormControl/index.ts      |  1 -
 packages/mui-material-next/migration.md         | 11 +++++++++++
 .../src/FormControl/FormControl.tsx             | 17 ++++++++---------
 .../src/FormControl/FormControl.types.ts        |  4 ++--
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/packages/mui-base/src/FormControl/index.ts b/packages/mui-base/src/FormControl/index.ts
index 1f758f2bf48b04..36bffd4e36536c 100644
--- a/packages/mui-base/src/FormControl/index.ts
+++ b/packages/mui-base/src/FormControl/index.ts
@@ -8,7 +8,6 @@ export type {
   FormControlRootSlotPropsOverrides,
   FormControlState,
   UseFormControlContextReturnValue,
-  // for material-next
   FormControlOwnProps,
 } from './FormControl.types';
 
diff --git a/packages/mui-material-next/migration.md b/packages/mui-material-next/migration.md
index f027c255db15e3..dee387220c4c9a 100644
--- a/packages/mui-material-next/migration.md
+++ b/packages/mui-material-next/migration.md
@@ -132,6 +132,17 @@ If you need to prevent default on a `key-up` and/or `key-down` event, then besid
 
 This is to ensure that default is prevented when the `ButtonBase` root is not a native button, for example, when the root element used is a `span`.
 
+## FormControl
+
+### Renamed `FormControlState`
+
+The `FormControlState` interface was renamed to `FormControlContextValue`:
+
+```diff
+-import { FormControlState } from '@mui/material';
++import { FormControlContextValue } from '@mui/material-next';
+```
+
 ## InputBase
 
 ### Removed `inputProps`
diff --git a/packages/mui-material-next/src/FormControl/FormControl.tsx b/packages/mui-material-next/src/FormControl/FormControl.tsx
index 5f63f81147b7e1..32eed461d78314 100644
--- a/packages/mui-material-next/src/FormControl/FormControl.tsx
+++ b/packages/mui-material-next/src/FormControl/FormControl.tsx
@@ -28,11 +28,11 @@ const FormControlRoot = styled('div', {
   name: 'MuiFormControl',
   slot: 'Root',
   overridesResolver: ({ ownerState }, styles) => {
-    return {
-      ...(styles.root as Record<string, unknown>),
-      ...(styles[`margin${capitalize(ownerState.margin)}`] as Record<string, unknown>),
-      ...(ownerState.fullWidth && styles.fullWidth),
-    };
+    return [
+      styles.root,
+      styles[`margin${capitalize(ownerState.margin)}`],
+      ownerState.fullWidth && styles.fullWidth,
+    ];
   },
 })<{ ownerState: FormControlOwnerState }>(({ ownerState }) => ({
   display: 'inline-flex',
@@ -87,8 +87,7 @@ const FormControl = React.forwardRef(function FormControl<
   const props = useThemeProps({ props: inProps, name: 'MuiFormControl' });
   const {
     children,
-    className,
-    classes: classesProp,
+    classes: classesProp = {},
     color = 'primary',
     component: componentProp,
     disabled = false,
@@ -182,7 +181,7 @@ const FormControl = React.forwardRef(function FormControl<
 
   const ownerState = {
     ...props,
-    classes: props.classes ?? {},
+    classes: classesProp,
     color,
     component: componentProp,
     disabled,
@@ -252,7 +251,7 @@ const FormControl = React.forwardRef(function FormControl<
       as: componentProp,
     },
     ownerState,
-    className: [classes.root, className],
+    className: classes.root,
   });
 
   return (
diff --git a/packages/mui-material-next/src/FormControl/FormControl.types.ts b/packages/mui-material-next/src/FormControl/FormControl.types.ts
index 848054e6ad7577..9c7b27a5df8b03 100644
--- a/packages/mui-material-next/src/FormControl/FormControl.types.ts
+++ b/packages/mui-material-next/src/FormControl/FormControl.types.ts
@@ -79,7 +79,7 @@ export type FormControlProps<
   component?: React.ElementType;
 };
 
-type MaterialYouOwnerStateKeys =
+type MaterialDesignOwnerStateKeys =
   | 'classes'
   | 'color'
   | 'margin'
@@ -89,5 +89,5 @@ type MaterialYouOwnerStateKeys =
   | 'variant';
 
 export type FormControlOwnerState = Simplify<
-  Required<Pick<FormControlOwnProps, MaterialYouOwnerStateKeys>> & FormControlProps
+  Required<Pick<FormControlOwnProps, MaterialDesignOwnerStateKeys>> & FormControlProps
 >;