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

fix: templates not working

Browse Source
This commit is contained in:
Tienson Qin
2022-05-06 01:58:26 +08:00
parent 09e3fb1321
commit 161e0ee56a
2 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1890,6 +1890,16 @@
:block/path-refs (->> (cons (:db/id page) (:block/path-refs block))
(remove nil?))})))
(defn- edit-last-block-after-inserted!
[result]
(js/setTimeout
(fn []
(when-let [last-block (last (:blocks result))]
(clear-when-saved!)
(let [last-block' (db/pull [:block/uuid (:block/uuid last-block)])]
(edit-block! last-block' :max (:block/uuid last-block')))))
0))
(defn paste-blocks
[blocks {:keys [content-update-fn
exclude-properties
@@ -1923,13 +1933,7 @@
(paste-block-cleanup block page exclude-properties format content-update-fn))
blocks)
result (outliner-core/insert-blocks! blocks' target-block {:sibling? sibling?})]
(js/setTimeout
(fn []
(when-let [last-block (last (:blocks result))]
(clear-when-saved!)
(let [last-block' (db/pull [:block/uuid (:block/uuid last-block)])]
(edit-block! last-block' :max (:block/uuid last-block')))))
0))))))
(edit-last-block-after-inserted! result))))))
(defn- block-tree->blocks
[tree-vec format]
@@ -1961,11 +1965,12 @@
(defn insert-template!
([element-id db-id]
(insert-template! element-id db-id {}))
([element-id db-id opts]
([element-id db-id {:keys [target] :as opts}]
(when-let [db-id (if (integer? db-id)
db-id
(:db/id (db-model/get-template-by-name (name db-id))))]
(let [repo (state/get-current-repo)
target (or target (state/get-edit-block))
block (db/entity db-id)
format (:block/format block)
block-uuid (:block/uuid block)
@@ -1979,20 +1984,40 @@
(drop 1 sorted-blocks))]
(when element-id
(insert-command! element-id "" format {}))
(let [opts (merge
{:exclude-properties [:id :template :template-including-parent]
:content-update-fn (fn [content]
(->> content
(property/remove-property format "template")
(property/remove-property format "template-including-parent")
template/resolve-dynamic-template!))}
opts)]
(paste-blocks blocks opts))))))
(let [exclude-properties [:id :template :template-including-parent]
content-update-fn (fn [content]
(->> content
(property/remove-property format "template")
(property/remove-property format "template-including-parent")
template/resolve-dynamic-template!))
page (if (:block/name block) block
(when target (:block/page (db/entity (:db/id target)))))
blocks' (map (fn [block]
(paste-block-cleanup block page exclude-properties format content-update-fn))
blocks)
sibling? (:sibling? opts)
sibling?' (cond
(some? sibling?)
sibling?
(db/has-children? (:block/uuid target))
false
:else
true)]
(outliner-tx/transact!
{:outliner-op :insert-blocks}
(save-current-block!)
(let [result (outliner-core/insert-blocks! blocks'
target
(assoc opts :sibling? sibling?'))]
(edit-last-block-after-inserted! result))))))))
(defn template-on-chosen-handler
[element-id]
(fn [[_template db-id] _click?]
(insert-template! element-id db-id)))
(insert-template! element-id db-id
{:replace-empty-target? true})))
(defn parent-is-page?
[{{:block/keys [parent page]} :data :as node}]