Merge remote-tracking branch 'upstream/master' into whiteboards

2026-04-26 07:05:10 +00:00 · 2022-08-24 16:50:57 +08:00
parent f6bc4aa73c cc49f56a92
commit 37d0ad2524
44 changed files with 615 additions and 99 deletions
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -2922,8 +2922,9 @@

 (defn- cut-blocks-and-clear-selections!
  [copy?]
-  (cut-selection-blocks copy?)
-  (clear-selection!))
+  (when-not (get-in @state/state [:ui/find-in-page :active?])
+    (cut-selection-blocks copy?)
+    (clear-selection!)))

 (defn shortcut-copy-selection
  [_e]