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

style: addon size should inherit from props #44000

Merged
merged 3 commits into from
Aug 4, 2023

Conversation

MuxinFeng
Copy link
Contributor

@MuxinFeng MuxinFeng commented Aug 3, 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

close #43993

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English addon size should inherit from props
🇨🇳 Chinese addon 的尺寸应该要从props继承

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

This pull request enhances the input and input number components to support different font sizes based on the size prop. It updates the style files components/input/style/index.ts and components/input-number/style/index.ts to use the theme size tokens.

🔍 Walkthrough

🤖 Generated by Copilot at 7eea7c1

  • Set the font size of input number and input group components according to the size prop (link, link, link, link)

@stackblitz
Copy link

stackblitz bot commented Aug 3, 2023

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

@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

@argos-ci
Copy link

argos-ci bot commented Aug 3, 2023

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

Build Status Details Updated (UTC)
default (Inspect) 👍 Changes approved 1 change Aug 4, 2023, 2:37 AM

},
},
'&-sm': {
[`${componentCls}-group-addon`]: {
borderRadius: borderRadiusSM,
fontSize: token.fontSizeSM,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

小号的不一定要改,字体大小应该要和 input 一致

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的,addon 会默认给 14

@codecov
Copy link

codecov bot commented Aug 3, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (0e493b3) 100.00% compared to head (29fc90a) 100.00%.

Additional details and impacted files
@@            Coverage Diff            @@
##            master    #44000   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          658       658           
  Lines        11170     11170           
  Branches      3025      3025           
=========================================
  Hits         11170     11170           
Files Changed Coverage Δ
components/input-number/style/index.ts 100.00% <ø> (ø)
components/input/style/index.ts 100.00% <ø> (ø)

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

@MadCcc
Copy link
Member

MadCcc commented Aug 4, 2023

image
看看这个是什么原因?

@MuxinFeng
Copy link
Contributor Author

image 看看这个是什么原因?

好嘞

@MuxinFeng
Copy link
Contributor Author

image 看看这个是什么原因?

看不出来有啥区别 😂,有啥排查思路吗~

@afc163
Copy link
Member

afc163 commented Aug 4, 2023

addon 字体变化导致演示整体宽度变小的联动变化,符合预期。

@afc163 afc163 merged commit 63bb664 into ant-design:master Aug 4, 2023
51 checks passed
@PeachScript PeachScript mentioned this pull request Aug 11, 2023
20 tasks
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.

addOn font size should be 16 when control size is large
3 participants