From f9c2b19eacf84e5461b269ec81b58163bd703c37 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <antonella@standardnotes.org>
Date: Wed, 2 Jun 2021 18:59:27 -0300
Subject: [PATCH] fix: reload tabIndex after tags expansion

---
 app/assets/javascripts/components/NoteTag.tsx                  | 3 ++-
 .../javascripts/ui_models/app_state/active_note_state.ts       | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/components/NoteTag.tsx b/app/assets/javascripts/components/NoteTag.tsx
index 6d15c04d8..cf86641a6 100644
--- a/app/assets/javascripts/components/NoteTag.tsx
+++ b/app/assets/javascripts/components/NoteTag.tsx
@@ -14,6 +14,7 @@ type Props = {
 export const NoteTag: FunctionalComponent<Props> = ({ appState, tag }) => {
   const {
     tags,
+    tagsContainerExpanded,
     tagsContainerMaxWidth,
   } = appState.activeNote;
 
@@ -48,7 +49,7 @@ export const NoteTag: FunctionalComponent<Props> = ({ appState, tag }) => {
 
   useEffect(() => {
     reloadOverflowed();
-  }, [reloadOverflowed, tags, tagsContainerMaxWidth]);
+  }, [reloadOverflowed, tags, tagsContainerExpanded, tagsContainerMaxWidth]);
 
   const contextMenuListener = (event: MouseEvent) => {
     event.preventDefault();
diff --git a/app/assets/javascripts/ui_models/app_state/active_note_state.ts b/app/assets/javascripts/ui_models/app_state/active_note_state.ts
index 254b0da38..c61de8564 100644
--- a/app/assets/javascripts/ui_models/app_state/active_note_state.ts
+++ b/app/assets/javascripts/ui_models/app_state/active_note_state.ts
@@ -134,6 +134,9 @@ export class ActiveNoteState {
   }
 
   isTagOverflowed(tag: SNTag): boolean {
+    if (this.tagsContainerExpanded) {
+      return false;
+    }
     const tagElement = this.getTagElement(tag);
     return tagElement ? this.isElementOverflowed(tagElement) : false;
   }