|
@@ -341,8 +341,8 @@
|
|
|
(select-keys properties (property/hidden-properties))
|
|
(select-keys properties (property/hidden-properties))
|
|
|
(:block/properties block))]
|
|
(:block/properties block))]
|
|
|
(-> block
|
|
(-> block
|
|
|
- (dissoc :block/top?
|
|
|
|
|
- :block/bottom?)
|
|
|
|
|
|
|
+ (dissoc :block.temp/top?
|
|
|
|
|
+ :block.temp/bottom?)
|
|
|
(assoc :block/content content
|
|
(assoc :block/content content
|
|
|
:block/properties new-properties)
|
|
:block/properties new-properties)
|
|
|
(merge (if level {:block/level level} {})))))
|
|
(merge (if level {:block/level level} {})))))
|
|
@@ -826,7 +826,7 @@
|
|
|
(let [prev-block' (if (seq (:block/_refs block-e))
|
|
(let [prev-block' (if (seq (:block/_refs block-e))
|
|
|
(assoc prev-block
|
|
(assoc prev-block
|
|
|
:block/uuid (:block/uuid block)
|
|
:block/uuid (:block/uuid block)
|
|
|
- :block/additional-properties (:block/properties block))
|
|
|
|
|
|
|
+ :block.temp/additional-properties (:block/properties block))
|
|
|
prev-block)]
|
|
prev-block)]
|
|
|
(delete-block-aux! block delete-children?)
|
|
(delete-block-aux! block delete-children?)
|
|
|
(save-block! repo prev-block' new-content {:editor/op :delete}))
|
|
(save-block! repo prev-block' new-content {:editor/op :delete}))
|
|
@@ -2646,7 +2646,7 @@
|
|
|
edit-block' (if next-block-has-refs?
|
|
edit-block' (if next-block-has-refs?
|
|
|
(assoc edit-block
|
|
(assoc edit-block
|
|
|
:block/uuid (:block/uuid next-block)
|
|
:block/uuid (:block/uuid next-block)
|
|
|
- :block/additional-properties (dissoc (:block/properties next-block) :block/uuid))
|
|
|
|
|
|
|
+ :block.temp/additional-properties (dissoc (:block/properties next-block) :block/uuid))
|
|
|
edit-block)]
|
|
edit-block)]
|
|
|
(outliner-tx/transact! transact-opts
|
|
(outliner-tx/transact! transact-opts
|
|
|
(delete-block-aux! next-block false)
|
|
(delete-block-aux! next-block false)
|
|
@@ -2691,7 +2691,7 @@
|
|
|
repo (state/get-current-repo)
|
|
repo (state/get-current-repo)
|
|
|
top-block? (= (:block/left block) (:block/page block))
|
|
top-block? (= (:block/left block) (:block/page block))
|
|
|
single-block? (inside-of-single-block (.-target e))
|
|
single-block? (inside-of-single-block (.-target e))
|
|
|
- root-block? (= (:block/container block) (str (:block/uuid block)))]
|
|
|
|
|
|
|
+ root-block? (= (:block.temp/container block) (str (:block/uuid block)))]
|
|
|
(mark-last-input-time! repo)
|
|
(mark-last-input-time! repo)
|
|
|
(cond
|
|
(cond
|
|
|
(not= selected-start selected-end)
|
|
(not= selected-start selected-end)
|