Merge remote-tracking branch 'origin/main' into feat-v4

Author: tangjinzhou

components/button/__tests__/index.test.js

@@ -5,10 +5,12 @@ import { nextTick } from 'vue';
 import { asyncExpect, sleep } from '../../../tests/utils';
 import mountTest from '../../../tests/shared/mountTest';
 import { resetWarned } from '../../_util/warning';
+import focusTest from '../../../tests/shared/focusTest';
 
 describe('Button', () => {
   mountTest(Button);
   mountTest(Button.Group);
+  focusTest(Button);
   it('renders correctly', () => {
     const wrapper = mount({
       render() {

components/button/button.tsx

@@ -38,7 +38,7 @@ export default defineComponent({
   props: initDefaultProps(buttonProps(), { type: 'default' }),
   slots: ['icon'],
   // emits: ['click', 'mousedown'],
-  setup(props, { slots, attrs, emit }) {
+  setup(props, { slots, attrs, emit, expose }) {
     const { prefixCls, autoInsertSpaceInButton, direction, size } = useConfigInject('btn', props);
     const [wrapSSR, hashId] = useStyle(prefixCls);
     const groupSizeContext = GroupSizeContext.useInject();
@@ -157,6 +157,17 @@ export default defineComponent({
       delayTimeoutRef.value && clearTimeout(delayTimeoutRef.value);
     });
 
+    const focus = () => {
+      buttonNodeRef.value?.focus();
+    };
+    const blur = () => {
+      buttonNodeRef.value?.blur();
+    };
+    expose({
+      focus,
+      blur,
+    });
+
     return () => {
       const { icon = slots.icon?.() } = props;
       const children = flattenChildren(slots.default?.());

components/button/index.en-US.md

@@ -56,6 +56,15 @@ It accepts all props which native buttons support.
 
 ## FAQ
 
+### Methods
+
+#### Checkbox
+
+| Name    | Description  | Version |
+| ------- | ------------ | ------- |
+| blur()  | remove focus |         |
+| focus() | get focus    |         |
+
 ### How to remove space between 2 chinese characters
 
 Following the Ant Design specification, we will add one space between if Button (exclude Text button and Link button) contains two Chinese characters only. If you don't need that, you can use [ConfigProvider](/components/config-provider/#api) to set `autoInsertSpaceInButton` as `false`.

components/button/index.zh-CN.md

@@ -57,6 +57,15 @@ coverDark: https://mdn.alipayobjects.com/huamei_7uahnr/afts/img/A*Lp1kTYmSsgoAAA
 
 支持原生 button 的其他所有属性。
 
+### 方法
+
+#### Button
+
+| 名称    | 描述     | 版本 |
+| ------- | -------- | ---- |
+| blur()  | 移除焦点 |      |
+| focus() | 获取焦点 |      |
+
 ## FAQ
 
 ### 如何移除 2 个汉字之间的空格

components/date-picker/index.en-US.md

@@ -211,3 +211,20 @@ Please refer [replace date](/docs/vue/replace-date)
 ### Why config dayjs.locale globally not work?
 
 DatePicker default set `locale` as `en` in v4. You can config DatePicker `locale` prop or [ConfigProvider `locale`](/components/config-provider) prop instead.
+
+### How to modify start day of week?
+
+Please use correct [language](/docs/vue/i18n) ([#5605](https://github.com/ant-design/ant-design/issues/5605)), or update dayjs `locale` config:
+
+- Example: <https://codesandbox.io/s/dayjs-day-of-week-x9tuj2?file=/demo.tsx>
+
+```js
+import dayjs from 'dayjs';
+import updateLocale from 'dayjs/plugin/updateLocale';
+import 'dayjs/locale/zh-cn';
+
+dayjs.extend(updateLocale);
+dayjs.updateLocale('zh-cn', {
+  weekStart: 0,
+});
+```

components/date-picker/index.zh-CN.md

@@ -212,3 +212,18 @@ export type FormatType = Generic | GenericFn | Array<Generic | GenericFn>;
 ### 为何全局修改 dayjs.locale 不生效？
 
 DatePicker 默认 `locale` 为 `en`。你可以通过 DatePicker 的 `locale` 属性来单独设置，也可以通过 [ConfigProvider `locale`](/components/config-provider-cn) 属性来配置。
+
+### 如何修改周的起始日？
+
+请使用正确的[语言包](/docs/vue/i18n-cn)（[#5605](https://github.com/ant-design/ant-design/issues/5605)），或者修改 dayjs 的 `locale` 配置：<https://codesandbox.io/s/dayjs-day-of-week-x9tuj2?file=/demo.tsx>
+
+```js
+import dayjs from 'dayjs';
+import updateLocale from 'dayjs/plugin/updateLocale';
+import 'dayjs/locale/zh-cn';
+
+dayjs.extend(updateLocale);
+dayjs.updateLocale('zh-cn', {
+  weekStart: 0,
+});
+```

components/form/FormItem.tsx

@@ -34,12 +34,12 @@ import { warning } from '../vc-util/warning';
 import find from 'lodash-es/find';
 import { tuple } from '../_util/type';
 import type {
+  FormLabelAlign,
   InternalNamePath,
   Rule,
   RuleError,
   RuleObject,
   ValidateOptions,
-  FormLabelAlign,
 } from './interface';
 import useConfigInject from '../config-provider/hooks/useConfigInject';
 import { useInjectForm } from './context';
@@ -113,10 +113,7 @@ export const formItemProps = () => ({
   wrapperCol: { type: Object as PropType<ColProps & HTMLAttributes> },
   hasFeedback: { type: Boolean, default: false },
   colon: { type: Boolean, default: undefined },
-  labelAlign: {
-    ...PropTypes.oneOf(tuple('left', 'right')),
-    type: String as PropType<FormLabelAlign>,
-  },
+  labelAlign: String as PropType<FormLabelAlign>,
   prop: { type: [String, Number, Array] as PropType<string | number | Array<string | number>> },
   name: { type: [String, Number, Array] as PropType<string | number | Array<string | number>> },
   rules: [Array, Object] as PropType<Rule[] | Rule>,
@@ -237,7 +234,7 @@ export default defineComponent({
       if (typeof props.label === 'string') {
         variables.label = props.label;
       } else if (props.name) {
-        variables.label = String(name);
+        variables.label = String(props.name);
       }
       if (props.messageVariables) {
         variables = { ...variables, ...props.messageVariables };

components/mentions/index.tsx

@@ -2,13 +2,13 @@ import type { App, PropType, ExtractPropTypes } from 'vue';
 import { computed, watch, shallowRef, defineComponent } from 'vue';
 import classNames from '../_util/classNames';
 import PropTypes from '../_util/vue-types';
-import VcMentions, { Option } from '../vc-mentions';
+import VcMentions from '../vc-mentions';
 import { mentionsProps as baseMentionsProps } from '../vc-mentions/src/mentionsProps';
 import useConfigInject from '../config-provider/hooks/useConfigInject';
 import { flattenChildren, getOptionProps } from '../_util/props-util';
 import { FormItemInputContext, useInjectFormItemContext } from '../form/FormItemContext';
 import omit from '../_util/omit';
-import { optionProps } from '../vc-mentions/src/Option';
+import { optionProps, optionOptions } from '../vc-mentions/src/Option';
 import type { KeyboardEventHandler } from '../_util/EventInterface';
 import type { InputStatus } from '../_util/statusUtils';
 import { getStatusClassNames, getMergedStatus } from '../_util/statusUtils';
@@ -279,7 +279,7 @@ const Mentions = defineComponent({
 /* istanbul ignore next */
 export const MentionsOption = defineComponent({
   compatConfig: { MODE: 3 },
-  ...(Option as any),
+  ...optionOptions,
   name: 'AMentionsOption',
   props: optionProps,
 });

components/table/index.tsx

@@ -2,7 +2,6 @@ import Table, { tableProps } from './Table';
 import Column from './Column';
 import ColumnGroup from './ColumnGroup';
 import type { TableProps, TablePaginationConfig } from './Table';
-import { defineComponent } from 'vue';
 import type { App } from 'vue';
 import { EXPAND_COLUMN, Summary, SummaryCell, SummaryRow } from '../vc-table';
 import {
@@ -16,8 +15,8 @@ export type { ColumnProps } from './Column';
 export type { ColumnsType, ColumnType, ColumnGroupType } from './interface';
 export type { TableProps, TablePaginationConfig };
 
-const TableSummaryRow = defineComponent({ ...(SummaryRow as any), name: 'ATableSummaryRow' });
-const TableSummaryCell = defineComponent({ ...(SummaryCell as any), name: 'ATableSummaryCell' });
+const TableSummaryRow = SummaryRow;
+const TableSummaryCell = SummaryCell;
 
 const TableSummary = Object.assign(Summary, {
   Cell: TableSummaryCell,

components/transfer/demo/tree-transfer.vue

@@ -78,14 +78,12 @@ function isChecked(selectedKeys: (string | number)[], eventKey: string | number)
   return selectedKeys.indexOf(eventKey) !== -1;
 }
 
-function handleTreeData(data: TransferProps['dataSource'], targetKeys: string[] = []) {
-  data.forEach(item => {
-    item['disabled'] = targetKeys.includes(item.key as any);
-    if (item.children) {
-      handleTreeData(item.children, targetKeys);
-    }
-  });
-  return data as TreeProps['treeData'];
+function handleTreeData(treeNodes: TransferProps['dataSource'], targetKeys: string[] = []) {
+  return treeNodes.map(({ children, ...props }) => ({
+    ...props,
+    disabled: targetKeys.includes(props.key as string),
+    children: handleTreeData(children ?? [], targetKeys),
+  }));
 }
 
 export default defineComponent({