Skip to content

Commit cb09ec1

Browse files
lidord-wixlidord-wix
authored
Update Tokens (#1773)
1 parent 61c2ac7 commit cb09ec1

File tree

5 files changed

+36
-45
lines changed

5 files changed

+36
-45
lines changed

‎generatedTypes/src/incubator/TextField/usePreset.d.ts

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
363363
violet80?: boolean | undefined;
364364
backgroundDefault?: boolean | undefined;
365365
backgroundNeutralHeavy?: boolean | undefined;
366-
backgroundIdle?: boolean | undefined;
366+
backgroundNeutralIdle?: boolean | undefined;
367367
backgroundNeutralMedium?: boolean | undefined;
368368
backgroundNeutral?: boolean | undefined;
369369
backgroundNeutralLight?: boolean | undefined;
@@ -387,8 +387,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
387387
textNeutralHeavy?: boolean | undefined;
388388
textNeutral?: boolean | undefined;
389389
textNeutralLight?: boolean | undefined;
390-
textWhite?: boolean | undefined;
391-
textWhiteDisabled?: boolean | undefined;
390+
textDefaultLight?: boolean | undefined;
392391
textPrimary?: boolean | undefined;
393392
textGeneral?: boolean | undefined;
394393
textSuccess?: boolean | undefined;
@@ -397,8 +396,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
397396
textDangerLight?: boolean | undefined;
398397
iconDefault?: boolean | undefined;
399398
iconNeutral?: boolean | undefined;
400-
iconWhite?: boolean | undefined;
401-
iconWhiteDisabled?: boolean | undefined;
399+
iconDefaultLight?: boolean | undefined;
402400
iconPrimary?: boolean | undefined;
403401
iconPrimaryLight?: boolean | undefined;
404402
iconGeneral?: boolean | undefined;
@@ -409,15 +407,16 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
409407
iconDanger?: boolean | undefined;
410408
iconDangerLight?: boolean | undefined;
411409
iconDisabled?: boolean | undefined;
412-
outlineWhite?: boolean | undefined;
410+
outlineLight?: boolean | undefined;
413411
outlineNeutral?: boolean | undefined;
412+
outlineNeutralMedium?: boolean | undefined;
414413
outlineDisabled?: boolean | undefined;
414+
outlineDisabledHeavy?: boolean | undefined;
415415
outlinePrimary?: boolean | undefined;
416416
outlineGeneral?: boolean | undefined;
417417
outlineWarning?: boolean | undefined;
418418
outlineDanger?: boolean | undefined;
419-
dividerNeutral?: boolean | undefined;
420-
divider?: boolean | undefined;
419+
dividerDefault?: boolean | undefined;
421420
hint?: string | undefined;
422421
color?: import("./types").ColorType | undefined;
423422
placeholderTextColor?: import("./types").ColorType | undefined;
@@ -765,7 +764,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
765764
violet80?: boolean | undefined;
766765
backgroundDefault?: boolean | undefined;
767766
backgroundNeutralHeavy?: boolean | undefined;
768-
backgroundIdle?: boolean | undefined;
767+
backgroundNeutralIdle?: boolean | undefined;
769768
backgroundNeutralMedium?: boolean | undefined;
770769
backgroundNeutral?: boolean | undefined;
771770
backgroundNeutralLight?: boolean | undefined;
@@ -789,8 +788,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
789788
textNeutralHeavy?: boolean | undefined;
790789
textNeutral?: boolean | undefined;
791790
textNeutralLight?: boolean | undefined;
792-
textWhite?: boolean | undefined;
793-
textWhiteDisabled?: boolean | undefined;
791+
textDefaultLight?: boolean | undefined;
794792
textPrimary?: boolean | undefined;
795793
textGeneral?: boolean | undefined;
796794
textSuccess?: boolean | undefined;
@@ -799,8 +797,7 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
799797
textDangerLight?: boolean | undefined;
800798
iconDefault?: boolean | undefined;
801799
iconNeutral?: boolean | undefined;
802-
iconWhite?: boolean | undefined;
803-
iconWhiteDisabled?: boolean | undefined;
800+
iconDefaultLight?: boolean | undefined;
804801
iconPrimary?: boolean | undefined;
805802
iconPrimaryLight?: boolean | undefined;
806803
iconGeneral?: boolean | undefined;
@@ -811,15 +808,16 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
811808
iconDanger?: boolean | undefined;
812809
iconDangerLight?: boolean | undefined;
813810
iconDisabled?: boolean | undefined;
814-
outlineWhite?: boolean | undefined;
811+
outlineLight?: boolean | undefined;
815812
outlineNeutral?: boolean | undefined;
813+
outlineNeutralMedium?: boolean | undefined;
816814
outlineDisabled?: boolean | undefined;
815+
outlineDisabledHeavy?: boolean | undefined;
817816
outlinePrimary?: boolean | undefined;
818817
outlineGeneral?: boolean | undefined;
819818
outlineWarning?: boolean | undefined;
820819
outlineDanger?: boolean | undefined;
821-
dividerNeutral?: boolean | undefined;
822-
divider?: boolean | undefined;
820+
dividerDefault?: boolean | undefined;
823821
hint?: string | undefined;
824822
color?: import("./types").ColorType | undefined;
825823
placeholderTextColor?: import("./types").ColorType | undefined;

‎generatedTypes/src/style/colors.d.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ declare const colorObject: Colors & {
150150
} & {
151151
backgroundDefault: string;
152152
backgroundNeutralHeavy: string;
153-
backgroundIdle: string;
153+
backgroundNeutralIdle: string;
154154
backgroundNeutralMedium: string;
155155
backgroundNeutral: string;
156156
backgroundNeutralLight: string;
@@ -171,14 +171,10 @@ declare const colorObject: Colors & {
171171
backgroundDark: string;
172172
textDisabled: string;
173173
textDefault: string;
174-
/**
175-
* Get app's current color scheme
176-
*/
177174
textNeutralHeavy: string;
178175
textNeutral: string;
179176
textNeutralLight: string;
180-
textWhite: string;
181-
textWhiteDisabled: string;
177+
textDefaultLight: string;
182178
textPrimary: string;
183179
textGeneral: string;
184180
textSuccess: string;
@@ -187,8 +183,7 @@ declare const colorObject: Colors & {
187183
textDangerLight: string;
188184
iconDefault: string;
189185
iconNeutral: string;
190-
iconWhite: string;
191-
iconWhiteDisabled: string;
186+
iconDefaultLight: string;
192187
iconPrimary: string;
193188
iconPrimaryLight: string;
194189
iconGeneral: string;
@@ -199,14 +194,15 @@ declare const colorObject: Colors & {
199194
iconDanger: string;
200195
iconDangerLight: string;
201196
iconDisabled: string;
202-
outlineWhite: string;
197+
outlineLight: string;
203198
outlineNeutral: string;
199+
outlineNeutralMedium: string;
204200
outlineDisabled: string;
201+
outlineDisabledHeavy: string;
205202
outlinePrimary: string;
206203
outlineGeneral: string;
207204
outlineWarning: string;
208205
outlineDanger: string;
209-
dividerNeutral: string;
210-
divider: string;
206+
dividerDefault: string;
211207
};
212208
export default colorObject;

‎generatedTypes/src/style/designTokens.d.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export declare const designTokens: {
22
backgroundDefault: string;
33
backgroundNeutralHeavy: string;
4-
backgroundIdle: string;
4+
backgroundNeutralIdle: string;
55
backgroundNeutralMedium: string;
66
backgroundNeutral: string;
77
backgroundNeutralLight: string;
@@ -25,8 +25,7 @@ export declare const designTokens: {
2525
textNeutralHeavy: string;
2626
textNeutral: string;
2727
textNeutralLight: string;
28-
textWhite: string;
29-
textWhiteDisabled: string;
28+
textDefaultLight: string;
3029
textPrimary: string;
3130
textGeneral: string;
3231
textSuccess: string;
@@ -35,8 +34,7 @@ export declare const designTokens: {
3534
textDangerLight: string;
3635
iconDefault: string;
3736
iconNeutral: string;
38-
iconWhite: string;
39-
iconWhiteDisabled: string;
37+
iconDefaultLight: string;
4038
iconPrimary: string;
4139
iconPrimaryLight: string;
4240
iconGeneral: string;
@@ -47,13 +45,14 @@ export declare const designTokens: {
4745
iconDanger: string;
4846
iconDangerLight: string;
4947
iconDisabled: string;
50-
outlineWhite: string;
48+
outlineLight: string;
5149
outlineNeutral: string;
50+
outlineNeutralMedium: string;
5251
outlineDisabled: string;
52+
outlineDisabledHeavy: string;
5353
outlinePrimary: string;
5454
outlineGeneral: string;
5555
outlineWarning: string;
5656
outlineDanger: string;
57-
dividerNeutral: string;
58-
divider: string;
57+
dividerDefault: string;
5958
};

‎src/components/button/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class Button extends PureComponent<Props, ButtonState> {
103103
const {linkColor, outline, outlineColor, disabled, color: propsColor} = this.props;
104104
const isLink = this.isLink;
105105

106-
let color: string | undefined = Colors.textWhite;
106+
let color: string | undefined = Colors.textDefaultLight;
107107
if (isLink) {
108108
color = linkColor || Colors.textPrimary;
109109
} else if (outline) {

‎src/style/designTokens.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export const designTokens = {
44
// BACKGROUND
55
backgroundDefault: colorsPalette.white,
66
backgroundNeutralHeavy: colorsPalette.grey20,
7-
backgroundIdle: colorsPalette.grey40,
7+
backgroundNeutralIdle: colorsPalette.grey40,
88
backgroundNeutralMedium: colorsPalette.grey60,
99
backgroundNeutral: colorsPalette.grey70,
1010
backgroundNeutralLight: colorsPalette.grey80,
@@ -30,8 +30,7 @@ export const designTokens = {
3030
textNeutralHeavy: colorsPalette.grey20,
3131
textNeutral: colorsPalette.grey30,
3232
textNeutralLight: colorsPalette.grey40,
33-
textWhite: colorsPalette.white,
34-
textWhiteDisabled: colorsPalette.white,
33+
textDefaultLight: colorsPalette.white,
3534
textPrimary: colorsPalette.violet30,
3635
textGeneral: colorsPalette.blue30,
3736
textSuccess: colorsPalette.green10,
@@ -42,8 +41,7 @@ export const designTokens = {
4241
// ICON
4342
iconDefault: colorsPalette.grey10,
4443
iconNeutral: colorsPalette.grey20,
45-
iconWhite: colorsPalette.white,
46-
iconWhiteDisabled: colorsPalette.white,
44+
iconDefaultLight: colorsPalette.white,
4745
iconPrimary: colorsPalette.violet30,
4846
iconPrimaryLight: colorsPalette.violet50,
4947
iconGeneral: colorsPalette.blue30,
@@ -56,16 +54,16 @@ export const designTokens = {
5654
iconDisabled: colorsPalette.grey50,
5755

5856
// OUTLINE
59-
outlineWhite: colorsPalette.white,
57+
outlineLight: colorsPalette.white,
6058
outlineNeutral: colorsPalette.grey60,
59+
outlineNeutralMedium: colorsPalette.grey50,
6160
outlineDisabled: colorsPalette.grey50,
61+
outlineDisabledHeavy: colorsPalette.grey30,
6262
outlinePrimary: colorsPalette.violet30,
6363
outlineGeneral: colorsPalette.blue30,
6464
outlineWarning: colorsPalette.yellow30,
6565
outlineDanger: colorsPalette.red30,
6666

6767
// DIVIDER
68-
// dividerDisabled: TBD
69-
dividerNeutral: colorsPalette.grey50,
70-
divider: colorsPalette.grey60
68+
dividerDefault: colorsPalette.grey60
7169
};

0 commit comments

Comments
 (0)