wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'RaulTsc/master' into material-ui-v014. Pull request #8190.

Browse Source
This commit is contained in:
Nathan Brown
2016-02-26 10:55:51 -07:00
parent 18c3975d9c dd6a08e30a
commit 378c681a47
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
material-ui/material-ui-tests.tsx
+6 -1
View File
@@ -441,7 +441,8 @@ class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implemen
element = <SelectField
value = { 0 }
onChange = { this.selectFieldChangeHandler }
hintText = "Hint Text">
hintText = "Hint Text"
hintStyle = {{ fontSize: 10 }}>
arbitraryArrayMenuItems
</SelectField>;
element = <SelectField
@@ -469,6 +470,10 @@ class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implemen
element = <TextField
hintText = "Hint Text"
floatingLabelText = "Floating Label Text" />;
element = <TextField
hintText = "Hint Text"
hintStyle = {{fontSize: 10}}
floatingLabelText = "Floating Label Text" />;
element = <TextField
hintText="Hint Text"
defaultValue="Default Value"
material-ui/material-ui.d.ts
Vendored
+1
View File
@@ -1079,6 +1079,7 @@ declare namespace __MaterialUI {
floatingLabelStyle?: React.CSSProperties;
floatingLabelText?: string;
fullWidth?: boolean;
hintStyle?: React.CSSProperties;
hintText?: string | React.ReactElement<any>;
iconStyle?: React.CSSProperties;
inputStyle?: React.CSSProperties;