3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-14 13:16:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix excesive font fetching on embedding it.

Browse source
This commit is contained in:
Andrey Antukh 2021-04-15 14:41:56 +02:00 • committed by Andrés Moya
parent d01eb30ef2
commit ac4bfc9bac
1 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
;; Copyright (c) UXBOX Labs SL ;; Copyright (c) UXBOX Labs SL
(ns app.main.ui.shapes.text.embed (ns app.main.ui.shapes.text.embed
(:refer-clojure :exclude [memoize])
(:require (:require
[app.common.data :as d] [app.common.data :as d]
[app.common.text :as txt] [app.common.text :as txt]
@ -36,7 +37,7 @@
[node] [node]
(let [current-font (if (not (nil? (:font-id node))) (let [current-font (if (not (nil? (:font-id node)))
#{(select-keys node [:font-id :font-variant-id])} #{(select-keys node [:font-id :font-variant-id])}
#{}) #{(select-keys txt/default-text-attrs [:font-id :font-variant-id])})
children-font (map get-node-fonts (:children node))] children-font (map get-node-fonts (:children node))]
(reduce set/union (conj children-font current-font)))) (reduce set/union (conj children-font current-font))))
@ -74,21 +75,31 @@
replace-text (fn [text [url data]] (str/replace text url data))] replace-text (fn [text [url data]] (str/replace text url data))]
(reduce replace-text css url-to-data)))) (reduce replace-text css url-to-data))))
;; NOTE: we can't move this to generic hooks namespace because that
;; namespace imports some code incompatible with webworkers and this
;; font embbeding should be able run on browser and webworker
;; contexts.
(defn- memoize
[val]
(let [ref (mf/use-ref #js {})]
(when-not (= (mf/ref-val ref) val)
(mf/set-ref-val! ref val))
(mf/ref-val ref)))
(mf/defc embed-fontfaces-style (mf/defc embed-fontfaces-style
{::mf/wrap-props false} {::mf/wrap-props false
::mf/wrap [mf/memo]}
[props] [props]
(let [node (obj/get props "node") (let [node (obj/get props "node")
fonts (-> node get-node-fonts memoize)
style (mf/use-state nil)] style (mf/use-state nil)]
(mf/use-effect
(mf/deps node)
(fn []
(let [font-to-embed (get-node-fonts node)
font-to-embed (if (empty? font-to-embed) #{txt/default-text-attrs} font-to-embed)
embeded (map embed-font font-to-embed)]
(-> (p/all embeded)
(p/then (fn [result]
(reset! style (str/join "\n" result))))))))
(mf/use-effect
(mf/deps fonts)
(fn []
(-> (p/all (map embed-font fonts))
(p/then (fn [result]
(reset! style (str/join "\n" result)))))))
(when (some? @style) (when (some? @style)
[:style @style]))) [:style @style])))