clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-05 03:16:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: block insert

Browse Source
This commit is contained in:
Tienson Qin
2021-04-05 12:26:47 +08:00
parent 40f15c311f
commit da43e43603
5 changed files with 25 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -638,15 +638,19 @@
(reset! blocks-atom (->> (concat before-part blocks after-part)
(remove nil?)))))))))
;; TODO: fix for
;; 1. collapsed parent
;; 2. block as a container instead of a page
(defn build-outliner-relation
[current-block new-block]
(let [[current-node new-node]
(mapv outliner-core/block [current-block new-block])
has-children? (seq (tree/-get-children current-node))
new-is-sibling? (not has-children?)]
has-children? (db/has-children? (state/get-current-repo)
(tree/-get-id current-node))
sibling? (not has-children?)]
;; perf: multiple file writes
(outliner-core/save-node current-node)
(outliner-core/insert-node new-node current-node new-is-sibling?)))
(outliner-core/insert-node new-node current-node sibling?)))
(defn insert-new-block-aux!
[{:block/keys [uuid content repo format]
@@ -664,11 +668,11 @@
repo (or repo (state/get-current-repo))
[fst-block-text snd-block-text] (compute-fst-snd-block-text value pos)
current-block (-> (assoc block :block/content fst-block-text)
(wrap-parse-block))
(wrap-parse-block))
new-m {:block/uuid (db/new-block-id)
:block/content snd-block-text}
next-block (-> (merge block new-m)
(dissoc :db/id)
(dissoc :db/id :block/collapsed?)
(wrap-parse-block))]
(do
(repo-handler/update-last-edit-block)
@@ -757,24 +761,6 @@
:blocks-container-id (:id config)
:current-page (state/get-current-page)})))))
(defn insert-new-block-without-save-previous!
[config last-block]
(let [format (:block/format last-block)
id (:id config)
new-level (if (util/uuid-string? id)
(inc (:block/level (db/entity [:block/uuid (medley/uuid id)])))
2)]
(insert-new-block-aux!
last-block
(:block/content last-block)
{:create-new-block? true
:ok-handler
(fn [last-block]
(js/setTimeout #(edit-last-block-for-new-page! last-block :max) 50))
:new-level new-level
:blocks-container-id (:id config)
:current-page (state/get-current-page)})))
(defn update-timestamps-content!
[{:block/keys [repeated? marker] :as block} content]
(if repeated?