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/548/head
Cagatay Civici 2020-10-10 13:20:28 +03:00
parent ac82af6d8c b83486be97
commit e8b73066ea
2 changed files with 126 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,8 @@ export default {
_index: null, _index: null,
groupChar: '', groupChar: '',
isSpecialChar: null, isSpecialChar: null,
prefixChar: null,
suffixChar: null,
timer: null, timer: null,
data() { data() {
return { return {
@ -178,8 +180,8 @@ export default {
this._group = this.getGroupingExpression(); this._group = this.getGroupingExpression();
this._minusSign = this.getMinusSignExpression(); this._minusSign = this.getMinusSignExpression();
this._currency = this.getCurrencyExpression(); this._currency = this.getCurrencyExpression();
this._suffix = new RegExp(`[${this.suffix||''}]`, 'g'); this._suffix = this.getSuffixExpression();
this._prefix = new RegExp(`[${this.prefix||''}]`, 'g'); this._prefix = this.getPrefixExpression();
this._index = d => index.get(d); this._index = d => index.get(d);
}, },
updateConstructParser(newValue, oldValue) { updateConstructParser(newValue, oldValue) {
@ -187,13 +189,16 @@ export default {
this.constructParser(); this.constructParser();
} }
}, },
escapeRegExp(text) {
return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
},
getDecimalExpression() { getDecimalExpression() {
const formatter = new Intl.NumberFormat(this.locale, {useGrouping: false}); const formatter = new Intl.NumberFormat(this.locale, {useGrouping: false});
return new RegExp(`[${formatter.format(1.1).trim().replace(this._numeral, '')}]`, 'g'); return new RegExp(`[${formatter.format(1.1).trim().replace(this._numeral, '')}]`, 'g');
}, },
getGroupingExpression() { getGroupingExpression() {
const formatter = new Intl.NumberFormat(this.locale, {useGrouping: true}); const formatter = new Intl.NumberFormat(this.locale, {useGrouping: true});
this.groupChar = formatter.format(1000000).trim().replace(this._numeral, ''); this.groupChar = formatter.format(1000000).trim().replace(this._numeral, '').charAt(0);
return new RegExp(`[${this.groupChar}]`, 'g'); return new RegExp(`[${this.groupChar}]`, 'g');
}, },
getMinusSignExpression() { getMinusSignExpression() {
@ -208,6 +213,29 @@ export default {
return new RegExp(`[]`,'g'); return new RegExp(`[]`,'g');
}, },
getPrefixExpression() {
if (this.prefix) {
this.prefixChar = this.prefix;
}
else {
const formatter = new Intl.NumberFormat(this.locale, {style: this.mode, currency: this.currency, currencyDisplay: this.currencyDisplay});
this.prefixChar = formatter.format(1).split('1')[0];
}
return new RegExp(`${this.escapeRegExp(this.prefixChar||'')}`, 'g');
},
getSuffixExpression() {
if (this.suffix) {
this.suffixChar = this.suffix;
}
else {
const formatter = new Intl.NumberFormat(this.locale, {style: this.mode, currency: this.currency, currencyDisplay: this.currencyDisplay,
minimumFractionDigits: 0, maximumFractionDigits: 0});
this.suffixChar = formatter.format(1).split('1')[1];
}
return new RegExp(`${this.escapeRegExp(this.suffixChar||'')}`, 'g');
},
formatValue(value) { formatValue(value) {
if (value != null) { if (value != null) {
if (value === '-') { // Minus sign if (value === '-') { // Minus sign
@ -228,18 +256,19 @@ export default {
return formattedValue; return formattedValue;
} }
return value; return value.toString();
} }
return ''; return '';
}, },
parseValue(text) { parseValue(text) {
let filteredText = text.trim() let filteredText = text
.replace(this._suffix, '')
.replace(this._prefix, '')
.trim()
.replace(/\s/g, '') .replace(/\s/g, '')
.replace(this._currency, '') .replace(this._currency, '')
.replace(this._group, '') .replace(this._group, '')
.replace(this._suffix, '')
.replace(this._prefix, '')
.replace(this._minusSign, '-') .replace(this._minusSign, '-')
.replace(this._decimal, '.') .replace(this._decimal, '.')
.replace(this._numeral, this._index); .replace(this._numeral, this._index);
@ -275,18 +304,26 @@ export default {
this.handleOnInput(event, currentValue, newValue); this.handleOnInput(event, currentValue, newValue);
}, },
onUpButtonMouseDown(event) { onUpButtonMouseDown(event) {
this.$refs.input.$el.focus(); if (!this.$attrs.disabled) {
this.repeat(event, null, 1); this.$refs.input.$el.focus();
event.preventDefault(); this.repeat(event, null, 1);
event.preventDefault();
}
}, },
onUpButtonMouseUp() { onUpButtonMouseUp() {
this.clearTimer(); if (!this.$attrs.disabled) {
this.clearTimer();
}
}, },
onUpButtonMouseLeave() { onUpButtonMouseLeave() {
this.clearTimer(); if (!this.$attrs.disabled) {
this.clearTimer();
}
}, },
onUpButtonKeyUp() { onUpButtonKeyUp() {
this.clearTimer(); if (!this.$attrs.disabled) {
this.clearTimer();
}
}, },
onUpButtonKeyDown(event) { onUpButtonKeyDown(event) {
if (event.keyCode === 32 || event.keyCode === 13) { if (event.keyCode === 32 || event.keyCode === 13) {
@ -294,18 +331,26 @@ export default {
} }
}, },
onDownButtonMouseDown(event) { onDownButtonMouseDown(event) {
this.$refs.input.$el.focus(); if (!this.$attrs.disabled) {
this.repeat(event, null, -1); this.$refs.input.$el.focus();
event.preventDefault(); this.repeat(event, null, -1);
event.preventDefault();
}
}, },
onDownButtonMouseUp() { onDownButtonMouseUp() {
this.clearTimer(); if (!this.$attrs.disabled) {
this.clearTimer();
}
}, },
onDownButtonMouseLeave() { onDownButtonMouseLeave() {
this.clearTimer(); if (!this.$attrs.disabled) {
this.clearTimer();
}
}, },
onDownButtonKeyUp() { onDownButtonKeyUp() {
this.clearTimer(); if (!this.$attrs.disabled) {
this.clearTimer();
}
}, },
onDownButtonKeyDown(event) { onDownButtonKeyDown(event) {
if (event.keyCode === 32 || event.keyCode === 13) { if (event.keyCode === 32 || event.keyCode === 13) {
@ -464,6 +509,9 @@ export default {
} }
} }
}, },
allowMinusSign() {
return this.min === null || this.min < 0;
},
isMinusSign(char) { isMinusSign(char) {
if (this._minusSign.test(char)) { if (this._minusSign.test(char)) {
this._minusSign.lastIndex = 0; this._minusSign.lastIndex = 0;
@ -481,8 +529,14 @@ export default {
return false; return false;
}, },
insert(event, text, sign = { isDecimalSign: false, isMinusSign: false }) { insert(event, text, sign = { isDecimalSign: false, isMinusSign: false }) {
let selectionStart = this.$refs.input.$el.selectionStart; const minusCharIndexOnText = text.search(this._minusSign);
let selectionEnd = this.$refs.input.$el.selectionEnd; this._minusSign.lastIndex = 0;
if (!this.allowMinusSign() && minusCharIndexOnText !== -1) {
return;
}
const selectionStart = this.$refs.input.$el.selectionStart;
const selectionEnd = this.$refs.input.$el.selectionEnd;
let inputValue = this.$refs.input.$el.value.trim(); let inputValue = this.$refs.input.$el.value.trim();
const decimalCharIndex = inputValue.search(this._decimal); const decimalCharIndex = inputValue.search(this._decimal);
this._decimal.lastIndex = 0; this._decimal.lastIndex = 0;
@ -511,33 +565,40 @@ export default {
} }
else { else {
const maxFractionDigits = this.numberFormat.resolvedOptions().maximumFractionDigits; const maxFractionDigits = this.numberFormat.resolvedOptions().maximumFractionDigits;
const operation = selectionStart !== selectionEnd ? 'range-insert' : 'insert';
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, text, 'insert'); this.updateValue(event, newValueStr, text, operation);
} }
} }
else { else {
newValueStr = this.insertText(inputValue, text, selectionStart, selectionEnd); newValueStr = this.insertText(inputValue, text, selectionStart, selectionEnd);
const operation = selectionStart !== selectionEnd ? 'range-insert' : 'insert';
this.updateValue(event, newValueStr, text, operation); this.updateValue(event, newValueStr, text, operation);
} }
} }
}, },
insertText(value, text, start, end) { insertText(value, text, start, end) {
let newValueStr; let textSplit = text.split('.');
if ((end - start) === value.length) if (textSplit.length === 2) {
newValueStr = text; const decimalCharIndex = value.slice(start, end).search(this._decimal);
else if (start === 0) this._decimal.lastIndex = 0;
newValueStr = text + value.slice(end); return (decimalCharIndex > 0) ? value.slice(0, start) + this.formatValue(text) + value.slice(end) : (value || this.formatValue(text));
else if (end === value.length) }
newValueStr = value.slice(0, start) + text; else if ((end - start) === value.length) {
else return this.formatValue(text);
newValueStr = value.slice(0, start) + text + value.slice(end); }
else if (start === 0) {
return newValueStr; return text + value.slice(end);
}
else if (end === value.length) {
return value.slice(0, start) + text;
}
else {
return value.slice(0, start) + text + value.slice(end);
}
}, },
deleteRange(value, start, end) { deleteRange(value, start, end) {
let newValueStr; let newValueStr;
@ -659,6 +720,8 @@ export default {
return value; return value;
}, },
updateInput(value, insertedValueStr, operation) { updateInput(value, insertedValueStr, operation) {
insertedValueStr = insertedValueStr || '';
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;
@ -667,7 +730,9 @@ export default {
this.$refs.input.$el.value = newValue; 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); const prefixLength = (this.prefixChar || '').length;
const selectionEnd = prefixLength + insertedValueStr.length;
this.$refs.input.$el.setSelectionRange(selectionEnd, selectionEnd);
} }
else { else {
let selectionStart = this.$refs.input.$el.selectionStart; let selectionStart = this.$refs.input.$el.selectionStart;

27
src/components/tooltip/Tooltip.js
View File

@ -1,5 +1,6 @@
import UniqueComponentId from '../utils/UniqueComponentId'; import UniqueComponentId from '../utils/UniqueComponentId';
import DomHandler from '../utils/DomHandler'; import DomHandler from '../utils/DomHandler';
import ConnectedOverlayScrollHandler from '../utils/ConnectedOverlayScrollHandler';
function bindEvents(el) { function bindEvents(el) {
const modifiers = el.$_ptooltipModifiers; const modifiers = el.$_ptooltipModifiers;
@ -27,6 +28,22 @@ function unbindEvents(el) {
} }
} }
function bindScrollListener(el) {
if (!el.$_ptooltipScrollHandler) {
el.$_ptooltipScrollHandler = new ConnectedOverlayScrollHandler(el, function() {
hide(el);
});
}
el.$_ptooltipScrollHandler.bindScrollListener();
}
function unbindScrollListener(el) {
if (el.$_ptooltipScrollHandler) {
el.$_ptooltipScrollHandler.unbindScrollListener();
}
}
function onMouseEnter(event) { function onMouseEnter(event) {
show(event.currentTarget); show(event.currentTarget);
} }
@ -61,10 +78,13 @@ function show(el) {
hide(el); hide(el);
this.removeEventListener('resize', onWindowResize); this.removeEventListener('resize', onWindowResize);
}); });
bindScrollListener(el);
} }
function hide(el) { function hide(el) {
remove(el); remove(el);
unbindScrollListener(el);
} }
function getTooltipElement(el) { function getTooltipElement(el) {
@ -225,6 +245,11 @@ const Tooltip = {
unmounted(el) { unmounted(el) {
remove(el); remove(el);
unbindEvents(el); unbindEvents(el);
if (el.$_ptooltipScrollHandler) {
el.$_ptooltipScrollHandler.destroy();
el.$_ptooltipScrollHandler = null;
}
}, },
updated(el, options) { updated(el, options) {
el.$_ptooltipModifiers = options.modifiers; el.$_ptooltipModifiers = options.modifiers;
@ -232,4 +257,4 @@ const Tooltip = {
} }
}; };
export default Tooltip; export default Tooltip;