Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-18 21:06:11 -05:00
Code Issues Activity

🐛 Rework svg export of deleted components

Browse source
This commit is contained in:
Andrés Moya 2024-06-21 11:48:33 +02:00 • committed by Alonso Torres
parent 3b5b81b08f
commit 6aeb87a122
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@
[app.common.geom.shapes.bounds :as gsb] [app.common.geom.shapes.bounds :as gsb]
[app.common.logging :as l] [app.common.logging :as l]
[app.common.math :as mth] [app.common.math :as mth]
[app.common.types.components-list :as ctkl]
[app.common.types.file :as ctf] [app.common.types.file :as ctf]
[app.common.types.modifiers :as ctm] [app.common.types.modifiers :as ctm]
[app.common.types.shape-tree :as ctst] [app.common.types.shape-tree :as ctst]
@ -525,8 +526,10 @@
(mf/defc components-svg (mf/defc components-svg
{::mf/wrap-props false} {::mf/wrap-props false}
[{:keys [data children embed include-metadata source]}] [{:keys [data children embed include-metadata deleted?]}]
(let [source (keyword (d/nilv source "components"))] (let [components (if (not deleted?)
(ctkl/components-seq data)
(ctkl/deleted-components-seq data))]
[:& (mf/provider embed/context) {:value embed} [:& (mf/provider embed/context) {:value embed}
[:& (mf/provider export/include-metadata-ctx) {:value include-metadata} [:& (mf/provider export/include-metadata-ctx) {:value include-metadata}
[:svg {:version "1.1" [:svg {:version "1.1"
@ -536,9 +539,9 @@
:style {:display (when-not (some? children) "none")} :style {:display (when-not (some? children) "none")}
:fill "none"} :fill "none"}
[:defs [:defs
(for [[id component] (source data)] (for [component components]
(let [component (ctf/load-component-objects data component)] (let [component (ctf/load-component-objects data component)]
[:& component-symbol {:key (dm/str id) :component component}]))] [:& component-symbol {:key (dm/str (:id component)) :component component}]))]
children]]])) children]]]))
@ -595,10 +598,12 @@
(rds/renderToStaticMarkup elem))))))) (rds/renderToStaticMarkup elem)))))))
(defn render-components (defn render-components
[data source] [data deleted?]
(let [;; Join all components objects into a single map (let [;; Join all components objects into a single map
objects (->> (source data) components (if (not deleted?)
(vals) (ctkl/components-seq data)
(ctkl/deleted-components-seq data))
objects (->> components
(map (partial ctf/load-component-objects data)) (map (partial ctf/load-component-objects data))
(map :objects) (map :objects)
(reduce conj))] (reduce conj))]
@ -615,7 +620,7 @@
#js {:data data #js {:data data
:embed true :embed true
:include-metadata true :include-metadata true
:source (name source)})] :deleted? deleted?})]
(rds/renderToStaticMarkup elem)))))))) (rds/renderToStaticMarkup elem))))))))
(defn render-frame (defn render-frame

8
frontend/src/app/worker/export.cljs
View file

@ -52,7 +52,7 @@
:libraries (->> (:libraries file) (into #{}) (mapv str)) :libraries (->> (:libraries file) (into #{}) (mapv str))
:exportType (d/name export-type) :exportType (d/name export-type)
:hasComponents (d/not-empty? (ctkl/components-seq (:data file))) :hasComponents (d/not-empty? (ctkl/components-seq (:data file)))
:hasDeletedComponents (d/not-empty? (get-in file [:data :deleted-components])) :hasDeletedComponents (d/not-empty? (ctkl/deleted-components-seq (:data file)))
:hasMedia (d/not-empty? (get-in file [:data :media])) :hasMedia (d/not-empty? (get-in file [:data :media]))
:hasColors (d/not-empty? (get-in file [:data :colors])) :hasColors (d/not-empty? (get-in file [:data :colors]))
:hasTypographies (d/not-empty? (get-in file [:data :typographies]))}))))] :hasTypographies (d/not-empty? (get-in file [:data :typographies]))}))))]
@ -151,12 +151,12 @@
(defn parse-library-components (defn parse-library-components
[file] [file]
(->> (r/render-components (:data file) :components) (->> (r/render-components (:data file) false)
(rx/map #(vector (str (:id file) "/components.svg") %)))) (rx/map #(vector (str (:id file) "/components.svg") %))))
(defn parse-deleted-components (defn parse-deleted-components
[file] [file]
(->> (r/render-components (:data file) :deleted-components) (->> (r/render-components (:data file) true)
(rx/map #(vector (str (:id file) "/deleted-components.svg") %)))) (rx/map #(vector (str (:id file) "/deleted-components.svg") %))))
(defn fetch-file-with-libraries (defn fetch-file-with-libraries
@ -380,7 +380,7 @@
deleted-components-stream deleted-components-stream
(->> files-stream (->> files-stream
(rx/merge-map vals) (rx/merge-map vals)
(rx/filter #(d/not-empty? (get-in % [:data :deleted-components]))) (rx/filter #(d/not-empty? (ctkl/deleted-components-seq (:data %))))
(rx/merge-map parse-deleted-components)) (rx/merge-map parse-deleted-components))
pages-stream pages-stream