diff --git a/packages/react/.storybook/globalTypes/index.js b/packages/react/.storybook/globalTypes/index.js
index 1b75ee150f..f5bf5e31d0 100644
--- a/packages/react/.storybook/globalTypes/index.js
+++ b/packages/react/.storybook/globalTypes/index.js
@@ -12,6 +12,7 @@ export const globalTypes = {
{ value: 'theBodyShop', title: 'The Body Shop' },
{ value: 'consultoriaDeBeleza', title: 'Consultoria de Beleza' },
{ value: 'natura_v2', title: 'Natura V2' },
+ { value: 'natura_v3', title: 'Natura V3' },
{ value: 'casaEestilo', title: 'Casa & Estilo' },
{ value: 'avon_v2', title: 'Avon V2' },
],
diff --git a/packages/react/package.json b/packages/react/package.json
index 1c43e565fe..c7a5c728d4 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -2,7 +2,7 @@
"name": "@naturacosmeticos/natds-react",
"displayName": "NatDS-React",
"description": "A collection of components from Natura Design System for React",
- "version": "2.58.0",
+ "version": "2.58.1-alpha.DSY-4340.1.0",
"private": false,
"keywords": [
"design-system",
@@ -58,7 +58,7 @@
},
"dependencies": {
"@naturacosmeticos/natds-icons": "1.20.1",
- "@naturacosmeticos/natds-themes": "0.68.8",
+ "@naturacosmeticos/natds-themes": "0.71.0",
"react-jss": "10.9.0"
},
"devDependencies": {
diff --git a/packages/react/src/Templates/ColorView/ColorView.stories.tsx b/packages/react/src/Templates/ColorView/ColorView.stories.tsx
index be8708ac53..b93a8bab4c 100644
--- a/packages/react/src/Templates/ColorView/ColorView.stories.tsx
+++ b/packages/react/src/Templates/ColorView/ColorView.stories.tsx
@@ -20,12 +20,7 @@ export default {
title: 'Templates/ColorView'
}
-const keysToRemove = ['neutral50',
- 'neutral100', 'neutral200',
- 'neutral300', 'neutral400',
- 'neutral500', 'neutral600',
- 'neutral700', 'neutral800',
- 'neutral900'
+const keysToRemove = [
]
function removeKeys(obj: Color) {
for (const key of keysToRemove) {
diff --git a/packages/react/src/ThemeProvider/__snapshots__/buildTheme.test.ts.snap b/packages/react/src/ThemeProvider/__snapshots__/buildTheme.test.ts.snap
index c74c5130c6..e8dd4b43df 100644
--- a/packages/react/src/ThemeProvider/__snapshots__/buildTheme.test.ts.snap
+++ b/packages/react/src/ThemeProvider/__snapshots__/buildTheme.test.ts.snap
@@ -132,7 +132,7 @@ Object {
"color": Object {
"alert": Object {
"background": "#e74627",
- "label": "#ffffff",
+ "label": "#111111",
},
"primary": Object {
"background": "#f4ab34",
@@ -144,7 +144,7 @@ Object {
},
"success": Object {
"background": "#569a32",
- "label": "#ffffff",
+ "label": "#111111",
},
},
"dot": Object {
@@ -182,6 +182,7 @@ Object {
"lineHeight": 1.5,
},
"borderRadius": Object {
+ "circle": 999,
"large": 8,
"medium": 4,
"none": 0,
@@ -192,9 +193,9 @@ Object {
"contained": Object {
"color": Object {
"disable": Object {
- "background": "#bbbbbb",
+ "background": "#8c8c8c",
"border": "#FFFFFF00",
- "label": "#333333",
+ "label": "#363636",
},
"enable": Object {
"background": "#f4ab34",
@@ -230,23 +231,23 @@ Object {
"color": Object {
"disable": Object {
"background": "#FFFFFF00",
- "border": "#bbbbbb",
- "label": "#777777",
+ "border": "#8c8c8c",
+ "label": "#737373",
},
"enable": Object {
"background": "#FFFFFF00",
"border": "#f4ab34",
- "label": "#333333",
+ "label": "#363636",
},
"focus": Object {
- "background": "#e9ecef",
+ "background": "#c9c9c9",
"border": "#f4ab34",
- "label": "#333333",
+ "label": "#363636",
},
"hover": Object {
- "background": "#f1f3f5",
+ "background": "#e1e1e1",
"border": "#f4ab34",
- "label": "#333333",
+ "label": "#363636",
},
},
},
@@ -255,22 +256,22 @@ Object {
"disable": Object {
"background": "#FFFFFF00",
"border": "#FFFFFF00",
- "label": "#777777",
+ "label": "#737373",
},
"enable": Object {
"background": "#FFFFFF00",
"border": "#FFFFFF00",
- "label": "#333333",
+ "label": "#363636",
},
"focus": Object {
- "background": "#e9ecef",
+ "background": "#c9c9c9",
"border": "#FFFFFF00",
- "label": "#333333",
+ "label": "#363636",
},
"hover": Object {
- "background": "#f1f3f5",
+ "background": "#e1e1e1",
"border": "#FFFFFF00",
- "label": "#333333",
+ "label": "#363636",
},
},
},
@@ -313,42 +314,62 @@ Object {
"alertLight": "#ff826a",
"alertLightest": "#ffd0c7",
"background": "#fafafa",
- "highEmphasis": "#333333",
- "highlight": "#000000",
+ "contentDisabled": "#a4a4a4",
+ "contentHighEmphasis": "#363636",
+ "contentHighEmphasisFixedLight": "#e1e1e1",
+ "contentHighlight": "#111111",
+ "contentHighlightFixedLight": "#ffffff",
+ "contentLowEmphasis": "#8c8c8c",
+ "contentLowEmphasisFixedLight": "#a4a4a4",
+ "contentMediumEmphasis": "#737373",
+ "contentMediumEmphasisFixedLight": "#bdbdbd",
+ "highEmphasis": "#363636",
+ "highlight": "#111111",
+ "info": "#227bbd",
+ "infoDark": "#1a588a",
+ "infoDarkest": "#194b73",
+ "infoLight": "#54a6dc",
+ "infoLightest": "#c4dff3",
"link": "#227bbd",
"linkDark": "#1a588a",
"linkDarkest": "#194b73",
"linkLight": "#54a6dc",
"linkLightest": "#c4dff3",
- "lowEmphasis": "#bbbbbb",
+ "lowEmphasis": "#8c8c8c",
"lowLight": "#ffffff",
- "mediumEmphasis": "#777777",
- "neutral100": "#f1f3f5",
- "neutral200": "#e9ecef",
- "neutral300": "#dee2e6",
- "neutral400": "#ced4da",
- "neutral50": "#f8f9fa",
- "neutral500": "#adb5bd",
- "neutral600": "#868e96",
- "neutral700": "#495057",
- "neutral800": "#343a40",
- "neutral900": "#212529",
+ "mediumEmphasis": "#737373",
+ "neutral0": "#ffffff",
+ "neutral100": "#e1e1e1",
+ "neutral200": "#c9c9c9",
+ "neutral300": "#bdbdbd",
+ "neutral400": "#a4a4a4",
+ "neutral50": "#fafafa",
+ "neutral500": "#8c8c8c",
+ "neutral600": "#737373",
+ "neutral700": "#4e4e4e",
+ "neutral800": "#363636",
+ "neutral900": "#111111",
"neutralDark": "#777777",
"neutralDarkest": "#333333",
"neutralLight": "#fafafa",
"neutralLightest": "#ffffff",
"neutralMedium": "#bbbbbb",
- "onAlert": "#ffffff",
+ "onAlert": "#111111",
"onAlertDark": "#ffffff",
"onAlertDarkest": "#ffffff",
- "onAlertLight": "#333333",
- "onAlertLightest": "#333333",
- "onBackground": "#333333",
+ "onAlertLight": "#111111",
+ "onAlertLightest": "#111111",
+ "onBackground": "#111111",
+ "onInfo": "#ffffff",
+ "onInfoDark": "#ffffff",
+ "onInfoDarkest": "#ffffff",
+ "onInfoLight": "#111111",
+ "onInfoLightest": "#111111",
"onLink": "#ffffff",
"onLinkDark": "#ffffff",
"onLinkDarkest": "#ffffff",
- "onLinkLight": "#ffffff",
- "onLinkLightest": "#333333",
+ "onLinkLight": "#111111",
+ "onLinkLightest": "#111111",
"onPrimary": "#333333",
"onPrimaryDark": "#ffffff",
"onPrimaryDarkest": "#ffffff",
@@ -359,23 +380,49 @@ Object {
"onSecondaryDarkest": "#ffffff",
"onSecondaryLight": "#000000",
"onSecondaryLightest": "#000000",
- "onSuccess": "#ffffff",
+ "onSuccess": "#111111",
"onSuccessDark": "#ffffff",
"onSuccessDarkest": "#ffffff",
- "onSuccessLight": "#333333",
- "onSuccessLightest": "#333333",
- "onSurface": "#333333",
+ "onSuccessLight": "#111111",
+ "onSuccessLightest": "#111111",
+ "onSurface": "#363636",
+ "onSurfaceDark": "#ffffff",
+ "onSurfaceDisabled": "#363636",
+ "onSurfaceFixedDark": "#ffffff",
+ "onSurfaceFixedLight": "#363636",
"onSurfaceInverse": "#ffffff",
- "onWarning": "#333333",
- "onWarningDark": "#333333",
+ "onWarning": "#111111",
+ "onWarningDark": "#111111",
"onWarningDarkest": "#ffffff",
- "onWarningLight": "#333333",
- "onWarningLightest": "#333333",
+ "onWarningLight": "#111111",
+ "onWarningLightest": "#111111",
"primary": "#f4ab34",
"primaryDark": "#cd902c",
"primaryDarkest": "#A67423",
"primaryLight": "#f6b854",
"primaryLightest": "#F8C675",
+ "primitiveBlack": "#000000",
+ "primitiveDarkGray100": "#7f7f7f",
+ "primitiveDarkGray200": "#737373",
+ "primitiveDarkGray300": "#676767",
+ "primitiveDarkGray400": "#4e4e4e",
+ "primitiveDarkGray50": "#8c8c8c",
+ "primitiveDarkGray500": "#424242",
+ "primitiveDarkGray600": "#363636",
+ "primitiveDarkGray700": "#2a2a2a",
+ "primitiveDarkGray800": "#1d1d1d",
+ "primitiveDarkGray900": "#111111",
+ "primitiveLightGray100": "#eeeeee",
+ "primitiveLightGray200": "#e1e1e1",
+ "primitiveLightGray300": "#d5d5d5",
+ "primitiveLightGray400": "#c9c9c9",
+ "primitiveLightGray50": "#fafafa",
+ "primitiveLightGray500": "#c3c3c3",
+ "primitiveLightGray600": "#bdbdbd",
+ "primitiveLightGray700": "#b0b0b0",
+ "primitiveLightGray800": "#a4a4a4",
+ "primitiveLightGray900": "#989898",
+ "primitiveWhite": "#ffffff",
"secondary": "#ff6b0b",
"secondaryDark": "#d65a09",
"secondaryDarkest": "#ad4907",
@@ -387,12 +434,16 @@ Object {
"successLight": "#a0d87e",
"successLightest": "#e1f3d4",
"surface": "#ffffff",
- "surfaceInverse": "#333333",
+ "surfaceDark": "#4e4e4e",
+ "surfaceDisabled": "#a4a4a4",
+ "surfaceFixedDark": "#4e4e4e",
+ "surfaceFixedLight": "#ffffff",
+ "surfaceInverse": "#4e4e4e",
"warning": "#fcc433",
- "warningDark": "#f69e0a",
- "warningDarkest": "#da7705",
- "warningLight": "#fde68a",
- "warningLightest": "#fef3c7",
+ "warningDark": "#dea003",
+ "warningDarkest": "#946b02",
+ "warningLight": "#fdd265",
+ "warningLightest": "#fde198",
},
"counter": Object {
"borderRadius": 4,
@@ -440,7 +491,7 @@ Object {
"borderRadius": 4,
"color": Object {
"background": "#ffffff",
- "title": "#000000",
+ "title": "#111111",
},
"title": Object {
"fallback": Object {
@@ -458,7 +509,7 @@ Object {
},
"divider": Object {
"color": Object {
- "background": "#bbbbbb",
+ "background": "#8c8c8c",
},
},
"elevation": Object {
@@ -530,16 +581,16 @@ Object {
"float": Object {
"color": Object {
"disable": Object {
- "background": "#bbbbbb",
+ "background": "#8c8c8c",
},
"enable": Object {
"background": "#ffffff",
},
"focus": Object {
- "background": "#e9ecef",
+ "background": "#c9c9c9",
},
"hover": Object {
- "background": "#f1f3f5",
+ "background": "#e1e1e1",
},
},
},
@@ -549,16 +600,16 @@ Object {
"overlay": Object {
"color": Object {
"disable": Object {
- "background": "#000000",
+ "background": "#111111",
},
"enable": Object {
- "background": "#000000",
+ "background": "#111111",
},
"focus": Object {
- "background": "#000000",
+ "background": "#111111",
},
"hover": Object {
- "background": "#000000",
+ "background": "#111111",
},
},
},
@@ -577,10 +628,10 @@ Object {
"background": "#FFFFFF00",
},
"focus": Object {
- "background": "#e9ecef",
+ "background": "#c9c9c9",
},
"hover": Object {
- "background": "#f1f3f5",
+ "background": "#e1e1e1",
},
},
},
@@ -596,7 +647,7 @@ Object {
"label": Object {
"enable": Object {
"default": "#227bbd",
- "light": "#bbbbbb",
+ "light": "#8c8c8c",
},
},
},
@@ -714,16 +765,16 @@ Object {
"borderRadius": 12,
"color": Object {
"disable": Object {
- "border": "#bbbbbb",
- "content": "#bbbbbb",
+ "border": "#8c8c8c",
+ "content": "#8c8c8c",
},
"select": Object {
"border": "#f4ab34",
"content": "#f4ab34",
},
"unselect": Object {
- "border": "#000000",
- "content": "#000000",
+ "border": "#111111",
+ "content": "#111111",
},
},
"label": Object {
@@ -778,50 +829,50 @@ Object {
"color": Object {
"disable": Object {
"neutral": Object {
- "background": "#bbbbbb",
+ "background": "#8c8c8c",
"border": "#FFFFFF00",
- "label": "#777777",
+ "label": "#737373",
},
"primary": Object {
- "background": "#bbbbbb",
+ "background": "#8c8c8c",
"border": "#FFFFFF00",
- "label": "#777777",
+ "label": "#737373",
},
},
"enable": Object {
"neutral": Object {
"background": "#ffffff",
"border": "#FFFFFF00",
- "label": "#333333",
+ "label": "#363636",
},
"primary": Object {
"background": "#f4ab34",
"border": "#FFFFFF00",
- "label": "#333333",
+ "label": "#363636",
},
},
"focus": Object {
"neutral": Object {
- "background": "#e9ecef",
+ "background": "#c9c9c9",
"border": "#FFFFFF00",
- "label": "#333333",
+ "label": "#363636",
},
"primary": Object {
"background": "#A67423",
"border": "#FFFFFF00",
- "label": "#333333",
+ "label": "#363636",
},
},
"hover": Object {
"neutral": Object {
- "background": "#f1f3f5",
+ "background": "#e1e1e1",
"border": "#FFFFFF00",
- "label": "#333333",
+ "label": "#363636",
},
"primary": Object {
"background": "#cd902c",
"border": "#FFFFFF00",
- "label": "#333333",
+ "label": "#363636",
},
},
},
@@ -844,49 +895,49 @@ Object {
"disable": Object {
"neutral": Object {
"background": "#ffffff",
- "border": "#bbbbbb",
- "label": "#bbbbbb",
+ "border": "#8c8c8c",
+ "label": "#8c8c8c",
},
"primary": Object {
"background": "#ffffff",
- "border": "#bbbbbb",
- "label": "#bbbbbb",
+ "border": "#8c8c8c",
+ "label": "#8c8c8c",
},
},
"enable": Object {
"neutral": Object {
"background": "#FFFFFF00",
- "border": "#bbbbbb",
- "label": "#333333",
+ "border": "#8c8c8c",
+ "label": "#363636",
},
"primary": Object {
"background": "#FFFFFF00",
"border": "#f4ab34",
- "label": "#333333",
+ "label": "#363636",
},
},
"focus": Object {
"neutral": Object {
- "background": "#e9ecef",
- "border": "#777777",
- "label": "#333333",
+ "background": "#c9c9c9",
+ "border": "#737373",
+ "label": "#363636",
},
"primary": Object {
- "background": "#e9ecef",
+ "background": "#c9c9c9",
"border": "#cd902c",
- "label": "#333333",
+ "label": "#363636",
},
},
"hover": Object {
"neutral": Object {
- "background": "#f1f3f5",
- "border": "#777777",
- "label": "#333333",
+ "background": "#e1e1e1",
+ "border": "#737373",
+ "label": "#363636",
},
"primary": Object {
- "background": "#f1f3f5",
+ "background": "#e1e1e1",
"border": "#cd902c",
- "label": "#333333",
+ "label": "#363636",
},
},
},
@@ -976,12 +1027,12 @@ Object {
"warning": "#fcc433",
},
"label": Object {
- "alert": "#ffffff",
+ "alert": "#111111",
"link": "#ffffff",
"primary": "#333333",
"secondary": "#000000",
- "success": "#ffffff",
- "warning": "#333333",
+ "success": "#111111",
+ "warning": "#111111",
},
},
"label": Object {
diff --git a/packages/react/src/ThemeProvider/mock-theme.json b/packages/react/src/ThemeProvider/mock-theme.json
index b3dbd9c9d2..0a0cdbad93 100644
--- a/packages/react/src/ThemeProvider/mock-theme.json
+++ b/packages/react/src/ThemeProvider/mock-theme.json
@@ -3,7 +3,8 @@
"none": 0,
"small": 2,
"medium": 4,
- "large": 8
+ "large": 8,
+ "circle": 999
},
"alert": {
"title": {
diff --git a/packages/react/src/brandTypes/brandTypes.ts b/packages/react/src/brandTypes/brandTypes.ts
index ba59df74a9..0d9e8da9ca 100644
--- a/packages/react/src/brandTypes/brandTypes.ts
+++ b/packages/react/src/brandTypes/brandTypes.ts
@@ -5,4 +5,5 @@ export type BrandTypes = 'aesop'
| 'theBodyShop'
| 'consultoriaDeBeleza'
| 'natura_v2'
+| 'natura_v3'
| 'casaEestilo'
diff --git a/packages/react/src/components/AccordionItem/__snapshots__/AccordionItem.test.tsx.snap b/packages/react/src/components/AccordionItem/__snapshots__/AccordionItem.test.tsx.snap
index 5839844a8e..b042224c16 100644
--- a/packages/react/src/components/AccordionItem/__snapshots__/AccordionItem.test.tsx.snap
+++ b/packages/react/src/components/AccordionItem/__snapshots__/AccordionItem.test.tsx.snap
@@ -17,12 +17,12 @@ Array [
font-weight: 400;
}
.wrapper-d0-0-2-5 {
- color: #333333;
+ color: #363636;
pointer-events: auto;
}
.header-d1-0-2-6 {
flex: 1;
- color: #777777;
+ color: #737373;
display: flex;
padding: 16px 24px;
position: relative;
@@ -48,7 +48,7 @@ Array [
content: \\" \\";
opacity: 0.08;
position: absolute;
- background-color: #000000;
+ background-color: #111111;
}
.header-d1-0-2-6:hover {
cursor: pointer;
@@ -61,10 +61,10 @@ Array [
content: \\" \\";
opacity: 0.04;
position: absolute;
- background-color: #000000;
+ background-color: #111111;
}
.legend-d2-0-2-7 {
- color: #777777;
+ color: #737373;
}
.icon-0-2-8 {
font-family: natds-icons;
diff --git a/packages/react/src/components/Alert/__snapshots__/Alert.test.tsx.snap b/packages/react/src/components/Alert/__snapshots__/Alert.test.tsx.snap
index 56c75ff033..5e9b790493 100644
--- a/packages/react/src/components/Alert/__snapshots__/Alert.test.tsx.snap
+++ b/packages/react/src/components/Alert/__snapshots__/Alert.test.tsx.snap
@@ -8,7 +8,7 @@ Array [
pointer-events: none;
}
.icon-d0-0-2-6 {
- color: #333333;
+ color: #363636;
font-size: 24px;
}
.wrapper-0-2-1 {}
@@ -27,7 +27,7 @@ Array [
border-radius: 4px;
}
.content-d1-0-2-4 {
- color: #333333;
+ color: #363636;
}",
@@ -188,11 +188,11 @@ Array [
}
.input-0-2-4::placeholder {}
.input-0-2-4:focus:enabled {
- color: #777777;
+ color: #737373;
}
.input-0-2-4:hover:enabled {
- color: #333333;
- border-color: #333333;
+ color: #363636;
+ border-color: #363636;
}
.icon-0-2-5 {
top: 0;
@@ -235,7 +235,7 @@ Array [
padding-right: 16px;
}
.optionsItem-0-2-8:hover {
- background-color: #e9ecef;
+ background-color: #c9c9c9;
}
.labelText-d0-0-2-9 {
color: #e74627;
@@ -244,10 +244,10 @@ Array [
height: 56px;
background-color: #ffffff;
border-color: #e74627;
- color: #333333;
+ color: #363636;
}
.input-d1-0-2-10::placeholder {
- color: #333333;
+ color: #363636;
}
.input-d1-0-2-10:focus:enabled {
border-color: #f4ab34;
@@ -259,7 +259,7 @@ Array [
bottom: initial;
}
.optionsItem-d4-0-2-13 {
- color: #777777;
+ color: #737373;
}
.icon-0-2-14 {
font-family: natds-icons;
@@ -267,7 +267,7 @@ Array [
pointer-events: none;
}
.icon-d0-0-2-15 {
- color: #000000;
+ color: #111111;
font-size: 32px;
}",
@@ -337,11 +337,11 @@ Array [
}
.input-0-2-4::placeholder {}
.input-0-2-4:focus:enabled {
- color: #777777;
+ color: #737373;
}
.input-0-2-4:hover:enabled {
- color: #333333;
- border-color: #333333;
+ color: #363636;
+ border-color: #363636;
}
.icon-0-2-5 {
top: 0;
@@ -384,7 +384,7 @@ Array [
padding-right: 16px;
}
.optionsItem-0-2-8:hover {
- background-color: #e9ecef;
+ background-color: #c9c9c9;
}
.labelText-d0-0-2-9 {
color: #569a32;
@@ -393,10 +393,10 @@ Array [
height: 56px;
background-color: #ffffff;
border-color: #569a32;
- color: #333333;
+ color: #363636;
}
.input-d1-0-2-10::placeholder {
- color: #333333;
+ color: #363636;
}
.input-d1-0-2-10:focus:enabled {
border-color: #f4ab34;
@@ -408,7 +408,7 @@ Array [
bottom: initial;
}
.optionsItem-d4-0-2-13 {
- color: #777777;
+ color: #737373;
}
.icon-0-2-14 {
font-family: natds-icons;
@@ -416,7 +416,7 @@ Array [
pointer-events: none;
}
.icon-d0-0-2-15 {
- color: #000000;
+ color: #111111;
font-size: 32px;
}",
@@ -486,11 +486,11 @@ Array [
}
.input-0-2-4::placeholder {}
.input-0-2-4:focus:enabled {
- color: #777777;
+ color: #737373;
}
.input-0-2-4:hover:enabled {
- color: #333333;
- border-color: #333333;
+ color: #363636;
+ border-color: #363636;
}
.icon-0-2-5 {
top: 0;
@@ -533,19 +533,19 @@ Array [
padding-right: 16px;
}
.optionsItem-0-2-8:hover {
- background-color: #e9ecef;
+ background-color: #c9c9c9;
}
.labelText-d0-0-2-9 {
- color: #333333;
+ color: #363636;
}
.input-d1-0-2-10 {
height: 56px;
background-color: #ffffff;
- border-color: #333333;
- color: #333333;
+ border-color: #363636;
+ color: #363636;
}
.input-d1-0-2-10::placeholder {
- color: #333333;
+ color: #363636;
}
.input-d1-0-2-10:focus:enabled {
border-color: #f4ab34;
@@ -557,7 +557,7 @@ Array [
bottom: initial;
}
.optionsItem-d4-0-2-13 {
- color: #777777;
+ color: #737373;
}
.icon-0-2-14 {
font-family: natds-icons;
@@ -565,7 +565,7 @@ Array [
pointer-events: none;
}
.icon-d0-0-2-15 {
- color: #000000;
+ color: #111111;
font-size: 32px;
}",
diff --git a/packages/react/src/components/Badge/__snapshots__/Badge.test.tsx.snap b/packages/react/src/components/Badge/__snapshots__/Badge.test.tsx.snap
index 10cc3bc546..5ef509ee6d 100644
--- a/packages/react/src/components/Badge/__snapshots__/Badge.test.tsx.snap
+++ b/packages/react/src/components/Badge/__snapshots__/Badge.test.tsx.snap
@@ -41,7 +41,7 @@ Array [
border-radius: 4px;
}
.label-d1-0-2-5 {
- color: #ffffff;
+ color: #111111;
}",
= (args) => (
+
+
+
+
+
diff --git a/packages/react/src/components/Button/Button.styles.ts b/packages/react/src/components/Button/Button.styles.ts
index b7fc37d942..ec6ca66a9e 100644
--- a/packages/react/src/components/Button/Button.styles.ts
+++ b/packages/react/src/components/Button/Button.styles.ts
@@ -348,6 +348,18 @@ const getletterSpacing = (theme: Theme) => ({ textTransform }: ButtonStyleProps)
}
return theme.button.label.letterSpacing
}
+
+const getPropsThemeButton = (theme: Theme) => ({ brand }: Pick) => {
+ if (brand) {
+ const themeSelectdRipple = buildTheme(brand, 'light')
+ return {
+ buttonborderRadius: themeSelectdRipple.button.borderRadius
+ }
+ }
+ return {
+ buttonborderRadius: theme.button.borderRadius
+ }
+}
const styles = createUseStyles((theme: Theme) => ({
button: {
backgroundColor: ({
@@ -356,7 +368,7 @@ const styles = createUseStyles((theme: Theme) => ({
border: ({
variant, brand, color, mode
}: ButtonStyleProps) => variant && `1px solid ${(brand ? getColorBrand(theme)(brand, { variant, color, mode })?.border : getColorVariant(theme, { variant, color }).border)}`,
- borderRadius: theme.button.borderRadius,
+ borderRadius: ({ brand }: ButtonStyleProps) => getPropsThemeButton(theme)({ brand }).buttonborderRadius,
boxShadow: ({ variant }: ButtonStyleProps) => variant && (variant === 'contained' ? theme.elevation.tiny : 'none'),
color: ({
variant, brand, color, mode
diff --git a/packages/react/src/components/Button/Button.tsx b/packages/react/src/components/Button/Button.tsx
index 9218e6a88b..9c0e57f354 100644
--- a/packages/react/src/components/Button/Button.tsx
+++ b/packages/react/src/components/Button/Button.tsx
@@ -41,7 +41,7 @@ const Button = React.forwardRef(({
const iconColor = theme.button[variant].color.enable.label as IconColor
return (
-
+