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

Merge pull request #214 from logseq/defclass/fix/right-sidebar-display-problem 

fix(sidebar): fix sider display problem when update or delete a page
pull/645/head
Michael Wong 2020-11-12 11:11:28 +08:00 committed by GitHub
parent bb0857ed3f 80d715e948
commit f4af624968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/frontend/components/right_sidebar.cljs
View File

@ -135,7 +135,7 @@
(block-cp repo idx block-data)]]))
:page
(let [page-name (get-in block-data [:page :page/name])]
(let [page-name (:page/name block-data)]
[[:a {:href (rfe/href :page {:name (util/url-encode page-name)})}
(util/capitalize-all page-name)]
[:div.ml-2
@ -171,24 +171,29 @@
(rum/defc sidebar-item < rum/reactive
[repo idx db-id block-type block-data t]
(let [collapse? (state/sub [:ui/sidebar-collapsed-blocks db-id])
item (build-sidebar-item repo idx db-id block-type block-data t)]
(let [item
(if (= :page block-type)
(let [page (db/query-entity-in-component db-id)]
(when (seq page)
(build-sidebar-item repo idx db-id block-type page t)))
(build-sidebar-item repo idx db-id block-type block-data t))]
(when item
[:div.sidebar-item.content
(let [[title component] item]
[:div.flex.flex-col
[:div.flex.flex-row.justify-between
[:div.flex.flex-row.justify-center
[:a.opacity-50.hover:opacity-100.flex.items-center.pr-1
{:on-click #(state/sidebar-block-toggle-collapse! db-id)}
(if collapse?
(svg/caret-right)
(svg/caret-down))]
[:div.ml-1
title]]
(close #(state/sidebar-remove-block! idx))]
[:div {:class (if collapse? "hidden" "initial")}
component]])])))
(let [collapse? (state/sub [:ui/sidebar-collapsed-blocks db-id])]
[:div.sidebar-item.content
(let [[title component] item]
[:div.flex.flex-col
[:div.flex.flex-row.justify-between
[:div.flex.flex-row.justify-center
[:a.opacity-50.hover:opacity-100.flex.items-center.pr-1
{:on-click #(state/sidebar-block-toggle-collapse! db-id)}
(if collapse?
(svg/caret-right)
(svg/caret-down))]
[:div.ml-1
title]]
(close #(state/sidebar-remove-block! idx))]
[:div {:class (if collapse? "hidden" "initial")}
component]])]))))
(defn- get-page
[match]

14
src/main/frontend/db.cljs
View File

@ -213,6 +213,20 @@
(when-let [db (get-conn repo)]
(d/entity db id-or-lookup-ref))))
(defn query-entity-in-component
([id-or-lookup-ref]
(entity (state/get-current-repo) id-or-lookup-ref))
([repo id-or-lookup-ref]
(let [k [:entity id-or-lookup-ref]
result-atom (:result (get @query-state k))]
(when-let [component *query-component*]
(add-query-component! k component))
(when-let [db (get-conn repo)]
(let [result (d/entity db id-or-lookup-ref)
result-atom (or result-atom (atom nil))]
(set! (.-state result-atom) result)
(add-q! k nil nil result-atom identity identity identity))))))
(def touch d/touch)
(defn get-current-page