vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Fixed #330 - InputNumber Currency not working as expected

pull/463/head
mertsincan 2020-09-01 11:14:56 +03:00
parent e14303c4a7
commit 3b1fe8dcbd
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/components/inputnumber/InputNumber.vue
View File

@ -111,6 +111,7 @@ export default {
_suffix: null, _suffix: null,
_prefix: null, _prefix: null,
_index: null, _index: null,
groupChar: '',
isSpecialChar: null, isSpecialChar: null,
timer: null, timer: null,
data() { data() {
@ -149,7 +150,8 @@ export default {
}, },
getGroupingExpression() { getGroupingExpression() {
const formatter = new Intl.NumberFormat(this.locale, {useGrouping: true}); const formatter = new Intl.NumberFormat(this.locale, {useGrouping: true});
return new RegExp(`[${formatter.format(1000).trim().replace(this._numeral, '')}]`, 'g'); this.groupChar = formatter.format(1000).trim().replace(this._numeral, '');
return new RegExp(`[${this.groupChar}]`, 'g');
}, },
getMinusSignExpression() { getMinusSignExpression() {
const formatter = new Intl.NumberFormat(this.locale, {useGrouping: false}); const formatter = new Intl.NumberFormat(this.locale, {useGrouping: false});
@ -344,11 +346,11 @@ export default {
} }
} }
this.updateValue(event, newValueStr, 'delete-single'); this.updateValue(event, newValueStr, null, 'delete-single');
} }
else { else {
newValueStr = this.deleteRange(inputValue, selectionStart, selectionEnd); newValueStr = this.deleteRange(inputValue, selectionStart, selectionEnd);
this.updateValue(event, newValueStr, 'delete-range'); this.updateValue(event, newValueStr, null, 'delete-range');
} }
break; break;
@ -384,11 +386,11 @@ export default {
} }
} }
this.updateValue(event, newValueStr, 'delete-back-single'); this.updateValue(event, newValueStr, null, 'delete-back-single');
} }
else { else {
newValueStr = this.deleteRange(inputValue, selectionStart, selectionEnd); newValueStr = this.deleteRange(inputValue, selectionStart, selectionEnd);
this.updateValue(event, newValueStr, 'delete-range'); this.updateValue(event, newValueStr, null, 'delete-range');
} }
break; break;
@ -442,11 +444,11 @@ export default {
if (isDecimalSign) { if (isDecimalSign) {
if (decimalCharIndex > 0 && selectionStart === decimalCharIndex) { if (decimalCharIndex > 0 && selectionStart === decimalCharIndex) {
this.updateValue(event, inputValue, 'insert'); this.updateValue(event, inputValue, text, 'insert');
} }
else if (decimalCharIndex > selectionStart && decimalCharIndex < selectionEnd) { else if (decimalCharIndex > selectionStart && decimalCharIndex < selectionEnd) {
newValueStr = this.insertText(inputValue, text, selectionStart, selectionEnd); newValueStr = this.insertText(inputValue, text, selectionStart, selectionEnd);
this.updateValue(event, newValueStr, 'insert'); this.updateValue(event, newValueStr, text, 'insert');
} }
} }
else { else {
@ -455,13 +457,13 @@ export default {
if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) { if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) {
if ((selectionStart + text.length - (decimalCharIndex + 1)) <= maxFractionDigits) { if ((selectionStart + text.length - (decimalCharIndex + 1)) <= maxFractionDigits) {
newValueStr = inputValue.slice(0, selectionStart) + text + inputValue.slice(selectionStart + text.length); newValueStr = inputValue.slice(0, selectionStart) + text + inputValue.slice(selectionStart + text.length);
this.updateValue(event, newValueStr, 'insert'); this.updateValue(event, newValueStr, text, 'insert');
} }
} }
else { else {
newValueStr = this.insertText(inputValue, text, selectionStart, selectionEnd); newValueStr = this.insertText(inputValue, text, selectionStart, selectionEnd);
const operation = selectionStart !== selectionEnd ? 'range-insert' : 'insert'; const operation = selectionStart !== selectionEnd ? 'range-insert' : 'insert';
this.updateValue(event, newValueStr, operation); this.updateValue(event, newValueStr, text, operation);
} }
} }
}, },
@ -555,10 +557,10 @@ export default {
this._group.lastIndex = 0; this._group.lastIndex = 0;
this._minusSign.lastIndex = 0; this._minusSign.lastIndex = 0;
}, },
updateValue(event, valueStr, operation) { updateValue(event, valueStr, insertedValueStr, operation) {
if (valueStr != null) { if (valueStr != null) {
let newValue = this.parseValue(valueStr); let newValue = this.parseValue(valueStr);
this.updateInput(newValue, operation); this.updateInput(newValue, insertedValueStr, operation);
} }
}, },
validateValue(value) { validateValue(value) {
@ -572,7 +574,7 @@ export default {
return value; return value;
}, },
updateInput(value, operation) { updateInput(value, insertedValueStr, operation) {
let inputValue = this.$refs.input.$el.value; let inputValue = this.$refs.input.$el.value;
let newValue = this.formatValue(value); let newValue = this.formatValue(value);
let currentLength = inputValue.length; let currentLength = inputValue.length;
@ -584,26 +586,36 @@ export default {
this.$refs.input.$el.setSelectionRange(this.$refs.input.$el.selectionStart + 1, this.$refs.input.$el.selectionStart + 1); this.$refs.input.$el.setSelectionRange(this.$refs.input.$el.selectionStart + 1, this.$refs.input.$el.selectionStart + 1);
} }
else { else {
let selectionStart = this.$refs.input.$el.selectionEnd; let selectionStart = this.$refs.input.$el.selectionStart;
let selectionEnd = this.$refs.input.$el.selectionEnd; let selectionEnd = this.$refs.input.$el.selectionEnd;
this.$refs.input.$el.value = newValue; this.$refs.input.$el.value = newValue;
let newLength = newValue.length; let newLength = newValue.length;
if (newLength === currentLength) { if (operation === 'range-insert') {
const startValue = this.parseValue((inputValue || '').slice(0, selectionStart));
const startValueStr = startValue !== null ? startValue.toString() : '';
const startExpr = startValueStr.split('').join(`(${this.groupChar})?`);
const sRegex = new RegExp(startExpr, 'g');
sRegex.test(newValue);
const tExpr = insertedValueStr.split('').join(`(${this.groupChar})?`);
const tRegex = new RegExp(tExpr, 'g');
tRegex.test(newValue.slice(sRegex.lastIndex));
selectionEnd = sRegex.lastIndex + tRegex.lastIndex;
this.$refs.input.$el.setSelectionRange(selectionEnd, selectionEnd);
}
else if (newLength === currentLength) {
if (operation === 'insert' || operation === 'delete-back-single') if (operation === 'insert' || operation === 'delete-back-single')
this.$refs.input.$el.setSelectionRange(selectionEnd + 1, selectionEnd + 1); this.$refs.input.$el.setSelectionRange(selectionEnd + 1, selectionEnd + 1);
else if (operation === 'range-insert')
this.$refs.input.$el.setSelectionRange(selectionEnd, selectionEnd);
else if (operation === 'delete-single') else if (operation === 'delete-single')
this.$refs.input.$el.setSelectionRange(selectionEnd - 1, selectionEnd - 1); this.$refs.input.$el.setSelectionRange(selectionEnd - 1, selectionEnd - 1);
else if (operation === 'delete-range') else if (operation === 'delete-range' || operation === 'spin')
this.$refs.input.$el.setSelectionRange(selectionStart, selectionStart); this.$refs.input.$el.setSelectionRange(selectionEnd, selectionEnd);
else if (operation === 'spin')
this.$refs.input.$el.setSelectionRange(selectionStart, selectionEnd);
} }
else if (operation === 'delete-back-single') { else if (operation === 'delete-back-single') {
let prevChar = inputValue.charAt(selectionStart - 1); let prevChar = inputValue.charAt(selectionEnd - 1);
let nextChar = inputValue.charAt(selectionStart); let nextChar = inputValue.charAt(selectionEnd);
let diff = currentLength - newLength; let diff = currentLength - newLength;
let isGroupChar = this._group.test(nextChar); let isGroupChar = this._group.test(nextChar);