clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-28 22:49:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: typing backspace at front of block deletes properties

Browse Source 
Fixes LOG-2841
This commit is contained in:
Tienson Qin
2023-10-26 17:55:49 +08:00
parent 3b9361d617
commit f9ec83886c
2 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -789,7 +789,8 @@
{:outliner-op :delete-blocks}
concat-prev-block?
(assoc :concat-data
{:last-edit-block (:block/uuid block)}))]
{:last-edit-block (:block/uuid block)}))
db-based? (config/db-based-graph? repo)]
(outliner-tx/transact!
transact-opts
(cond
@@ -799,23 +800,32 @@
nil
concat-prev-block?
(if (seq (:block/_refs (db/entity (:db/id block))))
(do
(delete-block-fn prev-block)
(save-block! repo block new-content {:editor/op :delete})
(outliner-core/save-block! {:db/id (:db/id block)
:block/uuid (:block/uuid block)
:block/parent (:db/id (:block/parent prev-block))
:block/left (or (:db/id (:block/left prev-block))
(:db/id (:block/parent prev-block)))})
(when pos
(util/schedule
(fn []
(when-let [input (state/get-input)]
(cursor/move-cursor-to input pos))))))
(do
(delete-block-fn block)
(save-block! repo prev-block new-content {:editor/op :delete})))
(let [new-properties (merge (:block/properties (db/entity (:db/id prev-block)))
(:block/properties (db/entity (:db/id block))))]
(if (seq (:block/_refs (db/entity (:db/id block))))
(do
(delete-block-fn prev-block)
(save-block! repo block new-content {:editor/op :delete})
(outliner-core/save-block! {:db/id (:db/id block)
:block/uuid (:block/uuid block)
:block/parent (:db/id (:block/parent prev-block))
:block/left (or (:db/id (:block/left prev-block))
(:db/id (:block/parent prev-block)))})
(when db-based?
(outliner-core/save-block! {:db/id (:db/id block)
:block/properties new-properties}))
(when pos
(util/schedule
(fn []
(when-let [input (state/get-input)]
(cursor/move-cursor-to input pos))))))
(do
(delete-block-fn block)
(save-block! repo prev-block new-content {:editor/op :delete})
(when db-based?
(outliner-core/save-block! {:db/id (:db/id prev-block)
:block/properties new-properties})))))
:else
(delete-block-fn block))))))))))
@@ -2640,7 +2650,8 @@
first-child (:data (tree/-get-down (outliner-core/block current-block)))
next-block (if (or collapsed? (not current-block-has-children?))
(when right (db/pull (:db/id right)))
first-child)]
first-child)
db-based? (config/db-based-graph? repo)]
(cond
(nil? next-block)
nil
@@ -2664,13 +2675,19 @@
edit-block' (if next-block-has-refs?
(assoc edit-block
:block/uuid (:block/uuid next-block))
edit-block)]
edit-block)
new-properties (merge
(:block/properties (db/entity (:db/id next-block)))
(:block/properties (db/entity (:db/id edit-block))))]
(outliner-tx/transact!
{:outliner-op :delete-blocks
:concat-data {:last-edit-block (:block/uuid edit-block)
:end? true}}
(delete-block-aux! next-block false)
(save-block! repo edit-block' new-content {:editor/op :delete}))
(save-block! repo edit-block' new-content {:editor/op :delete})
(when db-based?
(outliner-core/save-block! {:db/id (:db/id edit-block)
:block/properties new-properties})))
(let [block (if next-block-has-refs? next-block edit-block)]
(edit-block! block current-pos nil))))))
@@ -3769,7 +3786,7 @@
[block-ids heading]
(let [repo (state/get-current-repo)]
(if (config/db-based-graph? repo)
(db-editor-handler/batch-set-heading! repo block-ids heading)
(db-editor-handler/batch-set-heading! repo block-ids heading)
(file-editor-handler/batch-set-heading! block-ids heading))))
(defn set-heading!

22
src/main/frontend/modules/outliner/core.cljs
View File

@@ -283,23 +283,19 @@
(-save [this txs-state]
(assert (ds/outliner-txs-state? txs-state)
"db should be satisfied outliner-tx-state?")
(let [m* (-> (:data this)
(dissoc :block/children :block/meta :block.temp/top? :block.temp/bottom?
:block/title :block/body :block/level)
gp-util/remove-nils
block-with-timestamps
fix-tag-ids)
(let [m (-> (:data this)
(dissoc :block/children :block/meta :block.temp/top? :block.temp/bottom?
:block/title :block/body :block/level)
gp-util/remove-nils
block-with-timestamps
fix-tag-ids)
repo (state/get-current-repo)
db-based? (config/db-based-graph? repo)
m (if db-based?
(dissoc m* :block/properties :block/properties-order)
m*)
id (:db/id (:data this))
block-entity (db/entity id)
structured-tags? (and (config/db-based-graph? (state/get-current-repo))
(seq (:block/tags m)))
structured-tags? (and db-based? (seq (:block/tags m)))
m (if (:block/content m)
(update m* :block/content
(update m :block/content
(fn [content]
(mldoc/content-without-tags content
(->>
@@ -307,7 +303,7 @@
(fn [tag]
(when (:block/uuid tag)
(str config/page-ref-special-chars (:block/uuid tag))))
(:block/tags m))
(:block/tags m))
(remove nil?)))))
m)]
(when id