CalvinBackup/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-03-30 00:00:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

💄 Normalize some attributes of changes

Browse Source
This commit is contained in:
Andrés Moya
2025-08-20 14:01:49 +02:00
committed by Andrés Moya
parent 5f886e141a
commit 03e05da41e
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/app/common/files/changes.cljc
View File

@@ -323,7 +323,7 @@
[:main-instance-page ::sm/uuid]]]
[:mod-component
[:map {:title "ModCompoenentChange"}
[:map {:title "ModComponentChange"}
[:type [:= :mod-component]]
[:id ::sm/uuid]
[:shapes {:optional true} [:vector {:gen/max 3} ::sm/any]]
@@ -408,8 +408,8 @@
[:set-token-set
[:map {:title "SetTokenSetChange"}
[:type [:= :set-token-set]]
[:set-id ::sm/uuid]
[:group? :boolean]
[:id ::sm/uuid]
[:is-group :boolean]
[:token-set [:maybe ctob/schema:token-set-attrs]]]]
[:set-token
@@ -995,18 +995,18 @@
(ctob/make-token (merge prev-token token)))))))))
(defmethod process-change :set-token-set
[data {:keys [set-id group? token-set]}]
[data {:keys [id is-group token-set]}]
(update data :tokens-lib
(fn [lib]
(let [lib' (ctob/ensure-tokens-lib lib)
set (ctob/get-set lib' set-id)] ;; FIXME: remove this when set-token-set uses set-id
set (ctob/get-set lib' id)] ;; FIXME: remove this when set-token-set uses set-id
(cond
(not token-set)
(if group?
(if is-group
(ctob/delete-set-group lib' (ctob/get-name set)) ;; FIXME: move to a separate change
(ctob/delete-set lib' (ctob/get-name set)))
(not (ctob/get-set lib' set-id))
(not (ctob/get-set lib' id))
(ctob/add-set lib' (ctob/make-token-set token-set))
:else

20
common/src/app/common/files/changes_builder.cljc
View File

@@ -916,30 +916,30 @@
(ctob/get-set id))]
(-> changes
(update :redo-changes conj {:type :set-token-set
:set-id id
:id id
:token-set (datafy (ctob/rename prev-token-set new-name))
:group? false})
:is-group false})
(update :undo-changes conj {:type :set-token-set
:set-id id
:id id
:token-set (datafy prev-token-set)
:group? false})
:is-group false})
(apply-changes-local))))
(defn set-token-set
[changes set-id group? token-set]
[changes id is-group token-set]
(assert-library! changes)
(let [library-data (::library-data (meta changes))
prev-token-set (some-> (get library-data :tokens-lib)
(ctob/get-set set-id))]
(ctob/get-set id))]
(-> changes
(update :redo-changes conj {:type :set-token-set
:set-id set-id
:id id
:token-set (datafy token-set)
:group? group?})
:is-group is-group})
(update :undo-changes conj {:type :set-token-set
:set-id set-id
:id id
:token-set (datafy prev-token-set)
:group? group?})
:is-group is-group})
(apply-changes-local))))
(defn add-component