chore: auto merge branches (ant-design#36379)

chore: merge master into feature

.eslintrc.js

@@ -17,7 +17,7 @@ module.exports = {
   },
   settings: {
     react: {
-      version: '16.9',
+      version: 'detect',
     },
     polyfills: ['Promise', 'URL'],
   },

CHANGELOG.en-US.md

@@ -15,6 +15,55 @@ timeline: true
 
 ---
 
+## 4.21.5
+
+`2022-07-03`
+
+- 🐞 Fix Checkbox cannot be disabled by Form `disabled` prop. [#36345](https://github.com/ant-design/ant-design/pull/36345)
+- 🐞 Fix Button `loading` prop with `null` value. [#36288](https://github.com/ant-design/ant-design/pull/36288) [@kejianfeng](https://github.com/kejianfeng)
+- 🐞 Fix popover arrow compatibility problem on some browsers. [#36266](https://github.com/ant-design/ant-design/pull/36266)
+- 🐞 Fix extra shadow in nested Table. [#36277](https://github.com/ant-design/ant-design/pull/36277)
+- 🐞 Fix that some class name in Divider cannot be customized. [#36271](https://github.com/ant-design/ant-design/pull/36271) [@alanhaledc](https://github.com/alanhaledc)
+- 🇧🇾 Update Belarusian locale. [#36265](https://github.com/ant-design/ant-design/pull/36265)
+
+## 4.21.4
+
+`2022-06-27`
+
+- Table
+  - 🐞 Fix Table expand icon not align center. [#36215](https://github.com/ant-design/ant-design/pull/36215)
+  - 💄 Fix nested Table margin style. [#36209](https://github.com/ant-design/ant-design/pull/36209)
+  - 🐞 Fix Table filter dropdown with multiple subMenu may not closed. [#36132](https://github.com/ant-design/ant-design/pull/36132)
+  - 🐞 Table reset the last selection key when deselect or bulk operations. [#34705](https://github.com/ant-design/ant-design/pull/34705) [@Dunqing](https://github.com/Dunqing)
+- 🐞 Fix Popover arrow color with custom `color` prop. [#36241](https://github.com/ant-design/ant-design/pull/36241) [@MadCcc](https://github.com/MadCcc)
+- 🐞 Fix Upload `listType="picture-card"` select button not being hidden when children is empty. [#36196](https://github.com/ant-design/ant-design/pull/36196)
+- 🐞 Fix Menu deprecated warning when `item={undefined}`. [#36190](https://github.com/ant-design/ant-design/pull/36190)
+- 💄 Fix Button `loading` icon margin style lost. [#36168](https://github.com/ant-design/ant-design/pull/36168)
+- 🐞 Fix Dropdown using Menu with group item can not close by click. [#36148](https://github.com/ant-design/ant-design/pull/36148)
+- 💄 Enlarge dragable area for Slider handler. [#36018](https://github.com/ant-design/ant-design/pull/36018) [@slotDumpling](https://github.com/slotDumpling)
+- 🐞 Fix: repeat a css class in readOnly, which has been declared in rc-input-number. [#36120](https://github.com/ant-design/ant-design/pull/36120) [@RainyLiao](https://github.com/RainyLiao)
+- 💄 Fix Skeleton active background color in dark theme. [#36116](https://github.com/ant-design/ant-design/pull/36116)
+- TypeScript
+  - 🤖 Fix type incompatibility. [#36189](https://github.com/ant-design/ant-design/pull/36189) [@Dunqing](https://github.com/Dunqing)
+  - 🤖 exporting `UploadFile` from `Upload`. [#34733](https://github.com/ant-design/ant-design/pull/34733) [@chentsulin](https://github.com/chentsulin)
+
+## 4.21.3
+
+`2022-06-17`
+
+- 🐞 Fix Table customize `filterDropdown` with Menu should not break default `selectable`. [#36098](https://github.com/ant-design/ant-design/pull/36098)
+- 🐞 Fix Input.Textarea cannot focus after click clear icon in controlled mode. [#34728](https://github.com/ant-design/ant-design/pull/34728) [@Pulset](https://github.com/Pulset)
+- TypeScript
+  - 🤖 Tree.DirectoryTree supports generic DataNode type. [#36092](https://github.com/ant-design/ant-design/pull/36092) [@JaylanChen](https://github.com/JaylanChen)
+  - 🤖 Export `RefSelectProps` from `Select`. [#34732](https://github.com/ant-design/ant-design/pull/34732) [@chentsulin](https://github.com/chentsulin)
+  - 🤖 Export `FormRule`, `FormListFieldData`, `FormListOperation` from `Form`. [#34735](https://github.com/ant-design/ant-design/pull/34735) [@chentsulin](https://github.com/chentsulin)
+
+## 4.21.2
+
+`2022-06-15`
+
+- 🐞 Fix incorrect Form status with `noStyle`. [#36054](https://github.com/ant-design/ant-design/pull/36054)
+
 ## 4.21.1
 
 `2022-06-13`

CHANGELOG.zh-CN.md

@@ -15,6 +15,55 @@ timeline: true
 
 ---
 
+## 4.21.5
+
+`2022-07-03`
+
+- 🐞 修复 Checkbox 不会被 Form `disabled` 属性禁用的问题。[#36345](https://github.com/ant-design/ant-design/pull/36345)
+- 🐞 修复 Button `loading` 属性传入 `null` 时错误问题。[#36288](https://github.com/ant-design/ant-design/pull/36288) [@kejianfeng](https://github.com/kejianfeng)
+- 🐞 修复弹出框箭头在某些浏览器上的兼容性问题。[#36266](https://github.com/ant-design/ant-design/pull/36266)
+- 🐞 修复 Table 滚动阴影在内嵌表格内出现的问题。[#36277](https://github.com/ant-design/ant-design/pull/36277)
+- 🐞 修复 Divider 部分类名无法自定义的问题。[#36271](https://github.com/ant-design/ant-design/pull/36271) [@alanhaledc](https://github.com/alanhaledc)
+- 🇧🇾 调整白俄罗斯国际化语言。[#36265](https://github.com/ant-design/ant-design/pull/36265)
+
+## 4.21.4
+
+`2022-06-27`
+
+- Table
+  - 🐞 修复 Table 展开图标未居中的问题。[#36215](https://github.com/ant-design/ant-design/pull/36215)
+  - 💄 修复 Table 内嵌 Table 时的边距问题。[#36209](https://github.com/ant-design/ant-design/pull/36209)
+  - 🐞 Table 取消选择或批量操作时重置上一次选择的 key。[#34705](https://github.com/ant-design/ant-design/pull/34705) [@Dunqing](https://github.com/Dunqing)
+  - 🐞 修复 Table 过滤列表在某些场景下多级展开无法关闭的问题。[#36132](https://github.com/ant-design/ant-design/pull/36132)
+- 🐞 修复 Upload `listType="picture-card"` 当 children 为空时上传文件按钮没有隐藏的问题。[#36196](https://github.com/ant-design/ant-design/pull/36196)
+- 🐞 修复 Popover 自定义 `color` 时箭头颜色问题。[#36241](https://github.com/ant-design/ant-design/pull/36241) [@MadCcc](https://github.com/MadCcc)
+- 🐞 修复 Menu `item={undefined}` 时会有废弃警告的问题。[#36190](https://github.com/ant-design/ant-design/pull/36190)
+- 💄 修复 Button `loading` 图标的间距丢失的问题。[#36168](https://github.com/ant-design/ant-design/pull/36168)
+- 🐞 修复 Dropdown 中 Menu 分组下的 Item 点击不会关闭的问题。[#36148](https://github.com/ant-design/ant-design/pull/36148)
+- 💄 优化 Slider 拖拽手柄的可交互区域。[#36018](https://github.com/ant-design/ant-design/pull/36018) [@slotDumpling](https://github.com/slotDumpling)
+- 🐞 修复重复添加 readOnly 的 css 类名，它已在 rc-input-number 中被声明了。[#36120](https://github.com/ant-design/ant-design/pull/36120) [@RainyLiao](https://github.com/RainyLiao)
+- 💄 修复 Skeleton 在 `active` 时的背景色样式。[#36116](https://github.com/ant-design/ant-design/pull/36116)
+- TypeScript
+  - 🤖 修复 TreeSelect `switcherIcon` 类型不兼容。[#36189](https://github.com/ant-design/ant-design/pull/36189) [@Dunqing](https://github.com/Dunqing)
+  - 🤖 从 `Upload` 导出类型 `UploadFile`。[#34733](https://github.com/ant-design/ant-design/pull/34733) [@chentsulin](https://github.com/chentsulin)
+
+## 4.21.3
+
+`2022-06-17`
+
+- 🐞 修复 Table 自定义 `filterDropdown` 中使用 Menu 会被修改默认 `selectable` 的问题。[#36098](https://github.com/ant-design/ant-design/pull/36098)
+- 🐞 修复 Input.Textarea 受控时点击清除图标后无法聚焦的问题。[#34728](https://github.com/ant-design/ant-design/pull/34728) [@Pulset](https://github.com/Pulset)
+- TypeScript
+  - 🤖 修复 Tree.DirectoryTree 不支持泛型的问题。[#36092](https://github.com/ant-design/ant-design/pull/36092) [@JaylanChen](https://github.com/JaylanChen)
+  - 🤖 从 `Select` 导出类型 `RefSelectProps`。[#34732](https://github.com/ant-design/ant-design/pull/34732) [@chentsulin](https://github.com/chentsulin)
+  - 🤖 从 Form 导出类型 `FormRule`、`FormListFieldData`、`FormListOperation`。[#34735](https://github.com/ant-design/ant-design/pull/34735) [@chentsulin](https://github.com/chentsulin)
+
+## 4.21.2
+
+`2022-06-15`
+
+- 🐞 修复 Form 有 `noStyle` 属性时校验状态错误的问题。[#36054](https://github.com/ant-design/ant-design/pull/36054)
+
 ## 4.21.1
 
 `2022-06-13`

components/_util/ActionButton.tsx

@@ -1,7 +1,7 @@
-import * as React from 'react';
 import useState from 'rc-util/lib/hooks/useState';
+import * as React from 'react';
 import Button from '../button';
-import type { LegacyButtonType, ButtonProps } from '../button/button';
+import type { ButtonProps, LegacyButtonType } from '../button/button';
 import { convertLegacyProps } from '../button/button';
 
 export interface ActionButtonProps {

components/_util/__tests__/scrollTo.test.js

@@ -1,5 +1,5 @@
-import scrollTo from '../scrollTo';
 import { sleep } from '../../../tests/utils';
+import scrollTo from '../scrollTo';
 
 describe('Test ScrollTo function', () => {
   let dateNowMock;

components/_util/__tests__/transButton.test.js

@@ -1,5 +1,5 @@
-import React from 'react';
 import { mount } from 'enzyme';
+import React from 'react';
 import TransButton from '../transButton';
 
 describe('transButton component', () => {

components/_util/__tests__/useSyncState.test.js

@@ -1,5 +1,5 @@
-import React from 'react';
 import { mount } from 'enzyme';
+import React from 'react';
 import useSyncState from '../hooks/useSyncState';
 
 describe('Table', () => {

components/_util/__tests__/util.test.js

@@ -1,18 +1,17 @@
 /* eslint-disable class-methods-use-this */
-import raf from 'rc-util/lib/raf';
-import React from 'react';
 import { mount } from 'enzyme';
 import KeyCode from 'rc-util/lib/KeyCode';
+import raf from 'rc-util/lib/raf';
+import React from 'react';
+import { sleep } from '../../../tests/utils';
+import getDataOrAriaProps from '../getDataOrAriaProps';
 import delayRaf from '../raf';
+import { isStyleSupport } from '../styleChecker';
 import {
   throttleByAnimationFrame,
   throttleByAnimationFrameDecorator,
 } from '../throttleByAnimationFrame';
-import getDataOrAriaProps from '../getDataOrAriaProps';
-import Wave from '../wave';
 import TransButton from '../transButton';
-import { isStyleSupport } from '../styleChecker';
-import { sleep } from '../../../tests/utils';
 
 describe('Test utils function', () => {
   describe('throttle', () => {
@@ -140,60 +139,6 @@ describe('Test utils function', () => {
     });
   });
 
-  describe('wave', () => {
-    it('bindAnimationEvent should return when node is null', () => {
-      const wrapper = mount(
-        <Wave>
-          <button type="button" disabled>
-            button
-          </button>
-        </Wave>,
-      )
-        .find(Wave)
-        .instance();
-      expect(wrapper.bindAnimationEvent()).toBe(undefined);
-    });
-
-    it('bindAnimationEvent.onClick should return when children is hidden', () => {
-      const wrapper = mount(
-        <Wave>
-          <button type="button" style={{ display: 'none' }}>
-            button
-          </button>
-        </Wave>,
-      )
-        .find(Wave)
-        .instance();
-      expect(wrapper.bindAnimationEvent()).toBe(undefined);
-    });
-
-    it('bindAnimationEvent.onClick should return when children is input', () => {
-      const wrapper = mount(
-        <Wave>
-          <input />
-        </Wave>,
-      )
-        .find(Wave)
-        .instance();
-      expect(wrapper.bindAnimationEvent()).toBe(undefined);
-    });
-
-    it('should not throw when click it', () => {
-      expect(() => {
-        const wrapper = mount(
-          <Wave>
-            <div />
-          </Wave>,
-        );
-        wrapper.simulate('click');
-      }).not.toThrow();
-    });
-
-    it('should not throw when no children', () => {
-      expect(() => mount(<Wave />)).not.toThrow();
-    });
-  });
-
   describe('TransButton', () => {
     it('can be focus/blur', () => {
       const ref = React.createRef();

components/_util/__tests__/wave.test.js

@@ -1,9 +1,9 @@
-import React from 'react';
 import { mount } from 'enzyme';
-import Wave from '../wave';
-import ConfigProvider from '../../config-provider';
+import React from 'react';
 import mountTest from '../../../tests/shared/mountTest';
-import { sleep } from '../../../tests/utils';
+import { render, sleep } from '../../../tests/utils';
+import ConfigProvider from '../../config-provider';
+import Wave from '../wave';
 
 describe('Wave component', () => {
   mountTest(Wave);
@@ -148,4 +148,53 @@ describe('Wave component', () => {
     expect(styles[0].getAttribute('nonce')).toBe('YourNonceCode');
     wrapper.unmount();
   });
+
+  it('bindAnimationEvent should return when node is null', () => {
+    const ref = React.createRef();
+    render(
+      <Wave ref={ref}>
+        <button type="button" disabled>
+          button
+        </button>
+      </Wave>,
+    );
+    expect(ref.current?.bindAnimationEvent()).toBe(undefined);
+  });
+
+  it('bindAnimationEvent.onClick should return when children is hidden', () => {
+    const ref = React.createRef();
+    render(
+      <Wave ref={ref}>
+        <button type="button" style={{ display: 'none' }}>
+          button
+        </button>
+      </Wave>,
+    );
+    expect(ref.current?.bindAnimationEvent()).toBe(undefined);
+  });
+
+  it('bindAnimationEvent.onClick should return when children is input', () => {
+    const ref = React.createRef();
+    render(
+      <Wave ref={ref}>
+        <input />
+      </Wave>,
+    );
+    expect(ref.current?.bindAnimationEvent()).toBe(undefined);
+  });
+
+  it('should not throw when click it', () => {
+    expect(() => {
+      const wrapper = mount(
+        <Wave>
+          <div />
+        </Wave>,
+      );
+      wrapper.simulate('click');
+    }).not.toThrow();
+  });
+
+  it('should not throw when no children', () => {
+    expect(() => mount(<Wave />)).not.toThrow();
+  });
 });

components/_util/motion.tsx

@@ -1,4 +1,4 @@
-import type { CSSMotionProps, MotionEventHandler, MotionEndEventHandler } from 'rc-motion';
+import type { CSSMotionProps, MotionEndEventHandler, MotionEventHandler } from 'rc-motion';
 import type { MotionEvent } from 'rc-motion/lib/interface';
 import { tuple } from './type';
 

components/_util/scrollTo.ts

@@ -1,6 +1,6 @@
 import raf from 'rc-util/lib/raf';
-import getScroll, { isWindow } from './getScroll';
 import { easeInOutCubic } from './easings';
+import getScroll, { isWindow } from './getScroll';
 
 interface ScrollToOptions {
   /** Scroll container, default as window */

components/_util/transButton.tsx

@@ -3,8 +3,8 @@
  *
  * This helps accessibility reader to tread as a interactive button to operation.
  */
-import * as React from 'react';
 import KeyCode from 'rc-util/lib/KeyCode';
+import * as React from 'react';
 
 interface TransButtonProps extends React.HTMLAttributes<HTMLDivElement> {
   onClick?: (e?: React.MouseEvent<HTMLDivElement>) => void;

components/_util/wave.tsx

@@ -1,9 +1,10 @@
-import * as React from 'react';
 import { updateCSS } from 'rc-util/lib/Dom/dynamicCSS';
-import { supportRef, composeRef } from 'rc-util/lib/ref';
-import raf from './raf';
+import { composeRef, supportRef } from 'rc-util/lib/ref';
+import * as React from 'react';
+import { forwardRef } from 'react';
 import type { ConfigConsumerProps, CSPConfig } from '../config-provider';
 import { ConfigConsumer, ConfigContext } from '../config-provider';
+import raf from './raf';
 import { cloneElement } from './reactNode';
 
 let styleForPseudo: HTMLStyleElement | null;
@@ -31,7 +32,7 @@ export interface WaveProps {
   children?: React.ReactNode;
 }
 
-export default class Wave extends React.Component<WaveProps> {
+class InternalWave extends React.Component<WaveProps> {
   static contextType = ConfigContext;
 
   private instance?: {
@@ -226,3 +227,9 @@ export default class Wave extends React.Component<WaveProps> {
     return <ConfigConsumer>{this.renderWave}</ConfigConsumer>;
   }
 }
+
+const Wave = forwardRef<InternalWave, WaveProps>((props, ref) => (
+  <InternalWave ref={ref} {...props} />
+));
+
+export default Wave;

components/affix/__tests__/Affix.test.tsx

@@ -1,13 +1,13 @@
-import React from 'react';
 import type { ReactWrapper } from 'enzyme';
 import { mount } from 'enzyme';
+import React from 'react';
 import type { AffixProps, AffixState, InternalAffixClass } from '..';
 import Affix from '..';
-import { getObserverEntities } from '../utils';
-import Button from '../../button';
-import rtlTest from '../../../tests/shared/rtlTest';
 import accessibilityTest from '../../../tests/shared/accessibilityTest';
-import { sleep, render } from '../../../tests/utils';
+import rtlTest from '../../../tests/shared/rtlTest';
+import { render, sleep } from '../../../tests/utils';
+import Button from '../../button';
+import { getObserverEntities } from '../utils';
 
 const events: Partial<Record<keyof HTMLElementEventMap, (ev: Partial<Event>) => void>> = {};