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

fix: display loading for embedded blocks

pull/10438/head
Tienson Qin 2023-08-28 13:46:39 +08:00
parent 19e7920448
commit f74de89a1b
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/frontend/components/block.cljs
View File

@ -2973,6 +2973,7 @@
[state config block] [state config block]
(let [repo (state/get-current-repo) (let [repo (state/get-current-repo)
blocks-container-id (::blocks-container-id state) blocks-container-id (::blocks-container-id state)
unloaded? (state/sub-block-unloaded? repo (str (:block/uuid block)))
config (assoc config :blocks-container-id blocks-container-id) config (assoc config :blocks-container-id blocks-container-id)
edit-input-id (str "edit-block-" blocks-container-id "-" (:block/uuid block)) edit-input-id (str "edit-block-" blocks-container-id "-" (:block/uuid block))
edit? (state/sub [:editor/editing? edit-input-id]) edit? (state/sub [:editor/editing? edit-input-id])
@ -2980,13 +2981,24 @@
:edit-input-id edit-input-id} :edit-input-id edit-input-id}
ref? (:ref? config) ref? (:ref? config)
custom-query? (boolean (:custom-query? config))] custom-query? (boolean (:custom-query? config))]
(if (or ref? custom-query? (:lazy? config)) (cond
(ui/lazy-visible unloaded?
(fn [] (block-container-inner state repo config block opts)) [:div.ls-block.flex-1.flex-col.rounded-sm {:style {:width "100%"}}
{:debug-id (str "block-container-ref " (:db/id block)) [:div.flex.flex-row
:fade-in? false [:div.flex.flex-row.items-center.mr-2.ml-1 {:style {:height 24}}
:initial-state edit?}) [:span.bullet-container.cursor
(block-container-inner state repo config block opts)))) [:span.bullet]]]
[:div.flex.flex-1
[:span.opacity-70
"Loading..."]]]]
:else
(if (or ref? custom-query? (:lazy? config))
(ui/lazy-visible
(fn [] (block-container-inner state repo config block opts))
{:debug-id (str "block-container-ref " (:db/id block))
:fade-in? false
:initial-state edit?})
(block-container-inner state repo config block opts)))))
(defn divide-lists (defn divide-lists
[[f & l]] [[f & l]]