From 1f0c1dbbe6cc2e39c1c28abed2980475f9ba4b8c Mon Sep 17 00:00:00 2001 From: Florian Schroedl Date: Thu, 15 Aug 2024 18:52:31 +0200 Subject: [PATCH] Update shapes on token set switch --- .../src/app/main/ui/workspace/tokens/sidebar.cljs | 13 ++++++++++--- .../src/app/main/ui/workspace/tokens/update.cljs | 3 ++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs index a1995f5a2..d4534c6db 100644 --- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs @@ -10,6 +10,7 @@ [app.common.data :as d] [app.main.data.modal :as modal] [app.main.data.tokens :as dt] + [app.main.data.tokens :as wdt] [app.main.refs :as refs] [app.main.store :as st] [app.main.ui.icons :as i] @@ -20,6 +21,7 @@ [app.main.ui.workspace.tokens.style-dictionary :as sd] [app.main.ui.workspace.tokens.token :as wtt] [app.main.ui.workspace.tokens.token-types :as wtty] + [app.main.ui.workspace.tokens.update :as wtu] [app.util.dom :as dom] [cuerdas.core :as str] [okulary.core :as l] @@ -148,7 +150,6 @@ [_props] (let [selected-token-set-id (mf/deref refs/workspace-selected-token-set-id) token-sets (mf/deref refs/workspace-token-sets)] - (js/console.log "token-sets" token-sets) [:div {:style {:display "flex" :flex-direction "column" @@ -157,13 +158,19 @@ "Token Sets" [:div {:style {:display "flex" :gap "10px"}} - [:button "Create"] + [:button + {:on-click #(st/emit! (wdt/create-token-set nil))} + "Create"] [:button "Delete"]] [:ul {:style {:list-style "disk" :margin-left "20px"}} (for [[_ {:keys [id name]}] token-sets] - [:li {:style {:font-weight (when (= selected-token-set-id id) "bold")}} + [:li {:style {:font-weight (when (= selected-token-set-id id) "bold")} + :on-click (fn [] + (st/emit! + (wdt/set-selected-token-set-id id) + (wtu/update-workspace-tokens)))} name])] [:hr]])) diff --git a/frontend/src/app/main/ui/workspace/tokens/update.cljs b/frontend/src/app/main/ui/workspace/tokens/update.cljs index 1543d8d06..ab723fd55 100644 --- a/frontend/src/app/main/ui/workspace/tokens/update.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/update.cljs @@ -6,6 +6,7 @@ [app.main.refs :as refs] [app.main.ui.workspace.tokens.changes :as wtch] [app.main.ui.workspace.tokens.style-dictionary :as wtsd] + [app.main.ui.workspace.tokens.token-set :as wtts] [beicon.v2.core :as rx] [clojure.data :as data] [clojure.set :as set] @@ -120,7 +121,7 @@ ptk/WatchEvent (watch [_ state _] (->> - (rx/from (wtsd/resolve-tokens+ (get-in state [:workspace-data :tokens]))) + (rx/from (wtsd/resolve-tokens+ (wtts/get-selected-token-set-tokens state))) (rx/mapcat (fn [sd-tokens] (let [undo-id (js/Symbol)]