Skip to content

update: blue 30 system color hex, test fix #3792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 28, 2025
Merged

update: blue 30 system color hex, test fix #3792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3cfe176
update: blue 30 system color hex, test fix
adids1221 Aug 20, 2025
6d34dec
update: textSuccess, iconSuccess set to green5
adids1221 Aug 20, 2025
2440a71
update: textDanger, iconDanger set to red5
adids1221 Aug 20, 2025
8a7874a
update: change textMajor and iconMajor colors to orange5
adids1221 Aug 20, 2025
7e3d29e
update: change blue30 color hex to #0F62E6 and update related tests
adids1221 Aug 27, 2025
6bcd9cd
Update src/style/__tests__/colors.spec.js
adids1221 Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions demo/src/screens/__tests__/__snapshots__/AvatarScreen.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,11 +477,11 @@ exports[`AvatarScreen renders screen 1`] = `
},
{
"backgroundColor": "transparent",
"color": "#CD4700",
"color": "#9E3900",
"lineHeight": undefined,
},
{
"color": "#CD4700",
"color": "#9E3900",
},
],
]
Expand Down Expand Up @@ -776,7 +776,7 @@ exports[`AvatarScreen renders screen 1`] = `
{
"alignItems": "center",
"alignSelf": "flex-start",
"backgroundColor": "#116DFF",
"backgroundColor": "#0F62E6",
"borderRadius": 999,
"justifyContent": "center",
"overflow": "hidden",
Expand Down Expand Up @@ -1034,7 +1034,7 @@ exports[`AvatarScreen renders screen 1`] = `
{
"alignItems": "center",
"alignSelf": "flex-start",
"backgroundColor": "#116DFF",
"backgroundColor": "#0F62E6",
"borderRadius": 999,
"justifyContent": "center",
"overflow": "hidden",
Expand Down Expand Up @@ -1292,7 +1292,7 @@ exports[`AvatarScreen renders screen 1`] = `
{
"alignItems": "center",
"alignSelf": "flex-start",
"backgroundColor": "#116DFF",
"backgroundColor": "#0F62E6",
"borderRadius": 999,
"justifyContent": "center",
"overflow": "hidden",
Expand Down Expand Up @@ -1759,7 +1759,7 @@ exports[`AvatarScreen renders screen 1`] = `
{
"alignItems": "center",
"alignSelf": "flex-start",
"backgroundColor": "#116DFF",
"backgroundColor": "#0F62E6",
"borderRadius": 999,
"justifyContent": "center",
"overflow": "hidden",
Expand Down Expand Up @@ -2617,7 +2617,7 @@ exports[`AvatarScreen renders screen 1`] = `
"top": 0,
},
{
"backgroundColor": "#116DFF",
"backgroundColor": "#0F62E6",
},
{
"bottom": 1,
Expand Down Expand Up @@ -3142,7 +3142,7 @@ exports[`AvatarScreen renders screen 1`] = `
{
"alignItems": "center",
"alignSelf": "flex-start",
"backgroundColor": "#116DFF",
"backgroundColor": "#0F62E6",
"borderRadius": 999,
"justifyContent": "center",
"overflow": "hidden",
Expand Down
4 changes: 2 additions & 2 deletions demo/src/screens/__tests__/__snapshots__/TextFieldScreen.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4387,7 +4387,7 @@ exports[`TextField Screen renders screen 1`] = `
"textAlign": "right",
},
{
"color": "#116DFF",
"color": "#0F62E6",
},
],
]
Expand Down Expand Up @@ -5144,7 +5144,7 @@ exports[`TextField Screen renders screen 1`] = `
"lineHeight": 24,
},
{
"color": "#116DFF",
"color": "#0F62E6",
},
undefined,
undefined,
Expand Down
6 changes: 3 additions & 3 deletions src/style/__tests__/colors.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,17 +278,17 @@ describe('style/Colors', () => {
it('should return the system color, if the color is included in the validColors array', () => {
expect(uut.getSystemColorByHex('#FFFFFF', GetColorsByHexOptions)).toEqual('white');
expect(uut.getSystemColorByHex('#000000', GetColorsByHexOptions)).toEqual('black');
expect(uut.getSystemColorByHex('#116DFF', {validColors: [...SYSTEM_COLORS, 'blue']})).toEqual('blue30');
expect(uut.getSystemColorByHex('#0F62E6', {validColors: [...SYSTEM_COLORS, 'blue']})).toEqual('blue30');
expect(uut.getSystemColorByHex('#FB6413', {validColors: [...SYSTEM_COLORS, 'orange']})).toEqual('orange30');
});

it('should return undefined if the color is not included in validColors', () => {
expect(uut.getSystemColorByHex('#116DFF', GetColorsByHexOptions)).toEqual(undefined);
expect(uut.getSystemColorByHex('#0F62E6', GetColorsByHexOptions)).toEqual(undefined);
expect(uut.getSystemColorByHex('#00A87E', GetColorsByHexOptions)).toEqual(undefined);
});

it('without validColors array the function will return the first system color name match the color', () => {
expect(uut.getSystemColorByHex('#116DFF')).toEqual('blue30');
expect(uut.getSystemColorByHex('#0F62E6')).toEqual('blue30');
expect(uut.getSystemColorByHex('#00A87E')).toEqual('green30');
});

Expand Down
2 changes: 1 addition & 1 deletion src/style/colorsPalette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const colorsPalette = {
blue5: '#0C3E9D',
blue10: '#0F4DC4',
blue20: '#0F59E6',
blue30: '#116DFF',
blue30: '#0F62E6',
blue40: '#3582FF',
blue50: '#81B4FF',
blue60: '#97C7FF',
Expand Down
14 changes: 6 additions & 8 deletions src/style/designTokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,10 @@ export default {
$textDefaultLight: colorsPalette.white,
$textPrimary: colorsPalette.violet30,
$textGeneral: colorsPalette.blue30,
$textSuccess: colorsPalette.green10,
$textSuccess: colorsPalette.green5,
$textSuccessLight: colorsPalette.green30,
$textMajor: colorsPalette.orange10,
$textDanger: colorsPalette.red10,
//textDangerLight should be deprecated
$textMajor: colorsPalette.orange5,
$textDanger: colorsPalette.red5,
$textDangerLight: colorsPalette.red10,

// ICON
Expand All @@ -55,11 +54,10 @@ export default {
$iconPrimaryLight: colorsPalette.violet50,
$iconGeneral: colorsPalette.blue30,
$iconGeneralLight: colorsPalette.blue50,
$iconSuccess: colorsPalette.green10,
$iconSuccess: colorsPalette.green5,
$iconSuccessLight: colorsPalette.green30,
$iconMajor: colorsPalette.orange10,
$iconDanger: colorsPalette.red10,
//iconDangerLight should be deprecated
$iconMajor: colorsPalette.orange5,
$iconDanger: colorsPalette.red5,
$iconDangerLight: colorsPalette.red10,
$iconDisabled: colorsPalette.grey50,

Expand Down