johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-11 22:14:05 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

♻ Allow token set grouping - Remove slash to dash conversion

Browse Source
This commit is contained in:
Florian Schroedl
2024-11-05 15:48:37 +01:00
parent 3c5c9a8e14
commit 7044c17d89
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/app/main/ui/workspace/tokens/sets.cljs
View File

@@ -200,13 +200,9 @@
context] context]
:as _props}] :as _props}]
(let [{:keys [editing? new? on-edit on-create on-reset] :as ctx} (or context (sets-context/use-context)) (let [{:keys [editing? new? on-edit on-create on-reset] :as ctx} (or context (sets-context/use-context))
avoid-token-set-grouping #(str/replace % "/" "-")
submit-token submit-token
#(do #(do
;; TODO: We don't support set grouping for now so we rename sets for now (on-create-token-set %)
(when (str/includes? (:name %) "/")
(warn-on-try-create-token-set-group!))
(on-create-token-set (update % :name avoid-token-set-grouping))
(on-reset))] (on-reset))]
[:ul {:class (stl/css :sets-list)} [:ul {:class (stl/css :sets-list)}
(if (and (if (and
@@ -218,10 +214,7 @@
(when token-set (when token-set
(let [update-token (let [update-token
#(do #(do
;; TODO: We don't support set grouping for now so we rename sets for now (on-update-token-set (:name token-set) %)
(when (str/includes? (:name %) "/")
(warn-on-try-create-token-set-group!))
(on-update-token-set (avoid-token-set-grouping (:name token-set)) (update % :name avoid-token-set-grouping))
(on-reset))] (on-reset))]
[:& sets-tree [:& sets-tree
{:key (:name token-set) {:key (:name token-set)

3
frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs
View File

@@ -182,8 +182,7 @@
(->> data-stream (->> data-stream
(rx/map (fn [data] (rx/map (fn [data]
(try (try
(-> (str/replace data "/" "-") ;; TODO Remove when token groups work (t/decode-str data)
(t/decode-str))
(catch js/Error e (catch js/Error e
(throw (wte/error-ex-info :error.import/json-parse-error data e)))))) (throw (wte/error-ex-info :error.import/json-parse-error data e))))))
(rx/map (fn [json-data] (rx/map (fn [json-data]