3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-21 18:16:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix touched erroneously set after a text component sync

Browse source
This commit is contained in:
Andrés Moya 2023-06-01 09:48:32 +02:00
parent 8772e51bd2
commit 0b316d6828
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/app/main/data/workspace/changes.cljs
View file

@ -51,8 +51,8 @@
(defn update-shapes (defn update-shapes
([ids update-fn] (update-shapes ids update-fn nil)) ([ids update-fn] (update-shapes ids update-fn nil))
([ids update-fn {:keys [reg-objects? save-undo? stack-undo? attrs ignore-tree page-id ignore-remote?] ([ids update-fn {:keys [reg-objects? save-undo? stack-undo? attrs ignore-tree page-id ignore-remote? ignore-touched]
:or {reg-objects? false save-undo? true stack-undo? false ignore-remote? false}}] :or {reg-objects? false save-undo? true stack-undo? false ignore-remote? false ignore-touched false}}]
(dm/assert! (sm/coll-of-uuid? ids)) (dm/assert! (sm/coll-of-uuid? ids))
(dm/assert! (fn? update-fn)) (dm/assert! (fn? update-fn))
@ -71,7 +71,9 @@
changes (reduce changes (reduce
(fn [changes id] (fn [changes id]
(let [opts {:attrs attrs :ignore-geometry? (get ignore-tree id)}] (let [opts {:attrs attrs
:ignore-geometry? (get ignore-tree id)
:ignore-touched ignore-touched}]
(pcb/update-shapes changes [id] update-fn (d/without-nils opts)))) (pcb/update-shapes changes [id] update-fn (d/without-nils opts))))
(-> (pcb/empty-changes it page-id) (-> (pcb/empty-changes it page-id)
(pcb/set-save-undo? save-undo?) (pcb/set-save-undo? save-undo?)

5
frontend/src/app/main/data/workspace/texts.cljs
View file

@ -426,7 +426,10 @@
(let [ids (->> (keys props) (filter changed-text?))] (let [ids (->> (keys props) (filter changed-text?))]
(rx/of (dwu/start-undo-transaction undo-id) (rx/of (dwu/start-undo-transaction undo-id)
(dch/update-shapes ids update-fn {:reg-objects? true :stack-undo? true :ignore-remote? true}) (dch/update-shapes ids update-fn {:reg-objects? true
:stack-undo? true
:ignore-remote? true
:ignore-touched true})
(ptk/data-event :layout/update ids) (ptk/data-event :layout/update ids)
(dwu/commit-undo-transaction undo-id)))))))) (dwu/commit-undo-transaction undo-id))))))))