Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-12 16:25:51 +01:00
Code Issues Packages Projects Releases Activity

refactor(react): fix a few rules of hooks violations

Browse Source
This commit is contained in:
Elian Doran
2025-08-25 18:00:10 +03:00
parent e386b03b90
commit 733ec2c145
9 changed files with 125 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,29 +71,27 @@ export default function Modal({ children, className, size, title, header, footer
const parentWidget = useContext(ParentComponent);
const elementToFocus = useRef<Element | null>();
if (onShown || onHidden) {
useEffect(() => {
const modalElement = modalRef.current;
if (!modalElement) {
return;
useEffect(() => {
const modalElement = modalRef.current;
if (!modalElement) {
return;
}
if (onShown) {
modalElement.addEventListener("shown.bs.modal", onShown);
}
modalElement.addEventListener("hidden.bs.modal", () => {
onHidden();
if (elementToFocus.current && "focus" in elementToFocus.current) {
(elementToFocus.current as HTMLElement).focus();
}
});
return () => {
if (onShown) {
modalElement.addEventListener("shown.bs.modal", onShown);
modalElement.removeEventListener("shown.bs.modal", onShown);
}
modalElement.addEventListener("hidden.bs.modal", () => {
onHidden();
if (elementToFocus.current && "focus" in elementToFocus.current) {
(elementToFocus.current as HTMLElement).focus();
}
});
return () => {
if (onShown) {
modalElement.removeEventListener("shown.bs.modal", onShown);
}
modalElement.removeEventListener("hidden.bs.modal", onHidden);
};
}, [ ]);
}
modalElement.removeEventListener("hidden.bs.modal", onHidden);
};
}, [ onShown, onHidden ]);
useEffect(() => {
if (!parentWidget) {