Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[material-ui][Select] Fix variant type #41405

Merged
merged 10 commits into from
Mar 14, 2024
Merged

[material-ui][Select] Fix variant type #41405

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
07788a5
fix-variant-type
sai6855 Mar 8, 2024
a2ac82e
more-tests
sai6855 Mar 8, 2024
784af67
more-tests
sai6855 Mar 8, 2024
0804ff7
remove-unused-import
sai6855 Mar 8, 2024
d7bda2a
fix #41356
sai6855 Mar 8, 2024
2480153
fix #41375
sai6855 Mar 12, 2024
c9e4742
change implementation
sai6855 Mar 12, 2024
db9554d
'prettier'
sai6855 Mar 12, 2024
5b1a414
zeeshan review
sai6855 Mar 13, 2024
62ce5b4
trigger
sai6855 Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 38 additions & 11 deletions packages/mui-material/src/Select/Select.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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;
20 changes: 20 additions & 0 deletions packages/mui-material/src/Select/Select.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,24 @@ 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 />;
}
Loading