fix: allow deleting blocks from embeds

pull/10016/head
Tienson Qin 2023-06-26 16:16:38 +08:00
parent 87b2b42309
commit 4409554bea
1 changed files with 3 additions and 6 deletions

View File

@ -751,6 +751,7 @@
block (first blocks) block (first blocks)
block-parent (get uuid->dom-block (:block/uuid block)) block-parent (get uuid->dom-block (:block/uuid block))
sibling-block (when block-parent (util/get-prev-block-non-collapsed-non-embed block-parent))] sibling-block (when block-parent (util/get-prev-block-non-collapsed-non-embed block-parent))]
(prn {:blocks blocks})
(outliner-tx/transact! (outliner-tx/transact!
{:outliner-op :delete-blocks} {:outliner-op :delete-blocks}
(outliner-core/delete-blocks! blocks {})) (outliner-core/delete-blocks! blocks {}))
@ -954,13 +955,9 @@
[copy?] [copy?]
(when copy? (copy-selection-blocks true)) (when copy? (copy-selection-blocks true))
(when-let [blocks (seq (get-selected-blocks))] (when-let [blocks (seq (get-selected-blocks))]
;; remove embeds, references and queries ;; remove queries
(let [dom-blocks (remove (fn [block] (let [dom-blocks (remove (fn [block]
(or (= "true" (dom/attr block "data-transclude")) (= "true" (dom/attr block "data-query"))) blocks)]
(= "true" (dom/attr block "data-query")))) blocks)
dom-blocks (if (seq dom-blocks) dom-blocks
(remove (fn [block]
(= "true" (dom/attr block "data-transclude"))) blocks))]
(when (seq dom-blocks) (when (seq dom-blocks)
(let [repo (state/get-current-repo) (let [repo (state/get-current-repo)
block-uuids (distinct (map #(uuid (dom/attr % "blockid")) dom-blocks)) block-uuids (distinct (map #(uuid (dom/attr % "blockid")) dom-blocks))