3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-29 14:07:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename selected-token-set-id -> selected-token-set-path

Browse source
This commit is contained in:
Florian Schroedl 2024-11-27 10:48:11 +01:00
parent f2c6109dd9
commit 44105c2be2
8 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,20 +88,20 @@
(let [workspace-data (deref refs/workspace-data)] (let [workspace-data (deref refs/workspace-data)]
(get (:tokens workspace-data) id))) (get (:tokens workspace-data) id)))
(defn set-selected-token-set-id (defn set-selected-token-set-path
[id] [id]
(ptk/reify ::set-selected-token-set-id (ptk/reify ::set-selected-token-set-path
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
(wtts/assoc-selected-token-set-id state id)))) (wtts/assoc-selected-token-set-path state id))))
(defn set-selected-token-set-id-from-name (defn set-selected-token-set-path-from-name
[token-set-name] [token-set-name]
(ptk/reify ::set-selected-token-set-id-from-name (ptk/reify ::set-selected-token-set-path-from-name
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
(->> (ctob/set-name->prefixed-set-name token-set-name) (->> (ctob/set-name->prefixed-set-name token-set-name)
(wtts/assoc-selected-token-set-id state))))) (wtts/assoc-selected-token-set-path state)))))
(defn create-token-theme [token-theme] (defn create-token-theme [token-theme]
(let [new-token-theme token-theme] (let [new-token-theme token-theme]
@ -165,7 +165,7 @@
(let [changes (-> (pcb/empty-changes it) (let [changes (-> (pcb/empty-changes it)
(pcb/add-token-set new-token-set))] (pcb/add-token-set new-token-set))]
(rx/of (rx/of
(set-selected-token-set-id-from-name (:name new-token-set)) (set-selected-token-set-path-from-name (:name new-token-set))
(dch/commit-changes changes))))))) (dch/commit-changes changes)))))))
(defn update-token-set [set-name token-set] (defn update-token-set [set-name token-set]
@ -177,7 +177,7 @@
changes (-> (pcb/empty-changes it) changes (-> (pcb/empty-changes it)
(pcb/update-token-set token-set prev-token-set))] (pcb/update-token-set token-set prev-token-set))]
(rx/of (rx/of
(set-selected-token-set-id-from-name (:name token-set)) (set-selected-token-set-path-from-name (:name token-set))
(dch/commit-changes changes)))))) (dch/commit-changes changes))))))
(defn toggle-token-set [{:keys [token-set-name]}] (defn toggle-token-set [{:keys [token-set-name]}]
@ -210,7 +210,7 @@
(ctob/get-sets) (ctob/get-sets)
(first) (first)
(:name) (:name)
(set-selected-token-set-id-from-name)) (set-selected-token-set-path-from-name))
changes (-> (pcb/empty-changes it) changes (-> (pcb/empty-changes it)
(pcb/with-library-data data) (pcb/with-library-data data)
(pcb/set-tokens-lib lib))] (pcb/set-tokens-lib lib))]
@ -276,7 +276,7 @@
(pcb/update-token (pcb/empty-changes) (:name token-set) token prev-token) (pcb/update-token (pcb/empty-changes) (:name token-set) token prev-token)
(pcb/add-token (pcb/empty-changes) (:name token-set) token)))] (pcb/add-token (pcb/empty-changes) (:name token-set) token)))]
(rx/of (rx/of
(set-selected-token-set-id-from-name token-set-name) (set-selected-token-set-path-from-name token-set-name)
(dch/commit-changes changes)))))) (dch/commit-changes changes))))))
(defn delete-token (defn delete-token

4
frontend/src/app/main/refs.cljs
View file

@ -490,8 +490,8 @@
(def workspace-token-themes-no-hidden (def workspace-token-themes-no-hidden
(l/derived #(remove ctob/hidden-temporary-theme? %) workspace-token-themes)) (l/derived #(remove ctob/hidden-temporary-theme? %) workspace-token-themes))
(def workspace-selected-token-set-id (def workspace-selected-token-set-path
(l/derived wtts/get-selected-token-set-id st/state)) (l/derived wtts/get-selected-token-set-path st/state))
(def workspace-token-set-group-selected? (def workspace-token-set-group-selected?
(l/derived wtts/token-group-selected? st/state)) (l/derived wtts/token-group-selected? st/state))

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

@ -204,10 +204,10 @@
(generic-attribute-actions #{:x} "X" (assoc context-data :on-update-shape wtch/update-shape-position)) (generic-attribute-actions #{:x} "X" (assoc context-data :on-update-shape wtch/update-shape-position))
(generic-attribute-actions #{:y} "Y" (assoc context-data :on-update-shape wtch/update-shape-position))))})) (generic-attribute-actions #{:y} "Y" (assoc context-data :on-update-shape wtch/update-shape-position))))}))
(defn default-actions [{:keys [token selected-token-set-id]}] (defn default-actions [{:keys [token selected-token-set-path]}]
(let [{:keys [modal]} (wtty/get-token-properties token)] (let [{:keys [modal]} (wtty/get-token-properties token)]
[{:title "Delete Token" [{:title "Delete Token"
:action #(st/emit! (dt/delete-token (ctob/prefixed-set-full-path->set-name-name selected-token-set-id) (:name token)))} :action #(st/emit! (dt/delete-token (ctob/prefixed-set-full-path->set-name-name selected-token-set-path) (:name token)))}
{:title "Duplicate Token" {:title "Duplicate Token"
:action #(st/emit! (dt/duplicate-token (:name token)))} :action #(st/emit! (dt/duplicate-token (:name token)))}
{:title "Edit Token" {:title "Edit Token"
@ -220,7 +220,7 @@
:position :right :position :right
:fields fields :fields fields
:action "edit" :action "edit"
:selected-token-set-id selected-token-set-id :selected-token-set-path selected-token-set-path
:token token})))}])) :token token})))}]))
(defn selection-actions [{:keys [type token] :as context-data}] (defn selection-actions [{:keys [type token] :as context-data}]
@ -311,11 +311,11 @@
selected-shapes (into [] (keep (d/getf objects)) selected) selected-shapes (into [] (keep (d/getf objects)) selected)
token-name (:token-name mdata) token-name (:token-name mdata)
token (mf/deref (refs/workspace-selected-token-set-token token-name)) token (mf/deref (refs/workspace-selected-token-set-token token-name))
selected-token-set-id (mf/deref refs/workspace-selected-token-set-id)] selected-token-set-path (mf/deref refs/workspace-selected-token-set-path)]
[:ul {:class (stl/css :context-list)} [:ul {:class (stl/css :context-list)}
[:& menu-tree {:submenu-offset width [:& menu-tree {:submenu-offset width
:token token :token token
:selected-token-set-id selected-token-set-id :selected-token-set-path selected-token-set-path
:selected-shapes selected-shapes}]])) :selected-shapes selected-shapes}]]))
(mf/defc token-context-menu (mf/defc token-context-menu

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

@ -204,7 +204,7 @@ Token names should only contain letters and digits separated by . characters.")}
(mf/defc form (mf/defc form
{::mf/wrap-props false} {::mf/wrap-props false}
[{:keys [token token-type action selected-token-set-id]}] [{:keys [token token-type action selected-token-set-path]}]
(let [token (or token {:type token-type}) (let [token (or token {:type token-type})
token-properties (wtty/get-token-properties token) token-properties (wtty/get-token-properties token)
color? (wtt/color-token? token) color? (wtt/color-token? token)
@ -348,11 +348,11 @@ Token names should only contain letters and digits separated by . characters.")}
(modal/hide!)))))))) (modal/hide!))))))))
on-delete-token on-delete-token
(mf/use-fn (mf/use-fn
(mf/deps selected-token-set-id) (mf/deps selected-token-set-path)
(fn [e] (fn [e]
(dom/prevent-default e) (dom/prevent-default e)
(modal/hide!) (modal/hide!)
(st/emit! (dt/delete-token (ctob/prefixed-set-full-path->set-name-name selected-token-set-id) (:name token))))) (st/emit! (dt/delete-token (ctob/prefixed-set-full-path->set-name-name selected-token-set-path) (:name token)))))
on-cancel on-cancel
(mf/use-fn (mf/use-fn

4
frontend/src/app/main/ui/workspace/tokens/modals.cljs
View file

@ -42,7 +42,7 @@
(mf/defc token-update-create-modal (mf/defc token-update-create-modal
{::mf/wrap-props false} {::mf/wrap-props false}
[{:keys [x y position token token-type action selected-token-set-id] :as _args}] [{:keys [x y position token token-type action selected-token-set-path] :as _args}]
(let [wrapper-style (use-viewport-position-style x y position) (let [wrapper-style (use-viewport-position-style x y position)
close-modal (mf/use-fn close-modal (mf/use-fn
(fn [] (fn []
@ -57,7 +57,7 @@
:aria-label (tr "labels.close")}] :aria-label (tr "labels.close")}]
[:& form {:token token [:& form {:token token
:action action :action action
:selected-token-set-id selected-token-set-id :selected-token-set-path selected-token-set-path
:token-type token-type}]])) :token-type token-type}]]))
;; Modals ---------------------------------------------------------------------- ;; Modals ----------------------------------------------------------------------

8
frontend/src/app/main/ui/workspace/tokens/sets.cljs
View file

@ -25,7 +25,7 @@
(st/emit! (wdt/toggle-token-set {:token-set-name token-set-name}))) (st/emit! (wdt/toggle-token-set {:token-set-name token-set-name})))
(defn on-select-token-set-click [tree-path] (defn on-select-token-set-click [tree-path]
(st/emit! (wdt/set-selected-token-set-id tree-path))) (st/emit! (wdt/set-selected-token-set-path tree-path)))
(defn on-update-token-set [set-name token-set] (defn on-update-token-set [set-name token-set]
(st/emit! (wdt/update-token-set set-name token-set))) (st/emit! (wdt/update-token-set set-name token-set)))
@ -272,11 +272,11 @@
(mf/defc sets-list (mf/defc sets-list
[{:keys []}] [{:keys []}]
(let [token-sets (mf/deref refs/workspace-token-sets-tree) (let [token-sets (mf/deref refs/workspace-token-sets-tree)
selected-token-set-id (mf/deref refs/workspace-selected-token-set-id) selected-token-set-path (mf/deref refs/workspace-selected-token-set-path)
token-set-selected? (mf/use-fn token-set-selected? (mf/use-fn
(mf/deps token-sets selected-token-set-id) (mf/deps token-sets selected-token-set-path)
(fn [tree-path] (fn [tree-path]
(= tree-path selected-token-set-id))) (= tree-path selected-token-set-path)))
active-token-set-names (mf/deref refs/workspace-active-set-names) active-token-set-names (mf/deref refs/workspace-active-set-names)
token-set-active? (mf/use-fn token-set-active? (mf/use-fn
(mf/deps active-token-set-names) (mf/deps active-token-set-names)

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

@ -38,7 +38,7 @@
[{:keys [tree-path]}] [{:keys [tree-path]}]
(let [{:keys [on-edit]} (sets-context/use-context) (let [{:keys [on-edit]} (sets-context/use-context)
edit-name (mf/use-fn #(on-edit tree-path)) edit-name (mf/use-fn #(on-edit tree-path))
delete-set (mf/use-fn #(st/emit! (wdt/delete-token-set-prefix-full-path tree-path)))] delete-set (mf/use-fn #(st/emit! (wdt/delete-token-set-path tree-path)))]
[:ul {:class (stl/css :context-list)} [:ul {:class (stl/css :context-list)}
[:& menu-entry {:title (tr "labels.rename") :on-click edit-name}] [:& menu-entry {:title (tr "labels.rename") :on-click edit-name}]
[:& menu-entry {:title (tr "labels.delete") :on-click delete-set}]])) [:& menu-entry {:title (tr "labels.delete") :on-click delete-set}]]))

10
frontend/src/app/main/ui/workspace/tokens/token_set.cljs
View file

@ -36,15 +36,15 @@
;; === Set selection ;; === Set selection
(defn get-selected-token-set-id [state] (defn get-selected-token-set-path [state]
(or (get-in state [:workspace-local :selected-token-set-id]) (or (get-in state [:workspace-local :selected-token-set-path])
(some-> (get-workspace-tokens-lib state) (some-> (get-workspace-tokens-lib state)
(ctob/get-sets) (ctob/get-sets)
(first) (first)
(ctob/get-set-prefixed-path-string)))) (ctob/get-set-prefixed-path-string))))
(defn get-selected-token-set-node [state] (defn get-selected-token-set-node [state]
(when-let [path (some-> (get-selected-token-set-id state) (when-let [path (some-> (get-selected-token-set-path state)
(ctob/split-token-set-path))] (ctob/split-token-set-path))]
(some-> (get-workspace-tokens-lib state) (some-> (get-workspace-tokens-lib state)
(ctob/get-in-set-tree path)))) (ctob/get-in-set-tree path))))
@ -66,5 +66,5 @@
(defn token-group-selected? [state] (defn token-group-selected? [state]
(some? (get-selected-token-set-group state))) (some? (get-selected-token-set-group state)))
(defn assoc-selected-token-set-id [state id] (defn assoc-selected-token-set-path [state id]
(assoc-in state [:workspace-local :selected-token-set-id] id)) (assoc-in state [:workspace-local :selected-token-set-path] id))