clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-04 02:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: delete the parent block doesn't update children' left and parent

Browse Source
This commit is contained in:
Tienson Qin
2021-05-06 16:10:14 +08:00
parent 1570d95bcc
commit 90762899ab
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -648,8 +648,10 @@
(ui-handler/re-render-root!))))))
(defn delete-block!
[repo e]
(let [{:keys [id block-id block-parent-id dummy? value format]} (get-state)]
([repo e]
(delete-block! repo e true))
([repo e delete-children?]
(let [{:keys [id block-id block-parent-id dummy? value format]} (get-state)]
(when block-id
(let [page-id (:db/id (:block/page (db/entity [:block/uuid block-id])))
page-blocks-count (and page-id (db/get-page-blocks-count repo page-id))]
@@ -658,7 +660,7 @@
(let [block (db/pull [:block/uuid block-id])
block-parent (gdom/getElement block-parent-id)
sibling-block (get-prev-block-non-collapsed block-parent)]
(delete-block-aux! block dummy? true)
(delete-block-aux! block dummy? delete-children?)
(when (and repo sibling-block)
(when-let [sibling-block-id (dom/attr sibling-block "blockid")]
(when-let [block (db/pull repo '[*] [:block/uuid (uuid sibling-block-id)])]
@@ -673,7 +675,7 @@
(edit-block! block pos format id
{:custom-content new-value
:tail-len tail-len
:move-cursor? false}))))))))))))
:move-cursor? false})))))))))))))
(defn- get-end-block-parent
[end-block blocks]
@@ -2103,7 +2105,7 @@
(= (medley/uuid page) block-id))))
(do
(util/stop e)
(delete-block! repo e))
(delete-block! repo e false))
(and (> current-pos 1)
(= (util/nth-safe value (dec current-pos)) commands/slash))