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

Rewrite <Input> and <TextArea> components to be fully controlled #307

Merged
merged 1 commit into from
May 25, 2018
Merged

Rewrite <Input> and <TextArea> components to be fully controlled #307

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
175 changes: 102 additions & 73 deletions app/renderer/components/Input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,85 +2,114 @@ import React from 'react';
import {classNames} from 'react-extras';
import './Input.scss';

const Input = ({
className,
level,
message,
errorMessage,
disabled,
readOnly,
onChange,
type = 'text',
icon,
iconSize,
iconName,
view: View,
button: Button,
...props
}, ref) => {
if (errorMessage) {
level = 'error';
message = errorMessage;
}
class Input extends React.Component {
state = {
value: this.props.value,
};

if (type === 'password') {
iconName = 'password';
}
handleChange = event => {
const {value} = event.target;
const {onChange} = this.props;

if (onChange) {
event.persist();
}

this.setState({value}, () => {
if (onChange) {
onChange(value, event);
}
});
};

if (iconName) {
icon = `/assets/${iconName}-icon.svg`;
componentWillReceiveProps(nextProps) {
if (nextProps.value !== this.state.value) {
this.setState({value: nextProps.value});
}
}

const containerClassName = classNames(
'Input',
{
[`Input--${level}`]: level,
'Input--disabled': disabled,
'Input--readonly': readOnly,
'Input--icon': icon,
'Input--view': View || Button,
},
className
);
render() {
let {
forwardedRef,
className,
level,
message,
errorMessage,
disabled,
readOnly,
onChange,
type = 'text',
icon,
iconSize,
iconName,
view: View,
button: Button,
...props
} = this.props;

return (
<div className={containerClassName}>
<div className="Input-wrap">
<input
{...props}
ref={ref}
type={type}
disabled={disabled}
readOnly={readOnly}
onChange={event => {
if (onChange) {
onChange(event.target.value, event);
}
}}
/>
{icon &&
<span className="Input__icon">
<img src={icon} width={iconSize}/>
</span>
}
{View &&
<span className="Input__view">
<View/>
</span>
}
{Button &&
<span className="Input__view Input__button">
<Button/>
if (errorMessage) {
level = 'error';
message = errorMessage;
}

if (type === 'password') {
iconName = 'password';
}

if (iconName) {
icon = `/assets/${iconName}-icon.svg`;
}

const containerClassName = classNames(
'Input',
{
[`Input--${level}`]: level,
'Input--disabled': disabled,
'Input--readonly': readOnly,
'Input--icon': icon,
'Input--view': View || Button,
},
className
);

return (
<div className={containerClassName}>
<div className="Input-wrap">
<input
{...props}
ref={forwardedRef}
value={this.state.value}
type={type}
disabled={disabled}
readOnly={readOnly}
onChange={this.handleChange}
/>
{icon &&
<span className="Input__icon">
<img src={icon} width={iconSize}/>
</span>
}
{View &&
<span className="Input__view">
<View/>
</span>
}
{Button &&
<span className="Input__view Input__button">
<Button/>
</span>
}
</div>
{((level && message) || message) &&
<span className="Input__text">
<p>{message}</p>
</span>
}
</div>
{((level && message) || message) &&
<span className="Input__text">
<p>{message}</p>
</span>
}
</div>
);
};
);
}
}

export default React.forwardRef(Input);
export default React.forwardRef((props, ref) => (
<Input {...props} forwardedRef={ref}/>
));
134 changes: 80 additions & 54 deletions app/renderer/components/TextArea.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,90 @@ import React from 'react';
import {classNames} from 'react-extras';
import './TextArea.scss';

const TextArea = ({
className,
level,
message,
errorMessage,
disabled,
onChange,
preventNewlines,
...props
}, ref) => {
if (errorMessage) {
level = 'error';
message = errorMessage;
}
class TextArea extends React.Component {
state = {
value: this.props.value,
};

const containerClassName = classNames(
'TextArea',
'Input',
{
[`Input--${level}`]: level,
'Input--disabled': disabled,
},
className
);
handleChange = event => {
const {target} = event;
const {value} = target;
const {onChange, preventNewlines} = this.props;

return (
<div className={containerClassName}>
<div className="Input-wrap">
<textarea
{...props}
ref={ref}
disabled={disabled}
onChange={event => {
const {target} = event;
const {value} = target;
if (preventNewlines && /\r?\n/.test(value)) {
const form = target.closest('form');
if (form) {
form.dispatchEvent(new Event('submit'));
}

if (preventNewlines && /\r?\n/.test(value)) {
const form = target.closest('form');
if (form) {
form.dispatchEvent(new Event('submit'));
}
return;
}

return;
}
if (onChange) {
event.persist();
}

if (onChange) {
onChange(value);
}
}}
/>
</div>
{((level && message) || message) &&
<span className="Input__text">
<p>{message}</p>
</span>
this.setState({value}, () => {
if (onChange) {
onChange(value, event);
}
</div>
);
};
});
};

componentWillReceiveProps(nextProps) {
if (nextProps.value !== this.state.value) {
this.setState({value: nextProps.value});
}
}

render() {
let {
forwardedRef,
className,
level,
message,
errorMessage,
disabled,
preventNewlines,
...props
} = this.props;

if (errorMessage) {
level = 'error';
message = errorMessage;
}

const containerClassName = classNames(
'TextArea',
'Input',
{
[`Input--${level}`]: level,
'Input--disabled': disabled,
},
className
);

return (
<div className={containerClassName}>
<div className="Input-wrap">
<textarea
{...props}
ref={forwardedRef}
value={this.state.value}
disabled={disabled}
onChange={this.handleChange}
/>
</div>
{((level && message) || message) &&
<span className="Input__text">
<p>{message}</p>
</span>
}
</div>
);
}
}

export default React.forwardRef(TextArea);
export default React.forwardRef((props, ref) => (
<TextArea {...props} forwardedRef={ref}/>
));