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

feat: Watermark support inherit to disable passing #45319

Merged
merged 3 commits into from Oct 13, 2023
Merged

feat: Watermark support inherit to disable passing #45319

merged 3 commits into from Oct 13, 2023

Conversation

zombieJ
Copy link
Member

@zombieJ zombieJ commented Oct 13, 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 Watermark support inherit prop to disable watermark pass to Drawer & Modal.
🇨🇳 Chinese Watermark 支持 inherit 配置,关闭水印传导至弹出 Drawer 与 Modal。

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

🤖 Generated by Copilot at fd080eb

This pull request adds a new inherit prop to the Watermark component, which allows users to control whether the watermark effect is inherited by the nested components or not. It also updates the demo, the tests, and the documentation files to reflect the new feature.

🔍 Walkthrough

🤖 Generated by Copilot at fd080eb

  • Add a new prop inherit to the Watermark component, which controls whether the watermark appears in the portal components such as Drawer or not (link, link, link, link).

@stackblitz
Copy link

stackblitz bot commented Oct 13, 2023

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

@github-actions
Copy link
Contributor

github-actions bot commented Oct 13, 2023

Preview Is ready

@crazyair
Copy link
Member

issue link

@github-actions
Copy link
Contributor

github-actions bot commented Oct 13, 2023

size-limit report 📦

Path Size
./dist/antd.min.js 398.39 KB (+13 B 🔺)
./dist/antd-with-locales.min.js 457.72 KB (+15 B 🔺)

@argos-ci
Copy link

argos-ci bot commented Oct 13, 2023

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

Build Status Details Updated (UTC)
default (Inspect) 👍 Changes approved 1 change Oct 13, 2023, 6:38 AM

@codecov
Copy link

codecov bot commented Oct 13, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (eaf4949) 100.00% compared to head (6b4c7b5) 100.00%.

Additional details and impacted files
@@            Coverage Diff            @@
##           feature    #45319   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          693       693           
  Lines        11696     11700    +4     
  Branches      3124      3127    +3     
=========================================
+ Hits         11696     11700    +4     
Files Coverage Δ
components/watermark/index.tsx 100.00% <100.00%> (ø)

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants