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

Merge branch 'master' of https://github.com/primefaces/primevue

pull/457/head
cagataycivici 2020-08-27 13:40:41 +03:00
parent 08207930a5 4b2ef6abc6
commit d83ccb7675
2 changed files with 105 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,7 +258,7 @@ export default {
this.repeat(event, null, -1); this.repeat(event, null, -1);
} }
}, },
onInput(val) { onInput() {
if (this.isSpecialChar) { if (this.isSpecialChar) {
this.$refs.input.$el.value = this.lastValue; this.$refs.input.$el.value = this.lastValue;
} }
@ -274,6 +274,7 @@ export default {
let selectionStart = event.target.selectionStart; let selectionStart = event.target.selectionStart;
let selectionEnd = event.target.selectionEnd; let selectionEnd = event.target.selectionEnd;
let inputValue = event.target.value; let inputValue = event.target.value;
let newValueStr = null;
if (event.altKey) { if (event.altKey) {
event.preventDefault(); event.preventDefault();
@ -309,7 +310,6 @@ export default {
//backspace //backspace
case 8: { case 8: {
event.preventDefault(); event.preventDefault();
let newValueStr = null;
if (selectionStart === selectionEnd) { if (selectionStart === selectionEnd) {
let deleteChar = inputValue.charAt(selectionStart - 1); let deleteChar = inputValue.charAt(selectionStart - 1);
@ -328,14 +328,16 @@ export default {
else if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) { else if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) {
newValueStr = inputValue.slice(0, selectionStart - 1) + '0' + inputValue.slice(selectionStart); newValueStr = inputValue.slice(0, selectionStart - 1) + '0' + inputValue.slice(selectionStart);
} }
else if (decimalCharIndex > 0 && decimalCharIndex === 1) {
newValueStr = inputValue.slice(0, selectionStart - 1) + '0' + inputValue.slice(selectionStart);
newValueStr = this.parseValue(newValueStr) > 0 ? newValueStr : '';
}
else { else {
newValueStr = inputValue.slice(0, selectionStart - 1) + inputValue.slice(selectionStart); newValueStr = inputValue.slice(0, selectionStart - 1) + inputValue.slice(selectionStart);
} }
} }
if (newValueStr != null) { this.updateValue(event, newValueStr, 'delete-single');
this.updateValue(event, newValueStr, 'delete-single');
}
} }
else { else {
newValueStr = this.deleteRange(inputValue, selectionStart, selectionEnd); newValueStr = this.deleteRange(inputValue, selectionStart, selectionEnd);
@ -345,6 +347,44 @@ export default {
break; break;
} }
// del
case 46:
event.preventDefault();
if (selectionStart === selectionEnd) {
let deleteChar = inputValue.charAt(selectionStart);
let decimalCharIndex = inputValue.search(this._decimal);
this._decimal.lastIndex = 0;
if (this.isNumeralChar(deleteChar)) {
if (this._group.test(deleteChar)) {
this._group.lastIndex = 0;
newValueStr = inputValue.slice(0, selectionStart) + inputValue.slice(selectionStart + 2);
}
else if (this._decimal.test(deleteChar)) {
this._decimal.lastIndex = 0;
this.$refs.input.$el.setSelectionRange(selectionStart + 1, selectionStart + 1);
}
else if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) {
newValueStr = inputValue.slice(0, selectionStart) + '0' + inputValue.slice(selectionStart + 1);
}
else if (decimalCharIndex > 0 && decimalCharIndex === 1) {
newValueStr = inputValue.slice(0, selectionStart) + '0' + inputValue.slice(selectionStart + 1);
newValueStr = this.parseValue(newValueStr) > 0 ? newValueStr : '';
}
else {
newValueStr = inputValue.slice(0, selectionStart) + inputValue.slice(selectionStart + 1);
}
}
this.updateValue(event, newValueStr, 'delete-back-single');
}
else {
newValueStr = this.deleteRange(inputValue, selectionStart, selectionEnd);
this.updateValue(event, newValueStr, 'delete-range');
}
break;
default: default:
break; break;
} }
@ -353,9 +393,10 @@ export default {
event.preventDefault(); event.preventDefault();
let code = event.which || event.keyCode; let code = event.which || event.keyCode;
let char = String.fromCharCode(code); let char = String.fromCharCode(code);
const isDecimalSign = this.isDecimalSign(char);
if ((48 <= code && code <= 57) || this.isMinusSign(char)) { if ((48 <= code && code <= 57) || this.isMinusSign(char) || isDecimalSign) {
this.insert(event, char); this.insert(event, char, isDecimalSign);
} }
}, },
onPaste(event) { onPaste(event) {
@ -376,24 +417,45 @@ export default {
return false; return false;
}, },
insert(event, text) { isDecimalSign(char) {
if (this._decimal.test(char)) {
this._decimal.lastIndex = 0;
return true;
}
return false;
},
insert(event, text, isDecimalSign = false) {
let selectionStart = this.$refs.input.$el.selectionStart; let selectionStart = this.$refs.input.$el.selectionStart;
let selectionEnd = this.$refs.input.$el.selectionEnd; let selectionEnd = this.$refs.input.$el.selectionEnd;
let inputValue = this.$refs.input.$el.value.trim(); let inputValue = this.$refs.input.$el.value.trim();
let maxFractionDigits = this.numberFormat.resolvedOptions().maximumFractionDigits; const decimalCharIndex = inputValue.search(this._decimal);
let newValueStr;
let decimalCharIndex = inputValue.search(this._decimal);
this._decimal.lastIndex = 0; this._decimal.lastIndex = 0;
let newValueStr;
if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) { if (isDecimalSign) {
if ((selectionStart + text.length - (decimalCharIndex + 1)) <= maxFractionDigits) { if (decimalCharIndex > 0 && selectionStart === decimalCharIndex) {
newValueStr = inputValue.slice(0, selectionStart) + text + inputValue.slice(selectionStart + text.length); this.updateValue(event, inputValue, 'insert');
}
else if (decimalCharIndex > selectionStart && decimalCharIndex < selectionEnd) {
newValueStr = this.insertText(inputValue, text, selectionStart, selectionEnd);
this.updateValue(event, newValueStr, 'insert'); this.updateValue(event, newValueStr, 'insert');
} }
} }
else { else {
newValueStr = this.insertText(inputValue, text, selectionStart, selectionEnd); const maxFractionDigits = this.numberFormat.resolvedOptions().maximumFractionDigits;
this.updateValue(event, newValueStr, 'insert');
if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) {
if ((selectionStart + text.length - (decimalCharIndex + 1)) <= maxFractionDigits) {
newValueStr = inputValue.slice(0, selectionStart) + text + inputValue.slice(selectionStart + text.length);
this.updateValue(event, newValueStr, 'insert');
}
}
else {
newValueStr = this.insertText(inputValue, text, selectionStart, selectionEnd);
const operation = selectionStart !== selectionEnd ? 'range-insert' : 'insert';
this.updateValue(event, newValueStr, operation);
}
} }
}, },
insertText(value, text, start, end) { insertText(value, text, start, end) {
@ -504,10 +566,12 @@ export default {
return value; return value;
}, },
updateInput(value, operation) { updateInput(value, operation) {
let currentLength = this.$refs.input.$el.value.length; let inputValue = this.$refs.input.$el.value;
let newValue = this.formatValue(value);
let currentLength = inputValue.length;
if (currentLength === 0) { if (currentLength === 0) {
this.$refs.input.$el.value = this.formatValue(value); this.$refs.input.$el.value = newValue;
this.$refs.input.$el.setSelectionRange(0, 0); this.$refs.input.$el.setSelectionRange(0, 0);
this.initCursor(); this.initCursor();
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);
@ -515,12 +579,14 @@ export default {
else { else {
let selectionStart = this.$refs.input.$el.selectionEnd; let selectionStart = this.$refs.input.$el.selectionEnd;
let selectionEnd = this.$refs.input.$el.selectionEnd; let selectionEnd = this.$refs.input.$el.selectionEnd;
this.$refs.input.$el.value = this.formatValue(value); this.$refs.input.$el.value = newValue;
let newLength = this.$refs.input.$el.value.length; let newLength = newValue.length;
if (newLength === currentLength) { if (newLength === currentLength) {
if (operation === 'insert') 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')
@ -528,6 +594,22 @@ export default {
else if (operation === 'spin') else if (operation === 'spin')
this.$refs.input.$el.setSelectionRange(selectionStart, selectionEnd); this.$refs.input.$el.setSelectionRange(selectionStart, selectionEnd);
} }
else if (operation === 'delete-back-single') {
let prevChar = inputValue.charAt(selectionStart - 1);
let nextChar = inputValue.charAt(selectionStart);
let diff = currentLength - newLength;
let isGroupChar = this._group.test(nextChar);
if (isGroupChar && diff === 1) {
selectionEnd += 1;
}
else if (!isGroupChar && this.isNumeralChar(prevChar)) {
selectionEnd += (-1 * diff) + 1;
}
this._group.lastIndex = 0;
this.$refs.input.$el.setSelectionRange(selectionEnd, selectionEnd);
}
else { else {
selectionEnd = selectionEnd + (newLength - currentLength); selectionEnd = selectionEnd + (newLength - currentLength);
this.$refs.input.$el.setSelectionRange(selectionEnd, selectionEnd); this.$refs.input.$el.setSelectionRange(selectionEnd, selectionEnd);