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

Refactor #2824

pull/2862/head
mertsincan 2022-08-17 11:02:11 +01:00
parent ec5c8f7405
commit 3e7c3f4144
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/autocomplete/AutoComplete.vue
View File

@ -195,6 +195,7 @@ export default {
searchTimeout: null, searchTimeout: null,
selectOnFocus: false, selectOnFocus: false,
focusOnHover: false, focusOnHover: false,
dirty: false,
data() { data() {
return { return {
id: UniqueComponentId(), id: UniqueComponentId(),
@ -270,6 +271,7 @@ export default {
}, },
show(isFocus) { show(isFocus) {
this.$emit('before-show'); this.$emit('before-show');
this.dirty = true;
this.overlayVisible = true; this.overlayVisible = true;
this.focusedOptionIndex = this.focusedOptionIndex !== -1 ? this.focusedOptionIndex : (this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1); this.focusedOptionIndex = this.focusedOptionIndex !== -1 ? this.focusedOptionIndex : (this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1);
@ -278,6 +280,7 @@ export default {
hide(isFocus) { hide(isFocus) {
const _hide = () => { const _hide = () => {
this.$emit('before-hide'); this.$emit('before-hide');
this.dirty = isFocus;
this.overlayVisible = false; this.overlayVisible = false;
this.focusedOptionIndex = -1; this.focusedOptionIndex = -1;
@ -287,12 +290,18 @@ export default {
setTimeout(() => { _hide() }, 0); // For ScreenReaders setTimeout(() => { _hide() }, 0); // For ScreenReaders
}, },
onFocus(event) { onFocus(event) {
if (!this.dirty && this.completeOnFocus) {
this.search(event, event.target.value, 'focus');
}
this.dirty = true;
this.focused = true; this.focused = true;
this.focusedOptionIndex = this.overlayVisible && this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1; this.focusedOptionIndex = this.overlayVisible && this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1;
this.overlayVisible && this.scrollInView(this.focusedOptionIndex); this.overlayVisible && this.scrollInView(this.focusedOptionIndex);
this.$emit('focus', event); this.$emit('focus', event);
}, },
onBlur(event) { onBlur(event) {
this.dirty = false;
this.focused = false; this.focused = false;
this.focusedOptionIndex = -1; this.focusedOptionIndex = -1;
this.$emit('blur', event); this.$emit('blur', event);
@ -429,18 +438,11 @@ export default {
} }
}, },
onContainerClick(event) { onContainerClick(event) {
if (this.disabled || this.searching) { if (this.disabled || this.searching || this.isInputClicked(event) || this.isDropdownClicked(event)) {
return; return;
} }
if (this.isDropdownClicked(event)) { if (!this.overlay || !this.overlay.contains(event.target)) {
return;
}
else if (!this.overlay || !this.overlay.contains(event.target)) {
if (this.completeOnFocus) {
this.search(event, '', 'click');
}
this.$refs.focusInput.focus(); this.$refs.focusInput.focus();
} }
}, },
@ -777,6 +779,7 @@ export default {
this.updateModel(event, value); this.updateModel(event, value);
this.$emit('item-unselect', { originalEvent: event, value: removedOption }); this.$emit('item-unselect', { originalEvent: event, value: removedOption });
this.dirty = true;
this.$refs.focusInput.focus(); this.$refs.focusInput.focus();
}, },
changeFocusedOptionIndex(event, index) { changeFocusedOptionIndex(event, index) {