3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-15 17:31:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Select token set on create

Browse source
This commit is contained in:
Florian Schroedl 2024-08-13 15:25:36 +02:00
parent ba31914ca4
commit a4865522cc
3 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,8 +94,22 @@
(defn add-token-to-token-set [token token-set] (defn add-token-to-token-set [token token-set]
(update token-set :items conj (:id token))) (update token-set :items conj (:id token)))
(defn get-selected-token-set [state]
(when-let [id (get-in state [:workspace-local :selected-token-set-id])]
(get-token-set state id)))
(defn assoc-selected-token-set-id [state id]
(assoc-in state [:workspace-local :selected-token-set-id] id))
(defn set-selected-token-set-id
[id]
(ptk/reify ::set-selected-token-set-id
ptk/UpdateEvent
(update [_ state]
(assoc-selected-token-set-id state id))))
(defn update-create-token (defn update-create-token
[token set-id] [token]
(let [token (update token :id #(or % (uuid/next)))] (let [token (update token :id #(or % (uuid/next)))]
(ptk/reify ::add-token (ptk/reify ::add-token
ptk/WatchEvent ptk/WatchEvent
@ -107,20 +121,22 @@
(pcb/add-token token)) (pcb/add-token token))
(-> (pcb/empty-changes it) (-> (pcb/empty-changes it)
(pcb/update-token token prev-token))) (pcb/update-token token prev-token)))
token-set (get-token-set state set-id) token-set (get-selected-token-set state)
create-set? (not token-set) create-set? (not token-set)
new-token-set {:id (uuid/next)
:name "Global"
:tokens [(:id token)]}
changes (cond changes (cond
create-set? (-> token-changes create-set? (-> token-changes
(pcb/add-token-set {:id (uuid/next) (pcb/add-token-set new-token-set))
:name "Global"
:tokens [(:id token)]}))
:else (let [updated-token-set (if (contains? token-set (:id token)) :else (let [updated-token-set (if (contains? token-set (:id token))
token-set token-set
(update token-set :tokens conj (:id token)))] (update token-set :tokens conj (:id token)))]
(-> token-changes (-> token-changes
(pcb/update-token-set token-set updated-token-set))))] (pcb/update-token-set token-set updated-token-set))))]
(js/console.log "changes" changes) (rx/of
(rx/of (dch/commit-changes changes))))))) (set-selected-token-set-id (:id new-token-set))
(dch/commit-changes changes)))))))
(defn delete-token (defn delete-token
[id] [id]
@ -135,11 +151,12 @@
(rx/of (dch/commit-changes changes)))))) (rx/of (dch/commit-changes changes))))))
(defn duplicate-token (defn duplicate-token
[id set-id] [id]
(let [new-token (-> (get-token-data-from-token-id id) (let [new-token (-> (get-token-data-from-token-id id)
(dissoc :id) (dissoc :id)
(update :name #(str/concat % "-copy")))] (update :name #(str/concat % "-copy")))]
(update-create-token new-token set-id))) (update-create-token new-token)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; TEMP (Move to test) ;; TEMP (Move to test)

2
frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
View file

@ -207,7 +207,7 @@
[{:title "Delete Token" [{:title "Delete Token"
:action #(st/emit! (dt/delete-token (:id token)))} :action #(st/emit! (dt/delete-token (:id token)))}
{:title "Duplicate Token" {:title "Duplicate Token"
:action #(st/emit! (dt/duplicate-token (:id token) nil))} :action #(st/emit! (dt/duplicate-token (:id token)))}
{:title "Edit Token" {:title "Edit Token"
:action (fn [event] :action (fn [event]
(let [{:keys [key fields]} modal (let [{:keys [key fields]} modal

2
frontend/src/app/main/ui/workspace/tokens/form.cljs
View file

@ -246,7 +246,7 @@ Token names should only contain letters and digits separated by . characters.")}
:value final-value} :value final-value}
final-description (assoc :description final-description) final-description (assoc :description final-description)
(:id token) (assoc :id (:id token)))] (:id token) (assoc :id (:id token)))]
(st/emit! (dt/update-create-token new-token nil)) (st/emit! (dt/update-create-token new-token))
(st/emit! (wtu/update-workspace-tokens)) (st/emit! (wtu/update-workspace-tokens))
(modal/hide!)))))))))] (modal/hide!)))))))))]
[:form [:form