clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-03 18:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: filters work on block children too

Browse Source
This commit is contained in:
Tienson Qin
2021-06-04 16:29:35 +08:00
parent ff24f80e0b
commit 742210d25d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/frontend/handler/block.cljs
View File

@@ -28,12 +28,23 @@
block)]
@ids))
(defn get-block-refs-with-children
[block]
(let [refs (atom [])]
(walk/postwalk
(fn [f]
(when (and (map? f) (:block/refs f))
(swap! refs concat (:block/refs f)))
f)
block)
(distinct @refs)))
(defn filter-blocks
[repo ref-blocks filters group-by-page?]
(let [ref-pages (->> (if group-by-page?
(mapcat last ref-blocks)
ref-blocks)
(mapcat (fn [b] (concat (:block/refs b) (:block/children-refs b))))
(mapcat (fn [b] (get-block-refs-with-children b)))
(concat (when group-by-page? (map first ref-blocks)))
(distinct)
(map :db/id)
@@ -51,16 +62,14 @@
(cond->> ref-blocks
(seq exclude-ids)
(remove (fn [block]
(let [ids (set (concat (map :db/id (:block/refs block))
(map :db/id (:block/children-refs block))
(let [ids (set (concat (map :db/id (get-block-refs-with-children block))
[(:db/id (:block/page block))]))]
(seq (set/intersection exclude-ids ids)))))
(seq include-ids)
(remove (fn [block]
(let [page-block-id (:db/id (:block/page block))
ids (set (concat (map :db/id (:block/refs block))
(map :db/id (:block/children-refs block))))]
ids (set (map :db/id (get-block-refs-with-children block)))]
(if (and (contains? include-ids page-block-id)
(= 1 (count include-ids)))
(not= page-block-id (first include-ids))