github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-10 14:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix multiple shapes export on files rendered with webgl (#11506)

Browse Source
This commit is contained in:
Elena Torró 2026-09-04 11:00:35 +02:00 committed by GitHub
parent 064f200774
commit fdcc4666e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
exporter/src/app/renderer/bitmap.cljs
View File

@ -17,7 +17,7 @@
[promesa.core :as p])) [promesa.core :as p]))
(defn render (defn render
[{:keys [file-id page-id share-id token scale type objects skip-children is-wasm] :as params} on-object] [{:keys [file-id page-id share-id token scale type objects skip-children] :as params} on-object]
(letfn [(prepare-options [uri] (letfn [(prepare-options [uri]
#js {:screen #js {:width bw/default-viewport-width #js {:screen #js {:width bw/default-viewport-width
:height bw/default-viewport-height} :height bw/default-viewport-height}
@ -25,7 +25,7 @@
:height bw/default-viewport-height} :height bw/default-viewport-height}
:locale "en-US" :locale "en-US"
:storageState #js {:cookies (bw/create-cookies uri {:token token})} :storageState #js {:cookies (bw/create-cookies uri {:token token})}
:deviceScaleFactor (if is-wasm 1 scale) ;; wasm won't use deviceScaleFactor :deviceScaleFactor scale
:userAgent bw/default-user-agent}) :userAgent bw/default-user-agent})
(render-object [page {:keys [id] :as object}] (render-object [page {:keys [id] :as object}]
@ -59,9 +59,7 @@
:share-id share-id :share-id share-id
:object-id (mapv :id objects) :object-id (mapv :id objects)
:route "objects" :route "objects"
:skip-children skip-children :skip-children skip-children}
:wasm (when is-wasm "true")
:scale scale}
uri (-> (cf/get-internal-uri) uri (-> (cf/get-internal-uri)
(u/ensure-path-slash) (u/ensure-path-slash)
(u/join "render.html") (u/join "render.html")

8
frontend/src/app/render.cljs
View File

@ -136,7 +136,9 @@
(repo/cmd! :get-page {:file-id file-id (repo/cmd! :get-page {:file-id file-id
:page-id page-id :page-id page-id
:share-id share-id :share-id share-id
:object-id object-id :object-id (if (uuid? object-id)
object-id
(set object-id))
:features features})) :features features}))
(rx/tap (fn [[fonts]] (rx/tap (fn [[fonts]]
(when (seq fonts) (when (seq fonts)
@ -155,7 +157,7 @@
[:embed {:optional true} :boolean] [:embed {:optional true} :boolean]
[:skip-children {:optional true} :boolean] [:skip-children {:optional true} :boolean]
[:object-id [:object-id
[:or [::sm/set ::sm/uuid] ::sm/uuid]]]) [:or [:vector ::sm/uuid] ::sm/uuid]]])
(def ^:private coerce-render-objects-params (def ^:private coerce-render-objects-params
(sm/coercer schema:render-objects)) (sm/coercer schema:render-objects))
@ -188,7 +190,7 @@
{:file-id file-id {:file-id file-id
:page-id page-id :page-id page-id
:share-id share-id :share-id share-id
:object-ids (into #{} object-id) :object-ids (into [] (distinct) object-id)
:embed embed :embed embed
:skip-children skip-children :skip-children skip-children
:wasm wasm :wasm wasm