clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-02 11:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: broken outliner structure when Backspace at the beginning (#9125)

Browse Source 
* fix: broken outliner structure when DELETE at the beginning

related to #8974

* fix: 'Delete' key deletes entire set of blocks

close #9128

---------

Co-authored-by: Mega Yu <yuhg2310@gmail.com>
This commit is contained in:
Tienson Qin
2023-04-18 22:46:49 +08:00
committed by GitHub
parent b8b16548d2
commit a8013a5288
2 changed files with 83 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -834,28 +834,38 @@
;; it's possible to find a block not belong to the same page of current editing block
sibling-block (util/get-prev-block-non-collapsed-non-embed block-parent)
delete_prev? (and (not (block-has-no-ref? (:db/id block)))
(block-has-no-ref? [:block/uuid (uuid (dom/attr sibling-block "blockid"))]))
(block-has-no-ref? [:block/uuid (uuid (dom/attr sibling-block "blockid"))])
(not (string/blank? value))) ; it doesn't make sense to preserve the block ref for totally different block
{:keys [prev-block new-content pos]} (move-to-prev-block repo sibling-block format id value (not delete_prev?))
concat-prev-block? (boolean (and prev-block new-content))
save-page? (= (:db/id (:block/page prev-block)) page-id)
same-page? (= (:db/id (:block/page prev-block)) page-id)
transact-opts (cond->
{:outliner-op :delete-block}
concat-prev-block?
(assoc :concat-data
{:last-edit-block (:block/uuid block)}))]
(if (and delete_prev? save-page?)
(let [block (assoc block :block/left (:block/left prev-block))
input (gdom/getElement id)]
(outliner-tx/transact! transact-opts
(delete-block-aux! prev-block false)
(save-block! repo block new-content))
(state/set-edit-content! id new-content)
(cursor/move-cursor-to input pos))
(outliner-tx/transact! transact-opts
(when concat-prev-block?
(save-block! repo prev-block new-content))
(delete-block-aux! block delete-children?)))
))))))))
(if (and delete_prev? same-page?)
(let [right (when-not (= (:block/parent block)
(:block/parent prev-block))
(when-let [right-id (some-> (tree/-get-right (outliner-core/block block))
tree/-get-id)]
{:block/uuid right-id
:block/left (:block/left block)}))
additional-tx (conj [{:db/id (:db/id block)
:block/left (:block/left prev-block)
:block/parent (:block/parent prev-block)}] right)
transact-opts (assoc transact-opts :additional-tx additional-tx)]
(outliner-tx/transact!
transact-opts
(delete-block-aux! prev-block false)
(save-block! repo block new-content))
(edit-block! block pos id {:custom-content new-content
:move-cursor? true}))
(outliner-tx/transact!
transact-opts
(when concat-prev-block?
(save-block! repo prev-block new-content))
(delete-block-aux! block delete-children?)))))))))))
(state/set-editor-op! nil)))
(defn delete-blocks!
@@ -2686,15 +2696,17 @@
(and next-block (block-has-no-ref? (:db/id current-block)))
(let [edit-block (state/get-edit-block)
new-content (str value (:block/content next-block))
transact-opts {:outliner-op :delete-block
:concat-data {:last-edit-block (:block/uuid edit-block)
:end? true}}
new-content (str value "" (:block/content next-block))
next-block (assoc next-block :block/left (:block/left current-block))
:end? true}
:additional-tx [{:db/id (:db/id next-block)
:block/left (:block/left current-block)
:block/parent (:block/parent current-block)}]}
repo (state/get-current-repo)]
(outliner-tx/transact! transact-opts
(delete-block-aux! edit-block false)
(save-block! repo next-block new-content))
(delete-block-aux! edit-block false)
(save-block! repo next-block new-content))
(edit-block! next-block current-pos (:block/uuid next-block)))
:else
@@ -2729,7 +2741,7 @@
custom-query? (get-in editor-state [:config :custom-query?])]
(when-not custom-query?
(delete-concat current-block input current-pos value)))
:else
(delete-and-update input current-pos (inc current-pos))))))