greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove useless :max-level parameters after refactoring

pull/3593/head
shidenggui 2021-12-25 09:56:31 +08:00 committed by Tienson Qin
parent 5d5811fb38
commit 85a7803c5e
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3317,7 +3317,6 @@
(defn all-blocks-with-level
"Return all blocks associated with correct level
if :root-block is not nil, only return root block with its children
if :max-level is not nil, only return blocks that level <= :max-level
if :expanded? true, return expanded children
if :collapse? true, return without any collapsed children
for example:
@ -3331,7 +3330,7 @@
[{:block a :level 1}
{:block b :level 2}
{:block e :level 2}]"
[{:keys [collapse? expanded? root-block max-level] :or {collapse? false expanded? false root-block nil max-level nil}}]
[{:keys [collapse? expanded? root-block] :or {collapse? false expanded? false root-block nil}}]
(when-let [page (or (state/get-current-page)
(date/today))]
(->>
@ -3356,9 +3355,6 @@
(#(cond->> %
expanded? (filter (fn [b] (collapsable? (:block/uuid b))))))
(#(cond->> %
max-level (filter (fn [b] (>= max-level (:block/level b))))))
(map (fn [x] (dissoc x :block/children))))))
(defn collapse-block! [block-id]
@ -3441,22 +3437,18 @@
(defn collapse-all!
([]
(collapse-all! nil nil))
(collapse-all! nil))
([block-id]
(collapse-all! block-id nil))
([block-id max-level]
(let [blocks-to-collapse (all-blocks-with-level {:expanded? true :root-block block-id :max-level max-level})]
(let [blocks-to-collapse (all-blocks-with-level {:expanded? true :root-block block-id})]
(when (seq blocks-to-collapse)
(doseq [{:block/keys [uuid]} blocks-to-collapse]
(collapse-block! uuid))))))
(defn expand-all!
([]
(expand-all! nil nil))
(expand-all! nil))
([block-id]
(expand-all! block-id nil))
([block-id max-level]
(->> (all-blocks-with-level {:root-block block-id :max-level max-level})
(->> (all-blocks-with-level {:root-block block-id})
(filter (fn [b] (-> b :block/properties :collapsed)))
(map (comp expand-block! :block/uuid))
doall)))