Skip to content

fix: popover closing on delete dialog #1022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amanharwara merged 1 commit into from
May 10, 2022
Merged

fix: popover closing on delete dialog #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 8 additions & 4 deletions app/assets/javascripts/Hooks/useCloseOnBlur.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]
Expand Down