From dd5873b513fba384a046020d8ddf29cfba052305 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <antonella@standardnotes.org>
Date: Fri, 7 May 2021 17:46:08 -0300
Subject: [PATCH] fix: revert closeOnBlur changes

---
 .../components/NotesContextMenu.tsx           |  3 +-
 .../javascripts/components/NotesOptions.tsx   | 28 +++++--------------
 .../components/NotesOptionsPanel.tsx          |  3 +-
 app/assets/javascripts/components/utils.ts    |  2 --
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/components/NotesContextMenu.tsx b/app/assets/javascripts/components/NotesContextMenu.tsx
index c09844647..1d2c1f86d 100644
--- a/app/assets/javascripts/components/NotesContextMenu.tsx
+++ b/app/assets/javascripts/components/NotesContextMenu.tsx
@@ -10,7 +10,7 @@ type Props = {
 
 const NotesContextMenu = observer(({ appState }: Props) => {
   const contextMenuRef = useRef<HTMLDivElement>();
-  const [closeOnBlur, blurLocked, setLockCloseOnBlur] = useCloseOnBlur(
+  const [closeOnBlur, setLockCloseOnBlur] = useCloseOnBlur(
     contextMenuRef,
     (open: boolean) => appState.notes.setContextMenuOpen(open)
   );
@@ -37,7 +37,6 @@ const NotesContextMenu = observer(({ appState }: Props) => {
       <NotesOptions
         appState={appState}
         closeOnBlur={closeOnBlur}
-        blurLocked={blurLocked}
         setLockCloseOnBlur={setLockCloseOnBlur}
       />
     </div>
diff --git a/app/assets/javascripts/components/NotesOptions.tsx b/app/assets/javascripts/components/NotesOptions.tsx
index 2e804d94e..6e12a3e88 100644
--- a/app/assets/javascripts/components/NotesOptions.tsx
+++ b/app/assets/javascripts/components/NotesOptions.tsx
@@ -12,18 +12,20 @@ import {
 type Props = {
   appState: AppState;
   closeOnBlur: (event: { relatedTarget: EventTarget | null }) => void;
-  blurLocked: boolean;
   setLockCloseOnBlur: (lock: boolean) => void;
 };
 
 export const NotesOptions = observer(
-  ({ appState, closeOnBlur, blurLocked, setLockCloseOnBlur }: Props) => {
+  ({ appState, closeOnBlur, setLockCloseOnBlur }: Props) => {
     const [tagsMenuOpen, setTagsMenuOpen] = useState(false);
     const [tagsMenuPosition, setTagsMenuPosition] = useState({
       top: 0,
       right: 0,
     });
-    const [shouldTrashNotes, setShouldTrashNotes] = useState(false);
+    const [lockedBlurAction, setLockedBlurAction] = useState<
+      Promise<void> | null
+    >(null);
+    const [shouldRunLockedBlurAction, setShouldRunLockedBlurAction] = useState(false);
 
     const notes = Object.values(appState.notes.selectedNotes);
     const hidePreviews = !notes.some((note) => !note.hidePreview);
@@ -41,23 +43,6 @@ export const NotesOptions = observer(
       'cursor-pointer hover:bg-contrast color-text bg-transparent px-3 ' +
       'text-left';
 
-    useEffect(() => {
-      const openTrashAlert = async () => {
-        if (shouldTrashNotes && blurLocked) {
-          setShouldTrashNotes(false);
-          await appState.notes.setTrashSelectedNotes(!trashed, trashButtonRef);
-          setLockCloseOnBlur(false);
-        }
-      };
-      openTrashAlert();
-    }, [
-      appState.notes,
-      blurLocked,
-      setLockCloseOnBlur,
-      shouldTrashNotes,
-      trashed,
-    ]);
-
     return (
       <>
         <Switch
@@ -186,7 +171,8 @@ export const NotesOptions = observer(
           onBlur={closeOnBlur}
           className={`${buttonClass} py-1.5`}
           onClick={async () => {
-            setShouldTrashNotes(true);
+            setLockCloseOnBlur(true);
+            await appState.notes.setTrashSelectedNotes(!trashed, trashButtonRef);
             setLockCloseOnBlur(true);
           }}
         >
diff --git a/app/assets/javascripts/components/NotesOptionsPanel.tsx b/app/assets/javascripts/components/NotesOptionsPanel.tsx
index 47e429b94..d1b3fa96e 100644
--- a/app/assets/javascripts/components/NotesOptionsPanel.tsx
+++ b/app/assets/javascripts/components/NotesOptionsPanel.tsx
@@ -23,7 +23,7 @@ export const NotesOptionsPanel = observer(({ appState }: Props) => {
   });
   const buttonRef = useRef<HTMLButtonElement>();
   const panelRef = useRef<HTMLDivElement>();
-  const [closeOnBlur, blurLocked, setLockCloseOnBlur] = useCloseOnBlur(panelRef, setOpen);
+  const [closeOnBlur, setLockCloseOnBlur] = useCloseOnBlur(panelRef, setOpen);
 
   return (
     <Disclosure
@@ -71,7 +71,6 @@ export const NotesOptionsPanel = observer(({ appState }: Props) => {
           <NotesOptions
             appState={appState}
             closeOnBlur={closeOnBlur}
-            blurLocked={blurLocked}
             setLockCloseOnBlur={setLockCloseOnBlur}
           />
         )}
diff --git a/app/assets/javascripts/components/utils.ts b/app/assets/javascripts/components/utils.ts
index eab1724de..13e025192 100644
--- a/app/assets/javascripts/components/utils.ts
+++ b/app/assets/javascripts/components/utils.ts
@@ -11,7 +11,6 @@ export function useCloseOnBlur(
   setOpen: (open: boolean) => void
 ): [
   (event: { relatedTarget: EventTarget | null }) => void,
-  boolean,
   StateUpdater<boolean>
 ] {
   const [locked, setLocked] = useState(false);
@@ -27,7 +26,6 @@ export function useCloseOnBlur(
       },
       [container, setOpen, locked]
     ),
-    locked,
     setLocked,
   ];
 }