3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-15 03:11:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix problems with export components

Browse source
This commit is contained in:
alonso.torres 2021-08-31 14:12:12 +02:00
parent e9fdd74a99
commit ce912c7430
3 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
frontend/src/app/main/exports.cljs
View file

@ -295,19 +295,20 @@
(let [data (obj/get props "data") (let [data (obj/get props "data")
children (obj/get props "children") children (obj/get props "children")
embed? (obj/get props "embed?") embed? (obj/get props "embed?")
include-metadata? (mf/use-ctx use/include-metadata-ctx)] include-metadata? (obj/get props "include-metadata?")]
[:& (mf/provider embed/context) {:value embed?} [:& (mf/provider embed/context) {:value embed?}
[:svg {:version "1.1" [:& (mf/provider use/include-metadata-ctx) {:value include-metadata?}
:xmlns "http://www.w3.org/2000/svg" [:svg {:version "1.1"
:xmlnsXlink "http://www.w3.org/1999/xlink" :xmlns "http://www.w3.org/2000/svg"
:xmlns:penpot (when include-metadata? "https://penpot.app/xmlns") :xmlnsXlink "http://www.w3.org/1999/xlink"
:style {:width "100vw" :xmlns:penpot (when include-metadata? "https://penpot.app/xmlns")
:height "100vh" :style {:width "100vw"
:display (when-not (some? children) "none")}} :height "100vh"
[:defs :display (when-not (some? children) "none")}}
(for [[component-id component-data] (:components data)] [:defs
[:& component-symbol {:id component-id (for [[component-id component-data] (:components data)]
:key (str component-id) [:& component-symbol {:id component-id
:data component-data}])] :key (str component-id)
:data component-data}])]
children]])) children]]]))

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

@ -82,5 +82,5 @@
(->> (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 :include-metadata? true})]
(rds/renderToStaticMarkup elem)))))))) (rds/renderToStaticMarkup elem))))))))

2
frontend/src/app/worker/import.cljs
View file

@ -358,7 +358,7 @@
(let [resolve (:resolve context)] (let [resolve (:resolve context)]
(->> (get-file context :media-list) (->> (get-file context :media-list)
(rx/flat-map (comp d/kebab-keys cip/string->uuid)) (rx/flat-map (comp d/kebab-keys cip/string->uuid))
(rx/flat-map (rx/mapcat
(fn [[id media]] (fn [[id media]]
(let [media (assoc media :id (resolve id))] (let [media (assoc media :id (resolve id))]
(->> (get-file context :media id media) (->> (get-file context :media id media)