New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: merge feature to master #48735

Merged

li-jia-nan merged 40 commits into master from feature

May 2, 2024

Member

afc163 commented May 2, 2024

中文版模板 / Chinese template

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language	Changelog
🇺🇸 English	--
🇨🇳 Chinese	--

☑️ Self-Check before Merge

⚠️ Please check all items below before requesting a reviewing. ⚠️

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

li-jia-nan and others added 30 commits

April 1, 2024 17:17


          Merge pull request #48209 from ant-design/master

bd9444f

chore: merge master into feature


          feat(upload): support ref.nativeElenent (#48210)

a038583

* feat(upload): support ref.nativeElenent

* test: add unit test

* Update components/upload/__tests__/upload.test.tsx

Signed-off-by: 红 <wxh16144@qq.com>

---------

Signed-off-by: 红 <wxh16144@qq.com>


          Merge pull request #48223 from ant-design/master

f5c00a8

chore: feature merge master


          feat: Mix style framework support (#48229)

* chore: add layer mark

* docs: enable @layer for test

* docs: add doc of third part lib

* docs: update order

* Update docs/react/compatible-style.zh-CN.md

Co-authored-by: lijianan <574980606@qq.com>
Signed-off-by: 二货爱吃白萝卜 <smith3816@gmail.com>

* Update docs/react/compatible-style.en-US.md

Co-authored-by: lijianan <574980606@qq.com>
Signed-off-by: 二货爱吃白萝卜 <smith3816@gmail.com>

* docs: ssr or reset case

---------

Signed-off-by: 二货爱吃白萝卜 <smith3816@gmail.com>
Co-authored-by: lijianan <574980606@qq.com>


          Merge pull request #48256 from ant-design/master

34a7faa

chore: merge master into feature


          chore: update size-limit (#48292)

42c5a2f


          Merge pull request #48293 from ant-design/master

bb74803

chore: merge master into feature


          Merge pull request #48317 from ant-design/master

24a65de

chore: merge master into feature


          feat: Support iconPosition with button icon (#47791)

14f8279

* feat: button support iconPosition

* fix: iconPosition compatible LoadingIcon

* docs(Button): update Button with iconPosition demo

* fix: delete debug type

* fix: iconPosition for InnerLoadingIcon with not existIcon

* chore: update button snapshots

* fix: fixed loading-icon-end style

* chore: refactor buttonContent with genButtonContent

* fix: iconPosition compatible with rtl

* docs(Button): update button with iconPosition demo

* chore: update test

* fix: iconPosition compatible with rtl

* docs(Buttob): add icon-position demo

* restore icon demo

* update snapshots

* docs: update icon button demo

* docs: update iconPosition button demo

* Update components/button/index.zh-CN.md

Co-authored-by: kiner-tang <1127031143@qq.com>
Signed-off-by: George H <default_hyn@163.com>

* Update components/button/index.zh-CN.md

Co-authored-by: kiner-tang <1127031143@qq.com>
Signed-off-by: George H <default_hyn@163.com>

* Update components/button/demo/icon-position.md

Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: George H <default_hyn@163.com>

* Update components/button/index.en-US.md

Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: George H <default_hyn@163.com>

* Update components/button/index.en-US.md

Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: George H <default_hyn@163.com>

---------

Signed-off-by: George H <default_hyn@163.com>
Co-authored-by: kiner-tang <1127031143@qq.com>
Co-authored-by: afc163 <afc163@gmail.com>


          feat: merge master

6dcd6e2


          Merge pull request #48328 from ant-design/merge-master-3

3062dc6

chore: merge master into feature


          feat: Alert support id and ref (#48336)

4621bd9

* feat: Alert support id and ref

* test: add test case

* chore: adjust ts def

---------

Co-authored-by: 二货机器人 <smith3816@gmail.com>


          feat: Input.OTP support mask prop (#48257)

53cbceb

* feat: Input.OTP support mask prop

* fix: fix

* fix: fix

* test: add test case

* test: add test case

* chore: fix

* chore: update

* chore: remove

* chore: rename useOTPSingleValue

* fix: fix

* fix: fix

* chore: rm 3 lib

* chore: add 3 lib

* fix: fix

* fix: fix

* test: fix test case

* test: fix test case

* fix: fix

* fix: fix

---------

Signed-off-by: lijianan <574980606@qq.com>


          Merge pull request #48383 from ant-design/master

4cba8b8

chore: merge master into feature


          feat: Button support autoInsertSpace prop (#48348)

6a7945d

* feat: Button support autoInsertSpaceInButton prop

* demo: update demo

* fix: fix

* test: add test case

* docs: update docs

* chore: deprecated autoInsertSpaceInButton prop

* Update components/button/button.tsx

Co-authored-by: MadCcc <madccc@foxmail.com>
Signed-off-by: lijianan <574980606@qq.com>

* fix: fix

* fix: fix

* Update components/button/button.tsx

Co-authored-by: MadCcc <madccc@foxmail.com>
Signed-off-by: lijianan <574980606@qq.com>

* fix: fix

* Update components/button/button.tsx

Signed-off-by: lijianan <574980606@qq.com>

* fix: fix

* fix: fix

---------

Signed-off-by: lijianan <574980606@qq.com>
Co-authored-by: MadCcc <madccc@foxmail.com>


          feat: wrap prop support boolean (#48391)

a09b9dd

* feat: wrap prop support boolean

* test: add test case

* fix: fix

* fix: fix

* fix: fix

* fix: fix

* fix: fix

* fix: fix

* fix: fix

* test: update

* chore: revert


          demo: update wrap="wrap" => wrap (#48409)

d34ab00


          feat: optimize CascaderProps (#48420)


          Merge pull request #48471 from ant-design/master

8a4a83a

chore: merge master into feature


          feat: add Tabs more props (#48321)

c7f2760

* feat: add Tabs more props

* fix

* fix

* Compatible with moreIcon

* compatible ConfigProvider with the moreIcon

* update site snap

* fix

* fix

* fix

* fix

* fix

---------

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


          feat: add inlineMargin token support form inline layout (#48362)

* feat: add inlineMargin token support form inline layout

* fix

* fix

---------

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


          feat: up form (#48486)

9b72caf


          feat(form): improve scrollToField logic (#48211)

9965d96

* feat(form): improve scrollToField logic

* docs: update form faq

* test: add unit test

* fix: boundary error

* style: update code

ref: #48211 (comment)
ref: #48211 (comment)

* docs: add scrolltofield demo

* chore: update snapshot

* Update components/form/demo/validate-scroll2field.md

Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: 红 <wxh16144@qq.com>

* chore: update demo

* chore: update logic

* chore: update snapshot

* Update components/form/demo/validate-scroll-to-field.tsx

Co-authored-by: lijianan <574980606@qq.com>
Signed-off-by: 红 <wxh16144@qq.com>

* chore: update demo

* chore: update snap

* chore: update

* chore: update demo

* chore: update

* chore: update docs

* chore: update

* chore: update snap

* Update components/form/demo/validate-scroll-to-field.tsx

Co-authored-by: crazyair <crazyair@users.noreply.github.com>

Signed-off-by: 红 <wxh16144@qq.com>

* chore:update logic

* test: add unit test

ref: #28869

* chore: update demo

* test: update snap

* chore: update demo

* chore: update

* chore: update

* chore: fix TS type

* chore: update demo fix layout

* chore: update demo

---------

Signed-off-by: 红 <wxh16144@qq.com>
Co-authored-by: afc163 <afc163@gmail.com>
Co-authored-by: lijianan <574980606@qq.com>


          Merge pull request #48524 from ant-design/master

27c942a

chore: merge master into feature


          chore: merge master into feature

ad7fdb0


          chore: auto merge branches (#48526)

2d237d0

chore: merge master into feature


          feat: Carousel support arrows for switching (#48542)

ed127e9

* feat: Carousel support arrows function

* fix: order matters

* feat: Carousel support arrows in vertical mode

* chore: update snapshot

* Apply suggestions from code review

Signed-off-by: afc163 <afc163@gmail.com>

* chore: fix lint

* chore: fix lint

* chore: dotMargin => dotGap

---------

Signed-off-by: afc163 <afc163@gmail.com>


          Merge pull request #48573 from ant-design/master

5c2e6e3

chore: merge master into feature


          feat: add tabindex option for paragraph button (#48567)

9acde83

* feat: add tabIndex option for paragraph

* test: update snapshot

* test: update test case

* revert: revert the testcase

* test: update test case

* fix: fix the coverage test

* chore: code optimize

* Update index.tsx

Signed-off-by: lijianan <574980606@qq.com>

* Update CopyBtn.tsx

Signed-off-by: lijianan <574980606@qq.com>

* Update transButton.tsx

Signed-off-by: lijianan <574980606@qq.com>

* Update copy.test.tsx

Signed-off-by: lijianan <574980606@qq.com>

* Update CopyBtn.tsx

Signed-off-by: lijianan <574980606@qq.com>

---------

Signed-off-by: lijianan <574980606@qq.com>
Co-authored-by: lijianan <574980606@qq.com>


          test: solve test cov (#48611)

cc51d06

* test: solve test cov

* test: solve test cov

zombieJ and others added 10 commits

April 25, 2024 15:58


          feat: RangePicker support disabledTime info (#48625)

8567e55


          Merge branch 'master' into feature-merge-master

d70de6c


          Merge pull request #48661 from ant-design/feature-merge-master

97b8913

chore: feature merge master


          docs: tree-select supports onPopupScroll (#48636)

4020f65

* docs: tree-select supports onPopupScroll props

* docs: update demo

* docs: update version

* test: update snapshots

* fix: update demo

---------

Co-authored-by: lijianan <574980606@qq.com>


          Merge pull request #48677 from ant-design/master

ba5f9fe

chore: merge master into feature


          feat: Drawer add loading prop to show spinner (#48563)

6f6868f

* feat: Drawer add loading prop to show spinner

* fix: loading replace drawer content while true

* fix: update snap

* fix: update site snap

* fix: increase test coverage

* fix: upate check-site snap

---------

Co-authored-by: ykryshtal <ykryshtal@magnite.com>


          feat: qrcode canvas supports style configuration (#48194)

3fa9d45

* feat: qrcode canvas supports style configuration

* Update components/qr-code/index.zh-CN.md

Co-authored-by: lijianan <574980606@qq.com>
Signed-off-by: thinkasany <480968828@qq.com>

* docs: update version

* fix: typos

* fix: ant-qrcode

* fix: update padding for canvas / svg

* fix: update

* fix: typos

* fix: when borderless padding shouble be 0

* fix: when borderless borderRadius should be 0

* fix: rm Variant

---------

Signed-off-by: thinkasany <480968828@qq.com>
Co-authored-by: lijianan <574980606@qq.com>
Co-authored-by: afc163 <afc163@gmail.com>


          chore: merge master into feature

20f183c


          chore: auto merge branches (#48725)

chore: merge master into feature


          test: add test case (#48724)

7b30c80

stackblitz bot commented May 2, 2024

Run & review this pull request in StackBlitz Codeflow.

Contributor

github-actions bot commented May 2, 2024 •

edited

👁 Visual Regression Report for PR #48735 Failed ❌

🎯 Target branch: master (88f363a)
📖 View Full Report ↗︎

Expected (Branch master)	Actual (Current PR)	Diff
carousel-autoplay.compact.png	carousel-autoplay.compact.png
carousel-autoplay.compact.png	carousel-autoplay.compact.css-var.png
carousel-basic.compact.png	carousel-basic.compact.png
carousel-basic.compact.png	carousel-basic.compact.css-var.png
carousel-component-token.compact.png	carousel-component-token.compact.png
carousel-component-token.compact.png	carousel-component-token.compact.css-var.png
carousel-position.compact.png	carousel-position.compact.png
carousel-position.compact.png	carousel-position.compact.css-var.png
input-otp.compact.png	input-otp.compact.png
input-otp.compact.png	input-otp.compact.css-var.png

Check Full Report for details

Contributor

github-actions bot commented May 2, 2024 •

edited

Contributor

github-actions bot commented May 2, 2024

请注意，当前 PR 是分支间的互相合并，请使用 BranchAutoMerge 标签来进行自动合并。切记不要、不要、不要使用 Squash。

afc163 added the BranchAutoMerge label

socket-security bot commented May 2, 2024

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher
npm/@types/prismjs@1.26.3	None	`0`	19.2 kB	types
npm/@types/progress@2.0.7	None	`0`	6.51 kB	types
npm/@types/react-copy-to-clipboard@5.0.7	None	`0`	4.36 kB	types
npm/@types/react-dom@18.3.0	None	`0`	37.8 kB	types
npm/@types/react-highlight-words@0.16.7	None	`0`	5.53 kB	types
npm/@types/react-resizable@3.0.7	None	`0`	7.1 kB	types
npm/@types/react@18.3.1	None	`0`	438 kB	types
npm/@types/semver@7.5.8	None	`0`	23.3 kB	types
npm/@types/spinnies@0.5.3	None	`0`	8.22 kB	types
npm/@types/tar@6.1.13	None	`0`	30.8 kB	types
npm/@types/throttle-debounce@5.0.2	None	`0`	6.48 kB	types
npm/@types/warning@3.0.3	None	`0`	2.71 kB	types
npm/@typescript-eslint/eslint-plugin@7.8.0	None	`0`	2.69 MB	jameshenry
npm/@typescript-eslint/parser@7.8.0	None	`0`	18 kB	jameshenry
npm/adm-zip@0.5.12	filesystem	`0`	104 kB	cthackers
npm/ali-oss@6.20.0	filesystem	`0`	2.72 MB	fengmk2
npm/antd-img-crop@4.21.0	None	`0`	49.7 kB	nanxiaobei
npm/antd-style@3.6.2	environment	`0`	188 kB	arvinxx
npm/antd-token-previewer@2.0.8	None	`0`	1.22 MB	madccc
npm/axios@1.6.8	network	`0`	1.84 MB	jasonsaayman
npm/cheerio@1.0.0-rc.12	None	`0`	558 kB	feedic
npm/circular-dependency-plugin@5.2.2	None	`0`	10.5 kB	theron
npm/cli-progress@3.12.0	None	`0`	62.2 kB	andidittrich
npm/cross-env@7.0.3	environment	`0`	29.1 kB	kentcdodds
npm/cross-fetch@4.0.0	network	`0`	88.1 kB	lquixada
npm/crypto@1.0.1	None	`0`	778 B	ehsalazar
npm/dekko@0.2.1	filesystem	`0`	8.91 kB	benjycui
npm/dumi-plugin-color-chunk@1.1.0	None	`0`	38.8 kB	wxh16144
npm/dumi@2.3.2	environment, eval, filesystem	`0`	2.89 MB	yifankakaxi
npm/esbuild-loader@4.1.0	None	`0`	34.3 kB	hirokiosame
npm/eslint-config-airbnb@19.0.4	None	`0`	81.7 kB	ljharb
npm/eslint-config-prettier@9.1.0	None	`0`	20.8 kB	lydell
npm/eslint-import-resolver-typescript@3.6.1	None	`0`	45.1 kB	jounqin
npm/eslint-plugin-compat@4.2.0	filesystem	`+1`	56.3 kB	amilajack
npm/eslint-plugin-import@2.29.1	filesystem, unsafe Transitive: environment	`+1`	1.26 MB	ljharb
npm/eslint-plugin-jest@28.3.0	filesystem	`0`	315 kB	simenb
npm/eslint-plugin-jsx-a11y@6.8.0	None	`0`	739 kB	ljharb
npm/eslint-plugin-lodash@7.4.0	filesystem	`0`	320 kB	idok
npm/eslint-plugin-markdown@4.0.1	None	`0`	30.5 kB	eslintbot
npm/eslint-plugin-react-hooks@4.6.2	environment	`0`	118 kB	react-bot
npm/eslint-plugin-react@7.34.1	filesystem	`+1`	915 kB	ljharb
npm/eslint-plugin-unicorn@52.0.0	None	`0`	677 kB	sindresorhus
npm/eslint@8.57.0	environment, filesystem	`+2`	3.45 MB	eslintbot
npm/fast-glob@3.3.2	filesystem	`0`	96.7 kB	mrmlnc
npm/fetch-jsonp@1.3.0	None	`0`	12.4 kB	camsong
npm/fs-extra@11.2.0	None	`+1`	59.6 kB	ryanzim
npm/gh-pages@6.1.1	filesystem, shell	`0`	39.9 kB	tschaub
npm/glob@10.3.12	Transitive: environment	`+1`	895 kB	isaacs
npm/html2sketch@1.0.2	network	`0`	1.87 MB	arvinxx
npm/http-server@14.1.1	environment, filesystem, network	`0`	124 kB	thornjad
npm/husky@9.0.11	environment, filesystem, shell	`0`	3.61 kB	typicode
npm/identity-obj-proxy@3.0.0	None	`0`	8.38 kB	keyanzhang
npm/immer@10.1.1	environment	`0`	627 kB	mweststrate
npm/inquirer@9.2.20	None	`+1`	92.9 kB	sboudrias
npm/is-ci@3.0.1	None	`0`	3.81 kB	sibiraj-s
npm/isomorphic-fetch@3.0.0	Transitive: network	`+1`	169 kB	mattandrews
npm/rc-cascader@3.25.0	environment	`0`	192 kB	zombiej
npm/rc-field-form@2.0.0	environment	`0`	279 kB	afc163
npm/rc-picker@4.5.0	environment	`0`	896 kB	zombiej
npm/rc-tabs@15.0.0	environment	`0`	166 kB	afc163
npm/rc-tree-select@5.20.0	environment	`0`	162 kB	zombiej

🚮 Removed packages: npm/minimist@1.2.8, npm/rc-cascader@3.24.1, npm/rc-field-form@1.44.0, npm/rc-picker@4.4.2, npm/rc-tabs@14.1.1, npm/rc-tree-select@5.19.0

View full report↗︎

Contributor

github-actions bot commented May 2, 2024

size-limit report 📦

Path	Size
`./dist/antd.min.js`	337.7 KB (+844 B 🔺)
`./dist/antd-with-locales.min.js`	385.37 KB (+313 B 🔺)

codesandbox-ci bot commented May 2, 2024

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.

codecov bot commented May 2, 2024 •

edited

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (2e9abf0) to head (7b30c80).
Report is 3 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff            @@
##            master    #48735   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          745       745           
  Lines        12947     12990   +43     
  Branches      3383      3409   +26     
=========================================
+ Hits         12947     12990   +43

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

li-jia-nan approved these changes

View reviewed changes

li-jia-nan merged commit 2f304d1 into master

110 of 111 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment