From c7d2545ec7bbcdba30b775453d53df5a359410bd Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 21 Sep 2023 15:35:27 +0800 Subject: Revert dialog. --- FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx | 28 +++++++++++------------ 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx') diff --git a/FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx b/FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx index 0df10411..4cdecbbb 100644 --- a/FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx +++ b/FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx @@ -9,21 +9,21 @@ import { getHttpUserClient } from "~src/http/user"; import { ImageCropper, useImageCrop } from "~src/components/ImageCropper"; import BlobImage from "~src/components/BlobImage"; import { ButtonRowV2 } from "~src/components/button"; -import { - Dialog, - DialogContainer, - useDialogController, -} from "~src/components/dialog"; +import { Dialog, DialogContainer } from "~src/components/dialog"; import "./ChangeAvatarDialog.css"; -export default function ChangeAvatarDialog() { +export default function ChangeAvatarDialog({ + open, + onClose, +}: { + open: boolean; + onClose: () => void; +}) { const c = useC(); const user = useUser(); - const controller = useDialogController(); - type State = | "select" | "crop" @@ -47,7 +47,9 @@ export default function ChangeAvatarDialog() { "settings.dialogChangeAvatar.prompt.select", ); - const close = controller.closeDialog; + const close = () => { + if (state !== "uploading") onClose(); + }; const onSelectFile = (e: ChangeEvent): void => { const files = e.target.files; @@ -90,7 +92,6 @@ export default function ChangeAvatarDialog() { } setState("uploading"); - controller.setCanSwitchDialog(false); getHttpUserClient() .putAvatar(user.username, resultBlob) .then( @@ -101,10 +102,7 @@ export default function ChangeAvatarDialog() { setState("error"); setMessage("operationDialog.error"); }, - ) - .finally(() => { - controller.setCanSwitchDialog(true); - }); + ); }; const cancelButton = { @@ -177,7 +175,7 @@ export default function ChangeAvatarDialog() { }; return ( - +