From 07788a5fb2a9a61b74022d6c9436277cf637ce9a Mon Sep 17 00:00:00 2001
From: sai6855 <saichand685@gmail.com>
Date: Fri, 8 Mar 2024 10:31:31 +0530
Subject: [PATCH 01/10] fix-variant-type

---
 packages/mui-material/src/Select/Select.d.ts  | 49 ++++++++++++++-----
 .../mui-material/src/Select/Select.spec.tsx   | 17 ++++++-
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/packages/mui-material/src/Select/Select.d.ts b/packages/mui-material/src/Select/Select.d.ts
index cbf55494ba697f..fec758ad8a1a48 100644
--- a/packages/mui-material/src/Select/Select.d.ts
+++ b/packages/mui-material/src/Select/Select.d.ts
@@ -187,6 +187,43 @@ export type SelectProps<
       ? StandardSelectProps
       : OutlinedSelectProps);
 
+interface SelectType {
+  <Value, Variant extends 'filled' | 'standard'>(
+    props: {
+      /**
+       * The variant to use.
+       * @default 'outlined'
+       */
+      variant: Variant;
+    } & Omit<SelectProps<Value, Variant>, 'variant'>,
+  ): JSX.Element & {
+    muiName: string;
+  };
+  <Value = unknown, Variant extends 'outlined' = 'outlined'>(
+    props: {
+      /**
+       * The variant to use.
+       * @default 'outlined'
+       */
+      variant?: Variant;
+    } & Omit<SelectProps<Value, Variant>, 'variant'>,
+  ): JSX.Element & {
+    muiName: string;
+  };
+}
+/**
+ *
+ * Demos:
+ *
+ * - [Select](https://mui.com/material-ui/react-select/)
+ *
+ * API:
+ *
+ * - [Select API](https://mui.com/material-ui/api/select/)
+ * - inherits [OutlinedInput API](https://mui.com/material-ui/api/outlined-input/)
+ */
+declare const Select: SelectType;
+
 /**
  *
  * Demos:
@@ -199,14 +236,4 @@ export type SelectProps<
  * - inherits [OutlinedInput API](https://mui.com/material-ui/api/outlined-input/)
  */
 
-export default function Select<Value = unknown, Variant extends SelectVariants = 'outlined'>(
-  props: {
-    /**
-     * The variant to use.
-     * @default 'outlined'
-     */
-    variant?: Variant;
-  } & Omit<SelectProps<Value, Variant>, 'variant'>,
-): JSX.Element & {
-  muiName: string;
-};
+export default Select;
diff --git a/packages/mui-material/src/Select/Select.spec.tsx b/packages/mui-material/src/Select/Select.spec.tsx
index 25283d8a874054..134ea47d6599d9 100644
--- a/packages/mui-material/src/Select/Select.spec.tsx
+++ b/packages/mui-material/src/Select/Select.spec.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import Select, { SelectChangeEvent } from '@mui/material/Select';
+import Select, { SelectChangeEvent, SelectProps } from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
 import { createTheme } from '@mui/material/styles';
 
@@ -75,4 +75,19 @@ function genericValueTest() {
       },
     }}
   />;
+
+  // @ts-expect-error
+  <Select<number, 'filled'> />;
+  // @ts-expect-error
+  <Select<number, 'standard'> />;
+  // @ts-expect-error
+  <Select<number, 'standard'> variant="filled" />;
+  // @ts-expect-error
+  <Select<number, 'filled'> variant="standard" />;
+
+  <Select<number, 'outlined'> />;
+
+  <Select<number, 'filled'> variant="filled" />;
+  <Select<number, 'outlined'> variant="outlined" />;
+  <Select<number, 'standard'> variant="standard" />;
 }

From a2ac82e7e47ff3c43b7ef8e8bbeb401fef287d5e Mon Sep 17 00:00:00 2001
From: sai6855 <saichand685@gmail.com>
Date: Fri, 8 Mar 2024 10:37:15 +0530
Subject: [PATCH 02/10] more-tests

---
 packages/mui-material/src/Select/Select.spec.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/mui-material/src/Select/Select.spec.tsx b/packages/mui-material/src/Select/Select.spec.tsx
index 134ea47d6599d9..9e2c4961b8d698 100644
--- a/packages/mui-material/src/Select/Select.spec.tsx
+++ b/packages/mui-material/src/Select/Select.spec.tsx
@@ -90,4 +90,7 @@ function genericValueTest() {
   <Select<number, 'filled'> variant="filled" />;
   <Select<number, 'outlined'> variant="outlined" />;
   <Select<number, 'standard'> variant="standard" />;
+
+  <Select variant="filled" />;
+  <Select variant="standard" />;
 }

From 784af677520ba887569d61933c8a17dcc5e9fec9 Mon Sep 17 00:00:00 2001
From: sai6855 <saichand685@gmail.com>
Date: Fri, 8 Mar 2024 10:38:21 +0530
Subject: [PATCH 03/10] more-tests

---
 packages/mui-material/src/Select/Select.spec.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/mui-material/src/Select/Select.spec.tsx b/packages/mui-material/src/Select/Select.spec.tsx
index 9e2c4961b8d698..6f28c39d04a075 100644
--- a/packages/mui-material/src/Select/Select.spec.tsx
+++ b/packages/mui-material/src/Select/Select.spec.tsx
@@ -93,4 +93,6 @@ function genericValueTest() {
 
   <Select variant="filled" />;
   <Select variant="standard" />;
+  <Select variant="outlined" />;
+  <Select />;
 }

From 0804ff7882eac799eca4f139c4956a22582bed37 Mon Sep 17 00:00:00 2001
From: sai6855 <saichand685@gmail.com>
Date: Fri, 8 Mar 2024 11:37:08 +0530
Subject: [PATCH 04/10] remove-unused-import

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

diff --git a/packages/mui-material/src/Select/Select.spec.tsx b/packages/mui-material/src/Select/Select.spec.tsx
index 6f28c39d04a075..150d2ede09f967 100644
--- a/packages/mui-material/src/Select/Select.spec.tsx
+++ b/packages/mui-material/src/Select/Select.spec.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import Select, { SelectChangeEvent, SelectProps } from '@mui/material/Select';
+import Select, { SelectChangeEvent } from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
 import { createTheme } from '@mui/material/styles';
 

From d7bda2aa8d0a39c5d168a52d178b34a2ac4b9ad0 Mon Sep 17 00:00:00 2001
From: sai6855 <saichand685@gmail.com>
Date: Fri, 8 Mar 2024 18:30:41 +0530
Subject: [PATCH 05/10] fix #41356

---
 packages/mui-material/src/Select/Select.d.ts  |  2 +-
 .../mui-material/src/Select/Select.spec.tsx   | 47 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/packages/mui-material/src/Select/Select.d.ts b/packages/mui-material/src/Select/Select.d.ts
index fec758ad8a1a48..9aa1e668f7185f 100644
--- a/packages/mui-material/src/Select/Select.d.ts
+++ b/packages/mui-material/src/Select/Select.d.ts
@@ -172,7 +172,7 @@ export interface OutlinedSelectProps extends Omit<OutlinedInputProps, 'value' |
    * The variant to use.
    * @default 'outlined'
    */
-  variant: 'outlined';
+  variant?: 'outlined';
 }
 
 export type SelectVariants = 'outlined' | 'standard' | 'filled';
diff --git a/packages/mui-material/src/Select/Select.spec.tsx b/packages/mui-material/src/Select/Select.spec.tsx
index 150d2ede09f967..ffc4b10316671b 100644
--- a/packages/mui-material/src/Select/Select.spec.tsx
+++ b/packages/mui-material/src/Select/Select.spec.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import Select, { SelectChangeEvent } from '@mui/material/Select';
+import Select, { SelectChangeEvent, SelectProps } from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
 import { createTheme } from '@mui/material/styles';
 
@@ -95,4 +95,49 @@ function genericValueTest() {
   <Select variant="standard" />;
   <Select variant="outlined" />;
   <Select />;
+
+  const defaultProps: SelectProps<number> = {};
+  const outlinedProps: SelectProps<number> = {
+    variant: 'outlined',
+  };
+  const filledProps: SelectProps<number> = {
+    variant: 'filled',
+  };
+  const standardProps: SelectProps<number> = {
+    variant: 'standard',
+  };
+
+  <Select {...defaultProps} />;
+  <Select {...outlinedProps} />;
+  <Select {...filledProps} />;
+  <Select {...standardProps} />;
+  <Select<number> {...outlinedProps} />;
+  <Select<number> {...defaultProps} />;
+  <Select<number, 'standard'> {...standardProps} />;
+  // @ts-expect-error variant type mismatch
+  <Select<number> {...filledProps} />;
+  // @ts-expect-error variant type mismatch
+  <Select<number, 'outlined'> {...filledProps} />;
+  // @ts-expect-error variant type mismatch
+  <Select<number, 'standard'> {...filledProps} />;
+
+  const rawDefaultProps: SelectProps = {};
+  const rawOutlinedProps: SelectProps = {
+    variant: 'outlined',
+  };
+  const rawFilledProps: SelectProps = {
+    variant: 'filled',
+  };
+
+  <Select {...rawDefaultProps} />;
+  <Select {...rawOutlinedProps} />;
+  <Select {...rawFilledProps} />;
+
+  // @ts-expect-error hiddenLabel is not present in outlined variant
+  <Select {...defaultProps} hiddenLabel />;
+  // @ts-expect-error hiddenLabel is not present in outlined variant
+  <Select {...outlinedProps} hiddenLabel />;
+  <Select {...filledProps} hiddenLabel />;
+  // @ts-expect-error hiddenLabel is not present in standard variant
+  <Select {...standardProps} hiddenLabel />;
 }

From 248015326e0d416a970e808e79ce3152d775a17a Mon Sep 17 00:00:00 2001
From: sai6855 <saichand685@gmail.com>
Date: Tue, 12 Mar 2024 15:22:38 +0530
Subject: [PATCH 06/10] fix #41375

---
 packages/mui-material/src/Select/Select.d.ts  | 50 ++++-------------
 .../mui-material/src/Select/Select.spec.tsx   | 54 +++++++++++++++++++
 2 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/packages/mui-material/src/Select/Select.d.ts b/packages/mui-material/src/Select/Select.d.ts
index 9aa1e668f7185f..3685b99876d5bb 100644
--- a/packages/mui-material/src/Select/Select.d.ts
+++ b/packages/mui-material/src/Select/Select.d.ts
@@ -187,43 +187,6 @@ export type SelectProps<
       ? StandardSelectProps
       : OutlinedSelectProps);
 
-interface SelectType {
-  <Value, Variant extends 'filled' | 'standard'>(
-    props: {
-      /**
-       * The variant to use.
-       * @default 'outlined'
-       */
-      variant: Variant;
-    } & Omit<SelectProps<Value, Variant>, 'variant'>,
-  ): JSX.Element & {
-    muiName: string;
-  };
-  <Value = unknown, Variant extends 'outlined' = 'outlined'>(
-    props: {
-      /**
-       * The variant to use.
-       * @default 'outlined'
-       */
-      variant?: Variant;
-    } & Omit<SelectProps<Value, Variant>, 'variant'>,
-  ): JSX.Element & {
-    muiName: string;
-  };
-}
-/**
- *
- * Demos:
- *
- * - [Select](https://mui.com/material-ui/react-select/)
- *
- * API:
- *
- * - [Select API](https://mui.com/material-ui/api/select/)
- * - inherits [OutlinedInput API](https://mui.com/material-ui/api/outlined-input/)
- */
-declare const Select: SelectType;
-
 /**
  *
  * Demos:
@@ -235,5 +198,14 @@ declare const Select: SelectType;
  * - [Select API](https://mui.com/material-ui/api/select/)
  * - inherits [OutlinedInput API](https://mui.com/material-ui/api/outlined-input/)
  */
-
-export default Select;
+export default function Select<Value = unknown, Variant extends SelectVariants = 'outlined'>(
+  props: {
+    /**
+     * The variant to use.
+     * @default 'outlined'
+     */
+    variant?: Variant;
+  } & SelectProps<Value, Variant>,
+): JSX.Element & {
+  muiName: string;
+};
diff --git a/packages/mui-material/src/Select/Select.spec.tsx b/packages/mui-material/src/Select/Select.spec.tsx
index ffc4b10316671b..3e324c34bf9106 100644
--- a/packages/mui-material/src/Select/Select.spec.tsx
+++ b/packages/mui-material/src/Select/Select.spec.tsx
@@ -141,3 +141,57 @@ function genericValueTest() {
   // @ts-expect-error hiddenLabel is not present in standard variant
   <Select {...standardProps} hiddenLabel />;
 }
+
+type Options<T> = { text: string; value: T } | T;
+
+type Props<T> = (
+  | {
+      value: T;
+      multiple?: false;
+      onChange: (value: T) => void;
+    }
+  | {
+      value: T[];
+      multiple: true;
+      onChange: (value: T[]) => void;
+    }
+) & {
+  options: Options<T>[];
+};
+
+// test for https://github.com/mui/material-ui/issues/41375
+const AppSelect = <T extends string>(props: Props<T>) => {
+  const getOptionText = (option: Options<T>) => {
+    if (typeof option === 'object') {
+      return option.text;
+    }
+    return option;
+  };
+
+  const getOptionValue = (option: Options<T>) => {
+    if (typeof option === 'object') {
+      return option.value;
+    }
+    return option;
+  };
+
+  return (
+    <Select
+      value={props.value}
+      multiple={props.multiple}
+      onChange={(event) => {
+        if (props.multiple) {
+          props.onChange(event.target.value as T[]);
+        } else {
+          props.onChange(event.target.value as T);
+        }
+      }}
+    >
+      {props.options.map((option, index) => (
+        <MenuItem key={index} value={getOptionValue(option)}>
+          {getOptionText(option)}
+        </MenuItem>
+      ))}
+    </Select>
+  );
+};

From c9e47429acb5f0a37994d631bb371ff05184710d Mon Sep 17 00:00:00 2001
From: sai6855 <saichand685@gmail.com>
Date: Tue, 12 Mar 2024 18:49:38 +0530
Subject: [PATCH 07/10] change implementation

---
 packages/mui-material/src/Select/Select.d.ts  | 23 +++-------
 .../mui-material/src/Select/Select.spec.tsx   | 46 ++++++++++---------
 2 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/packages/mui-material/src/Select/Select.d.ts b/packages/mui-material/src/Select/Select.d.ts
index 3685b99876d5bb..5d052f0a697ff4 100644
--- a/packages/mui-material/src/Select/Select.d.ts
+++ b/packages/mui-material/src/Select/Select.d.ts
@@ -177,15 +177,10 @@ export interface OutlinedSelectProps extends Omit<OutlinedInputProps, 'value' |
 
 export type SelectVariants = 'outlined' | 'standard' | 'filled';
 
-export type SelectProps<
-  Value = unknown,
-  Variant extends SelectVariants = SelectVariants,
-> = BaseSelectProps<Value> &
-  (Variant extends 'filled'
-    ? FilledSelectProps
-    : Variant extends 'standard'
-      ? StandardSelectProps
-      : OutlinedSelectProps);
+export type SelectProps<Value = unknown> =
+  | (FilledSelectProps & BaseSelectProps<Value>)
+  | (StandardSelectProps & BaseSelectProps<Value>)
+  | (OutlinedSelectProps & BaseSelectProps<Value>);
 
 /**
  *
@@ -198,14 +193,8 @@ export type SelectProps<
  * - [Select API](https://mui.com/material-ui/api/select/)
  * - inherits [OutlinedInput API](https://mui.com/material-ui/api/outlined-input/)
  */
-export default function Select<Value = unknown, Variant extends SelectVariants = 'outlined'>(
-  props: {
-    /**
-     * The variant to use.
-     * @default 'outlined'
-     */
-    variant?: Variant;
-  } & SelectProps<Value, Variant>,
+export default function Select<Value = unknown>(
+  props: SelectProps<Value>,
 ): JSX.Element & {
   muiName: string;
 };
diff --git a/packages/mui-material/src/Select/Select.spec.tsx b/packages/mui-material/src/Select/Select.spec.tsx
index 3e324c34bf9106..a98481b8e0ee84 100644
--- a/packages/mui-material/src/Select/Select.spec.tsx
+++ b/packages/mui-material/src/Select/Select.spec.tsx
@@ -76,26 +76,19 @@ function genericValueTest() {
     }}
   />;
 
-  // @ts-expect-error
-  <Select<number, 'filled'> />;
-  // @ts-expect-error
-  <Select<number, 'standard'> />;
-  // @ts-expect-error
-  <Select<number, 'standard'> variant="filled" />;
-  // @ts-expect-error
-  <Select<number, 'filled'> variant="standard" />;
-
-  <Select<number, 'outlined'> />;
-
-  <Select<number, 'filled'> variant="filled" />;
-  <Select<number, 'outlined'> variant="outlined" />;
-  <Select<number, 'standard'> variant="standard" />;
-
   <Select variant="filled" />;
   <Select variant="standard" />;
   <Select variant="outlined" />;
   <Select />;
 
+  <Select variant="filled" hiddenLabel />;
+  // @ts-expect-error hiddenLabel is not present in standard variant
+  <Select variant="standard" hiddenLabel />;
+  // @ts-expect-error hiddenLabel is not present in outlined variant
+  <Select variant="outlined" hiddenLabel />;
+  // @ts-expect-error hiddenLabel is not present in outlined variant
+  <Select hiddenLabel />;
+
   const defaultProps: SelectProps<number> = {};
   const outlinedProps: SelectProps<number> = {
     variant: 'outlined',
@@ -113,13 +106,7 @@ function genericValueTest() {
   <Select {...standardProps} />;
   <Select<number> {...outlinedProps} />;
   <Select<number> {...defaultProps} />;
-  <Select<number, 'standard'> {...standardProps} />;
-  // @ts-expect-error variant type mismatch
   <Select<number> {...filledProps} />;
-  // @ts-expect-error variant type mismatch
-  <Select<number, 'outlined'> {...filledProps} />;
-  // @ts-expect-error variant type mismatch
-  <Select<number, 'standard'> {...filledProps} />;
 
   const rawDefaultProps: SelectProps = {};
   const rawOutlinedProps: SelectProps = {
@@ -140,6 +127,23 @@ function genericValueTest() {
   <Select {...filledProps} hiddenLabel />;
   // @ts-expect-error hiddenLabel is not present in standard variant
   <Select {...standardProps} hiddenLabel />;
+
+  interface OtherProps {
+    otherProp?: number;
+  }
+
+  const SelectWrapper1 = <Value = unknown>(props: SelectProps<Value> & OtherProps) => {
+    const { otherProp, ...materialSelectProps } = props;
+
+    return (
+      // how to solve this:
+      <Select<Value> {...materialSelectProps} />
+    );
+  };
+
+  <SelectWrapper1 />;
+  <SelectWrapper1<number> variant="filled" hiddenLabel />;
+  <SelectWrapper1 variant="filled" hiddenLabel />;
 }
 
 type Options<T> = { text: string; value: T } | T;

From db9554d46d3ac612cb1a0fe34ba880bea4352540 Mon Sep 17 00:00:00 2001
From: sai6855 <saichand685@gmail.com>
Date: Tue, 12 Mar 2024 18:55:58 +0530
Subject: [PATCH 08/10] 'prettier'

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

diff --git a/packages/mui-material/src/Select/Select.spec.tsx b/packages/mui-material/src/Select/Select.spec.tsx
index a98481b8e0ee84..6d9bf30dd64820 100644
--- a/packages/mui-material/src/Select/Select.spec.tsx
+++ b/packages/mui-material/src/Select/Select.spec.tsx
@@ -132,7 +132,7 @@ function genericValueTest() {
     otherProp?: number;
   }
 
-  const SelectWrapper1 = <Value = unknown>(props: SelectProps<Value> & OtherProps) => {
+  const SelectWrapper1 = <Value = unknown,>(props: SelectProps<Value> & OtherProps) => {
     const { otherProp, ...materialSelectProps } = props;
 
     return (

From 5b1a41476e33e2a98ba4dcfd06b8ca6fc8f0a789 Mon Sep 17 00:00:00 2001
From: sai6855 <saichand685@gmail.com>
Date: Wed, 13 Mar 2024 10:50:10 +0530
Subject: [PATCH 09/10] zeeshan review

---
 packages/mui-material/src/Select/Select.d.ts     | 2 +-
 packages/mui-material/src/Select/Select.spec.tsx | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/mui-material/src/Select/Select.d.ts b/packages/mui-material/src/Select/Select.d.ts
index 5d052f0a697ff4..c39944e1e0ded8 100644
--- a/packages/mui-material/src/Select/Select.d.ts
+++ b/packages/mui-material/src/Select/Select.d.ts
@@ -148,7 +148,7 @@ export interface BaseSelectProps<Value = unknown>
    * The variant to use.
    * @default 'outlined'
    */
-  variant?: 'filled' | 'standard' | 'outlined';
+  variant?: SelectVariants;
 }
 
 export interface FilledSelectProps extends Omit<FilledInputProps, 'value' | 'onChange'> {
diff --git a/packages/mui-material/src/Select/Select.spec.tsx b/packages/mui-material/src/Select/Select.spec.tsx
index 6d9bf30dd64820..78f69c76c606d0 100644
--- a/packages/mui-material/src/Select/Select.spec.tsx
+++ b/packages/mui-material/src/Select/Select.spec.tsx
@@ -132,13 +132,10 @@ function genericValueTest() {
     otherProp?: number;
   }
 
-  const SelectWrapper1 = <Value = unknown,>(props: SelectProps<Value> & OtherProps) => {
+  const SelectWrapper1 = <Value,>(props: SelectProps<Value> & OtherProps) => {
     const { otherProp, ...materialSelectProps } = props;
 
-    return (
-      // how to solve this:
-      <Select<Value> {...materialSelectProps} />
-    );
+    return <Select<Value> {...materialSelectProps} />;
   };
 
   <SelectWrapper1 />;

From 62ce5b46d6c7985ab37507f1722b2c8fb15d09a9 Mon Sep 17 00:00:00 2001
From: sai6855 <saichand685@gmail.com>
Date: Wed, 13 Mar 2024 16:11:46 +0530
Subject: [PATCH 10/10] trigger