From 4cbbe072c89268693038304d896923c441a14c51 Mon Sep 17 00:00:00 2001 From: Daria Savinova Date: Thu, 10 Apr 2025 19:29:32 +0700 Subject: [PATCH] fix(float-button): correct border-radius for grouped and standalone buttons --- components/float-button/style/index.ts | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/components/float-button/style/index.ts b/components/float-button/style/index.ts index 24fcd018ed..91beaacc31 100644 --- a/components/float-button/style/index.ts +++ b/components/float-button/style/index.ts @@ -137,19 +137,8 @@ const floatButtonGroupStyle: GenerateStyle = token }, [`${groupPrefixCls}-square`]: { [`${componentCls}-square`]: { - borderRadius: 0, + borderRadius: borderRadiusLG, padding: 0, - '&:first-child': { - borderStartStartRadius: borderRadiusLG, - borderStartEndRadius: borderRadiusLG, - }, - '&:last-child': { - borderEndStartRadius: borderRadiusLG, - borderEndEndRadius: borderRadiusLG, - }, - '&:not(:last-child)': { - borderBottom: `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`, - }, [`${antCls}-badge`]: { [`${antCls}-badge-count`]: { top: -(floatButtonBodyPadding + badgeOffset), @@ -193,6 +182,18 @@ const floatButtonGroupStyle: GenerateStyle = token [`${componentCls}-square`]: { boxShadow: 'none', padding: floatButtonBodyPadding, + borderRadius: 0, + '&:first-child': { + borderStartStartRadius: borderRadiusLG, + borderStartEndRadius: borderRadiusLG, + }, + '&:last-child': { + borderEndStartRadius: borderRadiusLG, + borderEndEndRadius: borderRadiusLG, + }, + '&:not(:last-child)': { + borderBottom: `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`, + }, [`${componentCls}-body`]: { width: token.floatButtonBodySize, height: token.floatButtonBodySize,