Skip to content

High performance self-hosted photo and video management solution.

fix(web): clicking away closes context menu (#16989)

Ben3c8734190280
diff --git a/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte b/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte
index 62cc617223..a3e12e4f12 100644
--- a/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte
+++ b/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte
@@ -1,5 +1,4 @@
<script lang="ts">
- import { clickOutside } from '$lib/actions/click-outside';
import { contextMenuNavigation } from '$lib/actions/context-menu-navigation';
import { shortcuts } from '$lib/actions/shortcut';
import CircleIconButton, {
@@ -105,6 +104,19 @@
closeDropdown();
};
+ const handleDocumentClick = (event: MouseEvent) => {
+ if (!isOpen) {
+ return;
+ }
+
+ const target = event.target as Node | null;
+ if (buttonContainer?.contains(target)) {
+ return;
+ }
+
+ closeDropdown();
+ };
+
const focusButton = () => {
const button = buttonContainer?.querySelector(`#${buttonId}`) as HTMLButtonElement | null;
button?.focus();
@@ -118,6 +130,7 @@
</script>
<svelte:window onresize={onResize} />
+<svelte:document onclick={handleDocumentClick} />
<div
use:contextMenuNavigation={{
@@ -129,7 +142,6 @@
selectedId: $selectedIdStore,
selectionChanged: (id) => ($selectedIdStore = id),
}}
- use:clickOutside={{ onOutclick: closeDropdown }}
onresize={onResize}
{...restProps}
>