fix: hierarchy not shown

close #8888
pull/8874/head
Tienson Qin 2023-03-25 10:27:19 +08:00
parent 1d91b9cfd8
commit b1c61c7241
1 changed files with 10 additions and 10 deletions

View File

@ -410,7 +410,8 @@
(= page-name (util/page-name-sanity-lc (date/journal-name)))) (= page-name (util/page-name-sanity-lc (date/journal-name))))
*control-show? (::control-show? state) *control-show? (::control-show? state)
*all-collapsed? (::all-collapsed? 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 [:div.flex-1.page.relative
(merge (if (seq (:block/tags page)) (merge (if (seq (:block/tags page))
(let [page-names (model/get-page-names-by-ids (map :db/id (:block/tags page)))] (let [page-names (model/get-page-names-by-ids (map :db/id (:block/tags page)))]
@ -467,13 +468,12 @@
(tagged-pages repo page-name)) (tagged-pages repo page-name))
;; referenced blocks ;; referenced blocks
(when-not (or block? whiteboard?) (when-not block-or-whiteboard?
[:div {:key "page-references"} [:div {:key "page-references"}
(rum/with-key (rum/with-key
(reference/references route-page-name) (reference/references route-page-name)
(str route-page-name "-refs"))]) (str route-page-name "-refs"))])
(let [block-or-whiteboard? (or block? whiteboard?)]
(when-not block-or-whiteboard? (when-not block-or-whiteboard?
(when (not journal?) (when (not journal?)
(hierarchy/structures route-page-name))) (hierarchy/structures route-page-name)))
@ -481,7 +481,7 @@
(when-not block-or-whiteboard? (when-not block-or-whiteboard?
(when-not sidebar? (when-not sidebar?
[:div {:key "page-unlinked-references"} [:div {:key "page-unlinked-references"}
(reference/unlinked-references route-page-name)])))]))) (reference/unlinked-references route-page-name)]))])))
(defonce layout (atom [js/window.innerWidth js/window.innerHeight])) (defonce layout (atom [js/window.innerWidth js/window.innerHeight]))