greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(editor): incorrect auto save when paste batch blocks

pull/10645/head
charlie 2023-12-10 21:26:34 +08:00 committed by Tienson Qin
parent 6fab02581d
commit ea196dfe67
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/frontend/handler/editor.cljs
View File

@ -2017,6 +2017,7 @@
keep-uuid? keep-uuid?
revert-cut-txs] revert-cut-txs]
:or {exclude-properties []}}] :or {exclude-properties []}}]
(state/set-editor-op! :paste-blocks)
(let [editing-block (when-let [editing-block (state/get-edit-block)] (let [editing-block (when-let [editing-block (state/get-edit-block)]
(some-> (db/pull [:block/uuid (:block/uuid editing-block)]) (some-> (db/pull [:block/uuid (:block/uuid editing-block)])
(assoc :block/content (state/get-edit-content)))) (assoc :block/content (state/get-edit-content))))
@ -2068,7 +2069,8 @@
:replace-empty-target? replace-empty-target? :replace-empty-target? replace-empty-target?
:keep-uuid? keep-uuid?})] :keep-uuid? keep-uuid?})]
(state/set-block-op-type! nil) (state/set-block-op-type! nil)
(edit-last-block-after-inserted! result)))))) (edit-last-block-after-inserted! result)))))
(state/set-editor-op! nil))
(defn- block-tree->blocks (defn- block-tree->blocks
"keep-uuid? - maintain the existing :uuid in tree vec" "keep-uuid? - maintain the existing :uuid in tree vec"

2
src/main/frontend/handler/editor/lifecycle.cljs
View File

@ -39,7 +39,7 @@
(when (and (when (and
(not (contains? #{:insert :indent-outdent :auto-save :undo :redo :delete} (state/get-editor-op))) (not (contains? #{:insert :indent-outdent :auto-save :undo :redo :delete} (state/get-editor-op)))
;; Don't trigger auto-save if the latest op is undo or redo ;; Don't trigger auto-save if the latest op is undo or redo
(not (contains? #{:undo :redo} (state/get-editor-latest-op)))) (not (contains? #{:undo :redo :paste-blocks} (state/get-editor-latest-op))))
(editor-handler/save-block! (get-state) value))) (editor-handler/save-block! (get-state) value)))
state) state)