rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: popover closing on delete dialog (#1022)

Browse Source
This commit is contained in:
Aman Harwara
2022-05-10 22:41:40 +05:30
committed by GitHub
parent ae1097f207
commit ada8d5ab80
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx
View File

@@ -41,7 +41,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)
const [closeOnBlur, keepMenuOpen] = useCloseOnBlur(containerRef, setOpen, true)
useEffect(() => {
if (appState.filePreviewModal.isOpen) {

12
app/assets/javascripts/Hooks/useCloseOnBlur.ts
View File

@@ -8,16 +8,20 @@ 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 }) {
if (!locked && !container.current?.contains(event.relatedTarget as Node)) {
setOpen(false)
}
setTimeout(() => {
const keepOpen = keepOpenOnDialogs && document.activeElement?.closest('[role="dialog"], .sk-modal')
if (!keepOpen && !locked && !container.current?.contains(event.relatedTarget as Node)) {
setOpen(false)
}
})
},
[container, setOpen, locked],
[keepOpenOnDialogs, locked, container, setOpen],
),
setLocked,
]