chore: Merge master branch into feature branch #23607

dengfuping · 2020-04-26T05:35:46Z

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language	Changelog
🇺🇸 English	Merge master branch into feature branch.
🇨🇳 Chinese	将 master 分支代码合并到 feature 分支。

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

Doc is updated/provided or not needed
Demo is updated/provided or not needed
TypeScript definition is updated/provided or not needed
Changelog is provided or not needed

* refactor(tag): rewrite with hook * fix lint

* chore: Replace domhook with jest.spyon * use mockreturn value when possible * Update tests/shared/focusTest.js

* fix: include tests in type check * Do lint *.md * Improve types in tests

* refactor(slider): rewrite with hook * improve test * Revert "improve test" This reverts commit 48cd83d. * improve test * improve test 2

close #23470

* Update migration-v4.zh-CN.md * Update migration-v4.en-US.md

…CTION_INVERT (#23462) * fix:selections type when use SELECTION_ALL | SELECTION_INVERT * fix: Table selections type when use Table.SELECTION_ALL or Table.SELECTION_INVERT * fix: Table selections type when use Table.SELECTION_ALL or Table.SELECTION_INVERT * Update useSelection.tsx * Update type.test.tsx Co-authored-by: 二货机器人 <smith3816@gmail.com>

should be same as 3.x

close #13955

* style: optimize alert rtl tyle * fix dark

* 🎬 improve Input demo code * style: fix Input.Search height stretched by suffix close #23523 * fix react key warning * ✅ fix demo snapshot

* refactor(comment): rewrite with hook * improve comment code

* Add flex on steps to fix ie11 * Ordering

* 🎬 optimize Table demo code * ✅ fix demo snapshot * 🐛 Fix Table warning when pageSize is changed close #23554 * remove console.log * optimize demo code

* Add navigation for domestic mirror sites * use A tag

* Update data-display.zh-CN.md * Update data-display.en-US.md

* update docs for less-loader@6 * Revert "update docs for less-loader@6" This reverts commit 5be1a42. * update * update * update * in line

close #23588

tests-checker

Could you please add tests to make sure this change works as expected?

ant-design-bot · 2020-04-26T05:38:30Z

afc163 · 2020-04-26T05:50:25Z

分支错了，应该是合并到 feature 分支。

codesandbox-ci · 2020-04-26T06:14:46Z

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit a400014:

Sandbox	Source
antd reproduction template	Configuration

afc163 · 2020-04-26T06:36:05Z

好像有 lint 错误。

* fix: anchor regexp (#23577) * test: fix anchor complete href scrollTo test * test: anchor sharp matcher regexp * test: Anchor render perfectly for complete href - hash router

components/table/interface.tsx

close #23610

afc163 · 2020-04-26T08:34:03Z

merge-master 分支可以再合并一下 master，上面有新东西了。

codecov · 2020-04-26T08:41:27Z

Codecov Report

Merging #23607 into feature will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           feature   #23607   +/-   ##
========================================
  Coverage    98.51%   98.51%           
========================================
  Files          363      363           
  Lines         7254     7254           
  Branches      2009     2009           
========================================
  Hits          7146     7146           
  Misses         108      108

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a400014...a400014. Read the comment docs.

…master

hengkx and others added 30 commits April 22, 2020 10:59

refactor(tag): rewrite with hook (#23466)

cf3d611

* refactor(tag): rewrite with hook * fix lint

style: optimize tabs rtl style (#23471)

677168b

chore: Replace domhook with jest.spyon (#23469)

55265ac

* chore: Replace domhook with jest.spyon * use mockreturn value when possible * Update tests/shared/focusTest.js

fix: include tests in type check (#23452)

64cb958

* fix: include tests in type check * Do lint *.md * Improve types in tests

💄 fix DatePicker/TimePicker disabled icon color (#23478)

c550cb0

refactor(slider): rewrite with hook (#23474)

b7e877a

* refactor(slider): rewrite with hook * improve test * Revert "improve test" This reverts commit 48cd83d. * improve test * improve test 2

chore: Transform alert test to typescript (#23495)

8008711

fix: Tree custom icon missing when loading (#23494)

17f7e2f

close #23470

docs: Mention filterOption params change in doc (#23501)

d77c2e8

* Update migration-v4.zh-CN.md * Update migration-v4.en-US.md

💄 fix DatePicker/TimePicker icon color (#23508)

835bcab

should be same as 3.x

🐛 Fix Menu behavior when hover gap (#23511)

cd34b62

close #13955

update Compatibility intro (#23513)

fb2ef64

docs: Update research result image (#23519)

8ec4d3f

style: complete upload rtl (#23520)

eb5c7ff

fix: upload disabled hover border (#23522)

be72d17

style: optimize alert rtl tyle (#23526)

facbe46

* style: optimize alert rtl tyle * fix dark

fix: 🐛 Input.Search height affected by suffix (#23527)

d2c541b

* 🎬 improve Input demo code * style: fix Input.Search height stretched by suffix close #23523 * fix react key warning * ✅ fix demo snapshot

refactor(comment): rewrite with hook (#23498)

6401da2

* refactor(comment): rewrite with hook * improve comment code

docs: 📖 fixed link path for components

f9c56b6

docs: fixed link path for components (#23533)

eb83d6b

url navigates to correct component listing (#23540)

4f1ad3e

Update README.md

6556b58

🆙 upgrade intersection-observer

7cf20f1

fix(steps): Add flex on steps to fix ie11 (#23561)

289dd08

* Add flex on steps to fix ie11 * Ordering

chore: 🎬 optimize Table demo code (#23560)

d860358

* 🎬 optimize Table demo code * ✅ fix demo snapshot * 🐛 Fix Table warning when pageSize is changed close #23554 * remove console.log * optimize demo code

chore: Add navigation for China mirror site (#23562)

fb46b8a

* Add navigation for domestic mirror sites * use A tag

style: optimize steps rtl (#23564)

dfcaa40

Fix ie11 flex in steps (#23566)

d214049

docs: 📖 Update data-display.zh-CN.md (#23567)

6a49973

* Update data-display.zh-CN.md * Update data-display.en-US.md

afc163 and others added 4 commits April 26, 2020 11:00

✅ fix demo snapshot

c9c44c1

docs: update docs for less-loader@6 (#23603)

656b5ab

* update docs for less-loader@6 * Revert "update docs for less-loader@6" This reverts commit 5be1a42. * update * update * update * in line

🐛 Fix Input suffix align issue (#23606)

3ddc99c

close #23588

chore: Merge master branch and fix conflicts

f955620

pr-triage bot added the PR: unreviewed label Apr 26, 2020

tests-checker bot suggested changes Apr 26, 2020

View reviewed changes

pr-triage bot added PR: reviewed-changes-requested and removed PR: unreviewed labels Apr 26, 2020

dengfuping changed the base branch from master to feature April 26, 2020 05:55

fix: anchor regexp (#23577) (#23595)

4c9d038

* fix: anchor regexp (#23577) * test: fix anchor complete href scrollTo test * test: anchor sharp matcher regexp * test: Anchor render perfectly for complete href - hash router

afc163 reviewed Apr 26, 2020

View reviewed changes

components/table/interface.tsx Show resolved Hide resolved

afc163 and others added 2 commits April 26, 2020 16:21

🐛 Fix Button loading style of icon-only (#23614)

89bccf5

close #23610

fix(ci): lint error

eda0064

dengfuping requested a review from zombieJ as a code owner April 26, 2020 08:26

pr-triage bot added PR: unreviewed and removed PR: reviewed-changes-requested labels Apr 26, 2020

Merge branch 'master' of github.com:ant-design/ant-design into merge-…

a400014

…master

afc163 approved these changes Apr 26, 2020

View reviewed changes

pr-triage bot added PR: partially-approved and removed PR: unreviewed labels Apr 26, 2020

dengfuping merged commit 8d4ede4 into feature Apr 26, 2020

dengfuping deleted the merge-master branch April 26, 2020 09:49

pr-triage bot added PR: merged and removed PR: partially-approved labels Apr 26, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Merge master branch into feature branch #23607

chore: Merge master branch into feature branch #23607

dengfuping commented Apr 26, 2020 •

edited by markdownify bot

tests-checker bot left a comment

ant-design-bot commented Apr 26, 2020 •

edited

afc163 commented Apr 26, 2020

codesandbox-ci bot commented Apr 26, 2020 •

edited

afc163 commented Apr 26, 2020

afc163 commented Apr 26, 2020

codecov bot commented Apr 26, 2020 •

edited

chore: Merge master branch into feature branch #23607

chore: Merge master branch into feature branch #23607

Conversation

dengfuping commented Apr 26, 2020 • edited by markdownify bot

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self Check before Merge

tests-checker bot left a comment

Choose a reason for hiding this comment

ant-design-bot commented Apr 26, 2020 • edited

afc163 commented Apr 26, 2020

codesandbox-ci bot commented Apr 26, 2020 • edited

afc163 commented Apr 26, 2020

afc163 commented Apr 26, 2020

codecov bot commented Apr 26, 2020 • edited

Codecov Report

dengfuping commented Apr 26, 2020 •

edited by markdownify bot

ant-design-bot commented Apr 26, 2020 •

edited

codesandbox-ci bot commented Apr 26, 2020 •

edited

codecov bot commented Apr 26, 2020 •

edited