fix(ui): incorrect scrollable container for the blocks list within the preview page modal

This commit is contained in:
charlie
2024-11-08 14:04:03 +08:00
parent 7f37746a0b
commit f3878434bc

View File

@@ -819,12 +819,15 @@
[visible? set-visible!] (rum/use-state nil) [visible? set-visible!] (rum/use-state nil)
;; set-visible! (fn debug-visible [v] (js/console.warn "debug: visible" v) (set-visible! v)) ;; set-visible! (fn debug-visible [v] (js/console.warn "debug: visible" v) (set-visible! v))
_ #_:clj-kondo/ignore (rum/defc preview-render [] _ #_:clj-kondo/ignore (rum/defc preview-render []
(let [[ready? set-ready!] (rum/use-state false)]
(rum/use-effect! (rum/use-effect!
(fn [] (fn []
(let [el-popup (rum/deref *el-popup) (let [el-popup (rum/deref *el-popup)
focus! #(js/setTimeout (fn [] (.focus el-popup)))] focus! #(js/setTimeout (fn [] (.focus el-popup)))]
(set-ready! true)
(focus!) (focus!)
#(set-visible! false))) (fn [] (set-visible! false))))
[]) [])
(when-let [source (or (db/get-alias-source-page (state/get-current-repo) (:db/id page-entity)) (when-let [source (or (db/get-alias-source-page (state/get-current-repo) (:db/id page-entity))
@@ -844,11 +847,12 @@
(when (ui/last-shui-preview-popup?) (when (ui/last-shui-preview-popup?)
(rum/set-ref! *timer1 (rum/set-ref! *timer1
(js/setTimeout #(set-visible! false) 500))))} (js/setTimeout #(set-visible! false) 500))))}
(let [page-cp (state/get-page-blocks-cp)] (when-let [page-cp (and ready? (state/get-page-blocks-cp))]
(page-cp {:repo (state/get-current-repo) (page-cp {:repo (state/get-current-repo)
:page-name (str (:block/uuid source)) :page-name (str (:block/uuid source))
:sidebar? sidebar? :sidebar? sidebar?
:preview? true}))]))] :scroll-container (some-> (rum/deref *el-popup) (.closest ".ls-preview-popup"))
:preview? true}))])))]
(rum/use-effect! (rum/use-effect!
(fn [] (fn []