github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-04-29 05:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Changes after review

Browse Source
This commit is contained in:
alonso.torres 2026-04-28 12:02:28 +02:00
parent 71e13f1daa
commit b572d1a3db
4 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
frontend/src/app/main/data/workspace/shapes.cljs
View File

@ -46,33 +46,37 @@
(cond-> changes add-undo-group? (assoc :undo-group undo-group))))
(defn update-shapes-debounce-start
(defn update-shapes-buffer-start
[]
(ptk/reify ::update-shapes-debounce-start
(ptk/reify ::update-shapes-buffer-start
ptk/UpdateEvent
(update [_ state]
(assoc state ::update-shapes-debounce true))))
(assoc state ::update-shapes-buffer true))))
(defn update-shapes-debounce-stop
(defn update-shapes-buffer-stop
[]
(ptk/reify ::update-shapes-debounce-stop
(ptk/reify ::update-shapes-buffer-stop
ptk/UpdateEvent
(update [_ state]
(assoc state ::update-shapes-debounce false))))
(assoc state ::update-shapes-buffer false))))
(defn update-shapes-debounce-commit
(defn update-shapes-buffer-commit
[]
(ptk/reify ::update-shapes-debounce-commit
(ptk/reify ::update-shapes-buffer-commit
ptk/WatchEvent
(watch [_ state _]
(->> (get state ::update-shapes-debounce-changes)
(->> (get state ::update-shapes-buffer-changes)
(vals)
(map dch/commit-changes)
(rx/from)))))
(defn update-shapes-debounce
;; Accumulates the update shapes changes into a single commit-changes
;; The accumulation is marked between the events `start` and `stop` in between
;; those events all the `update-shapes` will be agregated together with this event.
;; After a `stop` arrives the `commit` will send the changes at the same time.
(defn update-shapes-buffer
([ids update-fn]
(update-shapes-debounce ids update-fn nil))
(update-shapes-buffer ids update-fn nil))
([ids update-fn
{:keys [reg-objects? save-undo? stack-undo? attrs ignore-tree page-id
ignore-touched undo-group with-objects? changed-sub-attr]
@ -83,17 +87,17 @@
with-objects? false}
:as props}]
(let [cur-event (js/Symbol)]
(ptk/reify ::update-shapes-debounce
(ptk/reify ::update-shapes-buffer
ptk/UpdateEvent
(update [it state]
(if (nil? (::update-shapes-debounce-event state))
(assoc state ::update-shapes-debounce-event cur-event)
(if (nil? (::update-shapes-buffer-event state))
(assoc state ::update-shapes-buffer-event cur-event)
(let [page-id (or page-id (get state :current-page-id))
objects (dsh/lookup-page-objects state page-id)]
(update-in
state
[::update-shapes-debounce-changes page-id]
[::update-shapes-buffer-changes page-id]
(fn [changes]
(-> (or changes
(-> (pcb/empty-changes it page-id)
@ -114,21 +118,21 @@
(cond-> reg-objects? (pcb/resize-parents ids))))))))
ptk/WatchEvent
(watch [_ state stream]
(if (= (::update-shapes-debounce-event state) cur-event)
(let [stopper (->> stream (rx/filter (ptk/type? ::update-shapes-debounce-stop)))]
(if (= (::update-shapes-buffer-event state) cur-event)
(let [stopper (->> stream (rx/filter (ptk/type? ::update-shapes-buffer-stop)))]
(rx/concat
(rx/merge
(->> stream
(rx/filter (ptk/type? ::update-shapes-debounce))
(rx/filter (ptk/type? ::update-shapes-buffer))
(rx/take-until stopper)
(rx/last)
(rx/map #(update-shapes-debounce-commit)))
(rx/map #(update-shapes-buffer-commit)))
(rx/of (update-shapes-debounce ids update-fn props)))
(rx/of (update-shapes-buffer ids update-fn props)))
(rx/of #(dissoc %
::update-shapes-debounce-changes
::update-shapes-debounce-event))))
::update-shapes-buffer-changes
::update-shapes-buffer-event))))
(rx/empty)))))))
(defn update-shapes
@ -151,8 +155,8 @@
ptk/WatchEvent
(watch [it state _]
(if (::update-shapes-debounce state)
(rx/of (update-shapes-debounce ids update-fn props))
(if (::update-shapes-buffer state)
(rx/of (update-shapes-buffer ids update-fn props))
(let [page-id (or page-id (get state :current-page-id))
objects (dsh/lookup-page-objects state page-id)

4
frontend/src/app/main/data/workspace/tokens/application.cljs
View File

@ -495,8 +495,8 @@
(watch [_ _ _]
(when (number? value)
(rx/of
(when (:width attributes) (dwtr/update-dimensions shape-ids :width value {:ignore-touched true :page-id page-id :no-wasm true}))
(when (:height attributes) (dwtr/update-dimensions shape-ids :height value {:ignore-touched true :page-id page-id :no-wasm true}))))))))
(when (:width attributes) (dwtr/update-dimensions shape-ids :width value {:ignore-touched true :page-id page-id :no-wasm? true}))
(when (:height attributes) (dwtr/update-dimensions shape-ids :height value {:ignore-touched true :page-id page-id :no-wasm? true}))))))))
(defn- attributes->actions
[{:keys [value shape-ids attributes page-id]}]

14
frontend/src/app/main/data/workspace/tokens/propagation.cljs
View File

@ -200,7 +200,15 @@
(let [undo-id (js/Symbol)]
(rx/concat
(rx/of (dwu/start-undo-transaction undo-id :timeout false))
(rx/of (dwsh/update-shapes-debounce-start))
(propagate-tokens state sd-tokens)
(rx/of (dwsh/update-shapes-debounce-stop))
;; FIXME: now the tokens propagations is done by accumulating the update-shapes
;; into a single commit-changes. This is not really the best way, the token application
;; should be done with a changes_builder and sending only one `commit-changes` instead
;; of creating lots of `update-shapes`.
(rx/of (dwsh/update-shapes-buffer-start))
(->> (propagate-tokens state sd-tokens)
(rx/catch #(rx/concat
(rx/of (dwsh/update-shapes-buffer-stop))
(rx/throw %))))
(rx/of (dwsh/update-shapes-buffer-stop))
(rx/of (dwu/commit-undo-transaction undo-id)))))))))))

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

@ -201,11 +201,11 @@
(let [resize-stream
(->> (rx/from ids)
(rx/map resize-wasm-text-debounce))]
(if (::dwsh/update-shapes-debounce state)
(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
(->> stream
(rx/filter (ptk/type? ::dwsh/update-shapes-debounce-commit))
(rx/filter (ptk/type? ::dwsh/update-shapes-buffer-commit))
(rx/take 1)
(rx/mapcat (constantly resize-stream)))
resize-stream)))))