Merge pull request #1835 from natura-cosmeticos/DSY-4393

feat(natds-react): added theme forcaDeVendas casaEestilo_v2
natura-cosmeticos · Jun 21, 2024 · 4f3d241 · 4f3d241
2 parents 1a885db + 51c6b19
commit 4f3d241
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 17 deletions.
diff --git a/packages/react/.storybook/globalTypes/index.js b/packages/react/.storybook/globalTypes/index.js
@@ -11,9 +11,11 @@ export const globalTypes = {
         { value: 'natura', title: 'Natura' },
         { value: 'theBodyShop', title: 'The Body Shop' },
         { value: 'consultoriaDeBeleza', title: 'Consultoria de Beleza' },
+        { value: 'forcaDeVendas', title: 'Força de Vendas' },
         { value: 'natura_v2', title: 'Natura V2' },
         { value: 'natura_v3', title: 'Natura V3' },
         { value: 'casaEestilo', title: 'Casa & Estilo' },
+        { value: 'casaEestilo_v2', title: 'Casa & Estilo V2' },
         { value: 'avon_v2', title: 'Avon V2' },
       ],
     },

diff --git 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.60.0",
+  "version": "2.61.0-alpha.DSY-4393.3.0",
   "private": false,
   "keywords": [
     "design-system",
@@ -58,7 +58,7 @@
   },
   "dependencies": {
     "@naturacosmeticos/natds-icons": "1.25.1",
-    "@naturacosmeticos/natds-themes": "0.75.1",
+    "@naturacosmeticos/natds-themes": "0.77.2",
     "react-jss": "10.9.0"
   },
   "devDependencies": {

diff --git a/packages/react/src/brandTypes/brandTypes.ts b/packages/react/src/brandTypes/brandTypes.ts
@@ -4,6 +4,8 @@ export type BrandTypes = 'aesop'
 | 'natura'
 | 'theBodyShop'
 | 'consultoriaDeBeleza'
+| 'forcaDeVendas'
 | 'natura_v2'
 | 'natura_v3'
 | 'casaEestilo'
+| 'casaEestilo_v2'
diff --git a/packages/react/src/components/GayaButton/GayaButton.stories.tsx b/packages/react/src/components/GayaButton/GayaButton.stories.tsx
@@ -66,7 +66,18 @@ export const Brands: Story<GayaButtonProps> = (args) => (
     </StoryContainer>
 
     <Divider />
-
+    <StoryContainer>
+      <GayaButton key={16} brand="consultoriaDeBeleza" {...args} variant="filled" />
+      <GayaButton key={17} brand="consultoriaDeBeleza" {...args} variant="outlined" />
+      <GayaButton key={18} brand="consultoriaDeBeleza" {...args} variant="ghost" />
+      <GayaButton key={18} brand="consultoriaDeBeleza" {...args} variant="tonal" />
+    </StoryContainer>
+    <StoryContainer>
+      <GayaButton key={16} brand="forcaDeVendas" {...args} variant="filled" />
+      <GayaButton key={17} brand="forcaDeVendas" {...args} variant="outlined" />
+      <GayaButton key={18} brand="forcaDeVendas" {...args} variant="ghost" />
+      <GayaButton key={18} brand="forcaDeVendas" {...args} variant="tonal" />
+    </StoryContainer>
     <StoryContainer>
       <GayaButton key={10} brand="natura_v2" {...args} variant="filled" />
       <GayaButton key={11} brand="natura_v2" {...args} variant="outlined" />
@@ -94,23 +105,23 @@ export const Brands: Story<GayaButtonProps> = (args) => (
       <GayaButton key={9} brand="natura" {...args} variant="tonal" />
     </StoryContainer>
 
+    <StoryContainer>
+      <GayaButton key={19} brand="theBodyShop" {...args} variant="filled" />
+      <GayaButton key={20} brand="theBodyShop" {...args} variant="outlined" />
+      <GayaButton key={21} brand="theBodyShop" {...args} variant="ghost" />
+      <GayaButton key={21} brand="theBodyShop" {...args} variant="tonal" />
+    </StoryContainer>
     <StoryContainer>
       <GayaButton key={13} brand="casaEestilo" {...args} variant="filled" />
       <GayaButton key={14} brand="casaEestilo" {...args} variant="outlined" />
       <GayaButton key={15} brand="casaEestilo" {...args} variant="ghost" />
       <GayaButton key={15} brand="casaEestilo" {...args} variant="tonal" />
     </StoryContainer>
     <StoryContainer>
-      <GayaButton key={16} brand="consultoriaDeBeleza" {...args} variant="filled" />
-      <GayaButton key={17} brand="consultoriaDeBeleza" {...args} variant="outlined" />
-      <GayaButton key={18} brand="consultoriaDeBeleza" {...args} variant="ghost" />
-      <GayaButton key={18} brand="consultoriaDeBeleza" {...args} variant="tonal" />
-    </StoryContainer>
-    <StoryContainer>
-      <GayaButton key={19} brand="theBodyShop" {...args} variant="filled" />
-      <GayaButton key={20} brand="theBodyShop" {...args} variant="outlined" />
-      <GayaButton key={21} brand="theBodyShop" {...args} variant="ghost" />
-      <GayaButton key={21} brand="theBodyShop" {...args} variant="tonal" />
+      <GayaButton key={13} brand="casaEestilo_v2" {...args} variant="filled" />
+      <GayaButton key={14} brand="casaEestilo_v2" {...args} variant="outlined" />
+      <GayaButton key={15} brand="casaEestilo_v2" {...args} variant="ghost" />
+      <GayaButton key={15} brand="casaEestilo_v2" {...args} variant="tonal" />
     </StoryContainer>
   </div>
 )

diff --git a/yarn.lock b/yarn.lock
@@ -2707,10 +2707,10 @@
     svg2vectordrawable "2.6.26"
     webp-converter "^2.3.3"
 
-"@naturacosmeticos/natds-themes@0.75.1":
-  version "0.75.1"
-  resolved "https://registry.yarnpkg.com/@naturacosmeticos/natds-themes/-/natds-themes-0.75.1.tgz#40b242289b919dcc0774c7107c64d46ef84625cd"
-  integrity sha512-arqN7qEBzeH00k5L010DCC4qT1pgCsfP4235D/NGZC6VQTkt4Wkasce9YOkLf/HcW8CWha8l9o6q4mSoTN5LrQ==
+"@naturacosmeticos/natds-themes@0.77.2":
+  version "0.77.2"
+  resolved "https://registry.yarnpkg.com/@naturacosmeticos/natds-themes/-/natds-themes-0.77.2.tgz#323a7e2a6404e628379c71b0fe4ec1d87dc56b1d"
+  integrity sha512-Ra+i27S2jv1ZBCU0RpF1sdcS6eHYUNl+b11MW/YfhjdFxgzjC3Uvc1cw1c5lA8vvKIrbaJqDdQV0cRflk2ljLw==
   dependencies:
     open-color "^1.8.0"
     svg2vectordrawable "2.6.26"