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

feat: Steps support inline #38311

Merged
merged 1 commit into from
Nov 8, 2022
Merged

feat: Steps support inline #38311

merged 1 commit into from
Nov 8, 2022

Conversation

JarvisArt
Copy link
Contributor

@JarvisArt JarvisArt commented Oct 31, 2022 •
edited by afc163
Loading

[中文版模板 / 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
  • Other (about what?)

🔗 Related issue link

💡 Background and solution

预览效果：https://preview-38311-ant-design.surge.sh/components/steps-cn/#components-steps-demo-inline

📝 Changelog

Language Changelog
🇺🇸 English Steps support inline
🇨🇳 Chinese Steps 支持 inline 类型

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

@github-actions
Copy link
Contributor

github-actions bot commented Oct 31, 2022 •
edited
Loading

@JarvisArt JarvisArt force-pushed the next-steps-inline branch 3 times, most recently from 03aed33 to a55a31e Compare November 1, 2022 14:36
@codecov
Copy link

codecov bot commented Nov 1, 2022 •
edited
Loading

Codecov Report

Base: 100.00% // Head: 100.00% // No change to project coverage 👍

Coverage data is based on head (091135b) compared to base (3c59952).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files 
@@            Coverage Diff            @@
##              next    #38311   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          543       544    +1     
  Lines         9338      9348   +10     
  Branches      2636      2639    +3     
=========================================
+ Hits          9338      9348   +10
Impacted Files Coverage Δ
components/steps/index.tsx 100.00% <100.00%> (ø)
components/steps/style/inline.ts 100.00% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

MadCcc
MadCcc reviewed Nov 3, 2022
View reviewed changes
components/steps/style/index.tsx Outdated Show resolved Hide resolved
components/steps/style/index.tsx Outdated Show resolved Hide resolved
components/steps/style/inline.ts Outdated Show resolved Hide resolved
components/steps/style/inline.ts Outdated Show resolved Hide resolved
components/steps/style/inline.ts Show resolved Hide resolved
components/steps/style/inline.ts Outdated Show resolved Hide resolved
components/steps/style/inline.ts Outdated
'&-wait': {
[`${componentCls}-item-icon ${componentCls}-icon ${componentCls}-icon-dot`]: {
backgroundColor: token.colorBorderBg,
border: `${token.lineWidth}px solid ${token.colorBorderSecondary}`,
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
border: `${token.lineWidth}px solid ${token.colorBorderSecondary}`,
border: `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`,

components/steps/style/inline.ts Outdated
},
'&-finish': {
[`${componentCls}-item-tail::after`]: {
backgroundColor: token.colorBorderSecondary,
Copy link
Member

Choose a reason for hiding this comment

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

和 line 相同的话可以搞个变量共用下

Copy link
Member

Choose a reason for hiding this comment

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

优先用 colorSplit

Copy link
Contributor Author

Choose a reason for hiding this comment

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

colorSplit 有透明度会重叠，加个变量

components/steps/style/inline.ts Outdated Show resolved Hide resolved
@MadCcc
Copy link
Member

MadCcc commented Nov 3, 2022

Demo 里可以改一下状态和进度，现在都是一样的

@JarvisArt JarvisArt force-pushed the next-steps-inline branch 2 times, most recently from 201b3fb to 68bb268 Compare November 4, 2022 03:55
@JarvisArt JarvisArt requested a review from MadCcc November 4, 2022 15:12
@JarvisArt JarvisArt force-pushed the next-steps-inline branch 2 times, most recently from 0cc942e to 6ae39bc Compare November 5, 2022 09:18
@MadCcc
Copy link
Member

MadCcc commented Nov 8, 2022

有冲突了，看设计应该不会有大变化了，解一下合了吧

@JarvisArt
feat: Steps support inline
091135b 
* test: update snapshot

* docs: add inline demo

* chore: upgrage rc-steps
@JarvisArt
Copy link
Contributor Author

有冲突了，看设计应该不会有大变化了，解一下合了吧

done

@MadCcc MadCcc merged commit 60d8e91 into ant-design:next Nov 8, 2022
@afc163
Copy link
Member

afc163 commented Nov 8, 2022

hover 背景色加个 transition 过渡。

@JarvisArt
Copy link
Contributor Author

hover 背景色加个 transition 过渡。

现在是有加过渡的，之前是用 motionDurationSlow ，后面改成 motionDurationFast 过渡得比较快，

image

@afc163
Copy link
Member

afc163 commented Nov 8, 2022

这个样式要加在普通状态上，放在 hover 上才加上 transition 会有渲染时机问题。

@JarvisArt
Copy link
Contributor Author

这个样式要加在普通状态上，放在 hover 上才加上 transition 会有渲染时机问题。

好哒~

@MadCcc MadCcc mentioned this pull request Nov 17, 2022
Merged
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MadCcc MadCcc MadCcc 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.
3 participants
@JarvisArt @MadCcc @afc163