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

[typescript] Synced with PR #12373 #12439

Merged
merged 1 commit into from
Aug 8, 2018
Merged

[typescript] Synced with PR #12373 #12439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion packages/material-ui/src/FormHelperText/FormHelperText.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ export interface FormHelperTextProps
extends StandardProps<React.HTMLAttributes<HTMLParagraphElement>, FormHelperTextClassKey> {
disabled?: boolean;
error?: boolean;
filled?: boolean;
focused?: boolean;
component?: React.ReactType<FormHelperTextProps>;
margin?: 'dense';
required?: boolean;
}

export type FormHelperTextClassKey = 'root' | 'error' | 'disabled' | 'marginDense';
export type FormHelperTextClassKey = 'root' | 'error' | 'disabled' | 'marginDense' | 'focused' | 'filled' | 'required';

declare const FormHelperText: React.ComponentType<FormHelperTextProps>;

Expand Down
3 changes: 2 additions & 1 deletion packages/material-ui/src/FormLabel/FormLabel.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ export interface FormLabelProps extends StandardProps<FormLabelBaseProps, FormLa
component?: React.ReactType<FormLabelBaseProps>;
disabled?: boolean;
error?: boolean;
filled?: boolean;
focused?: boolean;
required?: boolean;
}

export type FormLabelBaseProps = React.LabelHTMLAttributes<HTMLLabelElement>;

export type FormLabelClassKey = 'root' | 'focused' | 'disabled' | 'error' | 'asterisk';
export type FormLabelClassKey = 'root' | 'focused' | 'disabled' | 'error' | 'filled' | 'required' | 'asterisk';

declare const FormLabel: React.ComponentType<FormLabelProps>;

Expand Down