Skip to content

[material-ui][TextField][FormLabel][InputLabel][FormControl] Use exact children type to allow React children type augmentation #38872

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

Merged
merged 9 commits into from
Jan 4, 2024
Merged

[material-ui][TextField][FormLabel][InputLabel][FormControl] Use exact children type to allow React children type augmentation #38872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b3a314d
use exact children type to allow React type augmentation
nicegamer7 Sep 8, 2023
2ee3818
keep PropTypes in sync with TS changes
nicegamer7 Sep 8, 2023
8b0fd1e
update CircleCI config for mui-material augmentation changes
nicegamer7 Sep 8, 2023
69a9e79
remove accidently added file
nicegamer7 Sep 8, 2023
98ea0f1
keep children undocumented on TextField component
nicegamer7 Sep 8, 2023
70dac2f
resolve conflict
ZeeshanTamboli Dec 21, 2023
c408667
resolve conflicts
ZeeshanTamboli Jan 4, 2024
a45fca3
remove not needed tests
ZeeshanTamboli Jan 4, 2024
491c0c5
revert left over
ZeeshanTamboli Jan 4, 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
2 changes: 1 addition & 1 deletion packages/mui-material/src/FormControl/FormControl.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export interface FormControlOwnProps {
/**
* The content of the component.
*/
children?: React.ReactNode;
children?: React.HTMLAttributes<HTMLDivElement>['children'];
/**
* Override or extend the styles applied to the component.
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/FormLabel/FormLabel.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export interface FormLabelOwnProps {
/**
* The content of the component.
*/
children?: React.ReactNode;
children?: React.LabelHTMLAttributes<HTMLLabelElement>['children'];
/**
* Override or extend the styles applied to the component.
*/
Expand Down
6 changes: 1 addition & 5 deletions packages/mui-material/src/InputLabel/InputLabel.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ import { OverridableComponent, OverrideProps } from '../OverridableComponent';

export interface InputLabelPropsSizeOverrides {}

export interface InputLabelOwnProps {
/**
* The content of the component.
*/
children?: React.ReactNode;
export interface InputLabelOwnProps extends Pick<FormLabelProps, 'children'> {
/**
* Override or extend the styles applied to the component.
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/TextField/TextField.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export interface BaseTextFieldProps
/**
* @ignore
*/
children?: React.ReactNode;
children?: FormControlProps['children'];
/**
* Override or extend the styles applied to the component.
*/
Expand Down