mirror of
https://github.com/penpot/penpot.git
synced 2025-04-08 21:11:22 -05:00
Tokens in sidebar
This commit is contained in:
parent
cce4014fbe
commit
066ee9c489
6 changed files with 11 additions and 11 deletions
|
@ -459,9 +459,6 @@
|
|||
(ctob/get-theme lib group name)))
|
||||
tokens-lib))
|
||||
|
||||
(def workspace-token-theme-tree
|
||||
(l/derived #(or (some-> % ctob/get-theme-tree) []) tokens-lib))
|
||||
|
||||
(def workspace-token-theme-tree-no-hidden
|
||||
(l/derived (fn [lib]
|
||||
(or
|
||||
|
@ -493,13 +490,16 @@
|
|||
(l/derived #(some-> % ctob/get-active-themes-set-names) tokens-lib))
|
||||
|
||||
(def workspace-active-theme-sets-tokens
|
||||
(l/derived #(some-> % ctob/get-active-themes-set-tokens) tokens-lib))
|
||||
(l/derived #(or (some-> % ctob/get-active-themes-set-tokens) {}) tokens-lib))
|
||||
|
||||
(def workspace-selected-token-set-tokens
|
||||
(l/derived #(or (wtts/get-selected-token-set-tokens %) {}) st/state))
|
||||
|
||||
(dm/legacy
|
||||
(def workspace-selected-token-set-tokens
|
||||
(def workspace-selected-token-set-tokens-OLD
|
||||
(l/derived
|
||||
(fn [data]
|
||||
(or (wtts/get-selected-token-set-tokens data) {}))
|
||||
{})
|
||||
st/state
|
||||
=)))
|
||||
|
||||
|
|
|
@ -856,7 +856,7 @@
|
|||
|
||||
shape (when-not multiple
|
||||
(first (deref (refs/objects-by-id ids))))
|
||||
tokens (mf/deref refs/workspace-selected-token-set-tokens)
|
||||
tokens (mf/deref refs/workspace-selected-token-set-tokens-OLD)
|
||||
spacing-tokens (mf/use-memo (mf/deps tokens) #(:spacing (wtc/group-tokens-by-type-OLD tokens)))
|
||||
|
||||
spacing-column-options (mf/use-memo
|
||||
|
|
|
@ -312,7 +312,7 @@
|
|||
selected (mf/deref refs/selected-shapes)
|
||||
selected-shapes (into [] (keep (d/getf objects)) selected)
|
||||
token-id (:token-id mdata)
|
||||
token (get (mf/deref refs/workspace-selected-token-set-tokens) token-id)
|
||||
token (get (mf/deref refs/workspace-selected-token-set-tokens-OLD) token-id)
|
||||
selected-token-set-id (mf/deref refs/workspace-selected-token-set-id)]
|
||||
(mf/use-effect
|
||||
(mf/deps mdata)
|
||||
|
|
|
@ -66,6 +66,6 @@
|
|||
{:global global}))
|
||||
|
||||
(defn download-tokens-as-json []
|
||||
(let [all-tokens (deref refs/workspace-selected-token-set-tokens)
|
||||
(let [all-tokens (deref refs/workspace-selected-token-set-tokens-OLD)
|
||||
transformed-tokens-json (transform-tokens-into-json-format all-tokens)]
|
||||
(export-tokens-file transformed-tokens-json)))
|
||||
|
|
|
@ -202,7 +202,7 @@ Token names should only contain letters and digits separated by . characters.")}
|
|||
color? (wtt/color-token? token)
|
||||
selected-set-tokens (mf/deref refs/workspace-selected-token-set-tokens)
|
||||
active-theme-tokens (mf/deref refs/workspace-active-theme-sets-tokens)
|
||||
resolved-tokens (sd/use-resolved-tokens (vals active-theme-tokens)
|
||||
resolved-tokens (sd/use-resolved-tokens active-theme-tokens
|
||||
{:names-map? true
|
||||
:cache-atom form-token-cache-atom})
|
||||
token-path (mf/use-memo
|
||||
|
|
|
@ -103,7 +103,7 @@
|
|||
|
||||
(defn get-selected-token-set-tokens [state]
|
||||
(some-> (get-selected-token-set state)
|
||||
(ctob/get-tokens)))
|
||||
:tokens))
|
||||
|
||||
(defn assoc-selected-token-set-id [state id]
|
||||
(assoc-in state [:workspace-local :selected-token-set-id] id))
|
||||
|
|
Loading…
Add table
Reference in a new issue