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: add custom expand style for typography.paragraph #24385

Merged
merged 5 commits into from May 26, 2020

Conversation

fireairforce
Copy link
Member

@fireairforce fireairforce commented May 22, 2020

[中文版模板 / Chinese template]

🤔 This is a ...

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

🔗 Related issue link

close #17975

💡 Background and solution

add custom expand style for typography.paragraph

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • 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

View rendered components/typography/index.en-US.md
View rendered components/typography/index.zh-CN.md

@ant-design-bot
Copy link
Contributor

@ant-design-bot ant-design-bot commented May 22, 2020

@fireairforce
Copy link
Member Author

@fireairforce fireairforce commented May 22, 2020

Shoud I add some test cases or example for this change?

@afc163
Copy link
Member

@afc163 afc163 commented May 25, 2020

ci broken

@fireairforce
Copy link
Member Author

@fireairforce fireairforce commented May 25, 2020

fixed~

@codecov
Copy link

@codecov codecov bot commented May 25, 2020

Codecov Report

Merging #24385 into feature will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff            @@
##           feature   #24385   +/-   ##
========================================
  Coverage    98.96%   98.96%           
========================================
  Files          364      364           
  Lines         7405     7408    +3     
  Branches      2058     2060    +2     
========================================
+ Hits          7328     7331    +3     
  Misses          77       77           
Impacted Files Coverage Δ
components/typography/Base.tsx 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 47b3aa2...b164e86. Read the comment docs.

@afc163
Copy link
Member

@afc163 afc163 commented May 25, 2020

测试覆盖率要补一下。

@fireairforce
Copy link
Member Author

@fireairforce fireairforce commented May 25, 2020

好的。

@fireairforce
Copy link
Member Author

@fireairforce fireairforce commented May 26, 2020

@afc163 PTAL

@@ -54,7 +54,7 @@ cols: 1
| delete | 添加删除线样式 | boolean | false | |
| disabled | 禁用文本 | boolean | false | |
| editable | 是否可编辑,为对象时可对编辑进行控制 | boolean \| { editing: boolean, onStart: Function, onChange: Function(string) } | false | |
| ellipsis | 自动溢出省略,为对象时可设置省略行数、是否可展开、添加后缀等 | boolean \| { rows: number, expandable: boolean, suffix: string, onExpand: Function(event), onEllipsis: Function(ellipsis) } | false | onEllipsis: 4.2.0 |
| ellipsis | 自动溢出省略,为对象时可设置省略行数、是否可展开、添加后缀等 | boolean \| { rows: number, expandable: boolean, suffix: string, symbol: string | React.ReactNode, onExpand: Function(event), onEllipsis: Function(ellipsis) } | false | onEllipsis: 4.2.0 |
Copy link
Member

@afc163 afc163 May 26, 2020

Choose a reason for hiding this comment

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

Suggested change
| ellipsis | 自动溢出省略,为对象时可设置省略行数、是否可展开、添加后缀等 | boolean \| { rows: number, expandable: boolean, suffix: string, symbol: string | React.ReactNode, onExpand: Function(event), onEllipsis: Function(ellipsis) } | false | onEllipsis: 4.2.0 |
| ellipsis | 自动溢出省略,为对象时可设置省略行数、是否可展开、添加后缀等 | boolean \| { rows: number, expandable: boolean, suffix: string, symbol: React.ReactNode, onExpand: Function(event), onEllipsis: Function(ellipsis) } | false | onEllipsis: 4.2.0 |

@fireairforce
Copy link
Member Author

@fireairforce fireairforce commented May 26, 2020

done~

afc163
afc163 approved these changes May 26, 2020
@afc163 afc163 merged commit 4e9fc51 into ant-design:feature May 26, 2020
8 of 9 checks passed
@afc163
Copy link
Member

@afc163 afc163 commented May 27, 2020

PR 主楼要补充一下 changelog 的表格,方便发布的同学。

@zombieJ zombieJ mentioned this pull request May 31, 2020
13 tasks
@fireairforce
Copy link
Member Author

@fireairforce fireairforce commented Jun 1, 2020

好的,以后会注意的~

@fireairforce fireairforce deleted the feature-typography branch Jun 6, 2020
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