fix: ensures there's no multiple block editors at the same time

This commit is contained in:
Tienson Qin
2025-05-24 22:43:45 +08:00
parent e7ac4d22f0
commit 3a448af06f
4 changed files with 13 additions and 19 deletions

View File

@@ -2611,6 +2611,7 @@
:else
(let [block (or (db/entity [:block/uuid (:block/uuid block)]) block)]
(util/mobile-keep-keyboard-open)
(editor-handler/clear-selection!)
(editor-handler/unhighlight-blocks!)
(let [f #(p/do!
@@ -3050,24 +3051,6 @@
:container-id (:container-id config)}))}})])
(block-content config block edit-input-id block-id *show-query?))))
(rum/defc block-content-wrapper
[block editor-box edit? type-block-editor? editor-cp content-cp]
(let [[editing? set-editing!] (hooks/use-state edit?)
editing-block (state/get-edit-block)
next-edit-block-id (:db/id editing-block)]
(hooks/use-effect!
(fn []
(if (and editing? (false? edit?) next-edit-block-id
(not= next-edit-block-id (:db/id block)))
;; editing another block, need to wait another block's editor to be ready
(util/schedule #(set-editing! false))
(set-editing! edit?))
(fn []))
[edit?])
(if (and editor-box editing? (not type-block-editor?))
editor-cp
content-cp)))
(rum/defcs ^:large-vars/cleanup-todo block-content-or-editor < rum/reactive
[state config {:block/keys [uuid] :as block} {:keys [edit-input-id block-id edit? hide-block-refs-count? refs-count *hide-block-refs? *show-query?]}]
(let [format (if (config/db-based-graph? (state/get-current-repo))
@@ -3132,7 +3115,9 @@
:format format}
edit-input-id
config))]]
(block-content-wrapper block editor-box edit? type-block-editor? editor-cp content-cp))
(if (and editor-box edit? (not type-block-editor?))
editor-cp
content-cp))
(when-not (:table-block-title? config)
[:div.ls-block-right.flex.flex-row.items-center.self-start.gap-1

View File

@@ -175,6 +175,7 @@
save-code-editor? true}
:as opts}]
(when (and (not config/publishing?) (:block/uuid block))
(util/mobile-keep-keyboard-open)
(let [repo (state/get-current-repo)]
(p/do!
(when-not (:block.temp/fully-loaded? (db/entity (:db/id block)))

View File

@@ -16,6 +16,7 @@
container-id (when node
(when-let [container-id-str (dom/attr node "containerid")]
(util/safe-parse-int container-id-str)))]
(.focus input)
(when container-id
(state/set-state! :editor/container-id container-id))

View File

@@ -1543,3 +1543,10 @@ Arg *stop: atom, reset to true to stop the loop"
[^js target]
(when target
(some-> target (.querySelector ".CodeMirror") (.-CodeMirror)))))
#?(:cljs
(defn mobile-keep-keyboard-open
[]
(when mobile?
(when-let [node (gdom/getElement "app-keep-keyboard-open-input")]
(.focus node)))))