Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-14 16:51:18 -05:00
Code Issues Activity

🐛 Fix font loading when text is only rendered as svg

Browse source
This commit is contained in:
Andrey Antukh 2022-07-12 08:15:27 +02:00 • committed by Alonso Torres
parent 51023396bc
commit 18ca2aca15
4 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frontend/src/app/main/fonts.cljs
View file

@ -200,16 +200,19 @@
(p/create (fn [resolve] (p/create (fn [resolve]
(ensure-loaded! id resolve)))) (ensure-loaded! id resolve))))
([id on-loaded] ([id on-loaded]
(let [font (get @fontsdb id)] (when-let [font (get @fontsdb id)]
(log/debug :action "ensure-loaded!" :font-id id :font font)
(cond (cond
;; Font already loaded, we just continue ;; Font already loaded, we just continue
(contains? @loaded id) (contains? @loaded id)
(on-loaded id) (p/do
(on-loaded id)
id)
;; Font is currently downloading. We attach the caller to the promise ;; Font is currently downloading. We attach the caller to the promise
(contains? @loading id) (contains? @loading id)
(-> (get @loading id) (-> (get @loading id)
(p/then #(on-loaded id))) (p/then #(do (on-loaded id) id)))
;; First caller, we create the promise and then wait ;; First caller, we create the promise and then wait
:else :else
@ -226,8 +229,7 @@
(load-font))))] (load-font))))]
(swap! loading assoc id load-p) (swap! loading assoc id load-p)
load-p)))))
nil)))))
(defn ready (defn ready
[cb] [cb]

14
frontend/src/app/main/ui/shapes/text.cljs
View file

@ -6,16 +6,28 @@
(ns app.main.ui.shapes.text (ns app.main.ui.shapes.text
(:require (:require
[app.common.text :as txt]
[app.main.fonts :as fonts]
[app.main.ui.shapes.text.fo-text :as fo] [app.main.ui.shapes.text.fo-text :as fo]
[app.main.ui.shapes.text.svg-text :as svg] [app.main.ui.shapes.text.svg-text :as svg]
[app.util.object :as obj] [app.util.object :as obj]
[rumext.alpha :as mf])) [rumext.alpha :as mf]))
(defn- load-fonts!
[content]
(let [default (:font-id txt/default-text-attrs)]
(->> (tree-seq map? :children content)
(into #{default} (keep :font-id))
(run! fonts/ensure-loaded!))))
(mf/defc text-shape (mf/defc text-shape
{::mf/wrap-props false} {::mf/wrap-props false}
[props] [props]
(let [{:keys [position-data content] :as shape} (obj/get props "shape")]
(mf/with-memo [content]
(load-fonts! content))
(let [{:keys [position-data]} (obj/get props "shape")]
(if (some? position-data) (if (some? position-data)
[:> svg/text-shape props] [:> svg/text-shape props]
[:> fo/text-shape props]))) [:> fo/text-shape props])))

1
frontend/src/app/main/ui/shapes/text/styles.cljs
View file

@ -106,7 +106,6 @@
[font-family font-style font-weight] [font-family font-style font-weight]
(when (some? font) (when (some? font)
(fonts/ensure-loaded! font-id)
(let [font-variant (d/seek #(= font-variant-id (:id %)) (:variants font))] (let [font-variant (d/seek #(= font-variant-id (:id %)) (:variants font))]
[(str/quote (or (:family font) (:font-family data))) [(str/quote (or (:family font) (:font-family data)))
(or (:style font-variant) (:font-style data)) (or (:style font-variant) (:font-style data))

7
frontend/src/app/worker/thumbnails.cljs
View file

@ -81,9 +81,10 @@
frame (some->> page :thumbnail-frame-id (get objects)) frame (some->> page :thumbnail-frame-id (get objects))
element (if frame element (if frame
(mf/element render/frame-svg #js {:objects objects :frame frame :show-thumbnails? true}) (mf/element render/frame-svg #js {:objects objects :frame frame :show-thumbnails? true})
(mf/element render/page-svg #js {:data page :thumbnails? true}))] (mf/element render/page-svg #js {:data page :thumbnails? true}))
{:data (rds/renderToStaticMarkup element) data (rds/renderToStaticMarkup element)]
:fonts @fonts/loaded {:data data
:fonts (into @fonts/loaded (map first) @fonts/loading)
:file-id file-id :file-id file-id
:revn revn})) :revn revn}))