m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Refactor amount input: dynamic input width with vanilla js.

Browse Source
This commit is contained in:
Dan 2017-10-11 10:48:27 -02:30 committed by Chi Kei Chan
parent 2898914a54
commit 7ec77e0b45
2 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -136,7 +136,6 @@
"react-addons-css-transition-group": "^15.6.0", "react-addons-css-transition-group": "^15.6.0",
"react-dom": "^15.5.4", "react-dom": "^15.5.4",
"react-hyperscript": "^3.0.0", "react-hyperscript": "^3.0.0",
"react-input-autosize": "^2.0.1",
"react-markdown": "^2.3.0", "react-markdown": "^2.3.0",
"react-redux": "^5.0.5", "react-redux": "^5.0.5",
"react-select": "^1.0.0-rc.2", "react-select": "^1.0.0-rc.2",

53
ui/app/components/send/currency-display.js
View File

@ -2,7 +2,6 @@ const Component = require('react').Component
const h = require('react-hyperscript') const h = require('react-hyperscript')
const inherits = require('util').inherits const inherits = require('util').inherits
const Identicon = require('../identicon') const Identicon = require('../identicon')
const AutosizeInput = require('react-input-autosize').default
const { conversionUtil } = require('../../conversion-util') const { conversionUtil } = require('../../conversion-util')
module.exports = CurrencyDisplay module.exports = CurrencyDisplay
@ -17,29 +16,16 @@ function CurrencyDisplay () {
} }
} }
function isValidNumber (text) { function isValidInput (text) {
const re = /^([1-9]\d*|0)(\.|\.\d*)?$/ const re = /^([1-9]\d*|0)(\.|\.\d*)?$/
return re.test(text) return re.test(text)
} }
CurrencyDisplay.prototype.componentDidMount = function () { function resetCaretIfPastEnd (value, event) {
this.setState({ const caretPosition = event.target.selectionStart
minWidth: this.refs.currencyDisplayInput.sizer.clientWidth + 10,
currentclientWidth: this.refs.currencyDisplayInput.sizer.clientWidth,
})
}
CurrencyDisplay.prototype.componentWillUpdate = function ({ value: nextValue }) { if (caretPosition > value.length) {
const { value: currentValue } = this.props event.target.setSelectionRange(value.length, value.length)
const { currentclientWidth } = this.state
const newclientWidth = this.refs.currencyDisplayInput.sizer.clientWidth
if (currentclientWidth !== newclientWidth) {
const clientWidthChange = newclientWidth - currentclientWidth
this.setState({
minWidth: this.state.minWidth + clientWidthChange,
currentclientWidth: newclientWidth,
})
} }
} }
@ -54,7 +40,6 @@ CurrencyDisplay.prototype.render = function () {
convertedPrefix = '', convertedPrefix = '',
readOnly = false, readOnly = false,
handleChange, handleChange,
inputFontSize,
} = this.props } = this.props
const { minWidth } = this.state const { minWidth } = this.state
@ -71,27 +56,33 @@ CurrencyDisplay.prototype.render = function () {
h('div.currency-display__primary-row', [ h('div.currency-display__primary-row', [
h(AutosizeInput, { h('div.currency-display__input-wrapper', [
ref: 'currencyDisplayInput',
className: 'currency-display__input-wrapper', h('input.currency-display__input', {
inputClassName: 'currency-display__input', value: `${value} ${primaryCurrency}`,
value, placeholder: `${0} ${primaryCurrency}`,
placeholder,
readOnly, readOnly,
minWidth,
onChange: (event) => { onChange: (event) => {
const newValue = event.target.value let newValue = event.target.value.split(' ')[0]
if (newValue && !isValidNumber(newValue)) {
if (newValue === '') {
handleChange('0')
}
else if (newValue.match(/^0[1-9]$/)) {
handleChange(newValue.match(/[1-9]/)[0])
}
else if (newValue && !isValidInput(newValue)) {
event.preventDefault() event.preventDefault()
} }
else { else {
handleChange(newValue) handleChange(newValue)
} }
}, },
style: { fontSize: inputFontSize }, onKeyUp: event => resetCaretIfPastEnd(value, event),
onClick: event => resetCaretIfPastEnd(value, event),
}), }),
h('span.currency-display__primary-currency', {}, primaryCurrency), ]),
]), ]),