Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix outside click listeners (from click to mousedown+mouseup events) #5160

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix outside click listeners (from click to mousedown+mouseup events) #5160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d88060b
Fix outside click listeners (from `click` to `mousedown` event)
S3v3Nice Jan 27, 2024
ac27bb9
Merge branch 'master' into fix-outside-click-listeners
S3v3Nice Mar 31, 2024
898a392
Merge branch 'master' into fix-outside-click-listeners
S3v3Nice Apr 6, 2024
34c54e2
Replace the `mousedown` event with a bunch of `mousedown` and `mouseu…
S3v3Nice Apr 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions components/lib/autocomplete/AutoComplete.vue
View file
Open in desktop
Expand Up @@ -111,6 +111,7 @@
:class="[cx('panel'), panelClass]"
:style="{ ...panelStyle, 'max-height': virtualScrollerDisabled ? scrollHeight : '' }"
@click="onOverlayClick"
@mousedown="onOverlayMouseDown"
@keydown="onOverlayKeyDown"
v-bind="{ ...panelProps, ...ptm('panel') }"
>
Expand Down Expand Up @@ -182,6 +183,7 @@ export default {
extends: BaseAutoComplete,
inheritAttrs: false,
emits: ['update:modelValue', 'change', 'focus', 'blur', 'item-select', 'item-unselect', 'dropdown-click', 'clear', 'complete', 'before-show', 'before-hide', 'show', 'hide'],
isOverlayMouseDown: false,
outsideClickListener: null,
resizeListener: null,
scrollHandler: null,
Expand Down Expand Up @@ -530,6 +532,9 @@ export default {
target: this.$el
});
},
onOverlayMouseDown() {
this.isOverlayMouseDown = true;
},
onOverlayKeyDown(event) {
switch (event.code) {
case 'Escape':
Expand Down Expand Up @@ -707,18 +712,24 @@ export default {
bindOutsideClickListener() {
if (!this.outsideClickListener) {
this.outsideClickListener = (event) => {
if (this.overlayVisible && this.overlay && this.isOutsideClicked(event)) {
const isOverlayMouseUp = this.overlay && this.overlay.contains(event.target);
const isOutsideClicked = !this.isOverlayMouseDown && !isOverlayMouseUp;

if (this.overlayVisible && isOutsideClicked) {
this.hide();
}

this.isOverlayMouseDown = false;
};

document.addEventListener('click', this.outsideClickListener);
document.addEventListener('mouseup', this.outsideClickListener);
}
},
unbindOutsideClickListener() {
if (this.outsideClickListener) {
document.removeEventListener('click', this.outsideClickListener);
document.removeEventListener('mouseup', this.outsideClickListener);
this.outsideClickListener = null;
this.isOverlayMouseDown = false;
}
},
bindScrollListener() {
Expand Down Expand Up @@ -754,9 +765,6 @@ export default {
this.resizeListener = null;
}
},
isOutsideClicked(event) {
return !this.overlay.contains(event.target) && !this.isInputClicked(event) && !this.isDropdownClicked(event);
},
isInputClicked(event) {
if (this.multiple) return event.target === this.$refs.multiContainer || this.$refs.multiContainer.contains(event.target);
else return event.target === this.$refs.focusInput;
Expand Down
18 changes: 14 additions & 4 deletions components/lib/cascadeselect/CascadeSelect.vue
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@
</span>
<Portal :appendTo="appendTo">
<transition name="p-connected-overlay" @enter="onOverlayEnter" @after-enter="onOverlayAfterEnter" @leave="onOverlayLeave" @after-leave="onOverlayAfterLeave" v-bind="ptm('transition')">
<div v-if="overlayVisible" :ref="overlayRef" :class="[cx('panel'), panelClass]" :style="panelStyle" @click="onOverlayClick" @keydown="onOverlayKeyDown" v-bind="{ ...panelProps, ...ptm('panel') }">
<div v-if="overlayVisible" :ref="overlayRef" :class="[cx('panel'), panelClass]" :style="panelStyle" @mousedown="onOverlayMouseDown" @click="onOverlayClick" @keydown="onOverlayKeyDown" v-bind="{ ...panelProps, ...ptm('panel') }">
<div :class="cx('wrapper')" v-bind="ptm('wrapper')">
<CascadeSelectSub
:id="id + '_tree'"
Expand Down Expand Up @@ -92,6 +92,7 @@ export default {
extends: BaseCascadeSelect,
inheritAttrs: false,
emits: ['update:modelValue', 'change', 'focus', 'blur', 'click', 'group-change', 'before-show', 'before-hide', 'hide', 'show'],
isOverlayMouseDown: false,
outsideClickListener: null,
scrollHandler: null,
resizeListener: null,
Expand Down Expand Up @@ -341,6 +342,9 @@ export default {
this.clicked = true;
this.$emit('click', event);
},
onOverlayMouseDown() {
this.isOverlayMouseDown = true;
},
onOverlayClick(event) {
OverlayEventBus.emit('overlay-click', {
originalEvent: event,
Expand Down Expand Up @@ -510,18 +514,24 @@ export default {
bindOutsideClickListener() {
if (!this.outsideClickListener) {
this.outsideClickListener = (event) => {
if (this.overlayVisible && this.overlay && !this.$el.contains(event.target) && !this.overlay.contains(event.target)) {
const isOverlayMouseUp = this.overlay && this.overlay.contains(event.target);
const isOutsideClicked = !this.isOverlayMouseDown && !isOverlayMouseUp;

if (this.overlayVisible && this.overlay && isOutsideClicked) {
this.hide();
}

this.isOverlayMouseDown = false;
};

document.addEventListener('click', this.outsideClickListener);
document.addEventListener('mouseup', this.outsideClickListener);
}
},
unbindOutsideClickListener() {
if (this.outsideClickListener) {
document.removeEventListener('click', this.outsideClickListener);
document.removeEventListener('mouseup', this.outsideClickListener);
this.outsideClickListener = null;
this.isOverlayMouseDown = false;
}
},
bindScrollListener() {
Expand Down
22 changes: 15 additions & 7 deletions components/lib/colorpicker/ColorPicker.vue
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<input v-if="!inline" ref="input" type="text" :class="cx('input')" readonly="readonly" :tabindex="tabindex" :disabled="disabled" @click="onInputClick" @keydown="onInputKeydown" v-bind="ptm('input')" />
<Portal :appendTo="appendTo" :disabled="inline">
<transition name="p-connected-overlay" @enter="onOverlayEnter" @leave="onOverlayLeave" @after-leave="onOverlayAfterLeave" v-bind="ptm('transition')">
<div v-if="inline ? true : overlayVisible" :ref="pickerRef" :class="[cx('panel'), panelClass]" @click="onOverlayClick" v-bind="ptm('panel')">
<div v-if="inline ? true : overlayVisible" :ref="pickerRef" :class="[cx('panel'), panelClass]" @mousedown="onOverlayMouseDown" @click="onOverlayClick" v-bind="ptm('panel')">
<div :class="cx('content')" v-bind="ptm('content')">
<div :ref="colorSelectorRef" :class="cx('selector')" @mousedown="onColorMousedown($event)" @touchstart="onColorDragStart($event)" @touchmove="onDrag($event)" @touchend="onDragEnd()" v-bind="ptm('selector')">
<div :class="cx('color')" v-bind="ptm('color')">
Expand Down Expand Up @@ -36,6 +36,7 @@ export default {
overlayVisible: false
};
},
isOverlayMouseDown: false,
hsbValue: null,
outsideClickListener: null,
documentMouseMoveListener: null,
Expand Down Expand Up @@ -448,9 +449,6 @@ export default {
this.pickHue(event);
!this.isUnstyled && DomHandler.addClass(this.$el, 'p-colorpicker-dragging');
},
isInputClicked(event) {
return this.$refs.input && this.$refs.input.isSameNode(event.target);
},
bindDragListeners() {
this.bindDocumentMouseMoveListener();
this.bindDocumentMouseUpListener();
Expand All @@ -462,18 +460,25 @@ export default {
bindOutsideClickListener() {
if (!this.outsideClickListener) {
this.outsideClickListener = (event) => {
if (this.overlayVisible && this.picker && !this.picker.contains(event.target) && !this.isInputClicked(event)) {
const isOverlayMouseUp = this.picker && this.picker.contains(event.target);
const isInputMouseUp = this.$refs.input && this.$refs.input.contains(event.target);
const isOutsideClicked = !this.isOverlayMouseDown && !isOverlayMouseUp && !isInputMouseUp;

if (this.overlayVisible && isOutsideClicked) {
this.overlayVisible = false;
}

this.isOverlayMouseDown = false;
};

document.addEventListener('click', this.outsideClickListener);
document.addEventListener('mouseup', this.outsideClickListener);
}
},
unbindOutsideClickListener() {
if (this.outsideClickListener) {
document.removeEventListener('click', this.outsideClickListener);
document.removeEventListener('mouseup', this.outsideClickListener);
this.outsideClickListener = null;
this.isOverlayMouseDown = false;
}
},
bindScrollListener() {
Expand Down Expand Up @@ -555,6 +560,9 @@ export default {
this.hueView = null;
this.hueHandle = null;
},
onOverlayMouseDown() {
this.isOverlayMouseDown = true;
},
onOverlayClick(event) {
OverlayEventBus.emit('overlay-click', {
originalEvent: event,
Expand Down
24 changes: 15 additions & 9 deletions components/lib/confirmpopup/ConfirmPopup.vue
View file
Open in desktop
@@ -1,7 +1,7 @@
<template>
<Portal>
<transition name="p-confirm-popup" @enter="onEnter" @after-enter="onAfterEnter" @leave="onLeave" @after-leave="onAfterLeave" v-bind="ptm('transition')">
<div v-if="visible" :ref="containerRef" v-focustrap role="alertdialog" :class="cx('root')" :aria-modal="visible" @click="onOverlayClick" @keydown="onOverlayKeydown" v-bind="ptmi('root')">
<div v-if="visible" :ref="containerRef" v-focustrap role="alertdialog" :class="cx('root')" :aria-modal="visible" @mousedown="onOverlayMouseDown" @click="onOverlayClick" @keydown="onOverlayKeydown" v-bind="ptmi('root')">
<slot v-if="$slots.container" name="container" :message="confirmation" :onAccept="accept" :onReject="reject" :acceptCallback="accept" :rejectCallback="reject"></slot>
<template v-else>
<template v-if="!$slots.message">
Expand Down Expand Up @@ -151,6 +151,7 @@ export default {
this.autoFocusAccept = this.confirmation.defaultFocus === undefined || this.confirmation.defaultFocus === 'accept' ? true : false;
this.autoFocusReject = this.confirmation.defaultFocus === 'reject' ? true : false;

this.alignOverlay();
this.bindOutsideClickListener();
this.bindScrollListener();
this.bindResizeListener();
Expand Down Expand Up @@ -192,24 +193,29 @@ export default {
bindOutsideClickListener() {
if (!this.outsideClickListener) {
this.outsideClickListener = (event) => {
if (this.visible && this.container && !this.container.contains(event.target) && !this.isTargetClicked(event)) {
const isOverlayMouseUp = this.container && this.container.contains(event.target);
const isTargetMouseUp = this.target && this.target.contains(event.target);
const isOutsideClicked = !this.isOverlayMouseDown && !isOverlayMouseUp && !isTargetMouseUp;

if (this.visible && isOutsideClicked) {
if (this.confirmation.onHide) {
this.confirmation.onHide();
}

this.visible = false;
} else {
this.alignOverlay();
}

this.isOverlayMouseDown = false;
};

document.addEventListener('click', this.outsideClickListener);
document.addEventListener('mouseup', this.outsideClickListener);
}
},
unbindOutsideClickListener() {
if (this.outsideClickListener) {
document.removeEventListener('click', this.outsideClickListener);
document.removeEventListener('mouseup', this.outsideClickListener);
this.outsideClickListener = null;
this.isOverlayMouseDown = false;
}
},
bindScrollListener() {
Expand Down Expand Up @@ -252,12 +258,12 @@ export default {
focusTarget.focus({ preventScroll: true }); // Firefox requires preventScroll
}
},
isTargetClicked(event) {
return this.target && (this.target === event.target || this.target.contains(event.target));
},
containerRef(el) {
this.container = el;
},
onOverlayMouseDown() {
this.isOverlayMouseDown = true;
},
onOverlayClick(event) {
OverlayEventBus.emit('overlay-click', {
originalEvent: event,
Expand Down
4 changes: 2 additions & 2 deletions components/lib/contextmenu/ContextMenu.vue
View file
Open in desktop
Expand Up @@ -418,12 +418,12 @@ export default {
}
};

document.addEventListener('click', this.outsideClickListener);
document.addEventListener('mousedown', this.outsideClickListener);
}
},
unbindOutsideClickListener() {
if (this.outsideClickListener) {
document.removeEventListener('click', this.outsideClickListener);
document.removeEventListener('mousedown', this.outsideClickListener);
this.outsideClickListener = null;
}
},
Expand Down
70 changes: 29 additions & 41 deletions components/lib/datatable/BodyCell.vue
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
:class="containerClass"
:colspan="columnProp('colspan')"
:rowspan="columnProp('rowspan')"
@click="onClick"
@mousedown="onMouseDown"
@keydown="onKeyDown"
role="cell"
v-bind="{ ...getColumnPT('root'), ...getColumnPT('bodyCell') }"
Expand Down Expand Up @@ -183,9 +183,8 @@ export default {
default: null
}
},
documentEditListener: null,
selfClick: false,
overlayEventListener: null,
documentMouseUpListener: null,
isSelfMouseDown: false,
data() {
return {
d_editing: this.editing,
Expand All @@ -201,6 +200,8 @@ export default {
}
},
mounted() {
this.bindDocumentMouseUpListener();

if (this.columnProp('frozen')) {
this.updateStickyPosition();
}
Expand All @@ -219,10 +220,7 @@ export default {
}
},
beforeUnmount() {
if (this.overlayEventListener) {
OverlayEventBus.off('overlay-click', this.overlayEventListener);
this.overlayEventListener = null;
}
this.unbindDocumentMouseUpListener();
},
methods: {
columnProp(prop) {
Expand Down Expand Up @@ -266,50 +264,40 @@ export default {
isEditable() {
return this.column.children && this.column.children.editor != null;
},
bindDocumentEditListener() {
if (!this.documentEditListener) {
this.documentEditListener = (event) => {
if (!this.selfClick) {
bindDocumentMouseUpListener() {
if (!this.documentMouseUpListener) {
this.documentMouseUpListener = (event) => {
const isSelfMouseUp = this.$el.contains(event.target);

if (this.isSelfMouseDown && isSelfMouseUp) {
if (!this.d_editing && this.editMode === 'cell' && this.isEditable()) {
this.d_editing = true;
this.$emit('cell-edit-init', { originalEvent: event, data: this.rowData, field: this.field, index: this.rowIndex });
}
}

if (!this.isSelfMouseDown && !isSelfMouseUp) {
this.completeEdit(event, 'outside');
}

this.selfClick = false;
this.isSelfMouseDown = false;
};

document.addEventListener('click', this.documentEditListener);
document.addEventListener('mouseup', this.documentMouseUpListener);
}
},
unbindDocumentEditListener() {
if (this.documentEditListener) {
document.removeEventListener('click', this.documentEditListener);
this.documentEditListener = null;
this.selfClick = false;
unbindDocumentMouseUpListener() {
if (this.documentMouseUpListener) {
document.removeEventListener('mouseup', this.documentMouseUpListener);
this.documentMouseUpListener = null;
this.isSelfMouseDown = false;
}
},
switchCellToViewMode() {
this.d_editing = false;
this.unbindDocumentEditListener();
OverlayEventBus.off('overlay-click', this.overlayEventListener);
this.overlayEventListener = null;
},
onClick(event) {
if (this.editMode === 'cell' && this.isEditable()) {
this.selfClick = true;

if (!this.d_editing) {
this.d_editing = true;
this.bindDocumentEditListener();
this.$emit('cell-edit-init', { originalEvent: event, data: this.rowData, field: this.field, index: this.rowIndex });

this.overlayEventListener = (e) => {
if (this.$el && this.$el.contains(e.target)) {
this.selfClick = true;
}
};

OverlayEventBus.on('overlay-click', this.overlayEventListener);
}
}
},
onMouseDown() {
this.isSelfMouseDown = true;
},
completeEdit(event, type) {
const completeEvent = {
Expand Down