From a76f57c608cb96d170c7d32fa505af5e7db675f3 Mon Sep 17 00:00:00 2001
From: ebeuker <e-j.beuker@hotmail.com>
Date: Sun, 3 Jan 2021 13:49:53 +0100
Subject: [PATCH] fix styling and behavior of overflow menu,  when it is opened
 for the first time

---
 src/OverflowMenu/OverflowMenu.svelte | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/OverflowMenu/OverflowMenu.svelte b/src/OverflowMenu/OverflowMenu.svelte
index 969758c5..a632923d 100644
--- a/src/OverflowMenu/OverflowMenu.svelte
+++ b/src/OverflowMenu/OverflowMenu.svelte
@@ -66,7 +66,7 @@
   const currentIndex = writable(-1);
 
   let buttonWidth = undefined;
-  let didOpen = false;
+  let onMountAfterUpdate = true;
 
   setContext("OverflowMenu", {
     focusedId,
@@ -108,7 +108,7 @@
 
       buttonWidth = width;
 
-      if ($currentIndex < 0) {
+      if (!onMountAfterUpdate && $currentIndex < 0) {
         menuRef.focus();
       }
 
@@ -125,15 +125,11 @@
       }
     }
 
-    if (didOpen && !open) {
-      items.set([]);
-      currentId.set(undefined);
-      currentIndex.set(0);
-    }
+    items.set([]);
+    currentId.set(undefined);
+    currentIndex.set(0);
 
-    if (!didOpen && open) {
-      didOpen = true;
-    }
+    onMountAfterUpdate = false;
   });
 
   $: ariaLabel = $$props["aria-label"] || "menu";