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.

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

[TextField] Make it meet guidelines #6566

Merged
merged 45 commits into from May 30, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
7f966d0
Adjusted styles accordingto specs, fixed #6425
kybarg Apr 10, 2017
10a5c0f
Merge branch 'callemall/next' into next-text-field-guidelines
kybarg Apr 11, 2017
6e8ad06
Fixes, simplified styles
kybarg Apr 11, 2017
b5fb82a
Removed dead `TextFieldLabel` component as for #6580
kybarg Apr 11, 2017
6cece85
Added colors according to specs, `InputLabel` disabled prop
kybarg Apr 12, 2017
7b7fa13
Avoiding label flicker and blurry text in webkit browsers
kybarg Apr 12, 2017
4716659
More smooth label animation.
kybarg Apr 12, 2017
6f83e5b
More smooth font-size animation
kybarg Apr 12, 2017
186a251
Proper error color, added `FormHelperText` component
kybarg Apr 12, 2017
7abcec9
FormHelperText docs
kybarg Apr 12, 2017
d02154c
Fixed lint errors
kybarg Apr 12, 2017
dffc976
Added new component to styles order, fixes
kybarg Apr 15, 2017
890217f
Merge remote-tracking branch 'refs/remotes/callemall/next' into next-…
kybarg Apr 15, 2017
0b15230
Fixed disabled border style
kybarg Apr 15, 2017
f27ea99
Solve conflicts
kybarg May 26, 2017
b11a2e8
FormHelperText exports
kybarg May 26, 2017
7a3d1f4
Merge remote-tracking branch 'refs/remotes/callemall/next' into next-…
kybarg May 26, 2017
710e605
Remove unused TextFieldLabel
kybarg May 26, 2017
ff1abe5
Merge remote-tracking branch 'callemall/next' into next-text-field-gu…
kybarg May 27, 2017
0061db1
Form helper fixes, test, docs
kybarg May 27, 2017
6af7c88
Merge remote-tracking branch 'refs/remotes/callemall/next' into next-…
kybarg May 27, 2017
0565e94
TextField tests for FormHelperText
kybarg May 27, 2017
c3bde34
Get rid of TextFieldLabel.md, added tests for InputLabel
kybarg May 27, 2017
c740da2
Added tests for FormControl
kybarg May 27, 2017
760eb25
Merge remote-tracking branch 'refs/remotes/callemall/next' into next-…
kybarg May 29, 2017
4e16f7c
Make dirty if `defaultValue` is set
kybarg May 29, 2017
e7e7f47
Fix helper text font
kybarg May 29, 2017
38d4043
Fix label "flicker" in webkit browsers.
kybarg May 29, 2017
2f70c6c
Use `theme.spacing.unit` instead of number values
kybarg May 29, 2017
1457b96
Disabled composed text field demo
kybarg May 29, 2017
5fe667a
Fixed type check
kybarg May 29, 2017
5d6970d
Fixed type check error
kybarg May 29, 2017
612b02c
Make `ComposedTextFiled` accept disabled prop
kybarg May 29, 2017
ae3d010
Fixed lint
kybarg May 29, 2017
3cd4b99
Fixed docs and input
kybarg May 29, 2017
9b40eee
Exposed FormHelperTextProps and InputLabelProps
kybarg May 29, 2017
428d870
Fixed docs
kybarg May 29, 2017
489de60
Merge remote-tracking branch 'refs/remotes/callemall/next' into next-…
kybarg May 29, 2017
a8a9a6c
Fixed multiline styles
kybarg May 29, 2017
3043877
Placeholder + Label behaviour
kybarg May 29, 2017
f30dbea
Fixes
kybarg May 29, 2017
0419922
Fixed lint errors
kybarg May 29, 2017
c37fe6e
Merge remote-tracking branch 'refs/remotes/callemall/next' into next-…
kybarg May 30, 2017
30be343
Typo fixes
kybarg May 30, 2017
60ae4d7
Typo fixes 2
kybarg May 30, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Form/FormControl.js
Expand Up @@ -81,11 +81,10 @@ export default class FormControl extends Component {

componentWillMount() {
let dirty = false;
Children.map(this.props.children, (child) => {
Children.forEach(this.props.children, (child) => {
if (child && child.type && child.type.name === 'Input' && isDirty(child.props)) {
dirty = true;
}
return child;
});

this.setState({ dirty });
Expand Down
2 changes: 1 addition & 1 deletion src/Form/FormHelperText.js
Expand Up @@ -12,7 +12,7 @@ export const styleSheet = createStyleSheet('MuiFormHelperText', (theme) => {
root: {
color: theme.palette.input.helperText,
fontSize: 12,
lineHeight: 1.33333333,
lineHeight: 1.4,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't 1.3' round to 1.3?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.3 results to 15px line-height in webkit...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha.

margin: 0,
},
error: {
Expand Down
1 change: 1 addition & 0 deletions src/styles/MuiThemeProvider.js
Expand Up @@ -22,6 +22,7 @@ export const MUI_SHEET_ORDER = [

'MuiFormLabel',
'MuiFormGroup',
'MuiFormHelperText',

'MuiText',
'MuiPaper',
Expand Down