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.

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

fix: Modal conflicting props classNames.wrapper and centered #47076

Merged
merged 4 commits into from Jan 20, 2024
Merged

fix: Modal conflicting props classNames.wrapper and centered #47076

merged 4 commits into from Jan 20, 2024

Conversation

sunsunmonkey
Copy link
Contributor

@sunsunmonkey sunsunmonkey commented Jan 20, 2024 •
edited by afc163

[中文版模板 / 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

close #47041

📝 Changelog

Language Changelog
🇺🇸 English Fix Modal conflicting props bettween classNames.wrapper and centered.
🇨🇳 Chinese 修复 Modal 自定义 classNames.wrapper 时 centered 属性不生效的问题。

☑️ 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

@stackblitz StackBlitz
Copy link

stackblitz bot commented Jan 20, 2024

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

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 20, 2024 •
edited

Preview Is ready

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 20, 2024 •
edited

Visual Regression Report for PR #47076 Failed ❌

Target branch: master (87b45e6)
View Full Report

image name expected actual diff
qr-code-Popover.dark.png master: 87b45e6198f4279a281a2cfb60af191dea7e11e2 current: pr-47076 diff
qr-code-Popover.dark.css-var.png master: 87b45e6198f4279a281a2cfb60af191dea7e11e2 current: pr-47076 diff

Check Full Report for details

@sunsunmonkey sunsunmonkey mentioned this pull request Jan 20, 2024
Closed
@codesandbox-ci CodeSandbox CI
Copy link

codesandbox-ci bot commented Jan 20, 2024 •
edited

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

Sandbox Source
antd reproduction template (forked) Configuration

afc163
afc163 reviewed Jan 20, 2024
View reviewed changes
components/modal/Modal.tsx Outdated Show resolved Hide resolved
@codecov Codecov
Copy link

codecov bot commented Jan 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (87b45e6) 100.00% compared to head (1319852) 100.00%.

Additional details and impacted files 
@@            Coverage Diff            @@
##            master    #47076   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          732       732           
  Lines        12553     12553           
  Branches      3294      3294           
=========================================
  Hits         12553     12553

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

@afc163 afc163 changed the title fix: conflict wrapper and centered fix: Modal conflicting props classNames.wrapper and centered Jan 20, 2024
@afc163 afc163 merged commit d25b4c1 into ant-design:master Jan 20, 2024
67 of 68 checks passed
@github-actions GitHub Actions
Copy link
Contributor

🎉 Thank you for your contribution! If you have not yet joined our DingTalk community group, please feel free to join us (when joining, please provide the link to this PR).

🎉 感谢您的贡献！如果您还没有加入钉钉社区群，请扫描下方二维码加入我们（加群时请提供此 PR 链接）。

@afc163 afc163 mentioned this pull request Jan 27, 2024
Merged
MadCcc pushed a commit that referenced this pull request Jan 29, 2024
@sunsunmonkey @MadCcc
fix: Modal conflicting props classNames.wrapper and centered (#47076)
136fe93 
* fix: conflict wrapper and centered

* test: update snap

* fix: undefined className

* refactor: use classNames for merge class
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@afc163 afc163 afc163 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Modal classNames wrapper disables centered option
2 participants
@sunsunmonkey @afc163