3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-28 21:37:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix loading same resources multiple times

Browse source
This commit is contained in:
Elena Torro 2025-06-06 12:15:33 +02:00
parent 8c20159fb0
commit a8d4b293dc
2 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

69
frontend/src/app/render_wasm/api.cljs
View file

@ -189,27 +189,28 @@
(defn- get-string-length [string] (+ (count string) 1))
(defn- store-image
(defn- fetch-image
[id]
(let [buffer (uuid/get-u32 id)
url (cf/resolve-file-media {:id id})]
(->> (http/send! {:method :get
:uri url
:response-type :blob})
(rx/map :body)
(rx/mapcat wapi/read-file-as-array-buffer)
(rx/map (fn [image]
(let [size (.-byteLength image)
offset (mem/alloc-bytes size)
heap (mem/get-heap-u8)
data (js/Uint8Array. image)]
(.set heap data offset)
(h/call wasm/internal-module "_store_image"
(aget buffer 0)
(aget buffer 1)
(aget buffer 2)
(aget buffer 3))
true))))))
{:key url
:callback #(->> (http/send! {:method :get
:uri url
:response-type :blob})
(rx/map :body)
(rx/mapcat wapi/read-file-as-array-buffer)
(rx/map (fn [image]
(let [size (.-byteLength image)
offset (mem/alloc-bytes size)
heap (mem/get-heap-u8)
data (js/Uint8Array. image)]
(.set heap data offset)
(h/call wasm/internal-module "_store_image"
(aget buffer 0)
(aget buffer 1)
(aget buffer 2)
(aget buffer 3))
true))))}))
(defn- get-fill-images
[leaf]
@ -227,7 +228,7 @@
(aget buffer 2)
(aget buffer 3))]
(when (zero? cached-image?)
(store-image id))))))
(fetch-image id))))))
(defn set-shape-text-images
[content]
@ -269,7 +270,7 @@
(aget buffer 2)
(aget buffer 3))]
(when (zero? cached-image?)
(store-image id))))
(fetch-image id))))
image-fills))))
(defn set-shape-strokes
@ -308,7 +309,7 @@
(dm/get-prop image :height))
(h/call wasm/internal-module "_add_shape_stroke_fill")
(when (== cached-image? 0)
(store-image id)))
(fetch-image id)))
(some? color)
(do
@ -763,16 +764,20 @@
pending)))
(defn process-pending
[pending]
(when-let [pending (-> (d/index-by :key :callback pending) vals)]
(->> (rx/from pending)
(rx/mapcat (fn [callback] (callback)))
(rx/reduce conj [])
(rx/subs! (fn [_]
(clear-drawing-cache)
(request-render "set-objects"))))))
(defn process-object
[shape]
(let [pending (set-object [] shape)]
(when-let [pending (seq pending)]
(->> (rx/from pending)
(rx/mapcat identity)
(rx/reduce conj [])
(rx/subs! (fn [_]
(clear-drawing-cache)
(request-render "set-objects")))))))
(process-pending pending)))
(defn set-objects
[objects]
@ -789,13 +794,7 @@
(perf/end-measure "set-objects")
(clear-drawing-cache)
(request-render "set-objects")
(when-let [pending (seq pending)]
(->> (rx/from pending)
(rx/mapcat identity)
(rx/reduce conj [])
(rx/subs! (fn [_]
(clear-drawing-cache)
(request-render "set-objects")))))))
(process-pending pending)))
(defn set-structure-modifiers
[entries]

15
frontend/src/app/render_wasm/api/fonts.cljs
View file

@ -94,13 +94,14 @@
fallback?)
true))
(defn- store-font-url
(defn- fetch-font
[font-data font-url emoji? fallback?]
(->> (http/send! {:method :get
:uri font-url
:response-type :buffer})
(rx/map (fn [{:keys [body]}]
(store-font-buffer font-data body emoji? fallback?)))))
{:key font-url
:callback #(->> (http/send! {:method :get
:uri font-url
:response-type :buffer})
(rx/map (fn [{:keys [body]}]
(store-font-buffer font-data body emoji? fallback?))))})
(defn- google-font-ttf-url
[font-id font-variant-id]
@ -134,7 +135,7 @@
(:style font-data)
emoji?))]
(when-not font-stored?
(store-font-url font-data uri emoji? fallback?)))))
(fetch-font font-data uri emoji? fallback?)))))
(defn serialize-font-style
[font-style]