Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-06 14:50:20 -05:00
Code Issues Activity

Add set

Browse source
This commit is contained in:
Florian Schroedl 2024-09-25 14:45:31 +02:00
parent 99e551925a
commit d2ed6b5501
3 changed files with 10 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
common/src/app/common/files/changes.cljc
View file

@ -793,18 +793,16 @@
;; -- Tokens
(defmethod process-change :add-token
[data {:keys [set-id set-name token]}]
[data {:keys [set-name token]}]
(-> data
(ctol/add-token set-id token)
(update :tokens-lib
#(-> %
(ctob/ensure-tokens-lib)
(ctob/add-token-in-set set-name (ctob/make-token token))))))
(defmethod process-change :mod-token
[data {:keys [set-name id name token]}]
[data {:keys [set-name name token]}]
(-> data
(ctol/update-token id merge token)
(update :tokens-lib
#(-> %
(ctob/ensure-tokens-lib)
@ -815,9 +813,8 @@
(ctob/make-token (merge old-token token))))))))
(defmethod process-change :del-token
[data {:keys [set-name id name]}]
[data {:keys [set-name name]}]
(-> data
(ctol/delete-token id)
(update :tokens-lib
#(-> %
(ctob/ensure-tokens-lib)
@ -836,7 +833,6 @@
(defmethod process-change :add-temporary-token-theme
[data {:keys [token-theme]}]
(-> data
(ctotl/add-temporary-token-theme token-theme)
(update :tokens-lib
#(-> %
(ctob/ensure-tokens-lib)
@ -852,9 +848,8 @@
(ctob/set-active-themes theme-ids)))))
(defmethod process-change :delete-temporary-token-theme
[data {:keys [id group name]}]
[data {:keys [group name]}]
(-> data
(ctotl/delete-temporary-token-theme id)
(update :tokens-lib
#(-> %
(ctob/ensure-tokens-lib)
@ -871,10 +866,8 @@
(ctob/make-token-theme)))))))
(defmethod process-change :mod-token-theme
[data {:keys [id name group token-theme]}]
[data {:keys [name group token-theme]}]
(-> data
(dm/legacy (#(when id
(ctotl/update-token-theme % (random-uuid) merge token-theme))))
(update :tokens-lib
#(-> %
(ctob/ensure-tokens-lib)
@ -895,16 +888,14 @@
(defmethod process-change :add-token-set
[data {:keys [token-set]}]
(-> data
(ctotl/add-token-set token-set)
(update :tokens-lib
#(-> %
(ctob/ensure-tokens-lib)
(ctob/add-set (ctob/make-token-set token-set))))))
(defmethod process-change :mod-token-set
[data {:keys [id name token-set]}]
[data {:keys [name token-set]}]
(-> data
(ctotl/update-token-set id merge token-set)
(update :tokens-lib
#(-> %
(ctob/ensure-tokens-lib)
@ -913,9 +904,8 @@
(dissoc token-set :tokens))))))))
(defmethod process-change :del-token-set
[data {:keys [id name]}]
[data {:keys [name]}]
(-> data
(ctotl/delete-token-set id)
(update :tokens-lib
#(-> %
(ctob/ensure-tokens-lib)

16
common/src/app/common/types/file.cljc
View file

@ -64,22 +64,6 @@
[:map-of {:gen/max 5} ::sm/uuid ::media-object]]
[:plugin-data {:optional true}
[:map-of {:gen/max 5} :keyword ::ctpg/plugin-data]]
[:token-theme-temporary-id {:optional true}
::sm/uuid]
[:token-active-themes {:optional true :default #{}}
[:set ::sm/uuid]]
[:token-themes {:optional true}
[:vector ::sm/uuid]]
[:token-themes-index {:optional true}
[:map-of {:gen/max 5} ::sm/uuid ::ctt/token-theme]]
[:token-set-groups {:optional true}
[:vector ::sm/uuid]]
[:token-set-groups-index {:optional true}
[:map-of {:gen/max 10} ::sm/uuid ::ctt/token-set-group]]
[:token-sets-index {:optional true}
[:map-of {:gen/max 10} ::sm/uuid ::ctt/token-set]]
[:tokens {:optional true}
[:map-of {:gen/max 100} ::sm/uuid ::cto/token]]
[:tokens-lib {:optional true} ::ctl/tokens-lib]])
(def check-file-data!

7
frontend/src/app/main/data/tokens.cljs
View file

@ -168,8 +168,7 @@
(defn create-token-set [token-set]
(let [new-token-set (merge
{:id (uuid/next)
:name "Token Set"
{:name "Token Set"
:tokens []}
token-set)]
(ptk/reify ::create-token-set
@ -177,8 +176,8 @@
(watch [it state _]
(let [changes (-> (pcb/empty-changes it)
(pcb/add-token-set new-token-set)
(ensure-token-theme-changes state {:id (:id new-token-set)
:new-set? true}))]
#_(ensure-token-theme-changes state {:id (:id new-token-set)
:new-set? true}))]
(rx/of
(set-selected-token-set-id (:name new-token-set))
(dch/commit-changes changes)))))))