From 8923d59860edf8aee8bcf96f9704051a36b95e9b Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 22 Apr 2022 14:16:54 +0800
Subject: [PATCH 1/5] fix: small table selection dropdown margin issue

close #35167
---
 components/table/style/size.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/table/style/size.less b/components/table/style/size.less
index f05d269866..b64d3bb710 100644
--- a/components/table/style/size.less
+++ b/components/table/style/size.less
@@ -32,6 +32,11 @@
         }
       }
     }
+
+    // https://github.com/ant-design/ant-design/issues/35167
+    .@{table-prefix-cls}-selection-column {
+      padding-inline-start: @padding-horizontal / 4;
+    }
   }
 }
 

From 7d822f1b263f6b0aeedb2475d6cda5a5f48494e6 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 22 Apr 2022 14:58:02 +0800
Subject: [PATCH 2/5] fix: small table selection dropdown margin issue (#35173)

close #35167
---
 components/table/style/index.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/table/style/index.less b/components/table/style/index.less
index abf4bd9079..68ab41591a 100644
--- a/components/table/style/index.less
+++ b/components/table/style/index.less
@@ -456,7 +456,7 @@
       cursor: pointer;
       transition: all 0.3s;
       margin-inline-start: 100%;
-      padding-inline-start: @padding-xss;
+      padding-inline-start: @table-padding-horizontal-md / 4;
 
       .@{iconfont-css-prefix} {
         color: @table-header-icon-color;

From 6a00bddadeef36519dc5450deef8d1c8f6fd462a Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Fri, 22 Apr 2022 15:33:01 +0800
Subject: [PATCH 3/5] docs: Update Dropdown demo

---
 .../__snapshots__/demo-extend.test.ts.snap    | 51 +++++++++++--------
 .../__tests__/__snapshots__/demo.test.js.snap | 51 +++++++++++--------
 components/dropdown/demo/dropdown-button.md   |  5 +-
 3 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
index cb04769392..57ec90d637 100644
--- a/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -4270,28 +4270,39 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
       class="ant-btn ant-btn-default ant-dropdown-trigger"
       type="button"
     >
-      <span>
-        Button 
-      </span>
-      <span
-        aria-label="down"
-        class="anticon anticon-down"
-        role="img"
+      <div
+        class="ant-space ant-space-horizontal ant-space-align-center"
       >
-        <svg
-          aria-hidden="true"
-          data-icon="down"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="64 64 896 896"
-          width="1em"
+        <div
+          class="ant-space-item"
+          style="margin-right:8px"
         >
-          <path
-            d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
-          />
-        </svg>
-      </span>
+          Button
+        </div>
+        <div
+          class="ant-space-item"
+        >
+          <span
+            aria-label="down"
+            class="anticon anticon-down"
+            role="img"
+          >
+            <svg
+              aria-hidden="true"
+              data-icon="down"
+              fill="currentColor"
+              focusable="false"
+              height="1em"
+              viewBox="64 64 896 896"
+              width="1em"
+            >
+              <path
+                d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
+              />
+            </svg>
+          </span>
+        </div>
+      </div>
     </button>
     <div>
       <div
diff --git a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
index 386cc3d365..370cf32944 100644
--- a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
@@ -340,28 +340,39 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
       class="ant-btn ant-btn-default ant-dropdown-trigger"
       type="button"
     >
-      <span>
-        Button 
-      </span>
-      <span
-        aria-label="down"
-        class="anticon anticon-down"
-        role="img"
+      <div
+        class="ant-space ant-space-horizontal ant-space-align-center"
       >
-        <svg
-          aria-hidden="true"
-          data-icon="down"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="64 64 896 896"
-          width="1em"
+        <div
+          class="ant-space-item"
+          style="margin-right:8px"
         >
-          <path
-            d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
-          />
-        </svg>
-      </span>
+          Button
+        </div>
+        <div
+          class="ant-space-item"
+        >
+          <span
+            aria-label="down"
+            class="anticon anticon-down"
+            role="img"
+          >
+            <svg
+              aria-hidden="true"
+              data-icon="down"
+              fill="currentColor"
+              focusable="false"
+              height="1em"
+              viewBox="64 64 896 896"
+              width="1em"
+            >
+              <path
+                d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
+              />
+            </svg>
+          </span>
+        </div>
+      </div>
     </button>
   </div>
 </div>
diff --git a/components/dropdown/demo/dropdown-button.md b/components/dropdown/demo/dropdown-button.md
index ddc6f8c830..15f9264e02 100644
--- a/components/dropdown/demo/dropdown-button.md
+++ b/components/dropdown/demo/dropdown-button.md
@@ -74,7 +74,10 @@ export default () => (
     </Dropdown.Button>
     <Dropdown overlay={menu}>
       <Button>
-        Button <DownOutlined />
+        <Space>
+          Button
+          <DownOutlined />
+        </Space>
       </Button>
     </Dropdown>
   </Space>

From e14ec001a11d083e3c4520b5b6c68791e4e57fa3 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 22 Apr 2022 16:01:20 +0800
Subject: [PATCH 4/5]  fix: small/middle table selection dropdown margin issue
 (#35174)

* fix: small/middle table selection dropdown margin issue

* Update index.less
---
 components/table/style/index.less | 2 +-
 components/table/style/size.less  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/table/style/index.less b/components/table/style/index.less
index 68ab41591a..cf49f1d4c2 100644
--- a/components/table/style/index.less
+++ b/components/table/style/index.less
@@ -456,7 +456,7 @@
       cursor: pointer;
       transition: all 0.3s;
       margin-inline-start: 100%;
-      padding-inline-start: @table-padding-horizontal-md / 4;
+      padding-inline-start: (@table-padding-horizontal / 4);
 
       .@{iconfont-css-prefix} {
         color: @table-header-icon-color;
diff --git a/components/table/style/size.less b/components/table/style/size.less
index b64d3bb710..2f864ade48 100644
--- a/components/table/style/size.less
+++ b/components/table/style/size.less
@@ -35,7 +35,7 @@
 
     // https://github.com/ant-design/ant-design/issues/35167
     .@{table-prefix-cls}-selection-column {
-      padding-inline-start: @padding-horizontal / 4;
+      padding-inline-start: (@padding-horizontal / 4);
     }
   }
 }

From f8e7cba353d4d10c2fc2ef35ac938032aac34a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Fri, 22 Apr 2022 17:40:52 +0800
Subject: [PATCH 5/5] refactor: Simplify Button Group Style (#35175)

* chore: refactor grp with context

* test: Update snapshot

* chore: clean up

* test: fix test case

* chore: clean up

* test: fix test
---
 .../__tests__/unreachableException.test.js    |  8 --
 components/_util/unreachableException.ts      |  7 --
 .../__snapshots__/demo-extend.test.ts.snap    | 16 ++--
 .../__tests__/__snapshots__/demo.test.ts.snap | 16 ++--
 components/button/__tests__/index.test.tsx    | 13 ++--
 components/button/button-group.tsx            | 75 ++++++++++---------
 components/button/button.tsx                  | 21 ++++--
 components/button/style/mixin.less            | 22 ------
 .../__snapshots__/demo-extend.test.ts.snap    |  4 +-
 .../__tests__/__snapshots__/demo.test.js.snap |  4 +-
 10 files changed, 78 insertions(+), 108 deletions(-)
 delete mode 100644 components/_util/__tests__/unreachableException.test.js
 delete mode 100644 components/_util/unreachableException.ts

diff --git a/components/_util/__tests__/unreachableException.test.js b/components/_util/__tests__/unreachableException.test.js
deleted file mode 100644
index 4019e4fedc..0000000000
--- a/components/_util/__tests__/unreachableException.test.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import UnreachableException from '../unreachableException';
-
-describe('UnreachableException', () => {
-  it('error thrown matches snapshot', () => {
-    const exception = new UnreachableException('some value');
-    expect(exception.error.message).toMatchInlineSnapshot(`"unreachable case: \\"some value\\""`);
-  });
-});
diff --git a/components/_util/unreachableException.ts b/components/_util/unreachableException.ts
deleted file mode 100644
index 424a2e5f61..0000000000
--- a/components/_util/unreachableException.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default class UnreachableException {
-  error: Error;
-
-  constructor(value: never) {
-    this.error = new Error(`unreachable case: ${JSON.stringify(value)}`);
-  }
-}
diff --git a/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap
index cb90130528..1613c44e88 100644
--- a/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -1016,7 +1016,7 @@ Array [
       class="ant-btn-group ant-btn-group-sm"
     >
       <button
-        class="ant-btn ant-btn-primary"
+        class="ant-btn ant-btn-primary ant-btn-sm"
         type="button"
       >
         <span>
@@ -1024,7 +1024,7 @@ Array [
         </span>
       </button>
       <button
-        class="ant-btn ant-btn-primary"
+        class="ant-btn ant-btn-primary ant-btn-sm"
         type="button"
       >
         <span>
@@ -1036,7 +1036,7 @@ Array [
         style="display:inline-block;cursor:not-allowed"
       >
         <button
-          class="ant-btn ant-btn-primary ant-btn-icon-only"
+          class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only"
           disabled=""
           style="pointer-events:none"
           type="button"
@@ -1087,7 +1087,7 @@ Array [
         </div>
       </div>
       <button
-        class="ant-btn ant-btn-primary ant-btn-icon-only"
+        class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only"
         type="button"
       >
         <span
@@ -1268,7 +1268,7 @@ Array [
       class="ant-btn-group ant-btn-group-lg"
     >
       <button
-        class="ant-btn ant-btn-primary"
+        class="ant-btn ant-btn-primary ant-btn-lg"
         type="button"
       >
         <span>
@@ -1276,7 +1276,7 @@ Array [
         </span>
       </button>
       <button
-        class="ant-btn ant-btn-primary"
+        class="ant-btn ant-btn-primary ant-btn-lg"
         type="button"
       >
         <span>
@@ -1288,7 +1288,7 @@ Array [
         style="display:inline-block;cursor:not-allowed"
       >
         <button
-          class="ant-btn ant-btn-primary ant-btn-icon-only"
+          class="ant-btn ant-btn-primary ant-btn-lg ant-btn-icon-only"
           disabled=""
           style="pointer-events:none"
           type="button"
@@ -1339,7 +1339,7 @@ Array [
         </div>
       </div>
       <button
-        class="ant-btn ant-btn-primary ant-btn-icon-only"
+        class="ant-btn ant-btn-primary ant-btn-lg ant-btn-icon-only"
         type="button"
       >
         <span
diff --git a/components/button/__tests__/__snapshots__/demo.test.ts.snap b/components/button/__tests__/__snapshots__/demo.test.ts.snap
index dd331c8dc0..cc34e31d3b 100644
--- a/components/button/__tests__/__snapshots__/demo.test.ts.snap
+++ b/components/button/__tests__/__snapshots__/demo.test.ts.snap
@@ -824,7 +824,7 @@ Array [
       class="ant-btn-group ant-btn-group-sm"
     >
       <button
-        class="ant-btn ant-btn-primary"
+        class="ant-btn ant-btn-primary ant-btn-sm"
         type="button"
       >
         <span>
@@ -832,7 +832,7 @@ Array [
         </span>
       </button>
       <button
-        class="ant-btn ant-btn-primary"
+        class="ant-btn ant-btn-primary ant-btn-sm"
         type="button"
       >
         <span>
@@ -844,7 +844,7 @@ Array [
         style="display:inline-block;cursor:not-allowed"
       >
         <button
-          class="ant-btn ant-btn-primary ant-btn-icon-only"
+          class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only"
           disabled=""
           style="pointer-events:none"
           type="button"
@@ -871,7 +871,7 @@ Array [
         </button>
       </span>
       <button
-        class="ant-btn ant-btn-primary ant-btn-icon-only"
+        class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only"
         type="button"
       >
         <span
@@ -980,7 +980,7 @@ Array [
       class="ant-btn-group ant-btn-group-lg"
     >
       <button
-        class="ant-btn ant-btn-primary"
+        class="ant-btn ant-btn-primary ant-btn-lg"
         type="button"
       >
         <span>
@@ -988,7 +988,7 @@ Array [
         </span>
       </button>
       <button
-        class="ant-btn ant-btn-primary"
+        class="ant-btn ant-btn-primary ant-btn-lg"
         type="button"
       >
         <span>
@@ -1000,7 +1000,7 @@ Array [
         style="display:inline-block;cursor:not-allowed"
       >
         <button
-          class="ant-btn ant-btn-primary ant-btn-icon-only"
+          class="ant-btn ant-btn-primary ant-btn-lg ant-btn-icon-only"
           disabled=""
           style="pointer-events:none"
           type="button"
@@ -1027,7 +1027,7 @@ Array [
         </button>
       </span>
       <button
-        class="ant-btn ant-btn-primary ant-btn-icon-only"
+        class="ant-btn ant-btn-primary ant-btn-lg ant-btn-icon-only"
         type="button"
       >
         <span
diff --git a/components/button/__tests__/index.test.tsx b/components/button/__tests__/index.test.tsx
index 7617fe922b..0ad1b25fcc 100644
--- a/components/button/__tests__/index.test.tsx
+++ b/components/button/__tests__/index.test.tsx
@@ -36,14 +36,13 @@ describe('Button', () => {
   });
 
   it('warns if size is wrong', () => {
-    const mockWarn = jest.fn();
-    jest.spyOn(console, 'warn').mockImplementation(mockWarn);
+    resetWarned();
+    const mockWarn = jest.spyOn(console, 'error').mockImplementation(() => {});
     const size = 'who am I' as any as SizeType;
-    mount(<Button.Group size={size} />);
-    expect(mockWarn).toHaveBeenCalledTimes(1);
-    expect(mockWarn.mock.calls[0][0]).toMatchObject({
-      message: 'unreachable case: "who am I"',
-    });
+    render(<Button.Group size={size} />);
+    expect(mockWarn).toHaveBeenCalledWith('Warning: [antd: Button.Group] Invalid prop `size`.');
+
+    mockWarn.mockRestore();
   });
 
   it('renders Chinese characters correctly', () => {
diff --git a/components/button/button-group.tsx b/components/button/button-group.tsx
index 3874c48e79..2dbbb9d09d 100644
--- a/components/button/button-group.tsx
+++ b/components/button/button-group.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import classNames from 'classnames';
 import { SizeType } from '../config-provider/SizeContext';
-import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
-import UnreachableException from '../_util/unreachableException';
+import { ConfigContext } from '../config-provider';
+import devWarning from '../_util/devWarning';
 
 export interface ButtonGroupProps {
   size?: SizeType;
@@ -12,42 +12,45 @@ export interface ButtonGroupProps {
   children?: React.ReactNode;
 }
 
-const ButtonGroup: React.FC<ButtonGroupProps> = props => (
-  <ConfigConsumer>
-    {({ getPrefixCls, direction }: ConfigConsumerProps) => {
-      const { prefixCls: customizePrefixCls, size, className, ...others } = props;
-      const prefixCls = getPrefixCls('btn-group', customizePrefixCls);
+export const GroupSizeContext = React.createContext<SizeType | undefined>(undefined);
 
-      // large => lg
-      // small => sm
-      let sizeCls = '';
-      switch (size) {
-        case 'large':
-          sizeCls = 'lg';
-          break;
-        case 'small':
-          sizeCls = 'sm';
-          break;
-        case 'middle':
-        case undefined:
-          break;
-        default:
-          // eslint-disable-next-line no-console
-          console.warn(new UnreachableException(size).error);
-      }
+const ButtonGroup: React.FC<ButtonGroupProps> = props => {
+  const { getPrefixCls, direction } = React.useContext(ConfigContext);
 
-      const classes = classNames(
-        prefixCls,
-        {
-          [`${prefixCls}-${sizeCls}`]: sizeCls,
-          [`${prefixCls}-rtl`]: direction === 'rtl',
-        },
-        className,
-      );
+  const { prefixCls: customizePrefixCls, size, className, ...others } = props;
+  const prefixCls = getPrefixCls('btn-group', customizePrefixCls);
 
-      return <div {...others} className={classes} />;
-    }}
-  </ConfigConsumer>
-);
+  // large => lg
+  // small => sm
+  let sizeCls = '';
+  switch (size) {
+    case 'large':
+      sizeCls = 'lg';
+      break;
+    case 'small':
+      sizeCls = 'sm';
+      break;
+    case 'middle':
+    case undefined:
+      break;
+    default:
+      devWarning(!size, 'Button.Group', 'Invalid prop `size`.');
+  }
+
+  const classes = classNames(
+    prefixCls,
+    {
+      [`${prefixCls}-${sizeCls}`]: sizeCls,
+      [`${prefixCls}-rtl`]: direction === 'rtl',
+    },
+    className,
+  );
+
+  return (
+    <GroupSizeContext.Provider value={size}>
+      <div {...others} className={classes} />
+    </GroupSizeContext.Provider>
+  );
+};
 
 export default ButtonGroup;
diff --git a/components/button/button.tsx b/components/button/button.tsx
index ee2622326f..4c92989cf7 100644
--- a/components/button/button.tsx
+++ b/components/button/button.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import classNames from 'classnames';
 import omit from 'rc-util/lib/omit';
 
-import Group from './button-group';
+import Group, { GroupSizeContext } from './button-group';
 import { ConfigContext } from '../config-provider';
 import Wave from '../_util/wave';
 import { tuple } from '../_util/type';
@@ -18,7 +18,7 @@ function isString(str: any) {
   return typeof str === 'string';
 }
 
-function isUnborderedButtonType(type: ButtonType | undefined) {
+function isUnBorderedButtonType(type: ButtonType | undefined) {
   return type === 'text' || type === 'link';
 }
 
@@ -94,7 +94,11 @@ export function convertLegacyProps(type?: LegacyButtonType): ButtonProps {
 export interface BaseButtonProps {
   type?: ButtonType;
   icon?: React.ReactNode;
-  /** @default default */
+  /**
+   * Shape of Button
+   *
+   * @default default
+   */
   shape?: ButtonShape;
   size?: SizeType;
   loading?: boolean | { delay?: number };
@@ -152,13 +156,14 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
   } = props;
 
   const size = React.useContext(SizeContext);
+  const groupSize = React.useContext(GroupSizeContext);
   const [innerLoading, setLoading] = React.useState<Loading>(!!loading);
   const [hasTwoCNChar, setHasTwoCNChar] = React.useState(false);
   const { getPrefixCls, autoInsertSpaceInButton, direction } = React.useContext(ConfigContext);
   const buttonRef = (ref as any) || React.createRef<HTMLElement>();
 
   const isNeedInserted = () =>
-    React.Children.count(children) === 1 && !icon && !isUnborderedButtonType(type);
+    React.Children.count(children) === 1 && !icon && !isUnBorderedButtonType(type);
 
   const fixTwoCNChar = () => {
     // Fix for HOC usage like <FormatMessage />
@@ -220,7 +225,7 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
   );
 
   devWarning(
-    !(ghost && isUnborderedButtonType(type)),
+    !(ghost && isUnBorderedButtonType(type)),
     'Button',
     "`link` or `text` button can't be a `ghost` button.",
   );
@@ -229,7 +234,7 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
   const autoInsertSpace = autoInsertSpaceInButton !== false;
 
   const sizeClassNameMap = { large: 'lg', small: 'sm', middle: undefined };
-  const sizeFullname = customizeSize || size;
+  const sizeFullname = groupSize || customizeSize || size;
   const sizeCls = sizeFullname ? sizeClassNameMap[sizeFullname] || '' : '';
 
   const iconType = innerLoading ? 'loading' : icon;
@@ -241,7 +246,7 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
       [`${prefixCls}-${type}`]: type,
       [`${prefixCls}-${sizeCls}`]: sizeCls,
       [`${prefixCls}-icon-only`]: !children && children !== 0 && !!iconType,
-      [`${prefixCls}-background-ghost`]: ghost && !isUnborderedButtonType(type),
+      [`${prefixCls}-background-ghost`]: ghost && !isUnBorderedButtonType(type),
       [`${prefixCls}-loading`]: innerLoading,
       [`${prefixCls}-two-chinese-chars`]: hasTwoCNChar && autoInsertSpace,
       [`${prefixCls}-block`]: block,
@@ -286,7 +291,7 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
     </button>
   );
 
-  if (isUnborderedButtonType(type)) {
+  if (isUnBorderedButtonType(type)) {
     return buttonNode;
   }
 
diff --git a/components/button/style/mixin.less b/components/button/style/mixin.less
index 96efadc8d5..084ecaa5bf 100644
--- a/components/button/style/mixin.less
+++ b/components/button/style/mixin.less
@@ -210,28 +210,6 @@
   .@{btnClassName}-icon-only {
     font-size: @font-size-base;
   }
-  // size
-  &-lg > .@{btnClassName},
-  &-lg > span > .@{btnClassName} {
-    .button-size(@btn-height-lg; @btn-padding-horizontal-lg; @btn-font-size-lg; 0);
-  }
-  &-lg .@{btnClassName}.@{btnClassName}-icon-only {
-    .square(@btn-height-lg);
-    padding-right: 0;
-    padding-left: 0;
-  }
-  &-sm > .@{btnClassName},
-  &-sm > span > .@{btnClassName} {
-    .button-size(@btn-height-sm; @btn-padding-horizontal-sm; @font-size-base; 0);
-    > .@{iconfont-css-prefix} {
-      font-size: @font-size-base;
-    }
-  }
-  &-sm .@{btnClassName}.@{btnClassName}-icon-only {
-    .square(@btn-height-sm);
-    padding-right: 0;
-    padding-left: 0;
-  }
 }
 // Base styles of buttons
 // --------------------------------------------------
diff --git a/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
index 57ec90d637..34d698b919 100644
--- a/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -5170,7 +5170,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
       class="ant-btn-group ant-btn-group-sm ant-dropdown-button"
     >
       <button
-        class="ant-btn ant-btn-primary ant-btn-loading"
+        class="ant-btn ant-btn-primary ant-btn-sm ant-btn-loading"
         type="button"
       >
         <span
@@ -5201,7 +5201,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
         </span>
       </button>
       <button
-        class="ant-btn ant-btn-primary ant-btn-icon-only ant-dropdown-trigger"
+        class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only ant-dropdown-trigger"
         type="button"
       >
         <span
diff --git a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
index 370cf32944..e57b2f80e8 100644
--- a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
@@ -534,7 +534,7 @@ exports[`renders ./components/dropdown/demo/loading.md correctly 1`] = `
       class="ant-btn-group ant-btn-group-sm ant-dropdown-button"
     >
       <button
-        class="ant-btn ant-btn-primary ant-btn-loading"
+        class="ant-btn ant-btn-primary ant-btn-sm ant-btn-loading"
         type="button"
       >
         <span
@@ -565,7 +565,7 @@ exports[`renders ./components/dropdown/demo/loading.md correctly 1`] = `
         </span>
       </button>
       <button
-        class="ant-btn ant-btn-primary ant-btn-icon-only ant-dropdown-trigger"
+        class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only ant-dropdown-trigger"
         type="button"
       >
         <span