github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-07-31 02:16:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix selrect not being recalculated after pasting properties (#10963)

Browse Source
This commit is contained in:
Belén Albeza 2026-07-30 15:01:50 +02:00 committed by GitHub
parent c8867f8c3a
commit 91d4b16171
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -703,22 +703,38 @@
ptk/WatchEvent
(watch [_ state _]
(let [features (get state :features)
selected (dsh/lookup-selected state)]
objects (dsh/lookup-page-objects state)
selected (dsh/lookup-selected state)
;; With WASM, pasted props change the text content but not the
;; selrect, so auto-grow text shapes need an explicit relayout.
text-ids (into []
(comp (filter #(cfh/text-shape? (get objects %)))
(filter #(not= :fixed (:grow-type (get objects %)))))
selected)]
(when (paste-data-valid? pdata)
(cfeat/check-paste-features! features (:features pdata))
(case (:type pdata)
:copied-props
(rx/concat
(->> (rx/of pdata)
(rx/mapcat (partial upload-images (:current-file-id state)))
(rx/map
#(dwsh/update-shapes
selected
(fn [shape objects] (cts/patch-props shape (:props pdata) objects))
{:with-objects? true})))
(rx/of (ptk/data-event :layout/update {:ids selected})))
;; Wrap in a single undo transaction so the async wasm text
;; resize is bundled with the props change (one undo step).
(let [undo-id (js/Symbol)
resize-texts? (and (features/active-feature? state "render-wasm/v1")
(seq text-ids))]
(rx/concat
(rx/of (dwu/start-undo-transaction undo-id))
(->> (rx/of pdata)
(rx/mapcat (partial upload-images (:current-file-id state)))
(rx/map
#(dwsh/update-shapes
selected
(fn [shape objects] (cts/patch-props shape (:props pdata) objects))
{:with-objects? true})))
(rx/of (ptk/data-event :layout/update {:ids selected}))
(if resize-texts?
(rx/of (dwwt/resize-wasm-text-all text-ids {:undo-id undo-id}))
(rx/of (dwu/commit-undo-transaction undo-id)))))
;;
(rx/empty))))))))

38
frontend/src/app/main/data/workspace/wasm_text.cljs
View File

@ -224,21 +224,23 @@
(defn resize-wasm-text-all
"Resize all text shapes (auto-width/auto-height) from a collection of ids."
[ids]
(ptk/reify ::resize-wasm-text-all
ptk/WatchEvent
(watch [_ state stream]
(let [resize-stream
(->> (rx/from ids)
(rx/map resize-wasm-text-debounce))]
(if (::dwsh/update-shapes-buffer state)
;; If we're in the middle of a token propagation we wait until is finished to
;; recalculate the text sizes. The shapes stay pending for that whole wait,
;; since the per-shape debounce only marks them once dispatched.
(wrf/with-pending
:text-resize ids
(->> stream
(rx/filter (ptk/type? ::dwsh/update-shapes-buffer-commit))
(rx/take 1)
(rx/mapcat (constantly resize-stream))))
resize-stream)))))
([ids]
(resize-wasm-text-all ids nil))
([ids opts]
(ptk/reify ::resize-wasm-text-all
ptk/WatchEvent
(watch [_ state stream]
(let [resize-stream
(->> (rx/from ids)
(rx/map #(resize-wasm-text-debounce % opts)))]
(if (::dwsh/update-shapes-buffer state)
;; If we're in the middle of a token propagation we wait until is finished to
;; recalculate the text sizes. The shapes stay pending for that whole wait,
;; since the per-shape debounce only marks them once dispatched.
(wrf/with-pending
:text-resize ids
(->> stream
(rx/filter (ptk/type? ::dwsh/update-shapes-buffer-commit))
(rx/take 1)
(rx/mapcat (constantly resize-stream))))
resize-stream))))))