From 5fef1ecb72ff6080fc106dde48137e63a7f52bc1 Mon Sep 17 00:00:00 2001
From: bduran <bryan.duran@jpl.nasa.gov>
Date: Tue, 25 Feb 2025 12:51:21 -0800
Subject: [PATCH 1/2] apply same `Menu` logic to `ContextMenu` to ensure only
 one is open at any time.

---
 .../context-menu/ContextMenu.svelte           | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/components/context-menu/ContextMenu.svelte b/src/components/context-menu/ContextMenu.svelte
index 6eccba8345..4f49527c44 100644
--- a/src/components/context-menu/ContextMenu.svelte
+++ b/src/components/context-menu/ContextMenu.svelte
@@ -1,7 +1,19 @@
 <svelte:options accessors={true} immutable={true} />
 
+<script lang="ts" context="module">
+  type HideFns = Set<() => void>;
+  const hideFns: HideFns = new Set<() => void>();
+
+  export function hideAllMenus() {
+    // TODO: https://github.com/sveltejs/language-tools/issues/1229
+    hideFns.forEach(hideFn => {
+      hideFn();
+    });
+  }
+</script>
+
 <script lang="ts">
-  import { createEventDispatcher } from 'svelte';
+  import { createEventDispatcher, onDestroy, onMount } from 'svelte';
   import { fade } from 'svelte/transition';
 
   const dispatch = createEventDispatcher<{
@@ -33,6 +45,7 @@
   }
 
   export function show(e: MouseEvent): void {
+    hideAllMenus();
     e.preventDefault();
     shown = true;
     x = e.clientX;
@@ -44,6 +57,14 @@
   let x: number;
   let y: number;
 
+  onMount(() => {
+    hideFns.add(hide);
+  });
+
+  onDestroy(() => {
+    hideFns.delete(hide);
+  });
+
   $: if (div) {
     const rect = div.getBoundingClientRect();
     if (x + rect.width > window.innerWidth) {

From fdcbc1fe2380fd002915351c1711047ab95cf0e8 Mon Sep 17 00:00:00 2001
From: bduran <bryan.duran@jpl.nasa.gov>
Date: Wed, 26 Feb 2025 10:23:25 -0800
Subject: [PATCH 2/2] cleanup comments

---
 src/components/context-menu/ContextMenu.svelte | 1 -
 src/components/menus/Menu.svelte               | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/context-menu/ContextMenu.svelte b/src/components/context-menu/ContextMenu.svelte
index 4f49527c44..3a8b94592f 100644
--- a/src/components/context-menu/ContextMenu.svelte
+++ b/src/components/context-menu/ContextMenu.svelte
@@ -5,7 +5,6 @@
   const hideFns: HideFns = new Set<() => void>();
 
   export function hideAllMenus() {
-    // TODO: https://github.com/sveltejs/language-tools/issues/1229
     hideFns.forEach(hideFn => {
       hideFn();
     });
diff --git a/src/components/menus/Menu.svelte b/src/components/menus/Menu.svelte
index 462e01ffa0..d9d2cb0481 100644
--- a/src/components/menus/Menu.svelte
+++ b/src/components/menus/Menu.svelte
@@ -12,7 +12,6 @@
   };
 
   export function hideAllMenus(type?: MenuType) {
-    // TODO: https://github.com/sveltejs/language-tools/issues/1229
     if (type) {
       hideFns[type].forEach(hide => {
         hide();