From 4151a520e0e70dbeb758aba5d89d72f1b81d8b08 Mon Sep 17 00:00:00 2001 From: Peng Xiao Date: Wed, 24 Aug 2022 14:13:14 +0800 Subject: [PATCH] fix: shortcut conflicts --- src/main/frontend/modules/shortcut/before.cljs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/frontend/modules/shortcut/before.cljs b/src/main/frontend/modules/shortcut/before.cljs index bf573cd748..ab25ba4e24 100644 --- a/src/main/frontend/modules/shortcut/before.cljs +++ b/src/main/frontend/modules/shortcut/before.cljs @@ -33,7 +33,7 @@ (defn enable-when-not-component-editing! [f] (fn [e] - (when (or (contains? #{:srs} (state/get-modal-id)) - (not (state/block-component-editing?)) - (not (whiteboard/tldraw-idle?))) + (when (and (or (contains? #{:srs} (state/get-modal-id)) + (not (state/block-component-editing?))) + (not (whiteboard/tldraw-idle?))) (f e))))