Skip to content

Commit

Permalink
Sync 4.21.7 version from Antd (#83)
Browse files Browse the repository at this point in the history
* 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>

* 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>

* 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

* 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>

* 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>

* docs: add changelog 4.21.1 (ant-design#36022)

* docs: title is no loger supported by SubMenuType (ant-design#36037)

* docs: fix menu API table (ant-design#36043)

* docs: fix menu API table

* Update index.en-US.md

* docs: fix demos (ant-design#36040)

* docs: fix demos

* ++

* fix: fix incorrect form status with noStyle (ant-design#36054)

* fix: form status

* test: update test case

* docs: 4.21.2 (ant-design#36055)

* test: improve test cases for Statistic (ant-design#36034)

* test: move test cases to testing lib for Badge (ant-design#36033)

* fix:when props.value is not undefined, can't reset value and focus (ant-design#34728)

* fix: when props.value is not undefined, can't reset value and focus

* test: add test case

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

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

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

* refactor: use jest.fn to replace done logic

* test: sample of moving test to testing lib

* test: check for 17

* refactor: manual control timer for React18

* refactor: animateEnd for useless middle state snapshot for 'handle error'

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

* fix: exporting Rule, FormListFieldData, FormListOperation from form (ant-design#34735)

* fix: exporting RefSelectProps from select (ant-design#34732)

* fix: Typescript - Tree component DirectoryTreeProps, missing Node Type (ant-design#36092)

* fix: edit DirectoryTreeProps

* test: add DirectoryTree type test

* fix: edit type

Co-authored-by: JaylanChen <JaylanChen@126.com>

* fix: Table customize filterDropdown with Menu should not block default selectable (ant-design#36098)

* fix: Table customize Menu should be selectable

* test: Add test case

* test: Update snapshow

* test: change to fakeTimer when error happens sometimes (ant-design#36102)

* docs(:sparkles:): release 4.21.3 (ant-design#36105)

* docs: add locale link in Calender (ant-design#36108)

close ant-design#36107 (comment)

* fix: exporting UploadFile from upload (ant-design#34733)

* fix: Skeleton active style in dark theme (ant-design#36116)

close ant-design#36114

* fix: Table multiple dropdown not closed (ant-design#36132)

* fix: Table dropdown can not close

* test: Test case

* test: cov

* chore: bump rc-util

* chore: reorder

* chore: bump rc-util

* chore: rm test

* chore: clean up

* fix: component.displayName To distinguish the environment (ant-design#36126)

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

* fix: repeat a css class in readOnly, which has been declared in rc-input-number (ant-design#36120)

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

* chore(deps): update dependency inquirer to v9 (ant-design#36121)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: afc163 <afc163@gmail.com>

* chore(deps-dev): bump jsdom from 19.0.0 to 20.0.0 (ant-design#36133)

Bumps [jsdom](https://github.com/jsdom/jsdom) from 19.0.0 to 20.0.0.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md)
- [Commits](jsdom/jsdom@19.0.0...20.0.0)

---
updated-dependencies:
- dependency-name: jsdom
  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>
Co-authored-by: afc163 <afc163@gmail.com>

* docs(Input): add proper type for `inputRef` (ant-design#36135)

* docs(Input): add proper type for `inputRef`

* docs: use `InputRef` instead of `ElementRef`

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

* style: enlarge draggable area for Slider handle (ant-design#36018)

* active skeleton animated with transform

* properties order fixed

* properties order fixed

* properties order fixed

* bigger dragable area for slider handle

* Update components/slider/style/index.less

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

* Update index.less

6px

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

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

* fix: Dropdown with group menu can not close (ant-design#36148)

* test: test driven

* fix: Dropdown with Menu list group

* style: Code style optimization (ant-design#36144)

* style: code style optimization

* style: code style optimization

* style: code style optimization

* style: Remove methed of Array push (ant-design#36157)

* style: code style optimization

* style: code style optimization

* style: code style optimization

* style: code style optimization

* style: fix Button loading icon margin issue (ant-design#36168)

* style: fix Button loading icon margin issue

* test: update snapshot

* test: fix tsx demo error

* chore: prettier components (ant-design#36171)

* test: replace pagination test with test-library (ant-design#36178)

* refactor: performance optimization (ant-design#36177)

* style: code style optimization

* style: code style optimization

* style: code style optimization

* style: code style optimization

* fix: Code style optimization

* style: format

* Corrected grammar in comment in hooks.md (ant-design#36185)

* Fix breaks (ant-design#36186)

* Added type assertion so function no longer returns any/unknown

* Add type constraint since Object.keys is called on this value

* chore: fix Menu deprecated warning when item={undefined} (ant-design#36190)

* fix: type incompatibility in strict mode (ant-design#36189)

* fix: type incompatibility

* fix: type

* fix: Reset the last selection key (ant-design#34705)

* fix: reset last selection key

* reset last selection key when deselect

* fix: add test case

* fix: remove unused code

* fix: enzyme bug

* fix: update test

* styles: remove empty line

* fix: lint error

* test: migrate to testing-libary

* fix: xxx.simulate is not a function

* fix: lint error

* fix: use wrong

* fix: solved test not work

Co-authored-by: dengqing <qing.deng@goldenpig.com.cn>

* fix: Upload listType="picture-card" select button when children is empty (ant-design#36196)

* fix: Upload listType="picture-card" select button should be hidden when children is empty

close ant-design#36183

* test: fix test case

* perf: unify regeneratorRuntime import path for bundle size (ant-design#36200)

* perf: unify regeneratorRuntime import path for bundle size

close ant-design#36198

* Update package.json

* Docs:  FAQ add explanation of null in controlled components. (ant-design#36082)

* docs: fix Chinese language grammar mistake in FAQ

* docs: FAQ add explanation of null in controlled components

* docs: update null in controlled components FAQ

* docs: update null in controlled components FAQ (add lost word)

* docs: null in controlled components FAQ optimization

* docs: FAQ add explanation of null in controlled components (English)

* docs: update faq docs

* docs: update faq docs(chinese)

* docs: optimize faq docs

* Update faq.en-US.md

* Update faq.en-US.md

* Update faq.en-US.md

* Update faq.zh-CN.md

* Update faq.en-US.md

Co-authored-by: shezhangzhang <chenkan@ChenKan-Mac.local>
Co-authored-by: MadCcc <1075746765@qq.com>

* chore: bump rc-util (ant-design#36210)

* fix: nested Table margin style (ant-design#36209)

* fix: nested Table margin style

* fix: tsx demo

* test: update snapshot

* style: fix Table expand icon align issue (ant-design#36215)

* docs: fix English FAQ title (ant-design#36222)

* docs: update valueStyle description (ant-design#36226)

close ant-design#36219

* chore: fix eslint warning and bisheng terminal log (ant-design#36220)

* chore: fix eslint warning

* chore: fix bisheng log

* Update basic.md

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

* docs:update demo code

* docs: update Tabs demo code

* docs: update Tabs demo code

* chore(deps-dev): bump @types/jest-image-snapshot from 4.3.2 to 5.1.0 (ant-design#36229)

Bumps [@types/jest-image-snapshot](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest-image-snapshot) from 4.3.2 to 5.1.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest-image-snapshot)

---
updated-dependencies:
- dependency-name: "@types/jest-image-snapshot"
  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(deps): update dependency remark-cli to v11 (ant-design#36237)

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

* chore: dev config (ant-design#36240)

* fix: popover arrow support custom color (ant-design#36241)

* refactor: wrap Wave with FC (ant-design#36248)

* refactor: wrap Wave with FC

* test: update test case

* docs: add 4.21.4 changelog (ant-design#36246)

* docs: add 4.21.4 changelog

* fix

* reset

* chore(deps-dev): bump cheerio from 1.0.0-rc.10 to 1.0.0-rc.12 (ant-design#36255)

Bumps [cheerio](https://github.com/cheeriojs/cheerio) from 1.0.0-rc.10 to 1.0.0-rc.12.
- [Release notes](https://github.com/cheeriojs/cheerio/releases)
- [Changelog](https://github.com/cheeriojs/cheerio/blob/main/History.md)
- [Commits](cheeriojs/cheerio@v1.0.0-rc.10...v1.0.0-rc.12)

---
updated-dependencies:
- dependency-name: cheerio
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

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

* chore: update Belarusian locale (ant-design#36265)

* Edited Belarusian locale:
 - Added missed entries
 - Fixed some mistakes

* test: update snapshot

Co-authored-by: Aliaksiej Razumaŭ <belarusaed@gmail.com>

* docs: update English sketch file link (ant-design#36269)

* docs: English sketch file links from communicatity

* Update resources.en-US.md

* style(Divider): replace fixed class name with variable (ant-design#36271)

* test: replace test case with test lib (ant-design#36276)

* style: fix Table shadow bug in nested situation (ant-design#36277)

close ant-design#36203

* test: Fix table empty test (ant-design#36290)

* chore: reduce css bundle size (ant-design#36307)

* fix: arrow compatibility (ant-design#36266)

* fix: arrow campatibility

* chore: code clean

* chore: rm useless style

* chore: code clean

* fix: use inset

* chore: bundlesize optimization

* chore: rm useless style

* chore: rm useless style

* fix: Fixed an error when the loading property of the Button component… (ant-design#36288)

* fix: Fixed an error when the loading property of the Button component was passed into null

* Update components/button/button.tsx

Obviously, this suggestion is more concise , thanks a lot

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

* Update components/button/button.tsx

* Update components/button/button.tsx

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

* test: move test cases to testing lib for Spin (ant-design#36317)

* test: move test cases to testing lib for Spin

* fix: types

* fix: lint

* test: move test cases to testing lib for Switch (ant-design#36326)

* add

* test: wave

* fix: type

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

* test: update snapshot

* test: update snapshot

* fix: checkbox should be disabled by form (ant-design#36345)

* fix: checkbox should be disabled by form

* chore: code clean

* test: update snapshot

* chore: snapshot

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

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

* fix: wait for animation

* test: replace layout test case with test lib (ant-design#36323)

* test: replace layout test case with test lib

* test: fix react 18

* test: clean up

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

* docs: v4.21.5 (ant-design#36353)

* docs: v4.21.5

* chore: add try time

* chore: update changelog

* chore(deps): update dependency eslint-plugin-unicorn to v43 (ant-design#36350)

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

* style: Radio focus shadow should be transparency (ant-design#36335)

* fix: ErrorList shaking (ant-design#36358)

* fix: ErrorList shaking

* fix: React 18 test case

* docs: replace lib with es (ant-design#36367)

* fix: Table hover perf (ant-design#36383)

* fix: correct border radius when table has title (ant-design#36384)

* style: fix size of close icon on Modal header (ant-design#36309)

* fix: update default.less, set the @modal-header-close-size to @modal-header-title-line-height + 2 * @modal-header-padding-vertical to keep the close icon in the center of vertical

Signed-off-by: Chang Wei <changwei1006@gmail.com>

* fix: update variable.less, set the @modal-header-close-size to @modal-header-title-line-height + 2 * @modal-header-padding-vertical to keep the close icon in the center of vertical

Signed-off-by: Chang Wei <changwei1006@gmail.com>

* fix: update compact.less, set the @modal-header-close-size to @modal-header-title-line-height + 2 * @modal-header-padding-vertical to keep the close icon in the center of vertical

Signed-off-by: Chang Wei <changwei1006@gmail.com>

* Update index.en-US.md (ant-design#36400)

Fixed a typo

* docs: fix customize calendar example (ant-design#36356)

* docs: fix customize calendar example

* test: changed calendar snapshot

Co-authored-by: lico <lico@licoui-MacBookPro.local>

* docs(Typography): translate docs from English to Chinese (ant-design#36417)

* fix: fix table container z-index (ant-design#36420)

* fix: fix wrong color of date picker with status set (ant-design#35685)

* fix: fix wrong color of date picker with status set

* Update status.less

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

* feat: Update Doc (ant-design#36437)

Co-authored-by: meng.jia <meng.jia@ly.com>

* docs(Typography): fix `editable.onChange` parameter (ant-design#36443)

* fix: Upload item removed should keep status className (ant-design#36439)

* fix: Upload item removed should keep status className

* add test case

* test: fix act warning

* revert act test

* test: update snapshot

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

面包屑部分, "是"应该改为"时"

* fix: breadcrumb seperators hidden when used in list (ant-design#36448)

* style: fix Skeleton active lost border-radius in Safari (ant-design#36445)

* style: fix Skeleton active lost border-radius in Safari

* perf: reduce skeleton css bundle size

* chore: fix bundle size limit

* chore: fix active typing

* docs: 4.21.6 changelog (ant-design#36455)

* feat: Add support to Skeleton, which allow deployer use custom node as prop. (ant-design#36441)

* feat: Skeleton component supports for custom node

* fix: Clear redundant code

* refactor: Remove changes in package.json

* test: Update the snapshot of Skeleton demo

* Update components/skeleton/demo/element.md

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

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

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

fix typo in useWatch.md

* docs: update index.zh-CN.md (ant-design#36471)

去掉文案描述中多的标点

* docs: moment version mismatched issue (ant-design#36473)

ant-design#36465 (comment)

* chore: bump mentions (ant-design#36479)

* fix: Select with percent width leaves unexpected height in Form (ant-design#36484)

* ci: add conch msg (ant-design#36481)

* ci: add conch msg

* Update release-helper.yml

* fix: tooltip cannot close on disabled Radio (ant-design#36483)

* fix: tooltip cannot close on disabled Radio

* test: add test

* ci: split notice (ant-design#36495)

* style: Table expandIcon style when column is fixed and ellipsis (ant-design#36496)

close ant-design#36485

* docs: simplified `Layout` component sample code (ant-design#36497)

the component example code expands to take up the entire monitor screen and is not well read

* chore: bump rc-tooltip (ant-design#36501)

* fix: SVG Upload Preview Error (ant-design#36402)

* Update utils.tsx

* style: unify img styling

Unify the styling  of img attribute setting.

* test: add previewImage test for svg file

Add previewImage test for SVG upload

* fix: remove charset

Remove charset in data url for text content.

* test: fix test

* fix: typo

* fix: correct patching for svg upload error

* fix: correct patching for svg upload error

* test: update test

* fix: fixed the non draggable element did not hide the draggable icon (ant-design#36511)

fix ant-design#33708

* docs: update select documentation

* refactor: move popconfirm content out (ant-design#36530)

* refactor: move popconfirm content out

* fix: lint

* test: update snapshot

* chore: update .gitignore (ant-design#36534)

* add Modal @modal-border-radius less variable (ant-design#36527)

* add Modal @modal-border-radius less variable

* fix:  add less variable

* chore(deps): update dependency eslint-plugin-markdown to v3 (ant-design#36560)

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

* fix: form disabeld support Upload (ant-design#36573)

Co-authored-by: ranrui.cwj <ranrui.cwj@alibaba-inc.com>

* docs: changelog for 4.21.7 (ant-design#36572)

* docs: changelog for 4.21.7

* chore: bump version to 4.21.7

* docs: update changelog

* docs: append a new changelog

* ci: fix publish (ant-design#36580)

* docs: menu faq (ant-design#36604)

* docs: menu faq

* docs: patch codesandbox

* style: fix Table tree data ellipsis style problem (ant-design#36608)

close ant-design#36583

* style: fix Table extra shadow and scrollbar when all columns are fixed

Co-authored-by: weiwang <wren@xuncetech.com>

* feat: Replace input-number part test with testing lib (ant-design#36080)

* feat: Replace input-number part test with testing lib

* feat: update rc-input-number version

* test: move test cases to testing lib for Collapse (ant-design#36227)

* test: move test cases to testing lib for Collapse

* chore: remove useless file

* fix: react 18 concurrent

* chore: remove useless file

* docs: tabpane add `disabled` (ant-design#36634)

close ant-design#36610

* docs: faq for internal API (ant-design#36643)

* fix(Tree): DraggableFn params type (ant-design#36648)

* fix(Tree): DraggableFn params type

* chore: add blank line

* test: add typ test for draggable Fn

* test: add typ test for draggable Fn

Co-authored-by: tianyuan233 <zty.dev@outlook.com>

* fix(modal):  Modal.xxx onCancel close argument is not a function  (ant-design#36600)

* fix(modal):  fix the error of `onCancel` parameter of modal returned by `useModal`

resolve: 36581

ref: ant-design#36581 (comment)

* test(confirm): 补充 modal 测试用例

* test(modal): 添加测试用例

* Revert "fix(modal):  fix the error of `onCancel` parameter of modal returned by `useModal`"

This reverts commit e4fcb3e.

* fix(modal): fix modal onOk/onCancel method is not a valid function when there is a close parameter

closed: ant-design#36581

* chore: cancel the introduction of `noop` from third-party library

* chore: write React.ChangeEvent<E> once (ant-design#36644)

* docs: renew Select dropdownRender demo and FAQ  (ant-design#36665)

* docs: renew Select dropdownRender FAQ and demo

* chore: update snapshot

* chore: fix Select demo tsc

* chore: fix Select demo tsc

* test: move-test-cases-to-testing-lib-for-Radio (ant-design#36664)

* test: move-test-cases-to-testing-lib-for-Radio

* update toMatchSnapshot

Co-authored-by: ranrui.cwj <ranrui.cwj@alibaba-inc.com>

Co-authored-by: dingkang <dingkang0458@gmail.com>
Co-authored-by: 黑雨 <wangning4567@163.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Zack Chang <73225408+jrr997@users.noreply.github.com>
Co-authored-by: 二货机器人 <smith3816@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: MadCcc <1075746765@qq.com>
Co-authored-by: vagusX <vagusX@users.noreply.github.com>
Co-authored-by: Niyaz Akhmetov <axmet180@gmail.com>
Co-authored-by: 叶枫 <7971419+crazyair@users.noreply.github.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: afc163 <afc163@gmail.com>
Co-authored-by: Gabriel Haruki <gabrielharukisatoh@gmail.com>
Co-authored-by: yykoypj <601924094@qq.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: Yuki Zhang <foryuki@outlook.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: Amumu <yoyo837@hotmail.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>
Co-authored-by: csr632 <632882184@qq.com>
Co-authored-by: Humble <745653239@qq.com>
Co-authored-by: zhang lay <lay.zhang@shopee.com>
Co-authored-by: C. T. Lin <chentsulin@gmail.com>
Co-authored-by: Jaylan <JaylanChen@users.noreply.github.com>
Co-authored-by: JaylanChen <JaylanChen@126.com>
Co-authored-by: RainyLiao <90637572+RainyLiao@users.noreply.github.com>
Co-authored-by: Dennis Chen <dennisc695@icloud.com>
Co-authored-by: pfsu <wellssu0@gmail.com>
Co-authored-by: lijianan <574980606@qq.com>
Co-authored-by: Andrew Horn <arhorn@smcm.edu>
Co-authored-by: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Co-authored-by: Dunqing <dengqing0821@gmail.com>
Co-authored-by: dengqing <qing.deng@goldenpig.com.cn>
Co-authored-by: shezhangzhang <chenkan@ChenKan-Mac.local>
Co-authored-by: Tianyuan Zhang <tianyuan233.zhang@gmail.com>
Co-authored-by: 陈帅 <qixian.cs@outlook.com>
Co-authored-by: Aliaksiej Razumaŭ <belarusaed@gmail.com>
Co-authored-by: Alan Deng <alanhaledc@gmail.com>
Co-authored-by: Jamki <13414367591@163.com>
Co-authored-by: kejianfeng <kejianfeng@cvte.com>
Co-authored-by: Yunwoo Ji <unu12073@gmail.com>
Co-authored-by: Chang Wei <changwei1006@gmail.com>
Co-authored-by: Kirill Barsukov <43782731+KirillSBarsukov@users.noreply.github.com>
Co-authored-by: hsk-kr <57546034+hsk-kr@users.noreply.github.com>
Co-authored-by: lico <lico@licoui-MacBookPro.local>
Co-authored-by: 舜岳 <1277952981@qq.com>
Co-authored-by: simplejason <simplejason.coder@gmail.com>
Co-authored-by: NinJa <386805508@qq.com>
Co-authored-by: meng.jia <meng.jia@ly.com>
Co-authored-by: 王小王 <wsp971@163.com>
Co-authored-by: Leon Kattendick <75811671+LeonKattendick@users.noreply.github.com>
Co-authored-by: Dawnlck <chaokai.lck@antgroup.com>
Co-authored-by: Sg <suica@users.noreply.github.com>
Co-authored-by: bobo <625391250@qq.com>
Co-authored-by: Wuxh <wxh16144@qq.com>
Co-authored-by: Jon <31494475+jonioni@users.noreply.github.com>
Co-authored-by: Wuxh <wxh1220@gmail.com>
Co-authored-by: Neil <100huming@gmail.com>
Co-authored-by: fairyland <cwjTerrace@163.com>
Co-authored-by: ranrui.cwj <ranrui.cwj@alibaba-inc.com>
Co-authored-by: dashaowang <40166750+dashaowang@users.noreply.github.com>
Co-authored-by: weiwang <wren@xuncetech.com>
Co-authored-by: tianyuan233 <zty.dev@outlook.com>
Co-authored-by: Zheeeng <hi@zheeeng.me>
  • Loading branch information
Show file tree
Hide file tree
Showing 60 changed files with 2,782 additions and 450 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-helper.yml
Expand Up @@ -28,7 +28,6 @@ jobs:
branch: 'master'
dingding-token: ${{ secrets.DINGDING_BOT_TOKEN }}
dingding-msg: 'CHANGELOG.zh-CN.md'
dingding-delay-minute: 10
msg-title: '# Ant Design {{v}} 发布日志'
msg-poster: 'https://gw.alipayobjects.com/mdn/rms_08e378/afts/img/A*zx7LTI_ECSAAAAAAAAAAAABkARQnAQ'
msg-footer: '💬 前往 [**Ant Design Releases**]({{url}}) 查看更新日志'
Expand All @@ -44,6 +43,7 @@ jobs:
dingding-token: ${{ secrets.DINGDING_BOT_BIGFISH_TOKEN }}
dingding-msg: 'CHANGELOG.zh-CN.md'
dingding-delay-minute: 10
release: false
antd-conch-msg: '🐟 当前 Bigfish 内嵌 antd 版本:'
msg-title: '# Ant Design {{v}} 发布日志'
msg-poster: 'https://gw.alipayobjects.com/mdn/rms_08e378/afts/img/A*zx7LTI_ECSAAAAAAAAAAAABkARQnAQ'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -60,6 +60,7 @@ site/theme/template/Resources/**/*.jsx
site/theme/template/NotFound.jsx
scripts/previewEditor/index.html
components/version/version.tsx
components/version/token.tsx

# Image snapshot diff
__diff_output__/
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.en-US.md
Expand Up @@ -9,6 +9,7 @@ timeline: true

| infrad version | antd version | update content | time |
| --- | --- | --- | --- |
| 4.21.7 | 4.21.7 | Synchronize the update of antd 4.21.7 version | 2022-07-25 |
| 4.21.6 | 4.21.6 | Synchronize the update of antd 4.21.6 version | 2022-07-15 |
| 4.21.4 | 4.21.4 | 1.Synchronize the update of antd 4.21.4 version<br/>2.Modified some styles of the table component<br/>3.The tooltip component has been rolled back to keep it consistent with antd<br/>4.Fix the style problem in the small state of the progress component<br/>5.Fixed the enter event penetration problem of the sorting cell of the table component | 2022-07-04 |
| 4.21.1 | 4.21.2 | 1.Synchronize the update of antd 4.20.2 version<br/> 2.Temporarily removed QuickPicker | 2022-06-16 |
Expand Down Expand Up @@ -37,6 +38,20 @@ if you have some problem, welcome to connect `taofeng.yang@shopee.com` or `lay.z

---

## 4.21.7

`2022-07-18`

- 🆕 Add Skeleton.Node sub-component, allow user customize content of Skeleton. [#36441](https://github.com/ant-design/ant-design/pull/36441) [@DawnLck](https://github.com/DawnLck)
- Form
- 🐞 Fix Form with percentage width Select may leaves unexpected height. [#36484](https://github.com/ant-design/ant-design/pull/36484)
- 🐞 Fix Form disabled but Upload component still uploadable in it. [#36573](https://github.com/ant-design/ant-design/pull/36573) [@cwjTerrace](https://github.com/cwjTerrace)
- 🐞 Fix Tree non-draggable element still render the draggable icon. [#36511](https://github.com/ant-design/ant-design/pull/36511) [@Wxh16144](https://github.com/Wxh16144)
- 🐞 Fix Upload preview error on SVG with `<foreignObject>` and cross-origin links. [#36402](https://github.com/ant-design/ant-design/pull/36402) [@jonioni](https://github.com/jonioni)
- 🐞 Fix that Tooltip cannot close automaticly on disabled Radio. [#36483](https://github.com/ant-design/ant-design/pull/36483)
- 💄 Add Modal Less variable `@modal-border-radius`. [#36527](https://github.com/ant-design/ant-design/pull/36527) [@kkkisme](https://github.com/kkkisme)
- 💄 Fix Table expand icon wrap style when column is fixed and ellipsis. [#36496](https://github.com/ant-design/ant-design/pull/36496)

## 4.21.6

`2022-07-11`
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.zh-CN.md
Expand Up @@ -9,6 +9,7 @@ timeline: true

| infrad 版本号 | 对应 antd 版本号 | 更新内容 | 时间 |
| --- | --- | --- | --- |
| 4.21.7 | 4.21.7 | 同步 antd 4.21.7 版本的更新 | 2022-07-25 |
| 4.21.6 | 4.21.6 | 同步 antd 4.21.6 版本的更新 | 2022-07-15 |
| 4.21.4 | 4.21.4 | 1.同步 antd 4.21.4 版本的更新<br/>2.修改了 table 组件的部分样式<br/>3.回退 tooltip 组件保持与 Antd 一致<br/>4.修复 progress 组件在 small 状态下的样式问题<br/>5.修复了 table 组件排序单元格 enter 事件穿透问题 | 2022-07-04 |
| 4.21.1 | 4.21.2 | 1.同步 antd 4.21.2 版本的更新<br/>2.暂时移除了 QuickPicker 组件 | 2022-06-16 |
Expand Down Expand Up @@ -38,6 +39,20 @@ timeline: true

---

## 4.21.7

`2022-07-18`

- 🆕 新增 Skeleton.Node 子组件,允许用户自定义 Skeleton 的内容。[#36441](https://github.com/ant-design/ant-design/pull/36441) [@DawnLck](https://github.com/DawnLck)
- Form
- 🐞 修复 Form 下设置 Select 百分比宽度时会有未预期空行问题。[#36484](https://github.com/ant-design/ant-design/pull/36484)
- 🐞 修复 Form 设为禁用时、内部的 Upload 组件仍能上传文件的问题。[#36573](https://github.com/ant-design/ant-design/pull/36573) [@cwjTerrace](https://github.com/cwjTerrace)
- 🐞 修复 Tree 非 `draggable` 依然展示可拖拽图标的问题。[#36511](https://github.com/ant-design/ant-design/pull/36511) [@Wxh16144](https://github.com/Wxh16144)
- 🐞 修复 Upload 在预览包含 `<foreignObject>` 及跨域链接的 SVG 文件时发生错误的问题。[#36402](https://github.com/ant-design/ant-design/pull/36402) [@jonioni](https://github.com/jonioni)
- 🐞 修复 Tooltip 在被禁用的 Radio 上时无法自动关闭的问题。[#36483](https://github.com/ant-design/ant-design/pull/36483)
- 💄 添加 Modal Less 变量 `@modal-border-radius`[#36527](https://github.com/ant-design/ant-design/pull/36527) [@kkkisme](https://github.com/kkkisme)
- 💄 修复 Table 开启固定和省略功能的列内的展开按钮换行样式。[#36496](https://github.com/ant-design/ant-design/pull/36496)

## 4.21.6

`2022-07-11`
Expand Down
17 changes: 10 additions & 7 deletions components/_util/ActionButton.tsx
Expand Up @@ -7,7 +7,7 @@ import { convertLegacyProps } from '../button/button';
export interface ActionButtonProps {
type?: LegacyButtonType;
actionFn?: (...args: any[]) => any | PromiseLike<any>;
close: Function;
close?: Function;
autoFocus?: boolean;
prefixCls: string;
buttonProps?: ButtonProps;
Expand All @@ -24,6 +24,10 @@ const ActionButton: React.FC<ActionButtonProps> = props => {
const clickedRef = React.useRef<boolean>(false);
const ref = React.useRef<any>();
const [loading, setLoading] = useState<ButtonProps['loading']>(false);
const { close } = props;
const onInternalClose = (...args: any[]) => {
close?.(...args);
};

React.useEffect(() => {
let timeoutId: any;
Expand All @@ -39,15 +43,14 @@ const ActionButton: React.FC<ActionButtonProps> = props => {
}, []);

const handlePromiseOnOk = (returnValueOfOnOk?: PromiseLike<any>) => {
const { close } = props;
if (!isThenable(returnValueOfOnOk)) {
return;
}
setLoading(true);
returnValueOfOnOk!.then(
(...args: any[]) => {
setLoading(false, true);
close(...args);
onInternalClose(...args);
clickedRef.current = false;
},
(e: Error) => {
Expand All @@ -62,21 +65,21 @@ const ActionButton: React.FC<ActionButtonProps> = props => {
};

const onClick = (e: React.MouseEvent<HTMLButtonElement>) => {
const { actionFn, close } = props;
const { actionFn } = props;
if (clickedRef.current) {
return;
}
clickedRef.current = true;
if (!actionFn) {
close();
onInternalClose();
return;
}
let returnValueOfOnOk;
if (props.emitEvent) {
returnValueOfOnOk = actionFn(e);
if (props.quitOnNullishReturnValue && !isThenable(returnValueOfOnOk)) {
clickedRef.current = false;
close(e);
onInternalClose(e);
return;
}
} else if (actionFn.length) {
Expand All @@ -86,7 +89,7 @@ const ActionButton: React.FC<ActionButtonProps> = props => {
} else {
returnValueOfOnOk = actionFn();
if (!returnValueOfOnOk) {
close();
onInternalClose();
return;
}
}
Expand Down
File renamed without changes.
@@ -1,7 +1,6 @@
import { mount } from 'enzyme';
import React from 'react';
import { act } from 'react-dom/test-utils';
import { render, sleep } from '../../../tests/utils';
import { sleep, render, fireEvent } from '../../../tests/utils';
import { resetWarned } from '../../_util/warning';

describe('Collapse', () => {
Expand All @@ -10,6 +9,15 @@ describe('Collapse', () => {

const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});

// fix React concurrent
function triggerAllTimer() {
for (let i = 0; i < 10; i += 1) {
act(() => {
jest.runAllTimers();
});
}
}

beforeEach(() => {
resetWarned();
});
Expand All @@ -23,16 +31,16 @@ describe('Collapse', () => {
});

it('should support remove expandIcon', () => {
const wrapper = mount(
const { asFragment } = render(
<Collapse expandIcon={() => null}>
<Collapse.Panel header="header" />
</Collapse>,
);
expect(wrapper.render()).toMatchSnapshot();
expect(asFragment().firstChild).toMatchSnapshot();
});

it('should keep the className of the expandIcon', () => {
const wrapper = mount(
const { container } = render(
<Collapse
expandIcon={() => (
<button type="button" className="custom-expandicon-classname">
Expand All @@ -44,49 +52,51 @@ describe('Collapse', () => {
</Collapse>,
);

expect(wrapper.find('.custom-expandicon-classname').exists()).toBe(true);
expect(container.querySelectorAll('.custom-expandicon-classname').length).toBe(1);
});

it('should render extra node of panel', () => {
const wrapper = mount(
const { asFragment } = render(
<Collapse>
<Collapse.Panel header="header" extra={<button type="button">action</button>} />
<Collapse.Panel header="header" extra={<button type="button">action</button>} />
</Collapse>,
);
expect(wrapper.render()).toMatchSnapshot();
expect(asFragment().firstChild).toMatchSnapshot();
});

it('could be expand and collapse', async () => {
const wrapper = mount(
const { container } = render(
<Collapse>
<Collapse.Panel header="This is panel header 1" key="1">
content
</Collapse.Panel>
</Collapse>,
);
expect(wrapper.find('.ant-collapse-item').hasClass('ant-collapse-item-active')).toBe(false);
wrapper.find('.ant-collapse-header').at(0).simulate('click');
wrapper.update();
expect(
container.querySelector('.ant-collapse-item')?.classList.contains('ant-collapse-item-active'),
).toBe(false);
fireEvent.click(container.querySelector('.ant-collapse-header')!);
await sleep(400);
wrapper.update();
expect(wrapper.find('.ant-collapse-item').hasClass('ant-collapse-item-active')).toBe(true);
expect(
container.querySelector('.ant-collapse-item')?.classList.contains('ant-collapse-item-active'),
).toBe(true);
});

it('could override default openMotion', () => {
const wrapper = mount(
const { container, asFragment } = render(
<Collapse openMotion={{}}>
<Collapse.Panel header="This is panel header 1" key="1">
content
</Collapse.Panel>
</Collapse>,
);
wrapper.find('.ant-collapse-header').at(0).simulate('click');
expect(wrapper.render()).toMatchSnapshot();
fireEvent.click(container.querySelector('.ant-collapse-header')!);
expect(asFragment().firstChild).toMatchSnapshot();
});

it('should trigger warning and keep compatibility when using disabled in Panel', () => {
const wrapper = mount(
const { container } = render(
<Collapse>
<Collapse.Panel disabled header="This is panel header 1" key="1">
content
Expand All @@ -98,19 +108,19 @@ describe('Collapse', () => {
'Warning: [antd: Collapse.Panel] `disabled` is deprecated. Please use `collapsible="disabled"` instead.',
);

expect(wrapper.find('.ant-collapse-item-disabled').length).toBe(1);
expect(container.querySelectorAll('.ant-collapse-item-disabled').length).toBe(1);

wrapper.find('.ant-collapse-header').simulate('click');
expect(wrapper.find('.ant-collapse-item-active').length).toBe(0);
fireEvent.click(container.querySelector('.ant-collapse-header')!);
expect(container.querySelectorAll('.ant-collapse-item-active').length).toBe(0);
});

it('should end motion when set activeKey while hiding', async () => {
jest.useFakeTimers();
jest.spyOn(window, 'requestAnimationFrame').mockImplementation(cb => {
setTimeout(cb, 16.66);
});
const spiedRAF = jest
.spyOn(window, 'requestAnimationFrame')
.mockImplementation(cb => setTimeout(cb, 16.66));

let setActiveKeyOuter;
let setActiveKeyOuter: React.Dispatch<React.SetStateAction<React.Key | undefined>>;
const Test = () => {
const [activeKey, setActiveKey] = React.useState();
setActiveKeyOuter = setActiveKey;
Expand All @@ -125,17 +135,18 @@ describe('Collapse', () => {
);
};

const wrapper = mount(<Test />);
const { container } = render(<Test />);

await act(async () => {
setActiveKeyOuter('1');
await Promise.resolve();
jest.runAllTimers();
});

expect(wrapper.render().find('.ant-motion-collapse').length).toBe(0);
triggerAllTimer();

expect(container.querySelectorAll('.ant-motion-collapse').length).toBe(0);

window.requestAnimationFrame.mockRestore();
spiedRAF.mockRestore();
jest.useRealTimers();
});

Expand Down
Expand Up @@ -42627,12 +42627,11 @@ exports[`ConfigProvider components Upload configProvider componentDisabled 1`] =
class=""
>
<div
class="config-upload config-upload-select config-upload-select-text"
class="config-upload config-upload-select config-upload-select-text config-upload-disabled"
>
<span
class="config-upload"
class="config-upload config-upload-disabled"
role="button"
tabindex="0"
>
<input
accept=""
Expand Down Expand Up @@ -42688,35 +42687,7 @@ exports[`ConfigProvider components Upload configProvider componentDisabled 1`] =
</span>
<span
class="config-upload-list-item-card-actions"
>
<button
class="config-btn config-btn-text config-btn-sm config-btn-icon-only config-upload-list-item-card-actions-btn"
disabled=""
title="Remove file"
type="button"
>
<span
aria-label="trash"
class="anticon anticon-trash config-upload-trash"
role="img"
tabindex="-1"
>
<svg
aria-hidden="true"
data-icon="trash"
fill="currentColor"
focusable="false"
height="1em"
viewBox="0 0 16 16"
width="1em"
>
<path
d="M2 4a.5.5 0 010-1h4V2a1 1 0 011-1h3a1 1 0 011 1v1h4a.5.5 0 010 1h-1v10a1 1 0 01-1 1H4a1 1 0 01-1-1V4H2zm11 0H4v10h9V4zm-2.5 3c.28 0 .5.22.5.5v4a.5.5 0 01-1 0v-4c0-.28.22-.5.5-.5zm-4 0c.28 0 .5.22.5.5v4a.5.5 0 01-1 0v-4c0-.28.22-.5.5-.5zm2-1c.28 0 .5.22.5.5v5a.5.5 0 01-1 0v-5c0-.28.22-.5.5-.5zM10 2H7v1h3V2z"
/>
</svg>
</span>
</button>
</span>
/>
</span>
</div>
</div>
Expand Down

0 comments on commit 5955325

Please sign in to comment.