Skip to content
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.

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

chore: feature merge master #45944

Merged
merged 9 commits into from Nov 17, 2023
Merged

chore: feature merge master #45944

merged 9 commits into from Nov 17, 2023

Conversation

MadCcc
Copy link
Member

@MadCcc MadCcc commented Nov 17, 2023

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Performance optimization
  • Enhancement feature
  • Internationalization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Workflow
  • Other (about what?)

🔗 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

🚀 Summary

🤖[deprecated] Generated by Copilot at ff462ad

This pull request fixes some zIndex issues for various components, adds a new prop to the Button component, improves the useZIndex hook and its test cases, cleans up some unused or redundant code and tokens, refactors the ConfirmDialog component, enhances the nested modal example, updates the Next.js documentation, and marks a deprecated version.

🔍 Walkthrough

🤖[deprecated] Generated by Copilot at ff462ad

  • Fix and simplify the useZIndex hook logic and test cases, where the zIndex value is computed based on the component type, parent zIndex, and token value, and the max zIndex value for the container components is limited by the CONTAINER_MAX_OFFSET constant (link,link,link,link,link,link,link)
  • Add a new prop to the Button component, where the tabIndex attribute can be controlled by the mergedDisabled state (link)
  • Expose the SiderContext as an internal prop for the Layout component, where the context can be used for testing purposes (link,link,link)
  • Remove unused props and tokens from the Menu component and its style functions, where the popupBg and darkPopupBg values are not used (link,link,link,link,link,link,link,link,link,link)
  • Increase the zIndex value for the message and notification components by the CONTAINER_MAX_OFFSET constant, where the components can use the constant imported from the useZIndex hook and the prepareComponentToken function (link,link,link,link)
  • Refactor the ConfirmDialog component and its wrapper, where the Dialog component is moved to the wrapper and uses the mergedZIndex value computed by the useToken hook and the zIndex prop, and some unused props are removed (link,link,link,link,link,link,link)
  • Update the useModal hook test case, where the zIndex prop and style are set to 903 to match the expected value (link,link)
  • Add some components and styles to the nested.tsx file, where the Button, message, notification, and Space components are used to demonstrate the zIndex behavior of the static and hook methods of the message and notification components, and the Switch component style is dynamically changed based on the isModalOpen state (link,link,link,link)
  • Add notes and images to the use-with-next.en-US.md and use-with-next.zh-CN.md files, where the notes warn about the potential issue of installing @ant-design/cssinjs with a different version than the one used by antd, which can cause multiple React instances and ctx errors (link,link,link,link)
  • Update the ci-mock-project-build.sh script, where the script adds some echo messages to indicate the progress of the commands, and adds a command to clean up the packageManager field from the package.json file, which can cause issues with the yarn install command (link)
  • Add a new entry to the DEPRECIATED_VERSION object in the post-script.ts file, where the entry marks the version 5.11.1 as deprecated and links to the issue that explains the reason (link)

zbw-zbw and others added 9 commits November 15, 2023 20:00
Co-authored-by: zbw01218944 <zbw01218944@alibaba-inc.com>
* fix: disabled btn with link should not be focused

* chore: update snapshot

* chore: update snapshot
* docs: update Nextjs docs

* Update use-with-next.en-US.md

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

* Update use-with-next.zh-CN.md

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

* update

* Update use-with-next.en-US.md

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

* Update use-with-next.zh-CN.md

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

---------

Signed-off-by: lijianan <574980606@qq.com>
* chore: add image to Next.js doc

* Update use-with-next.en-US.md

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

* Update use-with-next.zh-CN.md

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

---------

Signed-off-by: lijianan <574980606@qq.com>
* feat: export sider context from layout

* refactor: use internal naming
* fix: zIndex miss of message

* fix: modal static index

* test: update snapshot

* test: update snapshot

* test: update snapshot

* test: fix zIndex test

* test: update test case

* chore: clean up

* test: coverage
* chore: migrate to webpack@5

* Revert "feat: support popupBg and darkPopupBg (#45826)"

This reverts commit 496ac33.

* chore: update
Copy link

stackblitz bot commented Nov 17, 2023

Review PR in StackBlitz Codeflow Run & review this pull request in StackBlitz Codeflow.

Copy link
Contributor

github-actions bot commented Nov 17, 2023

Preview Is ready

Copy link
Contributor

size-limit report 📦

Path Size
./dist/antd.min.js 326.55 KB (-11 B 🔽)
./dist/antd-with-locales.min.js 372.44 KB (+256 B 🔺)

Copy link

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 ff462ad:

Sandbox Source
antd reproduction template (forked) Configuration

Copy link

argos-ci bot commented Nov 17, 2023

The latest updates on your projects. Learn more about Argos notifications ↗︎

Build Status Details Updated (UTC)
default (Inspect) 👍 Changes approved 2 changes Nov 17, 2023, 6:31 AM

Copy link

codecov bot commented Nov 17, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (a1f77f3) 100.00% compared to head (ff462ad) 100.00%.

Additional details and impacted files
@@            Coverage Diff            @@
##           feature    #45944   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          706       706           
  Lines        12117     12133   +16     
  Branches      3196      3199    +3     
=========================================
+ Hits         12117     12133   +16     

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

@github-actions github-actions bot merged commit 88a13b1 into feature Nov 17, 2023
100 checks passed
@github-actions github-actions bot deleted the feature-merge-master branch November 17, 2023 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants