From c150cd6867af87a6aa82cfaae809214cae57ad44 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Fri, 4 Mar 2022 18:14:25 +0530
Subject: [PATCH] feat: close change editor menu once editor is selected (#907)

---
 app/assets/javascripts/components/ChangeEditorButton.tsx      | 3 +++
 .../components/NotesOptions/ChangeEditorOption.tsx            | 3 +++
 .../components/NotesOptions/changeEditor/ChangeEditorMenu.tsx | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/app/assets/javascripts/components/ChangeEditorButton.tsx b/app/assets/javascripts/components/ChangeEditorButton.tsx
index 715dd94d7..c080c35ec 100644
--- a/app/assets/javascripts/components/ChangeEditorButton.tsx
+++ b/app/assets/javascripts/components/ChangeEditorButton.tsx
@@ -130,6 +130,9 @@ export const ChangeEditorButton: FunctionComponent<Props> = observer(
                 setSelectedEditor={setCurrentEditor}
                 note={note}
                 groups={editorMenuGroups}
+                closeMenu={() => {
+                  setOpen(false);
+                }}
               />
             )}
           </DisclosurePanel>
diff --git a/app/assets/javascripts/components/NotesOptions/ChangeEditorOption.tsx b/app/assets/javascripts/components/NotesOptions/ChangeEditorOption.tsx
index 7f35a9f2d..fb90c0623 100644
--- a/app/assets/javascripts/components/NotesOptions/ChangeEditorOption.tsx
+++ b/app/assets/javascripts/components/NotesOptions/ChangeEditorOption.tsx
@@ -148,6 +148,9 @@ export const ChangeEditorOption: FunctionComponent<ChangeEditorOptionProps> = ({
             note={note}
             groups={editorMenuGroups}
             isOpen={changeEditorMenuVisible}
+            closeMenu={() => {
+              setChangeEditorMenuOpen(false);
+            }}
           />
         )}
       </DisclosurePanel>
diff --git a/app/assets/javascripts/components/NotesOptions/changeEditor/ChangeEditorMenu.tsx b/app/assets/javascripts/components/NotesOptions/changeEditor/ChangeEditorMenu.tsx
index ac4a0631d..b6578bdba 100644
--- a/app/assets/javascripts/components/NotesOptions/changeEditor/ChangeEditorMenu.tsx
+++ b/app/assets/javascripts/components/NotesOptions/changeEditor/ChangeEditorMenu.tsx
@@ -26,6 +26,7 @@ import { PLAIN_EDITOR_NAME } from './createEditorMenuGroups';
 type ChangeEditorMenuProps = {
   application: WebApplication;
   closeOnBlur: (event: { relatedTarget: EventTarget | null }) => void;
+  closeMenu: () => void;
   groups: EditorMenuGroup[];
   isOpen: boolean;
   currentEditor: SNComponent | undefined;
@@ -39,6 +40,7 @@ const getGroupId = (group: EditorMenuGroup) =>
 export const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
   application,
   closeOnBlur,
+  closeMenu,
   groups,
   isOpen,
   currentEditor,
@@ -169,6 +171,8 @@ export const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
     if (shouldSelectEditor) {
       selectComponent(itemToBeSelected.component ?? null, note);
     }
+
+    closeMenu();
   };
 
   return (