neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix InputBalance (with value prop, si calc) (#738)

Browse Source 
* Fix InputBalance (with value prop, si calc)

* Cater for si and non-si cases (with si apply for default)

* Cleanup InputNumber interface
This commit is contained in:
Jaco Greeff 2019-02-20 13:20:50 +01:00 committed by GitHub
parent b4a702bc84
commit d24571d767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/ui-app/src/InputNumber.tsx
View File

@ -42,26 +42,18 @@ type State = {
const DEFAULT_BITLENGTH = BitLengthOption.NORMAL_NUMBERS as BitLength;
const KEYS_ALLOWED: Array<any> = [KEYS.ARROW_LEFT, KEYS.ARROW_RIGHT, KEYS.BACKSPACE, KEYS.ENTER, KEYS.ESCAPE, KEYS.TAB];
function maxConservativeLength (maxValueLength: number): number {
const conservativenessFactor = 1;
return maxValueLength - conservativenessFactor;
}
class InputNumber extends React.PureComponent<Props, State> {
constructor (props: Props) {
super(props);
const { defaultValue, value } = this.props;
const { defaultValue, isSi, value } = this.props;
let valueBN = new BN(value || 0);
const si = formatBalance.calcSi(valueBN.toString());
valueBN = valueBN.div(new BN(10).pow(new BN(si.power)));
this.state = {
defaultValue: defaultValue
? defaultValue.toString()
: valueBN.toString(),
defaultValue: isSi
? new BN(defaultValue || valueBN).div(new BN(10).pow(new BN(si.power))).toString()
: (defaultValue || valueBN).toString(),
isPreKeyDown: false,
isValid: !isUndefined(value),
siOptions: formatBalance.getOptions().map(({ power, text, value }) => ({
@ -94,7 +86,7 @@ class InputNumber extends React.PureComponent<Props, State> {
render () {
const { bitLength = DEFAULT_BITLENGTH, className, defaultValue = '0', isSi, isDisabled, maxLength, style, t } = this.props;
const { isValid } = this.state;
const maxValueLength = this.maxValue(bitLength).toString().length;
const maxValueLength = this.maxValue(bitLength).toString().length - 1;
const value = this.state.defaultValue || defaultValue;
return (
@ -109,7 +101,7 @@ class InputNumber extends React.PureComponent<Props, State> {
isAction={isSi}
isDisabled={isDisabled}
isError={!isValid}
maxLength={maxLength || maxConservativeLength(maxValueLength)}
maxLength={maxLength || maxValueLength}
onChange={this.onChange}
onKeyDown={this.onKeyDown}
onKeyUp={this.onKeyUp}
@ -145,11 +137,13 @@ class InputNumber extends React.PureComponent<Props, State> {
);
}
private maxValue = (bitLength?: number): BN =>
new BN(2).pow(new BN(bitLength || DEFAULT_BITLENGTH)).subn(1)
private maxValue (bitLength?: number): BN {
return new BN(2).pow(new BN(bitLength || DEFAULT_BITLENGTH)).subn(1);
}
private isValidBitLength = (value: BN, bitLength?: number): boolean =>
value.bitLength() <= (bitLength || DEFAULT_BITLENGTH)
private isValidBitLength (value: BN, bitLength?: number): boolean {
return value.bitLength() <= (bitLength || DEFAULT_BITLENGTH);
}
private isValidKey = (event: React.KeyboardEvent<Element>, isPreKeyDown: boolean): boolean => {
const { value: previousValue } = event.target as HTMLInputElement;
@ -182,7 +176,7 @@ class InputNumber extends React.PureComponent<Props, State> {
return true;
}
private isValidNumber = (input: BN, bitLength: number = DEFAULT_BITLENGTH): boolean => {
private isValidNumber (input: BN, bitLength: number = DEFAULT_BITLENGTH): boolean {
const maxBN = this.maxValue(bitLength);
if (!input.lt(maxBN) || !this.isValidBitLength(input, bitLength)) {
@ -293,8 +287,7 @@ class InputNumber extends React.PureComponent<Props, State> {
}
export {
InputNumber,
maxConservativeLength
InputNumber
};
export default translate(InputNumber);