diff --git a/common/src/app/common/types/token.cljc b/common/src/app/common/types/token.cljc index 49ef41164a..136c4ad76c 100644 --- a/common/src/app/common/types/token.cljc +++ b/common/src/app/common/types/token.cljc @@ -135,6 +135,8 @@ (def typography-keys (set/union font-size-keys letter-spacing-keys)) +(def ff-typography-keys (set/difference typography-keys font-size-keys)) + (def ^:private schema:number (reduce mu/union [[:map [:line-height {:optional true} token-name-ref]] schema:rotation])) diff --git a/frontend/src/app/main/data/workspace/tokens/import_export.cljs b/frontend/src/app/main/data/workspace/tokens/import_export.cljs index 13fd1c5ad4..185957cf08 100644 --- a/frontend/src/app/main/data/workspace/tokens/import_export.cljs +++ b/frontend/src/app/main/data/workspace/tokens/import_export.cljs @@ -70,7 +70,7 @@ (and (not (contains? cf/flags :token-units)) (= dtcg-token-type "number")) (and (not (contains? cf/flags :token-typography-types)) - (contains? ctt/typography-keys dtcg-token-type))) + (contains? ctt/ff-typography-keys dtcg-token-type))) nil dtcg-token-type))})} (catch js/Error e diff --git a/frontend/src/app/main/ui/workspace/tokens/management.cljs b/frontend/src/app/main/ui/workspace/tokens/management.cljs index df543889f2..bfc533364b 100644 --- a/frontend/src/app/main/ui/workspace/tokens/management.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/management.cljs @@ -34,7 +34,7 @@ token-typography-types? (contains? cf/flags :token-typography-types) all-types (cond-> dwta/token-properties (not token-units?) (dissoc :number) - (not token-typography-types?) (remove-keys ctt/typography-keys)) + (not token-typography-types?) (remove-keys ctt/ff-typography-keys)) all-types (-> all-types keys seq)] (loop [empty #js [] filled #js []