github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-05-14 20:43:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse Source
This commit is contained in:
Andrey Antukh 2026-05-14 12:43:13 +02:00
commit 74ca40abd4
9 changed files with 54 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exporter/src/app/handlers/export_shapes.cljs
View File

@ -64,7 +64,7 @@
(defn- handle-single-export
[{:keys [:request/auth-token] :as exchange} {:keys [export name skip-children is-wasm] :as params}]
(let [resource (rsc/create (:type export) (or name (:name export)))
export (assoc export :skip-children skip-children :is-wasm is-wasm)]
export (assoc export :skip-children skip-children :is-wasm (boolean is-wasm))]
(->> (rd/render export
(fn [{:keys [path] :as object}]
@ -112,7 +112,7 @@
(rsc/add-to-zip zip path (str/replace filename sanitize-file-regex "_")))
proc (->> exports
(map (fn [export] (rd/render (assoc export :is-wasm is-wasm) append)))
(map (fn [export] (rd/render (assoc export :is-wasm (boolean is-wasm)) append)))
(p/all)
(p/mcat (fn [_] (rsc/close-zip zip)))
(p/fmap (constantly resource))

3
frontend/src/app/main/data/event.cljs
View File

@ -23,6 +23,7 @@
[app.util.object :as obj]
[app.util.perf :as perf]
[app.util.storage :as storage]
[app.util.timers :as timers]
[beicon.v2.core :as rx]
[beicon.v2.operators :as rxo]
[cuerdas.core :as str]
@ -216,7 +217,7 @@
(rx/create
(fn [subs]
(let [start (perf/now)]
(js/requestAnimationFrame
(timers/raf
#(.postTask js/scheduler
(fn []
(let [time (- (perf/now) start)]

39
frontend/src/app/main/data/workspace/clipboard.cljs
View File

@ -34,6 +34,7 @@
[app.config :as cf]
[app.main.data.changes :as dch]
[app.main.data.event :as ev]
[app.main.data.exports.wasm :as wasm.exports]
[app.main.data.helpers :as dsh]
[app.main.data.notifications :as ntf]
[app.main.data.persistence :as-alias dps]
@ -1154,10 +1155,11 @@
:enabled true
:name ""}
params {:exports [export]
:profile-id (:profile-id state)
:cmd :export-shapes
:wait true}]
;; Create a deferred promise immediately, before any async operations.
;; Registering the clipboard write NOW preserves the user-gesture security
;; context; the actual blob is supplied asynchronously once the export finishes.
deferred (p/deferred)
write-promise (clipboard/to-clipboard-promise "image/png" deferred)]
(rx/concat
;; Ensure current state persisted before exporting.
@ -1167,21 +1169,34 @@
(rx/first)
(rx/timeout 400 (rx/empty)))
;; Exporting itself can time its time, better to notify that we are busy.
;; Exporting itself can take its time, better to notify that we are busy.
(rx/of (ntf/info (tr "workspace.clipboard.copying")))
;; Call exporter to get image URI, then fetch and copy blob.
(->> (rp/cmd! :export params)
;; Call exporter to get image URI, then fetch blob and resolve the deferred.
(->> (if (and (features/active-feature? state "render-wasm/v1")
(contains? cf/flags :wasm-export))
(rx/of {:uri (wasm.exports/export-image-uri export)})
(rp/cmd! :export
{:exports [export]
:profile-id (:profile-id state)
:cmd :export-shapes
:wait true}))
(rx/mapcat (fn [{:keys [uri]}]
(http/send! {:method :get
:uri uri
:response-type :blob})))
(rx/map :body)
(rx/tap (fn [blob]
(clipboard/to-clipboard-promise "image/png" (p/resolved blob))))
(rx/mapcat (fn [blob]
;; Resolve the deferred with the fetched blob; the browser
;; will now complete the clipboard write it started earlier.
(p/resolve! deferred blob)
(rx/from write-promise)))
(rx/map (fn [_]
(ntf/success (tr "workspace.clipboard.image-copied"))))
(rx/catch (fn [e]
(js/console.error "clipboard blocked:" e)
(ntf/error (tr "workspace.clipboard.image-copy-failed"))
(rx/empty)))))))))
(js/console.error "clipboard error:" e)
;; Reject the deferred in case the error occurred before the
;; blob was fetched, so the pending clipboard write is cancelled.
(p/reject! deferred e)
(rx/of (ntf/error (tr "workspace.clipboard.image-copy-failed")))))))))))

5
frontend/src/app/main/data/workspace/thumbnails_wasm.cljs
View File

@ -25,6 +25,7 @@
[app.main.repo :as rp]
[app.main.store :as st]
[app.render-wasm.api :as wasm.api]
[app.util.timers :as timers]
[app.util.webapi :as wapi]
[beicon.v2.core :as rx]
[cuerdas.core :as str]
@ -58,7 +59,7 @@
(rx/create
(fn [subs]
(let [req-id
(js/requestAnimationFrame
(timers/raf
(fn [_]
(try
(let [objects (dsh/lookup-page-objects @st/state file-id page-id)]
@ -83,7 +84,7 @@
(rx/error! subs "Frame not found")))
(catch :default err
(rx/error! subs err)))))]
#(js/cancelAnimationFrame req-id)))))
#(timers/cancel-af! req-id)))))
(defn render-thumbnail
"Renders a component thumbnail via WASM and updates the UI immediately.

2
frontend/src/app/main/ui/ds/tooltip/tooltip.cljs
View File

@ -322,7 +322,7 @@
(let [trigger-el (mf/ref-val trigger-ref)
tooltip-el (mf/ref-val tooltip-ref)]
(when (and trigger-el tooltip-el)
(js/requestAnimationFrame
(ts/raf
(fn []
(let [origin-brect (dom/get-bounding-rect trigger-el)
tooltip-brect (dom/get-bounding-rect tooltip-el)

3
frontend/src/app/main/ui/workspace/tokens/management/forms/controls/floating_dropdown.cljs
View File

@ -7,6 +7,7 @@
(ns app.main.ui.workspace.tokens.management.forms.controls.floating-dropdown
(:require
[app.util.dom :as dom]
[app.util.timers :as timers]
[rumext.v2 :as mf]))
(defn use-floating-dropdown [is-open input-wrapper-ref outer-wrapper-ref dropdown-ref]
@ -48,7 +49,7 @@
(when is-open
(let [recalculate
(fn []
(js/requestAnimationFrame
(timers/raf
(fn []
(let [input-node (mf/ref-val input-wrapper-ref)]
(calculate-position input-node)))))

5
frontend/src/app/main/ui/workspace/viewport/pixel_overlay.cljs
View File

@ -22,6 +22,7 @@
[app.util.globals :as ug]
[app.util.keyboard :as kbd]
[app.util.object :as obj]
[app.util.timers :as timers]
[beicon.v2.core :as rx]
[goog.events :as events]
[rumext.v2 :as mf]))
@ -96,7 +97,7 @@
;; Store latest color synchronously so the click handler always reads
;; the correct pixel even before the rAF fires (fixes race condition)
(mf/set-ref-val! last-picked-color color)
(js/requestAnimationFrame
(timers/raf
(fn []
(st/emit! (dwc/pick-color color))))))))))
@ -304,7 +305,7 @@
;; the correct pixel even before the rAF fires (fixes race condition)
(mf/set-ref-val! last-picked-color color)
;; rAF throttles state updates to avoid an infinite React re-render loop
(js/requestAnimationFrame
(timers/raf
(fn []
(st/emit! (dwc/pick-color color))))))))))

7
frontend/src/app/render_wasm/api.cljs
View File

@ -53,6 +53,7 @@
[app.util.i18n :refer [tr]]
[app.util.modules :as mod]
[app.util.text.content :as tc]
[app.util.timers :as timers]
[beicon.v2.core :as rx]
[cuerdas.core :as str]
[promesa.core :as p]
@ -398,7 +399,7 @@
(when-not @pending-render
(reset! pending-render true)
(let [frame-id
(js/requestAnimationFrame
(timers/raf
(fn [ts]
(reset! pending-render false)
(set! wasm/internal-frame-id nil)
@ -1708,7 +1709,7 @@
[]
(p/create
(fn [resolve _reject]
(js/requestAnimationFrame (fn [] (resolve nil))))))
(timers/raf (fn [] (resolve nil))))))
(def ^:private default-context-options
#js {:antialias false
@ -1878,7 +1879,7 @@
;; Cancel any pending animation frame to prevent race conditions.
(when wasm/internal-frame-id
(js/cancelAnimationFrame wasm/internal-frame-id))
(timers/cancel-af! wasm/internal-frame-id))
;; Reset render flags to prevent new renders from being scheduled.
(reset! pending-render false)

11
frontend/src/app/util/timers.cljs
View File

@ -65,11 +65,20 @@
#(.requestAnimationFrame js/globalThis %)
#(js/setTimeout % 16)))
(def ^:private cancel-animation-frame
(if (and (exists? js/globalThis)
(exists? (.-cancelAnimationFrame js/globalThis)))
#(.cancelAnimationFrame js/globalThis %)
#(js/clearTimeout %)))
(defn raf
[f]
(^function request-animation-frame f))
(defn cancel-af!
[frame-id]
(^function cancel-animation-frame frame-id))
(defn idle-then-raf
[f]
(schedule-on-idle #(^function raf f)))