3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-20 22:26:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix problem when exporting components with images

Browse source
This commit is contained in:
alonso.torres 2021-06-25 11:27:31 +02:00
parent 91b6a0bf69
commit e818170eec
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
frontend/src/app/main/render.cljs
View file

@ -30,16 +30,16 @@
[])) []))
(defn populate-images-cache (defn populate-images-cache
[data] [objects]
(let [images (->> (:objects data) (let [images (->> objects
(vals) (vals)
(mapcat get-image-data))] (mapcat get-image-data))]
(->> (rx/from images) (->> (rx/from images)
(rx/map #(cfg/resolve-file-media %)) (rx/map #(cfg/resolve-file-media %))
(rx/flat-map http/fetch-data-uri)))) (rx/flat-map http/fetch-data-uri))))
(defn populate-fonts-cache [data] (defn populate-fonts-cache [objects]
(let [texts (->> (:objects data) (let [texts (->> objects
(vals) (vals)
(filterv text?) (filterv text?)
(mapv :content)) ] (mapv :content)) ]
@ -56,8 +56,8 @@
[data] [data]
(rx/concat (rx/concat
(->> (rx/merge (->> (rx/merge
(populate-images-cache data) (populate-images-cache (:objects data))
(populate-fonts-cache data)) (populate-fonts-cache (:objects data)))
(rx/ignore)) (rx/ignore))
(->> (rx/of data) (->> (rx/of data)
@ -68,14 +68,19 @@
(defn render-components (defn render-components
[data] [data]
(let [;; Join all components objects into a single map
objects (->> (:components data)
(vals)
(map :objects)
(reduce conj))]
(rx/concat (rx/concat
(->> (rx/merge (->> (rx/merge
(populate-images-cache data) (populate-images-cache objects)
(populate-fonts-cache data)) (populate-fonts-cache objects))
(rx/ignore)) (rx/ignore))
(->> (rx/of data) (->> (rx/of data)
(rx/map (rx/map
(fn [data] (fn [data]
(let [elem (mf/element exports/components-sprite-svg #js {:data data :embed? true})] (let [elem (mf/element exports/components-sprite-svg #js {:data data :embed? true})]
(rds/renderToStaticMarkup elem))))))) (rds/renderToStaticMarkup elem))))))))