From b1c61c724192a1ed39e9c62756fdf46af08f8305 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Sat, 25 Mar 2023 10:27:19 +0800 Subject: [PATCH] fix: hierarchy not shown close #8888 --- src/main/frontend/components/page.cljs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/frontend/components/page.cljs b/src/main/frontend/components/page.cljs index c433f8497..77b29bf13 100644 --- a/src/main/frontend/components/page.cljs +++ b/src/main/frontend/components/page.cljs @@ -410,7 +410,8 @@ (= page-name (util/page-name-sanity-lc (date/journal-name)))) *control-show? (::control-show? state) *all-collapsed? (::all-collapsed? state) - *current-block-page (::current-page state)] + *current-block-page (::current-page state) + block-or-whiteboard? (or block? whiteboard?)] [:div.flex-1.page.relative (merge (if (seq (:block/tags page)) (let [page-names (model/get-page-names-by-ids (map :db/id (:block/tags page)))] @@ -467,21 +468,20 @@ (tagged-pages repo page-name)) ;; referenced blocks - (when-not (or block? whiteboard?) + (when-not block-or-whiteboard? [:div {:key "page-references"} (rum/with-key (reference/references route-page-name) (str route-page-name "-refs"))]) - (let [block-or-whiteboard? (or block? whiteboard?)] - (when-not block-or-whiteboard? - (when (not journal?) - (hierarchy/structures route-page-name))) + (when-not block-or-whiteboard? + (when (not journal?) + (hierarchy/structures route-page-name))) - (when-not block-or-whiteboard? - (when-not sidebar? - [:div {:key "page-unlinked-references"} - (reference/unlinked-references route-page-name)])))]))) + (when-not block-or-whiteboard? + (when-not sidebar? + [:div {:key "page-unlinked-references"} + (reference/unlinked-references route-page-name)]))]))) (defonce layout (atom [js/window.innerWidth js/window.innerHeight]))