chore: auto merge branchs (#35456)

chore: next merge master

.eslintrc.js

@@ -31,6 +31,7 @@ module.exports = {
         '@typescript-eslint/no-unused-vars': [2, { args: 'none' }],
         'no-unused-expressions': 'off',
         '@typescript-eslint/no-unused-expressions': 2,
+        '@typescript-eslint/consistent-type-imports': 2,
       },
     },
     {

CHANGELOG.en-US.md

@@ -15,6 +15,18 @@ timeline: true
 
 ---
 
+## 4.20.3
+
+`2022-05-08`
+
+- 🐞 Fix unnecessary `rowGap: 0` style attribute in Row. [#35409](https://github.com/ant-design/ant-design/pull/35409)
+- 🐞 Fix List.Item `ref` no work problem. [#35321](https://github.com/ant-design/ant-design/pull/35321)
+- 💄 Optimize the style of arrow in Tooltip. [#35401](https://github.com/ant-design/ant-design/pull/35401)
+- 🐞 Fix Table column filter reset is not working. [#35386](https://github.com/ant-design/ant-design/pull/35386) [@lalalazero](https://github.com/lalalazero)
+- 🌍 Add missing localizations for 🇬🇧 en_GB and 🇺🇦 uk_UA. [#35430](https://github.com/ant-design/ant-design/pull/35430) [@velykanov](https://github.com/velykanov)
+- Typescript
+  - 🤖 Fixed an issue where notification `maxCount` attribute was missing. [#35369](https://github.com/ant-design/ant-design/pull/35369) [@cwveysey](https://github.com/cwveysey)
+
 ## 4.20.2
 
 `2022-04-30`

CHANGELOG.zh-CN.md

@@ -15,6 +15,19 @@ timeline: true
 
 ---
 
+## 4.20.3
+
+`2022-05-08`
+
+- 🔥 增加 [官方国内镜像](https://ant-design.antgroup.com/index-cn)，享受飞一般的加载速度。
+- 🐞 修复 Row 里不必要的 `rowGap: 0` 样式属性。[#35409](https://github.com/ant-design/ant-design/pull/35409)
+- 🐞 修复 List.Item `ref` 不生效的问题。[#35321](https://github.com/ant-design/ant-design/pull/35321)
+- 💄 优化 Tooltip 箭头的样式。[#35401](https://github.com/ant-design/ant-design/pull/35401)
+- 🐞 修复 Table 筛选的重置功能不生效问题。[#35386](https://github.com/ant-design/ant-design/pull/35386) [@lalalazero](https://github.com/lalalazero)
+- 🌍 为 🇬🇧 en_GB 和 🇺🇦 uk_UA 添加缺失的本地化文案。[#35430](https://github.com/ant-design/ant-design/pull/35430) [@velykanov](https://github.com/velykanov)
+- TypeScript
+  - 🤖 修复 Notification 的 `maxCount` 属性缺失的问题。[#35369](https://github.com/ant-design/ant-design/pull/35369) [@cwveysey](https://github.com/cwveysey)
+
 ## 4.20.2
 
 `2022-04-30`

components/_util/ActionButton.tsx

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

components/_util/colors.ts

@@ -1,4 +1,5 @@
-import { ElementOf, tuple } from './type';
+import type { ElementOf } from './type';
+import { tuple } from './type';
 
 export const PresetStatusColorTypes = tuple('success', 'processing', 'error', 'default', 'warning');
 // eslint-disable-next-line import/prefer-default-export

components/_util/getRenderPropValue.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import type * as React from 'react';
 
 export type RenderFunction = () => React.ReactNode;
 

components/_util/motion.tsx

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

components/_util/placements.tsx

@@ -1,5 +1,5 @@
 import { placements } from 'rc-tooltip/lib/placements';
-import { BuildInPlacements } from 'rc-trigger';
+import type { BuildInPlacements } from 'rc-trigger';
 
 const autoAdjustOverflowEnabled = {
   adjustX: 1,

components/_util/statusUtils.tsx

@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { ValidateStatus } from '../form/FormItem';
+import type { ValidateStatus } from '../form/FormItem';
 import { tuple } from './type';
 
 const InputStatuses = tuple('warning', 'error', '');

components/_util/theme/index.tsx

@@ -1,18 +1,20 @@
 import React from 'react';
-import { CSSInterpolation, Theme, useCacheToken, useStyleRegister } from '@ant-design/cssinjs';
+import type { CSSInterpolation } from '@ant-design/cssinjs';
+import { Theme, useCacheToken, useStyleRegister } from '@ant-design/cssinjs';
 import genComponentStyleHook from './util/genComponentStyleHook';
 import defaultSeedToken, { derivative as defaultDerivative } from './themes/default';
 import version from '../../version';
 import { resetComponent, resetIcon, clearFix, roundedArrow, operationUnit } from './util';
 import formatToken from './util/alias';
 import statisticToken, { merge as mergeToken, statistic } from './util/statistic';
-import { GlobalToken, PresetColors } from './interface';
+import { PresetColors } from './interface';
 import type {
   SeedToken,
   DerivativeToken,
   AliasToken,
   OverrideToken,
   PresetColorType,
+  GlobalToken,
 } from './interface';
 import type { FullToken } from './util/genComponentStyleHook';
 

components/_util/theme/util/genComponentStyleHook.ts

@@ -1,8 +1,10 @@
 /* eslint-disable no-redeclare */
-import { CSSInterpolation, useStyleRegister } from '@ant-design/cssinjs';
+import type { CSSInterpolation } from '@ant-design/cssinjs';
+import { useStyleRegister } from '@ant-design/cssinjs';
 import { useContext } from 'react';
-import { GlobalToken, OverrideToken } from '../interface';
-import { mergeToken, statisticToken, UseComponentStyleResult, useToken } from '../index';
+import type { GlobalToken, OverrideToken } from '../interface';
+import type { UseComponentStyleResult } from '../index';
+import { mergeToken, statisticToken, useToken } from '../index';
 import { ConfigContext } from '../../../config-provider';
 
 export type OverrideTokenWithoutDerivative = Omit<OverrideToken, 'derivative'>;

components/_util/theme/util/index.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable import/prefer-default-export */
-import { CSSObject } from '@ant-design/cssinjs';
+import type { CSSObject } from '@ant-design/cssinjs';
 import type { DerivativeToken } from '..';
 
 export { operationUnit } from './operationUnit';

components/_util/theme/util/operationUnit.tsx

@@ -1,5 +1,5 @@
 import type { CSSObject } from '@ant-design/cssinjs';
-import { DerivativeToken } from '..';
+import type { DerivativeToken } from '..';
 
 // eslint-disable-next-line import/prefer-default-export
 export const operationUnit = (token: DerivativeToken): CSSObject => ({

components/_util/theme/util/roundedArrow.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable import/prefer-default-export */
-import { CSSObject } from '@ant-design/cssinjs';
+import type { CSSObject } from '@ant-design/cssinjs';
 import seedToken from '../themes/default';
 
 export const roundedArrow = (width: number, outerRadius: number, bgColor: string): CSSObject => {

components/_util/wave.tsx

@@ -2,7 +2,8 @@ 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 { ConfigConsumer, ConfigConsumerProps, CSPConfig, ConfigContext } from '../config-provider';
+import type { ConfigConsumerProps, CSPConfig } from '../config-provider';
+import { ConfigConsumer, ConfigContext } from '../config-provider';
 import { cloneElement } from './reactNode';
 
 let styleForPseudo: HTMLStyleElement | null;

components/affix/__tests__/Affix.test.tsx

@@ -1,6 +1,8 @@
 import React from 'react';
-import { mount, ReactWrapper } from 'enzyme';
-import Affix, { AffixProps, AffixState } from '..';
+import type { ReactWrapper } from 'enzyme';
+import { mount } from 'enzyme';
+import type { AffixProps, AffixState } from '..';
+import Affix from '..';
 import { getObserverEntities } from '../utils';
 import Button from '../../button';
 import rtlTest from '../../../tests/shared/rtlTest';

components/affix/index.tsx

@@ -2,7 +2,8 @@ import * as React from 'react';
 import classNames from 'classnames';
 import omit from 'rc-util/lib/omit';
 import ResizeObserver from 'rc-resize-observer';
-import { ConfigContext, ConfigConsumerProps } from '../config-provider';
+import type { ConfigConsumerProps } from '../config-provider';
+import { ConfigContext } from '../config-provider';
 import { throttleByAnimationFrameDecorator } from '../_util/throttleByAnimationFrame';
 
 import {

components/affix/style/index.tsx

@@ -1,6 +1,7 @@
 // deps-lint-skip-all
-import { CSSObject } from '@ant-design/cssinjs';
-import { GenerateStyle, genComponentStyleHook, FullToken, mergeToken } from '../../_util/theme';
+import type { CSSObject } from '@ant-design/cssinjs';
+import type { GenerateStyle, FullToken } from '../../_util/theme';
+import { genComponentStyleHook, mergeToken } from '../../_util/theme';
 
 interface AffixToken extends FullToken<'Affix'> {
   zIndexAffix: number;

components/alert/style/index.tsx

@@ -2,15 +2,10 @@
 // import './index.less';
 
 // deps-lint-skip-all
-import { CSSInterpolation, CSSObject } from '@ant-design/cssinjs';
-
-import {
-  resetComponent,
-  GenerateStyle,
-  FullToken,
-  genComponentStyleHook,
-  mergeToken,
-} from '../../_util/theme';
+import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs';
+
+import type { GenerateStyle, FullToken } from '../../_util/theme';
+import { resetComponent, genComponentStyleHook, mergeToken } from '../../_util/theme';
 
 // FIXME: missing token
 type AlertToken = FullToken<'Alert'> & {

components/anchor/Anchor.tsx

@@ -3,7 +3,8 @@ import classNames from 'classnames';
 import memoizeOne from 'memoize-one';
 import addEventListener from 'rc-util/lib/Dom/addEventListener';
 import Affix from '../affix';
-import { ConfigContext, ConfigConsumerProps } from '../config-provider';
+import type { ConfigConsumerProps } from '../config-provider';
+import { ConfigContext } from '../config-provider';
 import scrollTo from '../_util/scrollTo';
 import getScroll from '../_util/getScroll';
 import AnchorContext from './context';

components/anchor/AnchorLink.tsx

@@ -1,7 +1,8 @@
 import * as React from 'react';
 import classNames from 'classnames';
-import { AntAnchor } from './Anchor';
-import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
+import type { AntAnchor } from './Anchor';
+import type { ConfigConsumerProps } from '../config-provider';
+import { ConfigConsumer } from '../config-provider';
 import AnchorContext from './context';
 
 export interface AnchorLinkProps {

components/anchor/context.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AntAnchor } from './Anchor';
+import type { AntAnchor } from './Anchor';
 
 const AnchorContext = React.createContext<AntAnchor>(null as any);
 

components/anchor/style/index.tsx

@@ -1,5 +1,5 @@
 // deps-lint-skip-all
-import { CSSObject } from '@ant-design/cssinjs';
+import type { CSSObject } from '@ant-design/cssinjs';
 import { genComponentStyleHook, mergeToken, resetComponent } from '../../_util/theme';
 import type { GenerateStyle, FullToken } from '../../_util/theme';
 

components/auto-complete/demo/uncertain-category.md

@@ -16,7 +16,7 @@ Demonstration of [Lookup Patterns: Uncertain Category](https://ant.design/docs/s
 ```tsx
 import React, { useState } from 'react';
 import { Input, AutoComplete } from 'antd';
-import { SelectProps } from 'antd/es/select';
+import type { SelectProps } from 'antd/es/select';
 
 function getRandomInt(max: number, min: number = 0) {
   return Math.floor(Math.random() * (max - min + 1)) + min; // eslint-disable-line no-mixed-operators

components/auto-complete/index.tsx

@@ -11,16 +11,18 @@ import toArray from 'rc-util/lib/Children/toArray';
 import classNames from 'classnames';
 import omit from 'rc-util/lib/omit';
 import type { BaseSelectRef } from 'rc-select';
-import Select, {
+import type {
   BaseOptionType,
   DefaultOptionType,
   InternalSelectProps,
   RefSelectProps,
 } from '../select';
-import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
+import Select from '../select';
+import type { ConfigConsumerProps } from '../config-provider';
+import { ConfigConsumer } from '../config-provider';
 import devWarning from '../_util/devWarning';
 import { isValidElement } from '../_util/reactNode';
-import { InputStatus } from '../_util/statusUtils';
+import type { InputStatus } from '../_util/statusUtils';
 
 const { Option } = Select;
 

components/avatar/SizeContext.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ScreenSizeMap } from '../_util/responsiveObserve';
+import type { ScreenSizeMap } from '../_util/responsiveObserve';
 
 export type AvatarSize = 'large' | 'small' | 'default' | number | ScreenSizeMap;
 

components/avatar/avatar.tsx

@@ -4,10 +4,12 @@ import ResizeObserver from 'rc-resize-observer';
 import { composeRef } from 'rc-util/lib/ref';
 import { ConfigContext } from '../config-provider';
 import devWarning from '../_util/devWarning';
-import { Breakpoint, responsiveArray } from '../_util/responsiveObserve';
+import type { Breakpoint } from '../_util/responsiveObserve';
+import { responsiveArray } from '../_util/responsiveObserve';
 import useBreakpoint from '../grid/hooks/useBreakpoint';
-import SizeContext, { AvatarSize } from './SizeContext';
 import useStyle from './style';
+import type { AvatarSize } from './SizeContext';
+import SizeContext from './SizeContext';
 
 export interface AvatarProps {
   /** Shape of avatar, options: `circle`, `square` */

components/avatar/group.tsx

@@ -5,8 +5,9 @@ import { cloneElement } from '../_util/reactNode';
 import { ConfigContext } from '../config-provider';
 import Avatar from './avatar';
 import Popover from '../popover';
-import { AvatarSize, SizeContextProvider } from './SizeContext';
 import useStyle from './style';
+import type { AvatarSize } from './SizeContext';
+import { SizeContextProvider } from './SizeContext';
 
 export interface GroupProps {
   className?: string;

components/avatar/index.tsx

@@ -1,12 +1,13 @@
-import * as React from 'react';
-import InternalAvatar, { AvatarProps } from './avatar';
+import type { ForwardRefExoticComponent, RefAttributes } from 'react';
+import type { AvatarProps } from './avatar';
+import InternalAvatar from './avatar';
 import Group from './group';
 
 export { AvatarProps } from './avatar';
 export { GroupProps } from './group';
 
 interface CompoundedComponent
-  extends React.ForwardRefExoticComponent<AvatarProps & React.RefAttributes<HTMLElement>> {
+  extends ForwardRefExoticComponent<AvatarProps & RefAttributes<HTMLElement>> {
   Group: typeof Group;
 }
 

components/avatar/style/index.tsx

@@ -6,14 +6,9 @@
 // import '../../popover/style';
 
 // deps-lint-skip-all
-import { CSSObject } from '@ant-design/cssinjs';
-import {
-  GenerateStyle,
-  resetComponent,
-  FullToken,
-  genComponentStyleHook,
-  mergeToken,
-} from '../../_util/theme';
+import type { CSSObject } from '@ant-design/cssinjs';
+import type { GenerateStyle, FullToken } from '../../_util/theme';
+import { resetComponent, genComponentStyleHook, mergeToken } from '../../_util/theme';
 
 type AvatarToken = FullToken<'Avatar'> & {
   avatarBg: string;

components/back-top/style/index.tsx

@@ -1,12 +1,7 @@
 // deps-lint-skip-all
-import { CSSObject } from '@ant-design/cssinjs';
-import {
-  resetComponent,
-  genComponentStyleHook,
-  GenerateStyle,
-  FullToken,
-  mergeToken,
-} from '../../_util/theme';
+import type { CSSObject } from '@ant-design/cssinjs';
+import type { GenerateStyle, FullToken } from '../../_util/theme';
+import { resetComponent, genComponentStyleHook, mergeToken } from '../../_util/theme';
 
 /** Component only token. Which will handle additional calculation of alias token */
 export interface ComponentToken {}

components/badge/Ribbon.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import classNames from 'classnames';
-import { LiteralUnion } from '../_util/type';
-import { PresetColorType } from '../_util/colors';
+import type { LiteralUnion } from '../_util/type';
+import type { PresetColorType } from '../_util/colors';
 import { ConfigContext } from '../config-provider';
 import { isPresetColor } from './utils';
 import useStyle from './style';

components/badge/index.tsx

@@ -4,9 +4,9 @@ import CSSMotion from 'rc-motion';
 import classNames from 'classnames';
 import ScrollNumber from './ScrollNumber';
 import Ribbon from './Ribbon';
-import { PresetColorType, PresetStatusColorType } from '../_util/colors';
+import type { PresetColorType, PresetStatusColorType } from '../_util/colors';
 import { ConfigContext } from '../config-provider';
-import { LiteralUnion } from '../_util/type';
+import type { LiteralUnion } from '../_util/type';
 import { cloneElement } from '../_util/reactNode';
 import { isPresetColor } from './utils';
 import useStyle from './style';