From ffe0ef6dc532f5bf0226e074f95a351b36c5abbd Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 21 Sep 2023 17:45:06 +0800 Subject: ... --- FrontEnd/index.html | 1 + FrontEnd/src/components/InPortal.tsx | 14 ++++++ FrontEnd/src/components/dialog/Dialog.tsx | 60 ++++++++++++----------- FrontEnd/src/components/dialog/FullPageDialog.tsx | 55 +++++++++++---------- 4 files changed, 76 insertions(+), 54 deletions(-) create mode 100644 FrontEnd/src/components/InPortal.tsx diff --git a/FrontEnd/index.html b/FrontEnd/index.html index 64f55c90..859c3be7 100644 --- a/FrontEnd/index.html +++ b/FrontEnd/index.html @@ -26,6 +26,7 @@
+
diff --git a/FrontEnd/src/components/InPortal.tsx b/FrontEnd/src/components/InPortal.tsx new file mode 100644 index 00000000..7cb57ea8 --- /dev/null +++ b/FrontEnd/src/components/InPortal.tsx @@ -0,0 +1,14 @@ +import { ReactNode } from "react"; +import ReactDOM from "react-dom"; + +const optionalPortalElement = window.document.getElementById("portal"); +if (optionalPortalElement == null) { + throw Error("No portal element found."); +} + +const portalElement = optionalPortalElement; + +export default function InPortal({ children }: { children: ReactNode }) { + return ReactDOM.createPortal(<>{children}, portalElement); +} + diff --git a/FrontEnd/src/components/dialog/Dialog.tsx b/FrontEnd/src/components/dialog/Dialog.tsx index 15c898f1..2d0b34db 100644 --- a/FrontEnd/src/components/dialog/Dialog.tsx +++ b/FrontEnd/src/components/dialog/Dialog.tsx @@ -4,6 +4,8 @@ import { CSSTransition } from "react-transition-group"; import { ThemeColor } from "../common"; +import InPortal from "../InPortal"; + import "./Dialog.css"; interface DialogProps { @@ -25,35 +27,37 @@ export default function Dialog({ const lastPointerDownIdRef = useRef(null); return ( - -
+
{ - lastPointerDownIdRef.current = e.pointerId; - }} - onPointerUp={(e) => { - if (lastPointerDownIdRef.current === e.pointerId) { - if (!disableCloseOnClickOnOverlay) onClose(); - } - lastPointerDownIdRef.current = null; - }} - /> -
{children}
-
-
+ ref={nodeRef} + className={classNames( + `cru-theme-${color ?? "primary"}`, + "cru-dialog-overlay", + )} + > +
{ + lastPointerDownIdRef.current = e.pointerId; + }} + onPointerUp={(e) => { + if (lastPointerDownIdRef.current === e.pointerId) { + if (!disableCloseOnClickOnOverlay) onClose(); + } + lastPointerDownIdRef.current = null; + }} + /> +
{children}
+
+ + ); } diff --git a/FrontEnd/src/components/dialog/FullPageDialog.tsx b/FrontEnd/src/components/dialog/FullPageDialog.tsx index ad5abfde..b0a39ee3 100644 --- a/FrontEnd/src/components/dialog/FullPageDialog.tsx +++ b/FrontEnd/src/components/dialog/FullPageDialog.tsx @@ -4,6 +4,7 @@ import { CSSTransition } from "react-transition-group"; import { ThemeColor } from "../common"; import { IconButton } from "../button"; +import InPortal from "../InPortal"; import "./FullPageDialog.css"; @@ -25,35 +26,37 @@ export default function FullPageDialog({ const nodeRef = useRef(null); return ( - -
+ -
- -
- {children} +
+ +
+
+ {children} +
-
-
+ + ); } -- cgit v1.2.3