gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-30 04:24:24 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

fix(quick_edit): block popup not working

Browse Source
This commit is contained in:
Elian Doran 2025-11-29 11:47:36 +02:00
parent 1fe8079fd5
commit 70fe3b9773
No known key found for this signature in database
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/client/src/widgets/dialogs/PopupEditor.tsx
View File

@ -67,6 +67,7 @@ export default function PopupEditor() {
}} }}
onHidden={() => setShown(false)} onHidden={() => setShown(false)}
keepInDom // needed for faster loading keepInDom // needed for faster loading
noFocus // automatic focus breaks block popup
> >
<ReadOnlyNoteInfoBar /> <ReadOnlyNoteInfoBar />
<PromotedAttributes /> <PromotedAttributes />

12
apps/client/src/widgets/react/Modal.tsx
View File

@ -66,9 +66,13 @@ interface ModalProps {
* If true, the modal will remain in the DOM even when not shown. This can be useful for certain CSS transitions or when you want to avoid re-mounting the modal content. * If true, the modal will remain in the DOM even when not shown. This can be useful for certain CSS transitions or when you want to avoid re-mounting the modal content.
*/ */
keepInDom?: boolean; keepInDom?: boolean;
/**
* If true, the modal will not focus itself after becoming visible.
*/
noFocus?: boolean;
} }
export default function Modal({ children, className, size, title, header, footer, footerStyle, footerAlignment, onShown, onSubmit, helpPageId, minWidth, maxWidth, zIndex, scrollable, onHidden: onHidden, modalRef: externalModalRef, formRef, bodyStyle, show, stackable, keepInDom }: ModalProps) { export default function Modal({ children, className, size, title, header, footer, footerStyle, footerAlignment, onShown, onSubmit, helpPageId, minWidth, maxWidth, zIndex, scrollable, onHidden: onHidden, modalRef: externalModalRef, formRef, bodyStyle, show, stackable, keepInDom, noFocus }: ModalProps) {
const modalRef = useSyncedRef<HTMLDivElement>(externalModalRef); const modalRef = useSyncedRef<HTMLDivElement>(externalModalRef);
const modalInstanceRef = useRef<BootstrapModal>(); const modalInstanceRef = useRef<BootstrapModal>();
const elementToFocus = useRef<Element | null>(); const elementToFocus = useRef<Element | null>();
@ -100,13 +104,15 @@ export default function Modal({ children, className, size, title, header, footer
useEffect(() => { useEffect(() => {
if (show && modalRef.current) { if (show && modalRef.current) {
elementToFocus.current = document.activeElement; elementToFocus.current = document.activeElement;
openDialog($(modalRef.current), !stackable).then(($widget) => { openDialog($(modalRef.current), !stackable, {
focus: !noFocus
}).then(($widget) => {
modalInstanceRef.current = BootstrapModal.getOrCreateInstance($widget[0]); modalInstanceRef.current = BootstrapModal.getOrCreateInstance($widget[0]);
}) })
} else { } else {
modalInstanceRef.current?.hide(); modalInstanceRef.current?.hide();
} }
}, [ show, modalRef.current ]); }, [ show, modalRef.current, noFocus ]);
// Memoize styles to prevent recreation on every render // Memoize styles to prevent recreation on every render
const dialogStyle = useMemo<CSSProperties>(() => { const dialogStyle = useMemo<CSSProperties>(() => {