Skip to content

Commit

Permalink
Zl/v4.21.0 sync (#71)
Browse files Browse the repository at this point in the history
* test: Rewrite mountTest with testing lib (ant-design#35326)

* feat: Form disabled (ant-design#35210)

* feat: add form disabled

* feat: add form disabled

* feat: add radio disabled

* feat: update snap

* feat: add test case

* docs: add instruction about tokenSeparators (ant-design#35329)

* test: replace Empty part test with test lib (ant-design#35289)

* test: replace Empty part test with test lib

* test: update snapshot case

* fix: Switch disabled color in dark theme (ant-design#35332)

* Revert "feat: dropdown auto-focus (ant-design#35307)" (ant-design#35337)

This reverts commit 1ff58d2.

* docs: update Tabs component  onEdit prop describe (ant-design#35271)

* docs: update Tabs component  onEdit prop describe

* docs: update Tabs component  onEdit prop describe

* Apply suggestions from code review

Co-authored-by: afc163 <afc163@gmail.com>

* docs: changelog for 4.20.2 (ant-design#35338)

* docs: add changelog for ant-design#35336

* style: fix Select tag remove icon position (ant-design#35336)

The icon is pushed down a bit

* test: update test case

* test: transfer part of tooltip test case to testing library (ant-design#35362)

* test: refactor test cases of Space (ant-design#35372)

* test: migrate part of anchor tests (ant-design#35371)

* test: migrate part of checkbox tests (ant-design#35354)

* fix: Carousel compatible with vertical property (ant-design#35349)

* chore: fix npm start error in Gitpod

close ant-design#33444

* Revert "chore: fix npm start error in Gitpod"

This reverts commit 978226f.

* fix: table column filter reset is not working (ant-design#35226) (ant-design#35386)

* fix: Respect user provided space item key (ant-design#35344)

* Resolve Ant Design Notification component TypeScript error via adding maxCount as an ArgsProps property (ant-design#35369)

* fix: use less variables for Segmented (ant-design#35387)

* docs: reverse React 18 demo

* feat: Dropdown support autoFocus (ant-design#35391)

* feat: Dropdown support autoFocus

* chore: add bundle size

* test: replace textarea some test case with testing lib (ant-design#35398)

* test: replace textarea some test case with testing lib

* test: full process

* test: mv input test to input scope

* test: fix lint

* refactor: Progress rebuild as function component (ant-design#35393)

* refactor: Progress rebuild as function component

* refactor: Progress rebuild as function component

* refactor: Progress rebuild as function component

* refactor: Progress rebuild as function component

* refactor: Progress rebuild as function component

* refactor: Progress rebuild as function component

* refactor: Progress rebuild as function component

* chore: rm useless console

* chore: rm CODEOWNER since this block github action

* test: transfer tooltip test case to testing library

* ci: trigger the pr check

* test: try to fix the pr check

* test: remove some test case

* test: foreach all placement

* feat: focus menu item automaticly when focusing menu (ant-design#35407)

* feat: focus menu item automaticly when focusing menu

* chore: update mentions

* test: fix test case

* chore: decrease bundle size

* chore: increase bundle size

* fix(<Row/>): wipe out unnecessary prop (ant-design#35409)

* fix: wipe out unnecessary prop

* wipe out unnecessary prop(`row-gap: 0px`) on <Row />

* add test case

* chore: remove unnecessary import

* chore: add  prop to Row and Col

* chore: update snapshot (Form/Grid/Card)

* chore: update snapshot

* chore: move  location

* docs: explain Avatar fallback strategy (ant-design#35415)

The original description was unclear, incomplete, and confusing, requiring a look at the code to understand it, so I revised it to a more understandable version.

* fix: arrow style (ant-design#35401)

* fix: arrow style

* fix: raise arrow z-index

* fix: fix defualt arrow color

* fix: mix shadow

* chore: code clean

* chore: code clean

* fix: use fadeout instead

* test: fix style lint

* test: replace some slepp with jest.runAllTimers

* chore: update snapshot

* Revert "test: replace some slepp with jest.runAllTimers"

This reverts commit ad886d1.

* fix: List.Item ref (ant-design#35321)

* fix: list item ref

* add test

* improve

* fix: List.Item typescript (ant-design#35418)

* chore: eslint add consistent-type-imports (ant-design#35419)

* chore: eslint add consistent-type-imports

* fix avatar

* Update Item.tsx

* chore: change menu icon in site

* docs: update mirror link (ant-design#35424)

* docs: update mirror link

* feat: add modal

* feat: add icon

* chore: code clean

* feat: text

* fix: cancel btn

* chore: split chunks (ant-design#35222)

* chore: split chunks

* chore: update bisheng version

* chore: split @ant-design/icon

* chore: code clean

* chore: test

* chore: split moment

* chore: code clean

* fix: add missing localizations (ant-design#35430)

* Add missing localizations

* Update snapshot

* refactor: Progress type="circle" for some issues (ant-design#35433)

* refactor: Progress type="circle" for some issues

close ant-design#17706
close ant-design#35009
close ant-design#35352

* test: update progress snapshot

* docs: update linecap.md

* Update components/progress/demo/linecap.md

* test: update progress snapshot

* fix: rc-progress@~3.3.1

* fix: rc-progress@~3.3.2

* docs: add 4.20.3 changelog (ant-design#35435)

* docs: add 4.20.3 changelog

* Update CHANGELOG.zh-CN.md

Co-authored-by: afc163 <afc163@gmail.com>

* fix typo

* Update CHANGELOG.zh-CN.md

Co-authored-by: afc163 <afc163@gmail.com>

* Update CHANGELOG.en-US.md

Co-authored-by: afc163 <afc163@gmail.com>

* Update CHANGELOG.zh-CN.md

Co-authored-by: afc163 <afc163@gmail.com>

* fix typo

* fix typo

* fix typo

* fix typo

Co-authored-by: afc163 <afc163@gmail.com>

* feat: edit date-picker to hook (ant-design#35425)

* docs: update demo template (ant-design#35440)

* docs: fix typo (ant-design#35439)

* chore: fixed typo

* chore: fixed typo+1

* chore(deps-dev): bump husky from 7.0.4 to 8.0.1 (ant-design#35451)

Bumps [husky](https://github.com/typicode/husky) from 7.0.4 to 8.0.1.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](typicode/husky@v7.0.4...v8.0.1)

---
updated-dependencies:
- dependency-name: husky
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* test: update snapshot (ant-design#35452)

* chore: optimze LGTM (ant-design#35443)

* chore: optimze LGTM

* chore: type

* fix: dev broken (ant-design#35453)

* chore(deps-dev): upgrade to jest 28 (ant-design#35334)

https://jestjs.io/zh-Hans/docs/upgrading-to-jest28

* fix: bad List.Item type (ant-design#35454) (ant-design#35455)

Co-authored-by: Ron Smeral <ron.smeral@merck.com>

* docs: replace class component with hooks (ant-design#35461)

* docs(badge): replace class component with hooks

* docs(button): replace class component with hooks

* docs(calendar): replace class component with hooks

* docs(card): replace class component with hooks

* docs(button): replace class component with hooks

* chore(deps): remove webpack devDependencies

* refactor: remove cascader displayRender warning (ant-design#35417)

* refactor: remove useless warning (ant-design#35291)

* refactor: remove useless test case

* docs: remove cascader tagRender

* perf: refactor devWarning for production code size (ant-design#35411)

* pref: better code style for production

* refactor `devWarning`

* don't use `useEffect` only wrap `devWarning`

* chore: add 'noop' to coverage

* chore: add test cases for devWarning

* chore: add test case

* chore: update test cases for devWarning

* chore: restore test script command

* fix: remove 'throw new Error'

* should not use `throw` for browser

* chore: update test case for AutoComplete

* perf: add prefix for `devWarning`

* update RegExp for UMD

* add prefix for ES and CJS

* chore: better code style

* perf:

* upgrade antd-tools

* remove `injectWarningCondition`

* rename `devWarning` to `warning`

* chore: better code style

* chore: better code style

* chore: restore hasValidName

* docs: replace class component with hooks (ant-design#35472)

* docs(badge): replace class component with hooks

* docs(button): replace class component with hooks

* docs(calendar): replace class component with hooks

* docs(card): replace class component with hooks

* docs(button): replace class component with hooks

* chore(deps): remove webpack devDependencies

* docs(cascader): replace class component with hooks

* docs(checkbox): replace class component with hooks

* docs(collapse): replace class component with hooks

* docs(comment): replace class component with hooks

* docs(descriptions): replace class component with hooks

* chore: fix LGTM

* docs: indicate that menu items require `key`s (ant-design#35474)

* docs: remove editable in table documentation

close
ant-design#35471 (comment)

* fix: tree checkbox margin in rtl mode (ant-design#35491)

* docs: Table QA about rowSelection renderCell (ant-design#35494)

* Update index.zh-CN.md

之前需要在 可选列的勾选框 中增加 Tooltip,没有在文档中找到相关的文档,通过搜索 issue,以为暂时不支持,看了源码才发现已经支持了。

所以想要完善一下文档,可以方便其他用户找到此内容。

* docs: Table QA about rowSelection renderCell

update US doc

* docs: changelog 4.20.4 (ant-design#35495)

* docs: changelog 4.20.4

* chore: emoji

* docs: replace class component with hooks (ant-design#35500)

* docs(badge): replace class component with hooks

* docs(button): replace class component with hooks

* docs(calendar): replace class component with hooks

* docs(card): replace class component with hooks

* docs(button): replace class component with hooks

* chore(deps): remove webpack devDependencies

* docs(cascader): replace class component with hooks

* docs(checkbox): replace class component with hooks

* docs(collapse): replace class component with hooks

* docs(comment): replace class component with hooks

* docs(descriptions): replace class component with hooks

* docs(config-provider): replace class component with hooks

* docs(date-picker): replace class component with hooks

* test: update snapshot

* fix(statistic): ignore the decimal part when the precision is negative (ant-design#35520)

* test: Update snapshot

* test: Update snapshot (ant-design#35529)

* refactor: Card loading (ant-design#35525)

* feat: card loading with skeleton

* test: update snapshot

* test: add style deps

* chore: import

* docs: update work with us part

* refactor: modal confirm button style (ant-design#35530)

* fix: modal rtl style

* fix: cannot use logic css

* chore: change css writing order

* feat: update changelog

* test: moving to testing-library in `Segmented` (ant-design#35538)

* test(Segmented): moving to testing-library

* chore: cleanup

* fix: test

* test: use click instead of change to fire event

* Update index.test.tsx

* fix: Picker focus & blur not working (ant-design#35552)

* docs: replace class component with hooks (ant-design#35519)

* docs(badge): replace class component with hooks

* docs(button): replace class component with hooks

* docs(calendar): replace class component with hooks

* docs(card): replace class component with hooks

* docs(button): replace class component with hooks

* chore(deps): remove webpack devDependencies

* docs(cascader): replace class component with hooks

* docs(checkbox): replace class component with hooks

* docs(collapse): replace class component with hooks

* docs(comment): replace class component with hooks

* docs(descriptions): replace class component with hooks

* docs(config-provider): replace class component with hooks

* docs(date-picker): replace class component with hooks

* docs(drawer): replace class component with hooks

* docs(dropdown): replace class component with hooks

* docs(dropdown): replace class component with hooks

* docs(empty): replace class component with hooks

* docs(grid): replace class component with hooks

* docs(input): replace class component with hooks

* docs(input-number): replace class component with hooks

* docs(demo): fix lint error

* chore: deprecated rowSelection.onSelectNone and onSelectMultiple (ant-design#35545)

* chore: del unused package && downgrade some packages which related webpack@5 (ant-design#35551)

* docs: changelog 4.20.5 (ant-design#35560)

* chore: Update github action release helper release title

* fix: drawer close speed (ant-design#35339)

* fix: drawer close speed

* chroe: snap

* chroe: test

* chroe: test

* feat: remove file

* feat: 重新整理

* feat: forceRender

* feat: snap

* chroe: test

* chroe: test

* chroe: test

* feat: create event

* feat: diff code

* feat: forceRender

* chore: test (ant-design#35364)

* Update components/drawer/index.tsx

Co-authored-by: afc163 <afc163@gmail.com>

* feat: remove load state

* feat: test

* fix: destroyOnClose

* feat: add load

* fix: update snap

* fix: update snap

* feat: reset test

* feat: docs

* feat: test

* feat: test

Co-authored-by: afc163 <afc163@gmail.com>

* docs: fix 4.20.5 changelog typo (ant-design#35567)

* refactor: reduce empty cycling deps (ant-design#35570)

* chore: rm in root

* chore: fix ts

* test: Update snapshot

* chore: ignore part

* chore: delete extra spaces (ant-design#35582)

Co-authored-by: hezhaoshun <hezhaoshun@cmcm.com>

* docs: replace class component with hooks (ant-design#35580)

* docs(badge): replace class component with hooks

* docs(button): replace class component with hooks

* docs(calendar): replace class component with hooks

* docs(card): replace class component with hooks

* docs(button): replace class component with hooks

* chore(deps): remove webpack devDependencies

* docs(cascader): replace class component with hooks

* docs(checkbox): replace class component with hooks

* docs(collapse): replace class component with hooks

* docs(comment): replace class component with hooks

* docs(descriptions): replace class component with hooks

* docs(config-provider): replace class component with hooks

* docs(date-picker): replace class component with hooks

* docs(drawer): replace class component with hooks

* docs(dropdown): replace class component with hooks

* docs(dropdown): replace class component with hooks

* docs(empty): replace class component with hooks

* docs(grid): replace class component with hooks

* docs(input): replace class component with hooks

* docs(input-number): replace class component with hooks

* docs(demo): fix lint error

* docs(layout): replace class component with hooks

* docs(list): replace class component with hooks

* docs(mentions): replace class component with hooks

* docs: fix code review issue

* chore: bump tools version (ant-design#35594)

* style: fix Table header border when has rowSpan (ant-design#35591)

close ant-design#35577

* docs: Update CHANGELOG.zh-CN.md (ant-design#35604)

* feat: add a new locale tk_TK (ant-design#35605)

* feat: add a new locale tk_TK

* fix: fix moment locale

* feat: table rowSelection.onChange support type (ant-design#35598)

* feat: table rowSelection onChange support method

* docs: update

* chore: rename param

* test: update

* test: update

* Update rebase.yml

* docs: Fix DatePicker throw demo

* style: anchor text is overwritten (ant-design#35612)

Co-authored-by: hezhaoshun <hezhaoshun@cmcm.com>

* docs: replace class component with hooks (ant-design#35613)

* docs(badge): replace class component with hooks

* docs(button): replace class component with hooks

* docs(calendar): replace class component with hooks

* docs(card): replace class component with hooks

* docs(button): replace class component with hooks

* chore(deps): remove webpack devDependencies

* docs(cascader): replace class component with hooks

* docs(checkbox): replace class component with hooks

* docs(collapse): replace class component with hooks

* docs(comment): replace class component with hooks

* docs(descriptions): replace class component with hooks

* docs(config-provider): replace class component with hooks

* docs(date-picker): replace class component with hooks

* docs(drawer): replace class component with hooks

* docs(dropdown): replace class component with hooks

* docs(dropdown): replace class component with hooks

* docs(empty): replace class component with hooks

* docs(grid): replace class component with hooks

* docs(input): replace class component with hooks

* docs(input-number): replace class component with hooks

* docs(demo): fix lint error

* docs(layout): replace class component with hooks

* docs(list): replace class component with hooks

* docs(mentions): replace class component with hooks

* docs: fix code review issue

* docs(modal): replace class component with hooks

* docs: feat components TS demo (ant-design#34742)

* docs: add general components TS demo

* docs: add layout components TS demo

* docs: add navigation components TS demo

* docs: add data entry components TS demo

* chore(deps): add types for qs

* docs: add data display TS demo

* docs: add feedback components TS demo

* docs: add other components TS demo

* chore(deps): add types

* docs: unified demo code style

* docs: fix lint error

* docs: add demo TS type

* docs: fix demo TS type

* test: update snapshot

* docs: fix TS demo

* feat: update Rate character type

* docs: fix lint error

* feat: update Rate character type

* feat: update Rate character type

* fix: Remove Grid row and cell aria roles (ant-design#35616)

close ant-design#35549

* test: move test cases to `@testing/library` for Result (ant-design#35621)

* fix: incorrect position of picker popup (ant-design#35620)

Co-authored-by: yangpj17 <yangpj17@chianunicom.com>

close ant-design#35590

* feat: add-testing-lib (ant-design#35626)

* docs: Convert part demo to ts version (ant-design#35641)

* docs(badge): replace class component with hooks

* docs(button): replace class component with hooks

* docs(calendar): replace class component with hooks

* docs(card): replace class component with hooks

* docs(button): replace class component with hooks

* chore(deps): remove webpack devDependencies

* docs(cascader): replace class component with hooks

* docs(checkbox): replace class component with hooks

* docs(collapse): replace class component with hooks

* docs(comment): replace class component with hooks

* docs(descriptions): replace class component with hooks

* docs(config-provider): replace class component with hooks

* docs(date-picker): replace class component with hooks

* docs(drawer): replace class component with hooks

* docs(dropdown): replace class component with hooks

* docs(dropdown): replace class component with hooks

* docs(empty): replace class component with hooks

* docs(grid): replace class component with hooks

* docs(input): replace class component with hooks

* docs(input-number): replace class component with hooks

* docs(demo): fix lint error

* docs(layout): replace class component with hooks

* docs(list): replace class component with hooks

* docs(mentions): replace class component with hooks

* docs: fix code review issue

* docs(modal): replace class component with hooks

* docs(pagination): replace class component with hooks

* docs(popconfirm): replace class component with hooks

* docs(popover): replace class component with hooks

* docs(progress): replace class component with hooks

* docs(rate): replace class component with hooks

* docs(radio): replace class component with hooks

* docs: jsx to TS demo

* test: improve Select test case (ant-design#35633)

* docs(mentions): fix debounce demo bug (ant-design#35653)

* chore(deps-dev): bump @types/react-resizable from 1.7.4 to 3.0.0 (ant-design#35658)

Bumps [@types/react-resizable](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-resizable) from 1.7.4 to 3.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-resizable)

---
updated-dependencies:
- dependency-name: "@types/react-resizable"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* test: refactor test cases of Timeline with testing library (ant-design#35654)

* test: refactor test cases of TimeLine

* fix: lint errors

* chore(deps-dev): bump react-intl from 5.25.1 to 6.0.1 (ant-design#35659)

Bumps [react-intl](https://github.com/formatjs/formatjs) from 5.25.1 to 6.0.1.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@5.25.1...react-intl@6.0.1)

---
updated-dependencies:
- dependency-name: react-intl
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: fix cheerio for enzyme fix (ant-design#35666)

* docs: 4.20.6 changelog (ant-design#35671)

* docs: 4.20.6 changelog

* docs: fix build

* test: Update snapshot

* refactor: align with popover (ant-design#35676)

* chore: short auto merge time

* chore: update issue check mirror (ant-design#35680)

* fix: division in less for Segmented (ant-design#35701)

* fix: division in less for Segmented

* fix: update

* chore: increase bundle size (ant-design#35709)

* docs: fix mistype (ant-design#35714)

* docs: update demo code (ant-design#35695)

* docs: update demo code

* chore: increase bundle size

* Revert "chore: increase bundle size"

This reverts commit 1c75e5a.

* fix: drawer can not ref form instance when open (ant-design#35706)

* fix: drawer can not ref form instance when open

* fix: test

* feat: div ref

* feat: test

* feat: test

* feat: test

* feat: test

* chore: lock stylelint (ant-design#35725)

* fix: Popover arrow style (ant-design#35717)

* feat: config provider support componentDisabled (ant-design#35718)

* feat: config provider support componentDisable

* test: update snapshot

* docs: update

* chore: code

* docs: componentDisabled version (ant-design#35730)

* test: Replace alert part test with testing lib (ant-design#35736)

Co-authored-by: chenkan1 <chenkan1@huya.com>

* chore(deps-dev): bump typescript from 4.6.4 to 4.7.2 (ant-design#35737)

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.6.4 to 4.7.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](microsoft/TypeScript@v4.6.4...v4.7.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* docs(select): fix type  (ant-design#35726)

* fix: demo ts type

* mend

* Update select-users.md

* chore: move `@types/qs` from deps to devDeps (ant-design#35747)

* feat: Config provider pagination showSizeChanger (ant-design#35750)

* feat: support showSizeChanger

* test: test case

* fix: the ts wrong of card inteface (ant-design#35753)

* fix: the ts wrong of card inteface

* fix: add export cardproprs

* feat: add card type test

* docs(👍): update recommendation (ant-design#35758)

* docs: update recommendation

* Update recommendation.en-US.md

* docs: fix skeleton demo (ant-design#35760)

* refactor: Collapse replace expandIconPosition with logical position (ant-design#35770)

* refactor: change collapse to logic position

* test: Update snapshot

* chore: force trigger CI

* ci: use jest shard (ant-design#35622)

* refactor: bump rc-collapse to stable dom (ant-design#35781)

* chore: bump rc-collapse to stable dom

* chore: clean up

* test: Replace card component test with testing lib (ant-design#35751)

* test: Replace card component test with testing lib

* test: update the snapshot

* docs: add note to custom BackTop demo (ant-design#35625)

* docs: add note to custom BackTop demo

* Apply suggestions from code review

Co-authored-by: afc163 <afc163@gmail.com>

* test: lock eslint-plugin-jest version for false positive

jest-community/eslint-plugin-jest#1128

* test: move test cases to @testing/library for Tabs (ant-design#35796)

* chore(deps): update dependency eslint-plugin-jest to ~26.4.0 (ant-design#35801)

* chore(deps): update dependency eslint-plugin-jest to ~26.4.0

* Update package.json

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: afc163 <afc163@gmail.com>

* feat: change the changelog of 4.20.6 version

* test: move test cases to @testing/library for Image (ant-design#35806)

* docs: changelog for 4.20.7 (ant-design#35804)

* docs: changelog for 4.20.7

* chore: bump version to 4.20.7

* docs: update changelog

* refactor: Fix Dropdown nesting menu injection logic (ant-design#35810)

* refactor: Dependency Inversion

* test: update snapshot

* test: Update snapshot

* test: more

* fix: table dropdown logic

* fix: menu lint

* chore: upgrade to jest-image-snapshot 5.x (ant-design#35818)

* test: move test cases to @testing/library for Modal (ant-design#35785)

* test: move test cases to @testing/library for Modal

* update

* fix: test

* test: add test case for mouse position

* chore: revert

* fix: Progress type="line" strokeLinecap (ant-design#35822)

* docs: fix typo of Menu items code example (ant-design#35832)

* test: move test cases to @testing/library for Drawer (ant-design#35839)

* perf: active skeleton animated with transform (ant-design#35836)

* active skeleton animated with transform

* properties order fixed

* properties order fixed

* properties order fixed

Co-authored-by: afc163 <afc163@gmail.com>

* style: tweak Skeleton margin top style (ant-design#35848)

* docs: update FAQ titles

* test: move test cases to @testing/library for List (ant-design#35850)

* chore: bump rc-dialog & update snapshot

* fix: set jest shard to 2 (ant-design#35831)

* fix: drawer close twice children is undefined (ant-design#35853)

* fix: drawer close twice children is undefined

* fix: drawer close twice children is undefined

* chore: code

* fix: test

* test: update snapshot

* fix: remove extraneous space from rc-segmented version (ant-design#35863)

The extra spaces confuses third-party tooling

* feat: Progress steps support custom strokeColor for each step (ant-design#35855)

* feat: <Progress steps /> could accept string[] as strokeColor

close ant-design#35852
close ant-design#26858

* fix: tsx demo

* docs: add version column

* chore: stlye patch of statistic (ant-design#35874)

* chore: stlye patch of statistic

* test: Udpate snapshot

* test: replace Input part test with test lib (ant-design#35754)

* test: replace Input part test with test lib

* test: test input case

* test: update textarea case

Co-authored-by: z1399 <zhenggq@dtdream.com>
Co-authored-by: afc163 <afc163@gmail.com>

* refactor: pagination mini className (ant-design#35881)

* refactor: pagination mini cls

* test: update snapshot

* test: update snapshot

* chore: code clean

* chore: code clean

* test: update snapshot

* test: update snapshot

* refactor: Wave in React 18 StrictMode (ant-design#35889)

* feat: tabs support popupClassName (ant-design#35892)

* feat: tabs support popupClassName

* docs: update

* fix:border-style for inputNumber addon when rtl (ant-design#35876)

* chore(deps): update dependency @types/jest to v28 (ant-design#35907)

Co-authored-by: Renovate Bot <bot@renovateapp.com>

* ci: fix typo

* fix: 类型“FormListFieldData”上不存在属性“fieldKey”。(ant-design#35883) (ant-design#35884)

* fix: 类型“FormListFieldData”上不存在属性“fieldKey”。(ant-design#35883)

* add deprecated tag to fieldKey

* add changelog

* Revert "add changelog"

This reverts commit 2cc174f.

* chore: update changelog script (ant-design#35916)

* docs: add typography format version

* fix: remove important in radio style (ant-design#35920)

* fix: remove important in radio style

* chore: code clean

* docs: correct types (ant-design#35919)

* docs: correct types

* ++

Co-authored-by: afc163 <afc163@gmail.com>

* test: migrate part of Button tests (ant-design#35869)

* test: migrate part of Affix tests (ant-design#35860)

* docs: add changelog 4.21.0 (ant-design#35915)

* docs: add changelog 4.21.0

* Update CHANGELOG.en-US.md

Co-authored-by: Amumu <yoyo837@hotmail.com>

* Update CHANGELOG.zh-CN.md

Co-authored-by: Amumu <yoyo837@hotmail.com>

* docs: add

* Update CHANGELOG.en-US.md

* docs: fix

* docs: add

* docs: update

* docs: fix

* docs: remove 35407

Co-authored-by: Amumu <yoyo837@hotmail.com>

* Feat: support 'treeExpandAction' prop for TreeSelect (ant-design#35618)

* Feat: support 'treeExpandAction' prop for TreeSelect

* chore: bump rc-tree

* chore: fix lint

* fix: fix directory tree duplicate expandAction

* fix: fix directory tree duplicate expandAction

* fix: fix directory tree duplicate expandAction

* chore: add docs

Co-authored-by: zombiej <smith3816@gmail.com>
Co-authored-by: afc163 <afc163@gmail.com>

* chore: bump bundle size of babel runtime

* docs: Update 4.21.0 changelog

* docs: fix tree demo (ant-design#35927)

* fix: Form.Item noStyle should not be affected by parent Form.Item (ant-design#35849)

* fix: Form.Item noStyle should not be affected by parent Form.Item

* test: update snapshot

* fix: status

* chore: code clean

* fix: modal and drawer

* test: fix lint

* chore: code clean

* refactor: noFormStyle

* chore: code clean

* revert: revert change in Form.Item

* chore: code clean

* test: replace test case with test library (ant-design#35925)

* test: replace test case with test library

* test: replace test case with test library

* test: update snapshots

* docs: clean up useless space

* test: refactor tree with testing lib (ant-design#35937)

* test: tree test

* test: clean up

* chore: bump rc-tree

* test: Update snapshot

* test: Update for react 18

* test: move test cases to testing lib (ant-design#35909)

* test: move test cases to testing lib (ant-design#35900)

* fix: menu items typings (ant-design#35790)

* Fix menu items typings

* add test case for menu item type checking

* fix: cubic-bezier should be animation-timing-function (ant-design#35943)

* chore: upgrade react-slick to 0.29.1 (ant-design#35959)

* chore: upgrade react-slick to 0.29.0

* Update package.json

* chore: fix code (ant-design#35949)

* Fix color generation for grey colors (ant-design#35954)

Co-authored-by: afc163 <afc163@gmail.com>

* fix: modify 'antd' to 'infrad' in loop-banner.md of alert

* test: move test cases to @testing/library for Typography (ant-design#35955)

* test: move test cases to @testing/library for Typography

* fix: waitFor for tooltip test

* fix: sleep to wait copy hide

* test: refactor focus test

* chore: Update it_IT.tsx (ant-design#35970)

Fix italian translation for Table.cancelSort key

* docs: Segmented API type (ant-design#35974)

* Update index.en-US.md

* Update index.zh-CN.md

* fix: modify line-height value to @line-height-base of descriptions component

* chore: fix typo

* chore: bump rc-dialog version (ant-design#35969)

* chore: bump rc-dialog version

* chore: trigger

* chore: trigger

* docs: RM peer conflict demo

* chore: bump deps version

* chore: bump ver

* chore: bump

* chore: bump

* chore: test

* chore: rm peer

* chore: clean all peer

* chor: bump rc-image

* fix: Button has no disabled style when link type (ant-design#35975)

Co-authored-by: MadCcc <1075746765@qq.com>

* fix: `DropdownProps` definition (ant-design#35990)

Co-authored-by: jhonebee <zhangjin19960908@gamil.com>
Co-authored-by: MadCcc <1075746765@qq.com>

* chore(deps-dev): bump stylelint from 14.8.3 to 14.9.0 (ant-design#35998)

Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.8.3 to 14.9.0.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md)
- [Commits](stylelint/stylelint@14.8.3...14.9.0)

---
updated-dependencies:
- dependency-name: stylelint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: update ts config (ant-design#36000)

* fix: Fixed the getContainer property in Image not reading the settings in ConfigProvider (ant-design#36002)

* fix: 35942

* test: 添加测试用例

* fix:

* fix:

* fix: missing semicolon (ant-design#36008)

* Update package.json

* docs: fix onChange description repeated twice (ant-design#36013)

* chore(deps): update dependency stylelint-config-standard to v26 (ant-design#36017)

* chore(deps): update dependency stylelint-config-standard to v26

* chore: ignore selector-not-notation rule

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: afc163 <afc163@gmail.com>

* test: move test cases to testing lib for Statistic (ant-design#36019)

Co-authored-by: afc163 <afc163@gmail.com>

* fix: remove the last tr's border-bottom of table component

* test: replace Table part test with test lib (ant-design#35989)

* test: replace Table part test with test lib

* test: replace table test with test library

* test: update snapshot

* test: replace last mount

* test: fix 18 testing

Co-authored-by: zombiej <smith3816@gmail.com>

* fix: roll back style changes of table component and fix some test case

* fix: roll back style changes of table component and fix some test case

* feat: pull new content from Antd

* fix: remove style change of table component

Co-authored-by: Zack Chang <73225408+jrr997@users.noreply.github.com>
Co-authored-by: 黑雨 <wangning4567@163.com>
Co-authored-by: afc163 <afc163@gmail.com>
Co-authored-by: lalalazero <zzzero520@hotmail.com>
Co-authored-by: Dreamcreative <m543438924@163.com>
Co-authored-by: Walid Cherhane <56094829+walidcherhane@users.noreply.github.com>
Co-authored-by: zombiej <smith3816@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PCCCCCCC <zpc.excel@foxmail.com>
Co-authored-by: linqiqi077 <865530219@qq.com>
Co-authored-by: TrickyPi <33021497+TrickyPi@users.noreply.github.com>
Co-authored-by: haipeng <firemmet@gmail.com>
Co-authored-by: Yanlin Jiang <cncolder@gmail.com>
Co-authored-by: Cooper Veysey <cwveysey@gmail.com>
Co-authored-by: vagusX <vagusX@users.noreply.github.com>
Co-authored-by: MadCcc <1075746765@qq.com>
Co-authored-by: shuaijiumei <63175611+shuaijiumei@users.noreply.github.com>
Co-authored-by: Karott Schu <karott7@gmail.com>
Co-authored-by: parabolazz <parebolayh@outlook.com>
Co-authored-by: Tom Xu <ycxzhkx@gmail.com>
Co-authored-by: zhang lay <lay.zhang@shopee.com>
Co-authored-by: Mykyta Velykanov <nikitavelykanov@gmail.com>
Co-authored-by: 陈帅 <qixian.cs@outlook.com>
Co-authored-by: Yanming Deng <cisolarix@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ron Šmeral <ron.smeral@gmail.com>
Co-authored-by: Ron Smeral <ron.smeral@merck.com>
Co-authored-by: dingkang <dingkang0458@gmail.com>
Co-authored-by: Tony Wu <93302820+tonywu6@users.noreply.github.com>
Co-authored-by: miracles1919 <516571350@qq.com>
Co-authored-by: limingxin <906529775@qq.com>
Co-authored-by: ty888 <1506125048@qq.com>
Co-authored-by: Yuki Zhang <foryuki@outlook.com>
Co-authored-by: 叶枫 <7971419+crazyair@users.noreply.github.com>
Co-authored-by: joson <373693643@qq.com>
Co-authored-by: hezhaoshun <hezhaoshun@cmcm.com>
Co-authored-by: 周晨阳 <59002875+ZZZCNY@users.noreply.github.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>
Co-authored-by: 章鱼 <ryker.zy@gmail.com>
Co-authored-by: Bart Piotrowski <31428082+bartpio@users.noreply.github.com>
Co-authored-by: yykoypj <601924094@qq.com>
Co-authored-by: Niyaz Akhmetov <axmet180@gmail.com>
Co-authored-by: 社长长 <ischenkan@outlook.com>
Co-authored-by: chenkan1 <chenkan1@huya.com>
Co-authored-by: zhao-huo-long <lijiuyi1995@outlook.com>
Co-authored-by: Cong Zhang <dancerphil1994@gmail.com>
Co-authored-by: Long Hao (龙濠) <45565100+LongHaoo@users.noreply.github.com>
Co-authored-by: Gabriel Haruki <gabrielharukisatoh@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Peach <scdzwyxst@gmail.com>
Co-authored-by: MrHadEnough <mrhadenough@users.noreply.github.com>
Co-authored-by: slotDumpling <67586451+slotDumpling@users.noreply.github.com>
Co-authored-by: Mehdi Salem Naraghi <momesana@gmail.com>
Co-authored-by: 郑国庆 <zhengshuai1993816@163.com>
Co-authored-by: z1399 <zhenggq@dtdream.com>
Co-authored-by: Luobo Zhang <zhang.pc3@gmail.com>
Co-authored-by: xrkffgg <xrkffgg@gmail.com>
Co-authored-by: chenxiang <597219320@qq.com>
Co-authored-by: 元凛 <xrkffgg@vip.qq.com>
Co-authored-by: kalykun <984757534@qq.com>
Co-authored-by: Shang Song <14830727+zggmd@users.noreply.github.com>
Co-authored-by: Heaven <18418010+NE-SmallTown@users.noreply.github.com>
Co-authored-by: MasaoBlue <16271994+MasaoBlue@users.noreply.github.com>
Co-authored-by: 龙风 <455947455@qq.com>
Co-authored-by: Christian Lechner <6638938+christian-lechner@users.noreply.github.com>
Co-authored-by: Umberto Gariggio <gariggio@gmail.com>
Co-authored-by: XIN HU <hoosin.git@gmail.com>
Co-authored-by: muxin <a2944938071@163.com>
Co-authored-by: 苯苯 <91561865+robothot@users.noreply.github.com>
Co-authored-by: jhonebee <zhangjin19960908@gamil.com>
Co-authored-by: Taisuke Hinata <hinatades@users.noreply.github.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 56 changed files with 1,090 additions and 882 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/preview-build.yml
Expand Up @@ -30,7 +30,7 @@ jobs:
key: lock-${{ github.sha }}

- name: create package-lock.json
run: npm i --package-lock-only --ignore-scripts --legacy-peer-deps
run: npm i --package-lock-only --ignore-scripts

- name: hack for single file
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/site-deploy.yml
Expand Up @@ -22,7 +22,7 @@ jobs:
key: lock-${{ github.sha }}

- name: create package-lock.json
run: npm i --package-lock-only --ignore-scripts --legacy-peer-deps
run: npm i --package-lock-only --ignore-scripts

- name: hack for single file
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Expand Up @@ -26,7 +26,7 @@ jobs:
key: lock-${{ github.sha }}

- name: create package-lock.json
run: npm i --package-lock-only --ignore-scripts --legacy-peer-deps
run: npm i --package-lock-only --ignore-scripts

- name: hack for single file
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ui.yml
Expand Up @@ -28,7 +28,7 @@ jobs:
node-version: '16'

- name: create package-lock.json
run: npm i --package-lock-only --ignore-scripts --legacy-peer-deps
run: npm i --package-lock-only --ignore-scripts

- name: hack for single file
run: |
Expand Down
3 changes: 2 additions & 1 deletion .stylelintrc.json
Expand Up @@ -37,7 +37,8 @@
"alpha-value-notation": "number",
"color-function-notation": "legacy",
"selector-class-pattern": null,
"selector-id-pattern": null
"selector-id-pattern": null,
"selector-not-notation": null
},
"ignoreFiles": ["components/style/color/{bezierEasing,colorPalette,tinyColor}.less"]
}
107 changes: 28 additions & 79 deletions components/alert/__tests__/__snapshots__/demo-extend.test.ts.snap
Expand Up @@ -1323,89 +1323,38 @@ Array [
`;

exports[`renders ./components/alert/demo/loop-banner.md extend context correctly 1`] = `
Array [
<div
class="ant-alert ant-alert-warning ant-alert-banner"
data-show="true"
role="alert"
<div
class="ant-alert ant-alert-warning ant-alert-banner"
data-show="true"
role="alert"
>
<span
aria-label="exclamation-circle"
class="anticon anticon-exclamation-circle ant-alert-icon"
role="img"
>
<span
aria-label="exclamation-circle"
class="anticon anticon-exclamation-circle ant-alert-icon"
role="img"
>
<svg
aria-hidden="true"
data-icon="exclamation-circle"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
/>
</svg>
</span>
<div
class="ant-alert-content"
>
<div
class="ant-alert-message"
>
<div
class="x0 x1 x2 x3 "
>
<div
style="transition:width 150ms linear;height:auto;width:auto"
>
<div
class="x1 x4 x5 x6"
style="opacity:1;transform:translateY(0px);position:relative"
>
<div>
Notice message one
</div>
</div>
</div>
</div>
</div>
</div>
</div>,
<svg
aria-hidden="true"
data-icon="exclamation-circle"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
/>
</svg>
</span>
<div
class="ant-alert ant-alert-warning ant-alert-banner"
data-show="true"
role="alert"
class="ant-alert-content"
>
<span
aria-label="exclamation-circle"
class="anticon anticon-exclamation-circle ant-alert-icon"
role="img"
>
<svg
aria-hidden="true"
data-icon="exclamation-circle"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
/>
</svg>
</span>
<div
class="ant-alert-content"
>
<div
class="ant-alert-message"
/>
</div>
</div>,
]
class="ant-alert-message"
/>
</div>
</div>
`;

exports[`renders ./components/alert/demo/smooth-closed.md extend context correctly 1`] = `
Expand Down
107 changes: 28 additions & 79 deletions components/alert/__tests__/__snapshots__/demo.test.ts.snap
Expand Up @@ -1323,89 +1323,38 @@ Array [
`;

exports[`renders ./components/alert/demo/loop-banner.md correctly 1`] = `
Array [
<div
class="ant-alert ant-alert-warning ant-alert-banner"
data-show="true"
role="alert"
<div
class="ant-alert ant-alert-warning ant-alert-banner"
data-show="true"
role="alert"
>
<span
aria-label="exclamation-circle"
class="anticon anticon-exclamation-circle ant-alert-icon"
role="img"
>
<span
aria-label="exclamation-circle"
class="anticon anticon-exclamation-circle ant-alert-icon"
role="img"
>
<svg
aria-hidden="true"
data-icon="exclamation-circle"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
/>
</svg>
</span>
<div
class="ant-alert-content"
>
<div
class="ant-alert-message"
>
<div
class="x0 x1 x2 x3 "
>
<div
style="transition:width 150ms linear;height:auto;width:auto"
>
<div
class="x1 x4 x5 x6"
style="opacity:1;transform:translateY(0px);position:relative"
>
<div>
Notice message one
</div>
</div>
</div>
</div>
</div>
</div>
</div>,
<svg
aria-hidden="true"
data-icon="exclamation-circle"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
/>
</svg>
</span>
<div
class="ant-alert ant-alert-warning ant-alert-banner"
data-show="true"
role="alert"
class="ant-alert-content"
>
<span
aria-label="exclamation-circle"
class="anticon anticon-exclamation-circle ant-alert-icon"
role="img"
>
<svg
aria-hidden="true"
data-icon="exclamation-circle"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
/>
</svg>
</span>
<div
class="ant-alert-content"
>
<div
class="ant-alert-message"
/>
</div>
</div>,
]
class="ant-alert-message"
/>
</div>
</div>
`;

exports[`renders ./components/alert/demo/smooth-closed.md correctly 1`] = `
Expand Down
30 changes: 8 additions & 22 deletions components/alert/demo/loop-banner.md
Expand Up @@ -17,30 +17,16 @@ Show a loop banner by using with [react-text-loop-next](https://npmjs.com/packag
import { Alert } from 'infrad';
import React from 'react';
import Marquee from 'react-fast-marquee';
import { TextLoop } from 'react-text-loop-next';

const App: React.FC = () => (
<>
<Alert
banner
message={
<TextLoop mask>
<div>Notice message one</div>
<div>Notice message two</div>
<div>Notice message three</div>
<div>Notice message four</div>
</TextLoop>
}
/>
<Alert
banner
message={
<Marquee pauseOnHover gradient={false}>
I can be a React component, multiple React components, or just some text.
</Marquee>
}
/>
</>
<Alert
banner
message={
<Marquee pauseOnHover gradient={false}>
I can be a React component, multiple React components, or just some text.
</Marquee>
}
/>
);

export default App;
Expand Down
1 change: 1 addition & 0 deletions components/auto-complete/__tests__/focus.test.js
@@ -1,3 +1,4 @@
import React from 'react';
import { act } from 'react-dom/test-utils';
import AutoComplete from '..';
import { render } from '../../../tests/utils';
Expand Down
1 change: 1 addition & 0 deletions components/auto-complete/__tests__/index.test.js
@@ -1,3 +1,4 @@
import React from 'react';
import AutoComplete from '..';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
Expand Down
2 changes: 1 addition & 1 deletion components/auto-complete/index.en-US.md
Expand Up @@ -41,7 +41,7 @@ The differences with Select are:
| status | Set validation status | 'error' \| 'warning' | - | 4.19.0 |
| value | Selected option | string | - | |
| onBlur | Called when leaving the component | function() | - | |
| onChange | Called when select an option or input value change, or value of input is changed | function(value) | - | |
| onChange | Called when selecting an option or changing an input value | function(value) | - | |
| onDropdownVisibleChange | Call when dropdown open | function(open) | - | |
| onFocus | Called when entering the component | function() | - | |
| onSearch | Called when searching items | function(value) | - | |
Expand Down
1 change: 1 addition & 0 deletions components/back-top/__tests__/index.test.js
@@ -1,3 +1,4 @@
import React from 'react';
import BackTop from '..';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
Expand Down
2 changes: 1 addition & 1 deletion components/button/__tests__/delay-timer.test.tsx
@@ -1,4 +1,4 @@
import { useState } from 'react';
import React, { useState } from 'react';
import { act } from 'react-dom/test-utils';
import { fireEvent, render } from '../../../tests/utils';
import Button from '../button';
Expand Down
9 changes: 9 additions & 0 deletions components/button/__tests__/index.test.tsx
Expand Up @@ -328,6 +328,15 @@ describe('Button', () => {
expect(onClick).not.toHaveBeenCalled();
});

it('should match class .ant-btn-disabled when button is disabled and href is not undefined', () => {
const wrapper = render(
<Button href="https://ant.design" disabled>
click me
</Button>,
);
expect(wrapper.container.querySelector('.ant-btn')).toHaveClass('ant-btn-disabled');
});

// https://github.com/ant-design/ant-design/issues/30953
it('should handle fragment as children', () => {
const wrapper = render(
Expand Down
1 change: 1 addition & 0 deletions components/button/__tests__/wave.test.tsx
@@ -1,3 +1,4 @@
import React from 'react';
import Button from '..';
import { fireEvent, render, sleep } from '../../../tests/utils';

Expand Down
4 changes: 3 additions & 1 deletion components/button/button.tsx
Expand Up @@ -247,6 +247,8 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr

const iconType = innerLoading ? 'loading' : icon;

const linkButtonRestProps = omit(rest as AnchorButtonProps & { navigate: any }, ['navigate']);

const classes = classNames(
prefixCls,
{
Expand All @@ -260,6 +262,7 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
[`${prefixCls}-block`]: block,
[`${prefixCls}-dangerous`]: !!danger,
[`${prefixCls}-rtl`]: direction === 'rtl',
[`${prefixCls}-disabled`]: linkButtonRestProps.href !== undefined && mergedDisabled,
},
className,
);
Expand All @@ -276,7 +279,6 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
? spaceChildren(children, isNeedInserted() && autoInsertSpace)
: null;

const linkButtonRestProps = omit(rest as AnchorButtonProps & { navigate: any }, ['navigate']);
if (linkButtonRestProps.href !== undefined) {
return (
<a {...linkButtonRestProps} className={classes} onClick={handleClick} ref={buttonRef}>
Expand Down

0 comments on commit f26ad4d

Please sign in to comment.