From 775ceb47c13fff877a510a98d8eff0e476333c78 Mon Sep 17 00:00:00 2001
From: Erik-Jan <e-j.beuker@hotmail.com>
Date: Fri, 8 Jan 2021 23:59:33 +0100
Subject: [PATCH] Overflow menu first time open behavior is not correct (#477)

* Close overflow menu on focusout

* fix styling and behavior of overflow menu,
 when it is opened for the first time

* remove previous commit

* Fix keyboard navigation of overflow menu items
---
 src/OverflowMenu/OverflowMenu.svelte | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/OverflowMenu/OverflowMenu.svelte b/src/OverflowMenu/OverflowMenu.svelte
index 969758c5..c0c2e9c3 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,13 @@
       }
     }
 
-    if (didOpen && !open) {
+    if (!open) {
       items.set([]);
       currentId.set(undefined);
       currentIndex.set(0);
     }
 
-    if (!didOpen && open) {
-      didOpen = true;
-    }
+    onMountAfterUpdate = false;
   });
 
   $: ariaLabel = $$props["aria-label"] || "menu";