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

Use 'em' to size TextField elements relatively to fontSize #2039

Closed
wants to merge 2 commits into from
Closed

Use 'em' to size TextField elements relatively to fontSize #2039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c53edec
Use 'em' to size TextField elements relatively to fontSize
thomasguillory Nov 3, 2015
580feaa
Add a warning message if user uses a non-integer fontSize
thomasguillory Nov 9, 2015
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
6 changes: 6 additions & 0 deletions docs/src/app/components/pages/components/text-fields.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,12 @@ let TextFieldsPage = React.createClass({
hintText="Password Field"
floatingLabelText="Password"
type="password" /><br/>
<TextField
style={{
fontSize: 24,
}}
hintText="Custom Size"
floatingLabelText="Custom Size" /><br/>
</div>
</ClearFix>
</CodeExample>
Expand Down
6 changes: 6 additions & 0 deletions docs/src/app/components/raw-code/text-fields-code.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,9 @@
hintText="Password Field"
floatingLabelText="Password"
type="password" />
<TextField
style={{
fontSize: 24
}}
hintText="Custom Size"
floatingLabelText="Custom Size" />
54 changes: 33 additions & 21 deletions src/text-field.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const EnhancedTextarea = require('./enhanced-textarea');
const DefaultRawTheme = require('./styles/raw-themes/light-raw-theme');
const ThemeManager = require('./styles/theme-manager');
const ContextPure = require('./mixins/context-pure');
const warning = require('warning');

/**
* Check if a value is valid to be displayed inside an input.
Expand Down Expand Up @@ -155,10 +156,10 @@ const TextField = React.createClass({

let styles = {
root: {
fontSize: 16,
lineHeight: '24px',
width: props.fullWidth ? '100%' : 256,
height: (props.rows - 1) * 24 + (props.floatingLabelText ? 72 : 48),
fontSize: this._getFontSize(),
lineHeight: '1.5em',
width: props.fullWidth ? '100%' : '16em',
height: (props.rows - 1) * 1.5 + (props.floatingLabelText ? 4.5 : 3) + 'em',
display: 'inline-block',
position: 'relative',
backgroundColor: backgroundColor,
Expand All @@ -167,19 +168,19 @@ const TextField = React.createClass({
},
error: {
position: 'relative',
bottom: 5,
fontSize: 12,
lineHeight: '12px',
bottom: '0.417em',
fontSize: '0.75em',
lineHeight: '1em',
color: errorColor,
transition: Transitions.easeOut(),
},
hint: {
position: 'absolute',
lineHeight: '22px',
lineHeight: '1.375em',
opacity: 1,
color: hintColor,
transition: Transitions.easeOut(),
bottom: 12,
bottom: '0.545em',
},
input: {
tapHighlightColor: 'rgba(0,0,0,0)',
Expand All @@ -198,7 +199,7 @@ const TextField = React.createClass({
borderBottom: 'solid 1px ' + borderColor,
position: 'absolute',
width: '100%',
bottom: 8,
bottom: '0.5em',
margin: 0,
MozBoxSizing: 'content-box',
boxSizing: 'content-box',
Expand All @@ -210,7 +211,7 @@ const TextField = React.createClass({
overflow: 'hidden',
userSelect: 'none',
cursor: 'default',
bottom: 8,
bottom: '0.5em',
borderBottom: 'dotted 2px ' + disabledTextColor,
},
underlineFocus: {
Expand All @@ -226,8 +227,8 @@ const TextField = React.createClass({
styles.underlineAfter = this.mergeAndPrefix(styles.underlineAfter, props.underlineDisabledStyle);

styles.floatingLabel = this.mergeStyles(styles.hint, {
lineHeight: '22px',
top: 38,
lineHeight: '1.375em',
top: '2.375em',
bottom: 'none',
opacity: 1,
zIndex: 1, // Needed to display label above Chrome's autocomplete field background
Expand All @@ -236,8 +237,8 @@ const TextField = React.createClass({
});

styles.textarea = this.mergeStyles(styles.input, {
marginTop: props.floatingLabelText ? 36 : 12,
marginBottom: props.floatingLabelText ? -36 : -12,
marginTop: props.floatingLabelText ? '2.25em' : '0.75em',
marginBottom: props.floatingLabelText ? '-2.25em' : '-0.75em',
boxSizing: 'border-box',
font: 'inherit',
});
Expand All @@ -246,13 +247,13 @@ const TextField = React.createClass({

if (this.state.isFocused) {
styles.floatingLabel.color = focusColor;
styles.floatingLabel.transform = 'perspective(1px) scale(0.75) translate3d(2px, -28px, 0)';
styles.floatingLabel.transform = 'perspective(1px) scale(0.75) translate3d(0.125em, -1.75em, 0)';
styles.focusUnderline.transform = 'scaleX(1)';
}

if (this.state.hasValue) {
styles.floatingLabel.color = ColorManipulator.fade(props.disabled ? disabledTextColor : floatingLabelColor, 0.5);
styles.floatingLabel.transform = 'perspective(1px) scale(0.75) translate3d(2px, -28px, 0)';
styles.floatingLabel.transform = 'perspective(1px) scale(0.75) translate3d(0.125em, -1.75em, 0)';
styles.hint.opacity = 0;
}

Expand All @@ -267,7 +268,7 @@ const TextField = React.createClass({
}

if (this.state.errorText && this.state.isFocused) styles.floatingLabel.color = styles.error.color;
if (props.floatingLabelText && !props.multiLine) styles.input.marginTop = 14;
if (props.floatingLabelText && !props.multiLine) styles.input.marginTop = '0.875em';

if (this.state.errorText) {
styles.focusUnderline.borderColor = styles.error.color;
Expand Down Expand Up @@ -416,6 +417,17 @@ const TextField = React.createClass({
}
},

_getFontSize() {
if (this.props.style && this.props.style.fontSize) {
if (process.env.NODE_ENV !== 'production') {
Copy link
Member

Choose a reason for hiding this comment

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

if (process.env.NODE_ENV !== 'production') { is not needed anymore. It will be automaticaly added by the babel plugin. Could you remove it?

warning(typeof this.props.style.fontSize === 'number',
'style.fontSize property does not support non-integer values');
}
return this.props.style.fontSize;
}
return 16;
},

_getRef() {
return this.props.ref ? this.props.ref : 'input';
},
Expand Down Expand Up @@ -448,9 +460,9 @@ const TextField = React.createClass({
},

_handleTextAreaHeightChange(e, height) {
let newHeight = height + 24;
if (this.props.floatingLabelText) newHeight += 24;
ReactDOM.findDOMNode(this).style.height = newHeight + 'px';
let newHeight = (height / this._getFontSize()) + 1.5;
if (this.props.floatingLabelText) newHeight += 1.5;
ReactDOM.findDOMNode(this).style.height = newHeight + 'em';
},

_isControlled() {
Expand Down