From bf3c73b1a2a4c793649238ba7133f07b4eb37013 Mon Sep 17 00:00:00 2001
From: Diego Andai <diego@mui.com>
Date: Tue, 30 Apr 2024 11:53:18 -0400
Subject: [PATCH] Fix tests

---
 packages/mui-material/src/InputBase/InputBase.js      | 7 +++----
 packages/mui-material/src/InputLabel/InputLabel.js    | 2 +-
 packages/mui-material/src/Select/SelectInput.js       | 2 +-
 packages/mui-material/src/TextField/TextField.test.js | 2 ++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/mui-material/src/InputBase/InputBase.js b/packages/mui-material/src/InputBase/InputBase.js
index 970dd62ab36b2c..4bf1fbe7faa3c4 100644
--- a/packages/mui-material/src/InputBase/InputBase.js
+++ b/packages/mui-material/src/InputBase/InputBase.js
@@ -514,12 +514,12 @@ const InputBase = React.forwardRef(function InputBase(inProps, ref) {
       {!disableInjectingGlobalStyles && inputGlobalStyles}
       <Root
         {...rootProps}
-        {...(!isHostComponent(Root) && {
-          ownerState: { ...ownerState, ...rootProps.ownerState },
-        })}
         ref={ref}
         onClick={handleClick}
         {...other}
+        {...(!isHostComponent(Root) && {
+          ownerState: { ...ownerState, ...rootProps.ownerState },
+        })}
         className={clsx(
           classes.root,
           {
@@ -533,7 +533,6 @@ const InputBase = React.forwardRef(function InputBase(inProps, ref) {
         {startAdornment}
         <FormControlContext.Provider value={null}>
           <Input
-            ownerState={ownerState}
             aria-invalid={fcs.error}
             aria-describedby={ariaDescribedby}
             autoComplete={autoComplete}
diff --git a/packages/mui-material/src/InputLabel/InputLabel.js b/packages/mui-material/src/InputLabel/InputLabel.js
index dd8003ee8ebb7c..d3cbca8c3ccb44 100644
--- a/packages/mui-material/src/InputLabel/InputLabel.js
+++ b/packages/mui-material/src/InputLabel/InputLabel.js
@@ -161,10 +161,10 @@ const InputLabel = React.forwardRef(function InputLabel(inProps, ref) {
   return (
     <InputLabelRoot
       data-shrink={shrink}
-      ownerState={ownerState}
       ref={ref}
       className={clsx(classes.root, className)}
       {...other}
+      ownerState={ownerState}
       classes={classes}
     />
   );
diff --git a/packages/mui-material/src/Select/SelectInput.js b/packages/mui-material/src/Select/SelectInput.js
index 54741070da1a85..7bd2ba061ff998 100644
--- a/packages/mui-material/src/Select/SelectInput.js
+++ b/packages/mui-material/src/Select/SelectInput.js
@@ -532,8 +532,8 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
         disabled={disabled}
         className={classes.nativeInput}
         autoFocus={autoFocus}
-        ownerState={ownerState}
         {...other}
+        ownerState={ownerState}
       />
       <SelectIcon as={IconComponent} className={classes.icon} ownerState={ownerState} />
       <Menu
diff --git a/packages/mui-material/src/TextField/TextField.test.js b/packages/mui-material/src/TextField/TextField.test.js
index 273d76698697fe..2d14112c3ddbff 100644
--- a/packages/mui-material/src/TextField/TextField.test.js
+++ b/packages/mui-material/src/TextField/TextField.test.js
@@ -33,6 +33,7 @@ describe('<TextField />', () => {
       slots: {
         input: {
           testWithComponent: TestComponent,
+          testWithElement: null,
         },
         inputLabel: {},
         htmlInput: {
@@ -56,6 +57,7 @@ describe('<TextField />', () => {
       slots: {
         select: {
           testWithComponent: TestComponent,
+          testWithElement: null,
         },
       },
       only: ['slotsProp', 'slotPropsProp', 'slotPropsCallback'],