chore: auto merge branchs (#31308)

chore: sync master into feature

.antd-tools.config.js

@@ -22,7 +22,7 @@ function finalizeCompile() {
     fs.readdir(componentsPath, (err, files) => {
       files.forEach(file => {
         if (fs.existsSync(path.join(componentsPath, file, 'style', 'index.less'))) {
-          componentsLessContent += `@import "../${path.join(file, 'style', 'index.less')}";\n`;
+          componentsLessContent += `@import "../${path.posix.join(file, 'style', 'index.less')}";\n`;
         }
       });
       fs.writeFileSync(

components/avatar/index.en-US.md

@@ -28,7 +28,7 @@ Avatars can be used to represent people or objects. It supports images, `Icon`s,
 
 ### Avatar.Group (4.5.0+)
 
-| 参数 | 说明 | 类型 | 默认值 | 版本 |
+| Property | Description | Type | Default | Version |
 | --- | --- | --- | --- | --- |
 | maxCount | Max avatars to show | number | - |  |
 | maxPopoverPlacement | The placement of excess avatar Popover | `top` \| `bottom` | `top` |  |

components/descriptions/style/index.less

@@ -128,6 +128,7 @@
       border: 1px solid @border-color-split;
       > table {
         table-layout: auto;
+        border-collapse: collapse;
       }
     }
 

components/input-number/style/index.less

@@ -26,6 +26,7 @@
     font-weight: bold;
     line-height: 0;
     text-align: center;
+    border-left: @border-width-base @border-style-base @input-number-handler-border-color;
     transition: all 0.1s linear;
     &:active {
       background: @input-number-handler-active-bg;
@@ -123,7 +124,6 @@
     width: 22px;
     height: 100%;
     background: @input-number-handler-bg;
-    border-left: @border-width-base @border-style-base @input-number-handler-border-color;
     border-radius: 0 @border-radius-base @border-radius-base 0;
     opacity: 0;
     transition: opacity 0.24s linear 0.1s;

components/locale/en_GB.tsx

@@ -21,6 +21,7 @@ const localeValues: Locale = {
     emptyText: 'No data',
     selectAll: 'Select current page',
     selectInvert: 'Invert current page',
+    selectNone: 'Clear all data',
     selectionAll: 'Select all data',
     sortTitle: 'Sort',
     expand: 'Expand row',

components/modal/__tests__/__snapshots__/Modal.test.js.snap

@@ -4,7 +4,7 @@ exports[`Modal render correctly 1`] = `
 <div>
   <div
     class="ant-scrolling-effect"
-    style="width: calc(100% - 0px); overflow: hidden; overflow-x: hidden; overflow-y: hidden;"
+    style="overflow: hidden; overflow-x: hidden; overflow-y: hidden;"
   >
     <div>
       <div
@@ -103,7 +103,7 @@ exports[`Modal render without footer 1`] = `
 <div>
   <div
     class="ant-scrolling-effect"
-    style="width: calc(100% - 0px); overflow: hidden; overflow-x: hidden; overflow-y: hidden;"
+    style="overflow: hidden; overflow-x: hidden; overflow-y: hidden;"
   >
     <div>
       <div

components/table/style/bordered.less

@@ -12,9 +12,7 @@
 
   > .@{table-prefix-cls}-container {
     // ============================ Content ============================
-    border: @table-border;
-    border-right: 0;
-    border-bottom: 0;
+    border-left: @table-border;
 
     > .@{table-prefix-cls}-content,
     > .@{table-prefix-cls}-header,
@@ -67,6 +65,13 @@
         }
       }
     }
+
+    > .@{table-prefix-cls}-content,
+    > .@{table-prefix-cls}-header {
+      > table {
+        border-top: @table-border;
+      }
+    }
   }
 
   &.@{table-prefix-cls}-scroll-horizontal {

docs/react/migration-v4.en-US.md

@@ -141,7 +141,9 @@ const Demo = () => (
 - Table rewrite.
   - will keep at least one column even if `columns` is empty.
   - Nest `dataIndex` definition changes from `'xxx.yyy'` to `['xxx', 'yyy']`.
-- Pagination will default set `showSizeChanger` to `true` since `4.1.0`. This change also applied on Table component.
+- Pagination
+  - will default set `showSizeChanger` to `true` since `4.1.0`. This change also applied on Table component.
+  - `onChange` will also trigger when `pageSize` value changed.
 - Tabs rewrite. ([4.3.0](https://github.com/ant-design/ant-design/pull/24552))
   - Dom structrue is changed, please check style if you override tabs css.
   - `onPrevClick` 和 `onNextClick` would be not working anymore since we improve tabs scroll behavior.

docs/react/migration-v4.zh-CN.md

@@ -141,7 +141,9 @@ const Demo = () => (
 - Table 重写
   - 在没有 `columns` 时仍然会保留一列。
   - 嵌套 `dataIndex` 支持从 `'xxx.yyy'` 改成 `['xxx', 'yyy']`。
-- Pagination 自 `4.1.0` 起大于 50 条数据默认会展示 `pageSize` 切换器，这条规则同样会运用于 Table 上。
+- Pagination 重写
+  - 自 `4.1.0` 起大于 50 条数据默认会展示 `pageSize` 切换器，这条规则同样会运用于 Table 上。
+  - `onChange` 方法在 `pageSize` 值改变时也会触发。
 - Tabs 重写（[4.3.0](https://github.com/ant-design/ant-design/pull/24552)）
   - Dom 结构变化，如有覆盖样式需要仔细检查。
   - 横向滚动交互变化，`onPrevClick` 和 `onNextClick` 不再工作。

package.json

@@ -160,7 +160,7 @@
     "@stackblitz/sdk": "^1.3.0",
     "@types/classnames": "^2.2.8",
     "@types/enzyme": "^3.10.5",
-    "@types/gtag.js": "^0.0.6",
+    "@types/gtag.js": "^0.0.7",
     "@types/jest": "^26.0.0",
     "@types/jest-environment-puppeteer": "^4.4.0",
     "@types/jest-image-snapshot": "^4.1.0",