From 8a756300e51e90b17cd4c2aa1e15220b81a54e91 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Wed, 9 Apr 2025 11:30:35 +0200
Subject: [PATCH] Fix: dualtime view don't show on menu open

---
 src/lib/components/dualTimeView.svelte | 8 +++++++-
 src/lib/components/menu/menu.svelte    | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/dualTimeView.svelte b/src/lib/components/dualTimeView.svelte
index 5b28abdbc..4798414cc 100644
--- a/src/lib/components/dualTimeView.svelte
+++ b/src/lib/components/dualTimeView.svelte
@@ -75,7 +75,13 @@
 </script>
 
 <Popover let:show let:hide {placement} portal>
-    <button on:mouseenter={() => setTimeout(show, 150)} on:mouseleave={() => hidePopover(hide)}>
+    <button
+        on:mouseenter={() => {
+            if (!document.getElementById('actionmenuopen')) {
+                setTimeout(show, 150);
+            }
+        }}
+        on:mouseleave={() => hidePopover(hide)}>
         <slot>{capitalize(timeFromNow(time))}</slot>
     </button>
 
diff --git a/src/lib/components/menu/menu.svelte b/src/lib/components/menu/menu.svelte
index ca115bb76..7e0530425 100644
--- a/src/lib/components/menu/menu.svelte
+++ b/src/lib/components/menu/menu.svelte
@@ -18,6 +18,9 @@
 </script>
 
 <div use:melt={$menubar}>
+    {#if $open}
+        <div style:display="none" id="actionmenuopen"></div>
+    {/if}
     <div use:melt={$trigger}>
         <slot />
     </div>