revert: "fix: popover closing on delete dialog" (#1030)

standardnotes · May 17, 2022 · b3f6888 · b3f6888
1 parent 7f12f93
commit b3f6888
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx
@@ -43,7 +43,7 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
     const buttonRef = useRef<HTMLButtonElement>(null)
     const panelRef = useRef<HTMLDivElement>(null)
     const containerRef = useRef<HTMLDivElement>(null)
-    const [closeOnBlur, keepMenuOpen] = useCloseOnBlur(containerRef, setOpen, true)
+    const [closeOnBlur, keepMenuOpen] = useCloseOnBlur(containerRef, setOpen)
 
     useEffect(() => {
       if (appState.filePreviewModal.isOpen) {

diff --git a/app/assets/javascripts/Hooks/useCloseOnBlur.ts b/app/assets/javascripts/Hooks/useCloseOnBlur.ts
@@ -8,20 +8,16 @@ import { StateUpdater, useCallback, useState } from 'preact/hooks'
 export function useCloseOnBlur(
   container: { current?: HTMLDivElement | null },
   setOpen: (open: boolean) => void,
-  keepOpenOnDialogs = false,
 ): [(event: { relatedTarget: EventTarget | null }) => void, StateUpdater<boolean>] {
   const [locked, setLocked] = useState(false)
   return [
     useCallback(
       function onBlur(event: { relatedTarget: EventTarget | null }) {
-        setTimeout(() => {
-          const keepOpen = keepOpenOnDialogs && document.activeElement?.closest('[role="dialog"], .sk-modal')
-          if (!keepOpen && !locked && !container.current?.contains(event.relatedTarget as Node)) {
-            setOpen(false)
-          }
-        })
+        if (!locked && !container.current?.contains(event.relatedTarget as Node)) {
+          setOpen(false)
+        }
       },
-      [keepOpenOnDialogs, locked, container, setOpen],
+      [container, setOpen, locked],
     ),
     setLocked,
   ]