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

Ports from v3

pull/5868/head
tugcekucukoglu 2024-06-07 11:05:42 +03:00
parent 56933ea3d5
commit 970ba75b06
5 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/lib/contextmenu/ContextMenu.vue
View File

@ -44,7 +44,7 @@ export default {
name: 'ContextMenu',
extends: BaseContextMenu,
inheritAttrs: false,
emits: ['focus', 'blur', 'show', 'hide'],
emits: ['focus', 'blur', 'show', 'hide', 'before-show', 'before-hide'],
target: null,
outsideClickListener: null,
resizeListener: null,
@ -125,6 +125,7 @@ export default {
this.visible ? this.hide() : this.show(event);
},
show(event) {
this.$emit('before-show');
this.activeItemPath = [];
this.focusedItemInfo = { index: -1, level: 0, parentKey: '' };
DomHandler.focus(this.list);
@ -137,6 +138,7 @@ export default {
event.preventDefault();
},
hide() {
this.$emit('before-hide');
this.visible = false;
this.activeItemPath = [];
this.focusedItemInfo = { index: -1, level: 0, parentKey: '' };

21
components/lib/listbox/Listbox.vue
View File

@ -477,8 +477,14 @@ export default {
},
onHomeKey(event, pressedInInputText = false) {
if (pressedInInputText) {
event.currentTarget.setSelectionRange(0, 0);
this.focusedOptionIndex = -1;
const target = event.currentTarget;
if (event.shiftKey) {
target.setSelectionRange(0, event.target.selectionStart);
} else {
target.setSelectionRange(0, 0);
this.focusedOptionIndex = -1;
}
} else {
let metaKey = event.metaKey || event.ctrlKey;
let optionIndex = this.findFirstOptionIndex();
@ -495,10 +501,15 @@ export default {
onEndKey(event, pressedInInputText = false) {
if (pressedInInputText) {
const target = event.currentTarget;
const len = target.value.length;
target.setSelectionRange(len, len);
this.focusedOptionIndex = -1;
if (event.shiftKey) {
target.setSelectionRange(event.target.selectionStart, target.value.length);
} else {
const len = target.value.length;
target.setSelectionRange(len, len);
this.focusedOptionIndex = -1;
}
} else {
let metaKey = event.metaKey || event.ctrlKey;
let optionIndex = this.findLastOptionIndex();

26
components/lib/multiselect/MultiSelect.vue
View File

@ -610,13 +610,15 @@ export default {
pressedInInputText && (this.focusedOptionIndex = -1);
},
onHomeKey(event, pressedInInputText = false) {
const { currentTarget } = event;
if (pressedInInputText) {
const len = currentTarget.value.length;
const target = event.currentTarget;
currentTarget.setSelectionRange(0, event.shiftKey ? len : 0);
this.focusedOptionIndex = -1;
if (event.shiftKey) {
target.setSelectionRange(0, event.target.selectionStart);
} else {
target.setSelectionRange(0, 0);
this.focusedOptionIndex = -1;
}
} else {
let metaKey = event.metaKey || event.ctrlKey;
let optionIndex = this.findFirstOptionIndex();
@ -633,13 +635,17 @@ export default {
event.preventDefault();
},
onEndKey(event, pressedInInputText = false) {
const { currentTarget } = event;
if (pressedInInputText) {
const len = currentTarget.value.length;
const target = event.currentTarget;
currentTarget.setSelectionRange(event.shiftKey ? 0 : len, len);
this.focusedOptionIndex = -1;
if (event.shiftKey) {
target.setSelectionRange(event.target.selectionStart, target.value.length);
} else {
const len = target.value.length;
target.setSelectionRange(len, len);
this.focusedOptionIndex = -1;
}
} else {
let metaKey = event.metaKey || event.ctrlKey;
let optionIndex = this.findLastOptionIndex();

9
components/lib/select/Select.spec.js
View File

@ -90,15 +90,6 @@ describe('clear checks', () => {
expect(wrapper.find('.p-select-clear-icon').classes()).toContain('pi-discord');
});
it('should clear with delete key', async () => {
const updateModelSpy = vi.spyOn(wrapper.vm, 'updateModel');
await wrapper.find('.p-select-label.p-inputtext').trigger('keydown', { code: 'Delete' });
expect(updateModelSpy).toHaveBeenCalledOnce();
expect(updateModelSpy).toHaveBeenCalledWith(expect.any(KeyboardEvent), null);
});
});
describe('editable checks', () => {
let wrapper;

30
components/lib/select/Select.vue
View File

@ -376,9 +376,6 @@ export default {
this.onArrowLeftKey(event, this.editable);
break;
case 'Delete':
this.onDeleteKey(event);
case 'Home':
this.onHomeKey(event, this.editable);
break;
@ -555,12 +552,6 @@ export default {
break;
}
},
onDeleteKey(event) {
if (this.showClear) {
this.updateModel(event, null);
event.preventDefault();
}
},
onArrowDownKey(event) {
if (!this.overlayVisible) {
this.show();
@ -595,8 +586,14 @@ export default {
},
onHomeKey(event, pressedInInputText = false) {
if (pressedInInputText) {
event.currentTarget.setSelectionRange(0, 0);
this.focusedOptionIndex = -1;
const target = event.currentTarget;
if (event.shiftKey) {
target.setSelectionRange(0, event.target.selectionStart);
} else {
target.setSelectionRange(0, 0);
this.focusedOptionIndex = -1;
}
} else {
this.changeFocusedOptionIndex(event, this.findFirstOptionIndex());
@ -608,10 +605,15 @@ export default {
onEndKey(event, pressedInInputText = false) {
if (pressedInInputText) {
const target = event.currentTarget;
const len = target.value.length;
target.setSelectionRange(len, len);
this.focusedOptionIndex = -1;
if (event.shiftKey) {
target.setSelectionRange(event.target.selectionStart, target.value.length);
} else {
const len = target.value.length;
target.setSelectionRange(len, len);
this.focusedOptionIndex = -1;
}
} else {
this.changeFocusedOptionIndex(event, this.findLastOptionIndex());