Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Adds onPaste event to Inputs #3456

Merged
merged 1 commit into from
Nov 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions js/src/modals/AddContract/addContract.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ export default class AddContract extends Component {
onEditAbi = (abiIn) => {
const { api } = this.context;
const { abi, abiError, abiParsed } = validateAbi(abiIn, api);

this.setState({ abi, abiError, abiParsed });
}

Expand Down
28 changes: 19 additions & 9 deletions js/src/ui/Form/Input/input.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import React, { Component, PropTypes } from 'react';
import { TextField } from 'material-ui';
import { noop } from 'lodash';

import CopyToClipboard from '../../CopyToClipboard';

Expand Down Expand Up @@ -81,7 +82,7 @@ export default class Input extends Component {
}

componentWillReceiveProps (newProps) {
if (newProps.value !== this.props.value) {
if ((newProps.value !== this.props.value) && (newProps.value !== this.state.value)) {
this.setValue(newProps.value);
}
}
Expand Down Expand Up @@ -131,6 +132,7 @@ export default class Input extends Component {
onBlur={ this.onBlur }
onChange={ this.onChange }
onKeyDown={ this.onKeyDown }
onPaste={ this.onPaste }
inputStyle={ inputStyle }
min={ min }
max={ max }
Expand Down Expand Up @@ -180,9 +182,9 @@ export default class Input extends Component {
}

onChange = (event, value) => {
this.setValue(value);

this.props.onChange && this.props.onChange(event, value);
this.setValue(value, () => {
this.props.onChange && this.props.onChange(event, value);
});
}

onBlur = (event) => {
Expand All @@ -196,6 +198,14 @@ export default class Input extends Component {
this.props.onBlur && this.props.onBlur(event);
}

onPaste = (event) => {
const value = event.clipboardData.getData('Text');

window.setTimeout(() => {
this.onSubmit(value);
}, 0);
}

onKeyDown = (event) => {
const { value } = event.target;

Expand All @@ -209,12 +219,12 @@ export default class Input extends Component {
}

onSubmit = (value) => {
this.setValue(value);

this.props.onSubmit && this.props.onSubmit(value);
this.setValue(value, () => {
this.props.onSubmit && this.props.onSubmit(value);
});
}

setValue (value) {
this.setState({ value });
setValue (value, cb = noop) {
this.setState({ value }, cb);
}
}