From 3e278c1d2d9bf95c7020b43303ea2e5ec6bc8e4c Mon Sep 17 00:00:00 2001
From: tewarig <gaurav.tewari@razorpay.com>
Date: Thu, 13 Feb 2025 18:55:18 +0530
Subject: [PATCH] chore: border radius changes

---
 .../blade/src/components/Button/BaseButton/BaseButton.tsx  | 7 +------
 .../blade/src/components/ButtonGroup/ButtonGroup.web.tsx   | 2 --
 .../blade/src/components/ButtonGroup/StyledButtonGroup.tsx | 1 +
 packages/blade/src/components/ButtonGroup/types.ts         | 4 +---
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/blade/src/components/Button/BaseButton/BaseButton.tsx b/packages/blade/src/components/Button/BaseButton/BaseButton.tsx
index 096f331a577..fdfb0dd7574 100644
--- a/packages/blade/src/components/Button/BaseButton/BaseButton.tsx
+++ b/packages/blade/src/components/Button/BaseButton/BaseButton.tsx
@@ -184,7 +184,6 @@ const getProps = ({
   variant,
   color,
   hasIcon,
-  borderRadiusToken,
 }: {
   buttonTypographyTokens: ButtonTypography;
   childrenString?: string;
@@ -194,7 +193,6 @@ const getProps = ({
   size: NonNullable<BaseButtonProps['size']>;
   variant: NonNullable<BaseButtonProps['variant']>;
   color: BaseButtonProps['color'];
-  borderRadiusToken: string;
 }): BaseButtonStyleProps => {
   if (variant === 'tertiary' && color !== 'primary' && color !== 'white') {
     throwBladeError({
@@ -263,9 +261,7 @@ const getProps = ({
     ),
     focusRingColor: getIn(theme.colors, 'surface.border.primary.muted'),
     borderWidth: variant == 'secondary' ? makeBorderSize(theme.border.width.thin) : '0px',
-    borderRadius: borderRadiusToken
-      ? makeBorderSize(borderRadiusToken)
-      : makeBorderSize(theme.border.radius.medium),
+    borderRadius: makeBorderSize(theme.border.radius.medium),
     motionDuration: 'duration.xquick',
     motionEasing: 'easing.standard',
   };
@@ -405,7 +401,6 @@ const _BaseButton: React.ForwardRefRenderFunction<BladeElementRef, BaseButtonPro
     theme,
     color: buttonGroupProps.color ?? color,
     hasIcon: Boolean(Icon),
-    borderRadiusToken: buttonGroupProps.borderRadiusToken,
   });
 
   const renderElement = React.useMemo(() => getRenderElement(href), [href]);
diff --git a/packages/blade/src/components/ButtonGroup/ButtonGroup.web.tsx b/packages/blade/src/components/ButtonGroup/ButtonGroup.web.tsx
index 21b9f4b2aab..8e39143b187 100644
--- a/packages/blade/src/components/ButtonGroup/ButtonGroup.web.tsx
+++ b/packages/blade/src/components/ButtonGroup/ButtonGroup.web.tsx
@@ -70,8 +70,6 @@ const _ButtonGroup = (
     color,
     variant,
     isFullWidth,
-    // In case of buttonGroup we don't need borderRadius in internal buttons
-    borderRadiusToken: 'theme.border.radius.none',
   };
 
   useVerifyAllowedChildren({
diff --git a/packages/blade/src/components/ButtonGroup/StyledButtonGroup.tsx b/packages/blade/src/components/ButtonGroup/StyledButtonGroup.tsx
index d5bdb1e7091..688c070eca4 100644
--- a/packages/blade/src/components/ButtonGroup/StyledButtonGroup.tsx
+++ b/packages/blade/src/components/ButtonGroup/StyledButtonGroup.tsx
@@ -15,6 +15,7 @@ const StyledButtonGroup = styled(BaseBox)<StyledButtonGroupProps>(
       overflow: 'hidden',
       'button[role="button"]': {
         flex: isFullWidth ? 1 : 'auto',
+        borderRadius: 0,
       },
 
       ...(variant === 'secondary' && {
diff --git a/packages/blade/src/components/ButtonGroup/types.ts b/packages/blade/src/components/ButtonGroup/types.ts
index d93b5d7d3d8..de6a7a2b91a 100644
--- a/packages/blade/src/components/ButtonGroup/types.ts
+++ b/packages/blade/src/components/ButtonGroup/types.ts
@@ -50,8 +50,6 @@ type StyledButtonGroupProps = Pick<
 type ButtonGroupContextType = Pick<
   ButtonGroupProps,
   'isDisabled' | 'isFullWidth' | 'size' | 'color' | 'variant'
-> & {
-  borderRadiusToken: string;
-};
+>;
 
 export type { ButtonGroupProps, StyledButtonGroupProps, ButtonGroupContextType };