From e3de0bc5ca87402532407736b8e27a3b477ed22d Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Mon, 10 Nov 2025 21:57:14 +0800 Subject: [PATCH] enhance(ux): add close button for e2ee password dialogs and disable click outside --- src/main/frontend/handler/events/rtc.cljs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/frontend/handler/events/rtc.cljs b/src/main/frontend/handler/events/rtc.cljs index 3f3b52265e..4b2c743e74 100644 --- a/src/main/frontend/handler/events/rtc.cljs +++ b/src/main/frontend/handler/events/rtc.cljs @@ -10,8 +10,11 @@ (shui/dialog-close-all!) (shui/dialog-open! #(e2ee/e2ee-password-to-decrypt-private-key encrypted-private-key private-key-promise) - {:close-btn? false - :auto-width? true}) + {:auto-width? true + :content-props {:onPointerDownOutside #(.preventDefault %)} + :on-close (fn [] + (p/reject! private-key-promise (ex-info "input E2EE password cancelled" {})) + (shui/dialog-close!))}) private-key-promise)) (defmethod events/handle :rtc/request-e2ee-password [[_]] @@ -19,6 +22,9 @@ (shui/dialog-close-all!) (shui/dialog-open! #(e2ee/e2ee-request-new-password password-promise) - {:close-btn? false - :auto-width? true}) + {:auto-width? true + :content-props {:onPointerDownOutside #(.preventDefault %)} + :on-close (fn [] + (p/reject! password-promise (ex-info "cancelled" {})) + (shui/dialog-close!))}) password-promise))