merge code from ant-design #1

HamburgerTwo · 2019-06-19T08:05:41Z

First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

Make sure that you propose PR to right branch: bugfix for master, feature for latest active branch feature-x.x.
Make sure that you follow antd's code convention.
Run npm run lint and fix those errors before submitting in order to keep consistent code style.
Rebase before creating a PR to keep commit history clear.
Add some descriptions and refer relative issues for you PR.

Extra checklist:

if isBugFix :

Make sure that you add at least one unit test for the bug which you had fixed.

elif isNewFeature :

Update API docs for the component.
Update/Add demo to demonstrate new feature.
Update TypeScript definition for the component.
Add unit tests for the feature.

chore: merge master into feature

* feat: ConfigProvider support classNames and styles for Empty * fix * fix

* test: fix test case * test: ignore image diff

chore: master merge feature

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

* Revert "fix(layout): enhance Sider zero-width-trigger selector specificity (#51936)" This reverts commit a5dc406. * fix: resolve the style not taking effect error

* docs: changelog of 5.23.0 * fix: typo * fix: lint * docs: back of * docs: update desc * docs: reorder * docs: fix docs mistake * Update CHANGELOG.en-US.md Co-authored-by: thinkasany <480968828@qq.com> Signed-off-by: 二货爱吃白萝卜 <smith3816@gmail.com> --------- Signed-off-by: 二货爱吃白萝卜 <smith3816@gmail.com> Co-authored-by: thinkasany <480968828@qq.com>

* ci: unlock runner version * chore: update related: softprops/action-gh-release#556 ref：slsa-framework/slsa-github-generator#4036

chore: merge master into feature

* chore: add local visual regression * chore: add blog * chore: update english version * chore: 不用考虑移动，都改为 copy 即可 * chore: update * chore: update * Revert "chore: update" This reverts commit 4dbc5d4. * chore: update

* docs(changelog): repair img display * fix * fix

* feat: try recover history size when collapsed * update: update shouldUseCache condition * fix: it should recover history size when collapse back * test: add Splitter test use fallback size when collapse back * Apply suggestions from code review Signed-off-by: afc163 <afc163@gmail.com> * Update components/splitter/hooks/useResize.ts Signed-off-by: afc163 <afc163@gmail.com> * Update components/splitter/hooks/useResize.ts Signed-off-by: afc163 <afc163@gmail.com> --------- Signed-off-by: afc163 <afc163@gmail.com> Co-authored-by: sagajiang@tencent.com <sagajiang@tencent.com> Co-authored-by: afc163 <afc163@gmail.com>

Co-authored-by: WB01676250 <jl01676250@antgroup.com>

* doc: update duration version * test: update test

* fix: Button style of preset * chore: add info of fix * docs: update demo * chore: fix lint * test: update snapshot * fix: color of link * test: update snapshot * test: update snapshot

* docs: changelog of 5.24.1 * chore: fix lint * chore: miss en ver * chore: fix en

* refactor: use breakpoint * refactor: add hooks * chore: clean up * chore: fix logic * chore: fix logic * chore: fix ts * chore: fix ts

* refactor: rewrite renderSeparator to FC * refactor: rewrite renderSeparator to FC * refactor: rewrite renderSeparator to FC * fix: fix

* pref: improve animation performance * pref: improve animation performance

to #52860 Co-authored-by: 绍晗 <zhaoshaoting.zst@alibaba-inc.com>

* chore: fix input css var * Update debug-token.tsx Signed-off-by: 二货爱吃白萝卜 <smith3816@gmail.com> --------- Signed-off-by: 二货爱吃白萝卜 <smith3816@gmail.com>

Co-authored-by: thinkasany <480968828@qq.com>

* Revert "chore: fix input css var (#52887)" This reverts commit 9b854e4. * fix input css var again background: https://github.com/ant-design/ant-design/pull/52887/files#r1961100417 * chore: update

* docs(dropdown): correct button default 'size' value to 'middle' * docs(dropdown): synchronize button type --------- Co-authored-by: thinkasany <480968828@qq.com>

* fix: dropdown submenu arrow wrong direction in rtl * test: dropdown arrow direction in rtl mode * Update components/dropdown/dropdown.tsx Signed-off-by: lijianan <574980606@qq.com> --------- Signed-off-by: lijianan <574980606@qq.com> Co-authored-by: thinkasany <480968828@qq.com> Co-authored-by: lijianan <574980606@qq.com>

* fix: update genStyleUtils to correct linkStyle * feat: compatible with the "a" tag inside the element --------- Co-authored-by: thinkasany <480968828@qq.com>

…#52891) * feat(Watermark): remove 'hidden' when append watermark, prevent hide watermark by editing DOM attributes * Update components/watermark/useWatermark.ts Signed-off-by: afc163 <afc163@gmail.com> --------- Signed-off-by: afc163 <afc163@gmail.com> Co-authored-by: afc163 <afc163@gmail.com>

…lumn (#52899) Co-authored-by: liuqiang <qiang.liu@xinjifamily.com>

* docs: update App FAQ * Update components/app/index.zh-CN.md Co-authored-by: Amumu <yoyo837@hotmail.com> Signed-off-by: lijianan <574980606@qq.com> --------- Signed-off-by: lijianan <574980606@qq.com> Co-authored-by: Amumu <yoyo837@hotmail.com>

* docs[upload]: correct disabled styles * chore: update demo snap (upload, form) * chore: restore the disabled attribute

Bumps the dev-dependencies group with 1 update: [pixelmatch](https://github.com/mapbox/pixelmatch). Updates `pixelmatch` from 6.0.0 to 7.1.0 - [Release notes](https://github.com/mapbox/pixelmatch/releases) - [Commits](mapbox/pixelmatch@v6.0.0...v7.1.0) --- updated-dependencies: - dependency-name: pixelmatch dependency-type: direct:development update-type: version-update:semver-major dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

dengfuping force-pushed the master branch from d0fa0f4 to 54a992c Compare July 13, 2019 08:58

afc163 force-pushed the master branch from fe4f2d5 to e2029e3 Compare March 13, 2020 04:18

afc163 force-pushed the master branch from a5ded9e to 5203d25 Compare May 23, 2020 14:07

delete-merged-branch bot deleted the branch BY-HealthFED:master February 16, 2021 08:34

delete-merged-branch bot deleted the master branch February 16, 2021 08:34

MadCcc force-pushed the master branch from c0b9b07 to 483c8d3 Compare June 27, 2022 09:45

MadCcc force-pushed the master branch from 5df1131 to 18f9be6 Compare March 31, 2024 05:25

thinkasany and others added 23 commits January 3, 2025 11:38

chore: lock react-intl@7.0.4 (#52218)

bc03cca

fix: conflict

34d8bfb

test: update snap

5163516

chore: auto merge branches (#52219)

32bc7fd

chore: merge master into feature

feat: ConfigProvider support classNames and styles for Empty (#52208)

9fcce8f

* feat: ConfigProvider support classNames and styles for Empty * fix * fix

docs: improve semantic list for Card (#52221)

bcc802d

test: fix test case (#52224)

6139162

* test: fix test case * test: ignore image diff

chore: auto merge branches (#52223)

e9fb0bd

chore: master merge feature

chore: code optimization (#52228)

0386b9b

fix(Menu): extra fontSize and vertical align (#52217)

ae6a034

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

fix: resolve the style not taking effect error (#52210)

46a8eff

* Revert "fix(layout): enhance Sider zero-width-trigger selector specificity (#51936)" This reverts commit a5dc406. * fix: resolve the style not taking effect error

chore: bump rc-virtual-list (#52238)

46eca8d

type: update any type to Record (#52240)

968820a

docs: use styles.body replace bodyStyle (#52245)

b7295d7

fix: use styles replace labelStyle/contentStyle for Description (#52251)

8dc2636

chore: opt check npm versions

475258f

chore: fix website deploy action (#52260)

eede859

* ci: unlock runner version * chore: update related: softprops/action-gh-release#556 ref：slsa-framework/slsa-github-generator#4036

chore: auto merge branches (#52266)

9334e33

chore: merge master into feature

docs: repair img display for change doc (#52273)

8b99ad6

* docs(changelog): repair img display * fix * fix

docs: Replace open in tab code (#52277)

9974e8c

Co-authored-by: WB01676250 <jl01676250@antgroup.com>

li-jia-nan and others added 30 commits February 15, 2025 20:20

doc: update duration version (#52832)

7ecec7f

* doc: update duration version * test: update test

docs: add deprecated for tooltip (#52834)

2149450

ci: Add try catch to issue inactivity reminder script (#52831)

a7f33f2

lint: reopen no-new-array rules (#52826)

f7d9e33

fix: Button missing primary style (#52812)

63cbe9e

* fix: Button style of preset * chore: add info of fix * docs: update demo * chore: fix lint * test: update snapshot * fix: color of link * test: update snapshot * test: update snapshot

docs: changelog of 5.24.1 (#52848)

080f780

* docs: changelog of 5.24.1 * chore: fix lint * chore: miss en ver * chore: fix en

fix: arrow motion of it (#52854)

ddd403f

perf[menu]: Optimize expandIcon rerender (#52863)

e7b0a9c

fix: Layout.Sider content overflow when collapsedWidth={0} (#52862)

70ccc04

ci: try fix CI deploy failure (#52864)

0e8ed2c

fix: token calc of padding input (#52865)

a8f116f

refactor: use breakpoint by Copilot AI (#52870)

dd20460

* refactor: use breakpoint * refactor: add hooks * chore: clean up * chore: fix logic * chore: fix logic * chore: fix ts * chore: fix ts

refactor: rewrite renderSeparator to FC (#52841)

c3777d2

* refactor: rewrite renderSeparator to FC * refactor: rewrite renderSeparator to FC * refactor: rewrite renderSeparator to FC * fix: fix

refactor: improve animation performance (#52881)

0fb32e7

* pref: improve animation performance * pref: improve animation performance

fix: adjust input underlined height (#52861)

3bc18c3

to #52860 Co-authored-by: 绍晗 <zhaoshaoting.zst@alibaba-inc.com>

chore: fix input css var (#52887)

9b854e4

* chore: fix input css var * Update debug-token.tsx Signed-off-by: 二货爱吃白萝卜 <smith3816@gmail.com> --------- Signed-off-by: 二货爱吃白萝卜 <smith3816@gmail.com>

perf(OTP): useState initializer function called only once (#52878)

444f579

Co-authored-by: thinkasany <480968828@qq.com>

chore: fix input css var again (#52892)

accc036

* Revert "chore: fix input css var (#52887)" This reverts commit 9b854e4. * fix input css var again background: https://github.com/ant-design/ant-design/pull/52887/files#r1961100417 * chore: update

docs(dropdown): correct button default 'size' value to 'middle' (#52894)

d5d9a36

* docs(dropdown): correct button default 'size' value to 'middle' * docs(dropdown): synchronize button type --------- Co-authored-by: thinkasany <480968828@qq.com>

fix: update genStyleUtils to correct linkStyle (#52888)

8ecdc72

* fix: update genStyleUtils to correct linkStyle * feat: compatible with the "a" tag inside the element --------- Co-authored-by: thinkasany <480968828@qq.com>

fix: fix incorrect icon orientation in rtl mode (#52896)

2880c35

fix(Table):The single word column title does not wrap for sortable co…

6eebde3

…lumn (#52899) Co-authored-by: liuqiang <qiang.liu@xinjifamily.com>

chore: update version support text (#52900)

18d6384

docs: update App FAQ (#52904)

883b17f

* docs: update App FAQ * Update components/app/index.zh-CN.md Co-authored-by: Amumu <yoyo837@hotmail.com> Signed-off-by: lijianan <574980606@qq.com> --------- Signed-off-by: lijianan <574980606@qq.com> Co-authored-by: Amumu <yoyo837@hotmail.com>

chore: enable react-scan in development (#52910)

3b5b2a0

demo(form): correct disabled styles (#52912)

8a3c690

* docs[upload]: correct disabled styles * chore: update demo snap (upload, form) * chore: restore the disabled attribute

docs: docs update (#52918)

7134c5d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge code from ant-design #1

merge code from ant-design #1

HamburgerTwo commented Jun 19, 2019

merge code from ant-design #1

Are you sure you want to change the base?

merge code from ant-design #1

Conversation

HamburgerTwo commented Jun 19, 2019