fix #41375

mui · Mar 12, 2024 · 636740c · 636740c
1 parent d7bda2a
commit 636740c
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 17 deletions.
diff --git a/packages/mui-material/src/Select/Select.d.ts b/packages/mui-material/src/Select/Select.d.ts
@@ -188,28 +188,15 @@ export type SelectProps<
       : 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'>(
+  <Value = unknown, Variant extends SelectVariants = 'outlined'>(
     props: {
       /**
        * The variant to use.
        * @default 'outlined'
        */
       variant?: Variant;
-    } & Omit<SelectProps<Value, Variant>, 'variant'>,
-  ): JSX.Element & {
-    muiName: string;
-  };
+    } & SelectProps<Value, Variant>,
+  ): JSX.Element;
 }
 /**
  *

diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js
@@ -279,7 +279,11 @@ Select.propTypes /* remove-proptypes */ = {
    * The variant to use.
    * @default 'outlined'
    */
-  variant: PropTypes.oneOf(['filled', 'outlined', 'standard']),
+  variant: PropTypes /* @typescript-to-proptypes-ignore */.oneOf([
+    'filled',
+    'outlined',
+    'standard',
+  ]),
 };
 
 Select.muiName = 'Select';

diff --git 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>
+  );
+};