Skip to content

Move away side effect in copmuted definition #5076

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

Merged
myovchev merged 1 commit into from
Sep 17, 2025
Merged

Move away side effect in copmuted definition #5076

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions modules/@apostrophecms/area/ui/apos/components/AposAreaWidget.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ export default {
isSuppressed: false,
menuOpen: null,
isSuppressingWidgetControls: false,
hasClickOutsideListener: false, // Track if click-outside listener is active
classes: {
show: 'apos-is-visible',
open: 'apos-is-open',
Expand Down Expand Up @@ -396,13 +397,7 @@ export default {
return false;
}

const isWidgetFocused = this.widgetFocused === this.widget._id;
// FIXME: this is a memory leak, move to a watcher?
if (isWidgetFocused) {
document.addEventListener('click', this.unfocus);
}

return isWidgetFocused;
return this.widgetFocused === this.widget._id;
},
isHovered() {
return this.widgetHovered === this.widget._id;
Expand Down Expand Up @@ -450,10 +445,12 @@ export default {
isFocused(newVal) {
if (newVal) {
this.$refs.wrapper.addEventListener('keydown', this.handleKeyboardUnfocus);
this.addClickOutsideListener();
} else {
this.menuOpen = null;
this.$refs.wrapper.removeEventListener('keydown', this.handleKeyboardUnfocus);
this.isSuppressingWidgetControls = false;
this.removeClickOutsideListener();
}
}
},
Expand Down Expand Up @@ -488,6 +485,8 @@ export default {
unmounted() {
// Remove the focus parent listener when unmounted
apos.bus.$off('widget-focus-parent', this.focusParent);
// Ensure click-outside listener is cleaned up
this.removeClickOutsideListener();
},
methods: {
// Emits same actions as the Standard operations,
Expand Down Expand Up @@ -576,11 +575,23 @@ export default {
unfocus(event) {
if (!this.$el.contains(event.target)) {
this.isSuppressed = true;
document.removeEventListener('click', this.unfocus);
this.removeClickOutsideListener();
apos.bus.$emit('widget-focus', { _id: null });
}
},

addClickOutsideListener() {
if (!this.hasClickOutsideListener) {
document.addEventListener('click', this.unfocus);
this.hasClickOutsideListener = true;
}
},

removeClickOutsideListener() {
document.removeEventListener('click', this.unfocus);
this.hasClickOutsideListener = false;
},

handleKeyboardFocus($event) {
if ($event.key === 'Enter' || $event.code === 'Space') {
$event.preventDefault();
Expand Down