Merge branch 'master' into feat/custom-children-list-style

This commit is contained in:
charlie
2023-04-25 10:22:55 +08:00
57 changed files with 889 additions and 761 deletions

View File

@@ -2932,7 +2932,8 @@
custom-query? (boolean (:custom-query? config))]
(if (and (or ref? custom-query?) (not (:ref-query-child? config)))
(ui/lazy-visible
(fn [] (block-container-inner state repo config block)))
(fn [] (block-container-inner state repo config block))
{:debug-id (str "block-container-ref " (:db/id block))})
(block-container-inner state repo config block))))
(defn divide-lists
@@ -3360,7 +3361,7 @@
"More"
@*loading?
(ui/lazy-loading-placeholder)
(ui/lazy-loading-placeholder 88)
:else
"")})]))))
@@ -3452,8 +3453,7 @@
(rum/with-key
(breadcrumb-with-container blocks (assoc config :top-level? top-level?))
(:db/id parent)))))
{:debug-id page
:trigger-once? false})])))))]
{:debug-id page})])))))]
(and (:ref? config) (:group-by-page? config))
[:div.flex.flex-col