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

fix: default level to open for linked refs

Browse Source
This commit is contained in:
Tienson Qin
2022-12-07 20:33:22 +08:00
committed by Andelf
parent fa35b16ead
commit d8fef76de2
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/frontend/components/block.cljs
View File

@@ -3599,7 +3599,8 @@
(page-cp config page)
(when alias? [:span.text-sm.font-medium.opacity-50 " Alias"])]
(for [[parent blocks] parent-blocks]
(let [blocks' (map #(update % :block/children tree/non-consecutive-blocks->vec-tree) blocks)]
(let [blocks' (map #(update % :block/children (fn [col]
(tree/non-consecutive-blocks->vec-tree col 2))) blocks)]
(rum/with-key
(breadcrumb-with-container blocks' config)
(:db/id parent))))

18
src/main/frontend/modules/outliner/tree.cljs
View File

@@ -68,7 +68,7 @@
root-block (assoc root-block :block/children result)]
[root-block])))))))
(defn- tree [parent->children root]
(defn- tree [parent->children root default-level]
(let [root-id (:db/id root)
nodes (fn nodes [parent-id level]
(mapv (fn [b]
@@ -81,7 +81,7 @@
(-> (get parent->children parent)
(model/try-sort-by-left parent)))))
children (nodes root-id 1)
root' (assoc root :block/level 1)]
root' (assoc root :block/level (or default-level 1))]
(if (seq children)
(assoc root' :block/children children)
root')))
@@ -105,12 +105,14 @@
(defn non-consecutive-blocks->vec-tree
"`blocks` need to be in the same page."
[blocks]
(let [blocks (map block-entity->map blocks)
top-level-blocks (filter-top-level-blocks blocks)
top-level-blocks' (model/try-sort-by-left top-level-blocks (:block/parent (first top-level-blocks)))
parent->children (group-by :block/parent blocks)]
(map #(tree parent->children %) top-level-blocks')))
([blocks]
(non-consecutive-blocks->vec-tree blocks 1))
([blocks default-level]
(let [blocks (map block-entity->map blocks)
top-level-blocks (filter-top-level-blocks blocks)
top-level-blocks' (model/try-sort-by-left top-level-blocks (:block/parent (first top-level-blocks)))
parent->children (group-by :block/parent blocks)]
(map #(tree parent->children % (or default-level 1)) top-level-blocks'))))
(defn- sort-blocks-aux
[parents parent-groups]