Skip to content

Commit

Permalink
chore: auto merge branches (ant-design#44629)
Browse files Browse the repository at this point in the history
chore: feature merge master
  • Loading branch information
github-actions[bot] authored Sep 5, 2023
2 parents 6a5e7de + 114ff39 commit caa71d4
Show file tree
Hide file tree
Showing 101 changed files with 630 additions and 279 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mock-project-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Build Project
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-contributor-welcome.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
require-result: ${{ steps.contributors.outputs.content }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Read contributors.json
id: contributors
uses: juliangruber/read-file-action@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/preview-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: cache package-lock.json
uses: actions/cache@v3
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
needs: setup
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: restore cache from package-lock.json
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
if: github.event.issue.pull_request != '' && (contains(github.event.comment.body, '/rebase') || contains(github.event.comment.body, '\rebase'))
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Automatic Rebase
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/site-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
if: (startsWith(github.ref, 'refs/tags/') && (contains(github.ref_name, '-') == false)) || github.event_name == 'workflow_dispatch'
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: cache package-lock.json
uses: actions/cache@v3
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
needs: setup
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/size-limit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down
26 changes: 18 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand All @@ -79,7 +79,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand All @@ -104,7 +104,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -188,6 +188,12 @@ jobs:
if: ${{ matrix.module == 'dist' }}
run: node ./tests/dekko/dist.test.js

- name: check use client
if: ${{ matrix.module == 'dist' }}
run: node ./tests/dekko/use-client.test.js
env:
LIB_DIR: dist

# dom test
- name: dom test
if: ${{ matrix.module == 'dom' }}
Expand Down Expand Up @@ -225,7 +231,7 @@ jobs:
runs-on: ubuntu-latest
needs: [normal-test]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand All @@ -251,7 +257,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -286,6 +292,10 @@ jobs:

- name: check
run: node ./tests/dekko/lib.test.js

- name: check use client
run: node ./tests/dekko/use-client.test.js

needs: setup

compiled-module-test:
Expand All @@ -302,7 +312,7 @@ jobs:
- name: checkout
# lib only run in master branch not in pull request
if: ${{ github.event_name != 'pull_request' || matrix.module != 'lib' }}
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-package-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
if: contains(github.event.pull_request.title, 'changelog') || contains(github.event.pull_request.title, 'release')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: verify-version
uses: actions-cool/verify-package-version@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ tag: vVERSION

- 🛠 针对 CSSInJS 加载 styles 大小进行了优化。
- 🛠 Notification 和 Message 组件只有在展示时才会插入对应样式。[#44488](https://github.com/ant-design/ant-design/pull/44488)
- 🛠 剥离 Tag 状态与预设颜色样式,现在只有当使用的使用才会生成它们[#44512](https://github.com/ant-design/ant-design/pull/44512)
- 🛠 剥离 Button 紧凑模式样式,现在只有当使用了 Space.Compact 才会生成对应样式[#44475](https://github.com/ant-design/ant-design/pull/44475)
- 🛠 剥离 Tag 状态与预设颜色样式,现在只有当使用的时候才会生成它们[#44512](https://github.com/ant-design/ant-design/pull/44512)
- 🛠 剥离 Button 紧凑模式样式,现在只有当使用了 Space.Compact 的时候才会生成它们[#44475](https://github.com/ant-design/ant-design/pull/44475)
- 📦 移除 `@ant-design/icons` 依赖 `lodash/camelCase` 以优化 bundle size。[ant-design-icons#595](https://github.com/ant-design/ant-design-icons/pull/595)
- Form
- 🐞 修复 Form.Item 设置 `wrapperCol.span``0` 时,子元素不隐藏的问题。[#44485](https://github.com/ant-design/ant-design/pull/44485) [#44472](https://github.com/ant-design/ant-design/pull/44472) [@crazyair](https://github.com/crazyair)
Expand Down
2 changes: 0 additions & 2 deletions components/affix/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import React, { createRef, forwardRef, useContext } from 'react';

import classNames from 'classnames';
Expand Down
2 changes: 0 additions & 2 deletions components/alert/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import type { AlertProps } from './Alert';
import InternalAlert from './Alert';
import ErrorBoundary from './ErrorBoundary';
Expand Down
2 changes: 0 additions & 2 deletions components/anchor/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import InternalAnchor from './Anchor';
import AnchorLink from './AnchorLink';

Expand Down
2 changes: 0 additions & 2 deletions components/app/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import classNames from 'classnames';
import type { ReactNode } from 'react';
import React, { useContext } from 'react';
Expand Down
2 changes: 0 additions & 2 deletions components/auto-complete/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import classNames from 'classnames';
import type { BaseSelectRef } from 'rc-select';
import toArray from 'rc-util/lib/Children/toArray';
Expand Down
2 changes: 0 additions & 2 deletions components/avatar/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import type { ForwardRefExoticComponent, RefAttributes } from 'react';
import type { AvatarProps } from './avatar';
import InternalAvatar from './avatar';
Expand Down
2 changes: 0 additions & 2 deletions components/back-top/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import VerticalAlignTopOutlined from '@ant-design/icons/VerticalAlignTopOutlined';
import classNames from 'classnames';
import CSSMotion from 'rc-motion';
Expand Down
2 changes: 0 additions & 2 deletions components/badge/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import classnames from 'classnames';
import CSSMotion from 'rc-motion';
import * as React from 'react';
Expand Down
2 changes: 0 additions & 2 deletions components/breadcrumb/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import Breadcrumb from './Breadcrumb';

export type { BreadcrumbProps } from './Breadcrumb';
Expand Down
2 changes: 0 additions & 2 deletions components/button/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import Button from './button';

export type { SizeType as ButtonSize } from '../config-provider/SizeContext';
Expand Down
2 changes: 0 additions & 2 deletions components/calendar/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import type { Dayjs } from 'dayjs';
import dayjsGenerateConfig from 'rc-picker/lib/generate/dayjs';
import type { CalendarProps } from './generateCalendar';
Expand Down
2 changes: 0 additions & 2 deletions components/card/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import InternalCard from './Card';
import Grid from './Grid';
import Meta from './Meta';
Expand Down
2 changes: 0 additions & 2 deletions components/carousel/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import * as React from 'react';
import type { Settings } from '@ant-design/react-slick';
import SlickCarousel from '@ant-design/react-slick';
Expand Down
2 changes: 0 additions & 2 deletions components/cascader/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import * as React from 'react';
import LeftOutlined from '@ant-design/icons/LeftOutlined';
import LoadingOutlined from '@ant-design/icons/LoadingOutlined';
Expand Down
12 changes: 12 additions & 0 deletions components/checkbox/index.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,15 @@ interface Option {
## Design Token

<ComponentTokenTable component="Checkbox"></ComponentTokenTable>

## FAQ

### Why not work in Form.Item?

Form.Item default bind value to `value` property, but Checkbox value property is `checked`. You can use `valuePropName` to change bind property.

```tsx | pure
<Form.Item name="fieldA" valuePropName="checked">
<Checkbox />
</Form.Item>
```
2 changes: 0 additions & 2 deletions components/checkbox/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import type * as React from 'react';
import type { CheckboxProps } from './Checkbox';
import InternalCheckbox from './Checkbox';
Expand Down
12 changes: 12 additions & 0 deletions components/checkbox/index.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,15 @@ interface Option {
## 主题变量(Design Token)

<ComponentTokenTable component="Checkbox"></ComponentTokenTable>

## FAQ

### 为什么在 Form.Item 下不能绑定数据?

Form.Item 默认绑定值属性到 `value` 上,而 Checkbox 的值属性为 `checked`。你可以通过 `valuePropName` 来修改绑定的值属性。

```tsx | pure
<Form.Item name="fieldA" valuePropName="checked">
<Checkbox />
</Form.Item>
```
2 changes: 0 additions & 2 deletions components/col/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import { Col, type ColProps, type ColSize } from '../grid';

export type { ColProps, ColSize };
Expand Down
2 changes: 0 additions & 2 deletions components/collapse/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import Collapse from './Collapse';

export type { CollapseProps } from './Collapse';
Expand Down
2 changes: 0 additions & 2 deletions components/color-picker/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import ColorPicker from './ColorPicker';

export type { ColorPickerProps } from './ColorPicker';
Expand Down
2 changes: 0 additions & 2 deletions components/config-provider/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import { createTheme } from '@ant-design/cssinjs';
import IconContext from '@ant-design/icons/lib/components/Context';
import type { ValidateMessages } from 'rc-field-form/lib/interface';
Expand Down
2 changes: 0 additions & 2 deletions components/date-picker/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import type { Dayjs } from 'dayjs';
import dayjsGenerateConfig from 'rc-picker/lib/generate/dayjs';
import genPurePanel from '../_util/PurePanel';
Expand Down
2 changes: 0 additions & 2 deletions components/descriptions/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

/* eslint-disable react/no-array-index-key */
import * as React from 'react';
import classNames from 'classnames';
Expand Down
2 changes: 0 additions & 2 deletions components/divider/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import classNames from 'classnames';
import * as React from 'react';
import warning from '../_util/warning';
Expand Down
2 changes: 0 additions & 2 deletions components/drawer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import classNames from 'classnames';
import type { DrawerProps as RcDrawerProps } from 'rc-drawer';
import RcDrawer from 'rc-drawer';
Expand Down
2 changes: 0 additions & 2 deletions components/dropdown/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import InternalDropdown from './dropdown';
import DropdownButton from './dropdown-button';

Expand Down
2 changes: 0 additions & 2 deletions components/empty/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import classNames from 'classnames';
import * as React from 'react';
import { ConfigContext } from '../config-provider';
Expand Down
2 changes: 0 additions & 2 deletions components/float-button/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use client';

import BackTop from './BackTop';
import FloatButton from './FloatButton';
import FloatButtonGroup from './FloatButtonGroup';
Expand Down
Loading

0 comments on commit caa71d4

Please sign in to comment.