From 70d2645e98e68e1e3b4272631c56a578d756c70c Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Fri, 11 Aug 2023 19:15:15 +0530
Subject: [PATCH 01/12] add root class to SelectClasses

---
 packages/mui-material/src/Select/Select.spec.tsx  | 14 ++++++++++++++
 packages/mui-material/src/Select/selectClasses.ts |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/packages/mui-material/src/Select/Select.spec.tsx b/packages/mui-material/src/Select/Select.spec.tsx
index 505f2206daa22c..c745a4b631ce46 100644
--- a/packages/mui-material/src/Select/Select.spec.tsx
+++ b/packages/mui-material/src/Select/Select.spec.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import Select, { SelectChangeEvent } from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
+import { createTheme } from '@mui/material/styles';
 
 function genericValueTest() {
   function handleChangeWithSameTypeAsSelect(event: SelectChangeEvent<number>) {}
@@ -44,4 +45,17 @@ function genericValueTest() {
 
   // disabledUnderline prop should be available (inherited from InputProps) and NOT throw typescript error
   <Select disableUnderline />;
+
+  // Tests presence of `root` class in SelectClasses
+  const theme = createTheme({
+    components: {
+      MuiSelect: {
+        styleOverrides: {
+          root: {
+            borderRadius: '8px',
+          },
+        },
+      },
+    },
+  });
 }
diff --git a/packages/mui-material/src/Select/selectClasses.ts b/packages/mui-material/src/Select/selectClasses.ts
index 556196282b771e..583c40fe84e529 100644
--- a/packages/mui-material/src/Select/selectClasses.ts
+++ b/packages/mui-material/src/Select/selectClasses.ts
@@ -2,6 +2,8 @@ import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/
 import generateUtilityClass from '../generateUtilityClass';
 
 export interface SelectClasses {
+  /** Styles applied to the root element. */
+  root: string;
   /** Styles applied to the select component `select` class. */
   select: string;
   /** Styles applied to the select component if `multiple={true}`. */
@@ -37,6 +39,7 @@ export function getSelectUtilityClasses(slot: string): string {
 }
 
 const selectClasses: SelectClasses = generateUtilityClasses('MuiSelect', [
+  'root',
   'select',
   'multiple',
   'filled',

From d57eecbd7810cf866e3ad092752028f554384474 Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Fri, 11 Aug 2023 19:22:31 +0530
Subject: [PATCH 02/12] docs:api

---
 docs/pages/material-ui/api/select.json        | 1 +
 docs/translations/api-docs/select/select.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/pages/material-ui/api/select.json b/docs/pages/material-ui/api/select.json
index d13a2a3b243156..e00fb66cccd576 100644
--- a/docs/pages/material-ui/api/select.json
+++ b/docs/pages/material-ui/api/select.json
@@ -63,6 +63,7 @@
   ],
   "styles": {
     "classes": [
+      "root",
       "select",
       "multiple",
       "filled",
diff --git a/docs/translations/api-docs/select/select.json b/docs/translations/api-docs/select/select.json
index 1e4253a7b39f2f..3aa70871ef1418 100644
--- a/docs/translations/api-docs/select/select.json
+++ b/docs/translations/api-docs/select/select.json
@@ -74,6 +74,7 @@
     "variant": { "description": "The variant to use." }
   },
   "classDescriptions": {
+    "root": { "description": "Styles applied to the root element." },
     "select": {
       "description": "Styles applied to {{nodeName}}.",
       "nodeName": "the select component <code>select</code> class"

From 89bd95073ca161f3824fbba22be05661a35e4f8e Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Fri, 11 Aug 2023 19:54:22 +0530
Subject: [PATCH 03/12] add root class to input

---
 packages/mui-material/src/Select/Select.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js
index a7142fbcb51bc1..dede9807ff6273 100644
--- a/packages/mui-material/src/Select/Select.js
+++ b/packages/mui-material/src/Select/Select.js
@@ -2,7 +2,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import { deepmerge } from '@mui/utils';
+import { deepmerge, unstable_composeClasses as composeClasses } from '@mui/utils';
 import SelectInput from './SelectInput';
 import formControlState from '../FormControl/formControlState';
 import useFormControl from '../FormControl/useFormControl';
@@ -14,10 +14,16 @@ import OutlinedInput from '../OutlinedInput';
 import useThemeProps from '../styles/useThemeProps';
 import useForkRef from '../utils/useForkRef';
 import styled, { rootShouldForwardProp } from '../styles/styled';
+import { getSelectUtilityClasses } from './selectClasses';
 
 const useUtilityClasses = (ownerState) => {
   const { classes } = ownerState;
-  return classes;
+
+  const slots = {
+    root: ['root'],
+  };
+
+  return composeClasses(slots, getSelectUtilityClasses, classes);
 };
 
 const styledRootConfig = {
@@ -117,7 +123,7 @@ const Select = React.forwardRef(function Select(inProps, ref) {
         },
         ...(multiple && native && variant === 'outlined' ? { notched: true } : {}),
         ref: inputComponentRef,
-        className: clsx(InputComponent.props.className, className),
+        className: clsx(InputComponent.props.className, className, classes.root),
         // If a custom input is provided via 'input' prop, do not allow 'variant' to be propagated to it's root element. See https://github.com/mui/material-ui/issues/33894.
         ...(!input && { variant }),
         ...other,

From 25c366d3236cc611344c8117b3b38c23fa7604c3 Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Fri, 11 Aug 2023 20:04:20 +0530
Subject: [PATCH 04/12] change compose classes import

---
 packages/mui-material/src/Select/Select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js
index dede9807ff6273..822995f334da50 100644
--- a/packages/mui-material/src/Select/Select.js
+++ b/packages/mui-material/src/Select/Select.js
@@ -2,7 +2,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import { deepmerge, unstable_composeClasses as composeClasses } from '@mui/utils';
+import { deepmerge, unstable_composeClasses as composeClasses } from '@mui/base/composeClasses';
 import SelectInput from './SelectInput';
 import formControlState from '../FormControl/formControlState';
 import useFormControl from '../FormControl/useFormControl';

From 4afbab79388fa332d6013b1f2efadf387d26ae0a Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Fri, 11 Aug 2023 20:04:48 +0530
Subject: [PATCH 05/12] change compose classes import

---
 packages/mui-material/src/Select/Select.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js
index 822995f334da50..f7e573c6cfb7d0 100644
--- a/packages/mui-material/src/Select/Select.js
+++ b/packages/mui-material/src/Select/Select.js
@@ -2,7 +2,8 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import { deepmerge, unstable_composeClasses as composeClasses } from '@mui/base/composeClasses';
+import { deepmerge } from '@mui/utils';
+import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses';
 import SelectInput from './SelectInput';
 import formControlState from '../FormControl/formControlState';
 import useFormControl from '../FormControl/useFormControl';

From a2153de3cb94adf13f937d3d37f7c91a352a721b Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Fri, 11 Aug 2023 20:24:59 +0530
Subject: [PATCH 06/12] docs:api

---
 docs/pages/base-ui/api/number-input.json | 7 ++++++-
 docs/pages/base-ui/api/use-modal.json    | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/pages/base-ui/api/number-input.json b/docs/pages/base-ui/api/number-input.json
index 1bb6945c855368..edbfc4de395594 100644
--- a/docs/pages/base-ui/api/number-input.json
+++ b/docs/pages/base-ui/api/number-input.json
@@ -75,7 +75,12 @@
   ],
   "classes": {
     "classes": ["disabled", "error", "focused", "formControl", "readOnly"],
-    "globalClasses": { "focused": "Mui-focused", "disabled": "Mui-disabled", "error": "Mui-error" }
+    "globalClasses": {
+      "focused": "Mui-focused",
+      "disabled": "Mui-disabled",
+      "readOnly": "Mui-readOnly",
+      "error": "Mui-error"
+    }
   },
   "spread": true,
   "muiName": "MuiNumberInput",
diff --git a/docs/pages/base-ui/api/use-modal.json b/docs/pages/base-ui/api/use-modal.json
index f40ebdef554aef..d7fe1e226f3af0 100644
--- a/docs/pages/base-ui/api/use-modal.json
+++ b/docs/pages/base-ui/api/use-modal.json
@@ -90,5 +90,9 @@
   },
   "name": "useModal",
   "filename": "/packages/mui-base/src/unstable_useModal/useModal.ts",
+  "imports": [
+    "import { unstable_useModal as useModal } from '@mui/base/unstable_useModal';",
+    "import { unstable_useModal as useModal } from '@mui/base';"
+  ],
   "demos": "<ul><li><a href=\"/base-ui/react-modal/#hook\">Modal</a></li></ul>"
 }

From 7559463cdb9ad1b07ba3c779e99fb3f203824915 Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Tue, 15 Aug 2023 18:01:24 +0530
Subject: [PATCH 07/12] fix argos

---
 packages/mui-material/src/Select/Select.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js
index f7e573c6cfb7d0..b8303e9d0209b0 100644
--- a/packages/mui-material/src/Select/Select.js
+++ b/packages/mui-material/src/Select/Select.js
@@ -22,6 +22,8 @@ const useUtilityClasses = (ownerState) => {
 
   const slots = {
     root: ['root'],
+    select: ['select'],
+    icon: ['icon'],
   };
 
   return composeClasses(slots, getSelectUtilityClasses, classes);
@@ -124,7 +126,7 @@ const Select = React.forwardRef(function Select(inProps, ref) {
         },
         ...(multiple && native && variant === 'outlined' ? { notched: true } : {}),
         ref: inputComponentRef,
-        className: clsx(InputComponent.props.className, className, classes.root),
+        className: clsx(InputComponent.props.className, className, rootClass),
         // If a custom input is provided via 'input' prop, do not allow 'variant' to be propagated to it's root element. See https://github.com/mui/material-ui/issues/33894.
         ...(!input && { variant }),
         ...other,

From c559268f9dc91f11d7befd8fb40dd61e2e8b4329 Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Tue, 15 Aug 2023 18:03:07 +0530
Subject: [PATCH 08/12] fix argos

---
 packages/mui-material/src/Select/Select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js
index b8303e9d0209b0..b5075bb8f5db6a 100644
--- a/packages/mui-material/src/Select/Select.js
+++ b/packages/mui-material/src/Select/Select.js
@@ -126,7 +126,7 @@ const Select = React.forwardRef(function Select(inProps, ref) {
         },
         ...(multiple && native && variant === 'outlined' ? { notched: true } : {}),
         ref: inputComponentRef,
-        className: clsx(InputComponent.props.className, className, rootClass),
+        className: clsx(InputComponent.props.className, className, classes.root),
         // If a custom input is provided via 'input' prop, do not allow 'variant' to be propagated to it's root element. See https://github.com/mui/material-ui/issues/33894.
         ...(!input && { variant }),
         ...other,

From 5d240447e5e693607f91b4e792c0559f2ae958c0 Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Wed, 16 Aug 2023 19:25:53 +0530
Subject: [PATCH 09/12] empty commit to trigger ci


From b0586d5baa41eda5ea091201239b7dbd0d917387 Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Wed, 16 Aug 2023 19:42:26 +0530
Subject: [PATCH 10/12] move root class to SelectInput

---
 packages/mui-material/src/Select/Select.js      | 10 +---------
 packages/mui-material/src/Select/SelectInput.js |  1 +
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js
index b5075bb8f5db6a..9bc874e5d113f8 100644
--- a/packages/mui-material/src/Select/Select.js
+++ b/packages/mui-material/src/Select/Select.js
@@ -3,7 +3,6 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { deepmerge } from '@mui/utils';
-import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses';
 import SelectInput from './SelectInput';
 import formControlState from '../FormControl/formControlState';
 import useFormControl from '../FormControl/useFormControl';
@@ -15,18 +14,11 @@ import OutlinedInput from '../OutlinedInput';
 import useThemeProps from '../styles/useThemeProps';
 import useForkRef from '../utils/useForkRef';
 import styled, { rootShouldForwardProp } from '../styles/styled';
-import { getSelectUtilityClasses } from './selectClasses';
 
 const useUtilityClasses = (ownerState) => {
   const { classes } = ownerState;
 
-  const slots = {
-    root: ['root'],
-    select: ['select'],
-    icon: ['icon'],
-  };
-
-  return composeClasses(slots, getSelectUtilityClasses, classes);
+  return classes;
 };
 
 const styledRootConfig = {
diff --git a/packages/mui-material/src/Select/SelectInput.js b/packages/mui-material/src/Select/SelectInput.js
index ba51fc1925035a..4bb15a868d7417 100644
--- a/packages/mui-material/src/Select/SelectInput.js
+++ b/packages/mui-material/src/Select/SelectInput.js
@@ -88,6 +88,7 @@ const useUtilityClasses = (ownerState) => {
   const { classes, variant, disabled, multiple, open, error } = ownerState;
 
   const slots = {
+    root: ['root'],
     select: ['select', variant, disabled && 'disabled', multiple && 'multiple', error && 'error'],
     icon: ['icon', `icon${capitalize(variant)}`, open && 'iconOpen', disabled && 'disabled'],
     nativeInput: ['nativeInput'],

From ffd6157c99fbc53b1b36c679793d5fe9779b7b6d Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Thu, 17 Aug 2023 19:52:18 +0530
Subject: [PATCH 11/12] remove root from select input

---
 packages/mui-material/src/Select/SelectInput.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/mui-material/src/Select/SelectInput.js b/packages/mui-material/src/Select/SelectInput.js
index 4bb15a868d7417..ba51fc1925035a 100644
--- a/packages/mui-material/src/Select/SelectInput.js
+++ b/packages/mui-material/src/Select/SelectInput.js
@@ -88,7 +88,6 @@ const useUtilityClasses = (ownerState) => {
   const { classes, variant, disabled, multiple, open, error } = ownerState;
 
   const slots = {
-    root: ['root'],
     select: ['select', variant, disabled && 'disabled', multiple && 'multiple', error && 'error'],
     icon: ['icon', `icon${capitalize(variant)}`, open && 'iconOpen', disabled && 'disabled'],
     nativeInput: ['nativeInput'],

From 3c2d11bb774d56ea971c97e937ed83f9ae41a23f Mon Sep 17 00:00:00 2001
From: sai6855 <60743144+sai6855@users.noreply.github.com>
Date: Thu, 17 Aug 2023 20:48:26 +0530
Subject: [PATCH 12/12] remove root class from classes

---
 packages/mui-material/src/Select/Select.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js
index 9bc874e5d113f8..97fcc1c6817d9c 100644
--- a/packages/mui-material/src/Select/Select.js
+++ b/packages/mui-material/src/Select/Select.js
@@ -74,6 +74,7 @@ const Select = React.forwardRef(function Select(inProps, ref) {
 
   const ownerState = { ...props, variant, classes: classesProp };
   const classes = useUtilityClasses(ownerState);
+  const { root, ...restOfClasses } = classes;
 
   const InputComponent =
     input ||
@@ -113,7 +114,7 @@ const Select = React.forwardRef(function Select(inProps, ref) {
                 SelectDisplayProps: { id, ...SelectDisplayProps },
               }),
           ...inputProps,
-          classes: inputProps ? deepmerge(classes, inputProps.classes) : classes,
+          classes: inputProps ? deepmerge(restOfClasses, inputProps.classes) : restOfClasses,
           ...(input ? input.props.inputProps : {}),
         },
         ...(multiple && native && variant === 'outlined' ? { notched: true } : {}),