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: fix loading Button in Badge style #23691

Merged
merged 10 commits into from May 16, 2020
Merged

fix: fix loading Button in Badge style #23691

merged 10 commits into from May 16, 2020

Conversation

yoyo837
Copy link
Contributor

@yoyo837 yoyo837 commented Apr 28, 2020 •
edited by markdownify bot

🤔 This is a ...

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

🔗 Related issue link

fix #23640

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English Fix the problem that the badge number style is blocked when put loading button in to the badge
🇨🇳 Chinese 修复loading按钮在Badge中遮挡样式的问题

☑️ 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/badge/demo/basic.md

@codesandbox-ci
Copy link

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

Sandbox Source
antd reproduction template Configuration

@codesandbox-ci
Copy link

codesandbox-ci bot commented Apr 28, 2020 •
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 229d79b:

Sandbox Source
antd reproduction template Configuration

@afc163
Copy link
Member

afc163 commented Apr 28, 2020

看看修改完什么效果。

@yoyo837
Copy link
Contributor Author

yoyo837 commented Apr 28, 2020

image

咋CI不过呢，本地可以。

@zombieJ
Copy link
Member

zombieJ commented Apr 29, 2020

本地用 npm 安装一下，覆盖测试用例。 cnpm 把 react-resizable 加了一个 bug version

@yoyo837
Copy link
Contributor Author

yoyo837 commented Apr 29, 2020

Cannot find module '@jest/globals' 这玩意儿哪里配置

@yoyo837 yoyo837 changed the title fix: fix loading Button in Badge style [WIP]fix: fix loading Button in Badge style Apr 30, 2020
@yoyo837
Copy link
Contributor Author

yoyo837 commented Apr 30, 2020 •
edited

fixed columns #20751

afc163
afc163 reviewed Apr 30, 2020
View reviewed changes
components/style/themes/default.less
@@ -265,7 +265,7 @@
@layout-trigger-color-light: @text-color;

// z-index list, order by `z-index`
@zindex-badge: auto;
@zindex-badge: 1;
Copy link
Member

Choose a reason for hiding this comment

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

改过很多次，需要 blame 看看之前解决的问题会不会再出现。

Copy link
Member

Choose a reason for hiding this comment

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

@yoyo837, 这个有看过上下文吗？

Copy link
Contributor Author

Choose a reason for hiding this comment

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

应该没破坏之前的效果。

@yoyo837
Copy link
Contributor Author

yoyo837 commented Apr 30, 2020

affix #15782

@yoyo837
Copy link
Contributor Author

yoyo837 commented Apr 30, 2020 

"antd": "git://github.com/ant-design/ant-design.git#fix-loading-btn-in-badge"

codesandbox 不能这么写么？

@yoyo837
Copy link
Contributor Author

yoyo837 commented Apr 30, 2020

preview : https://codesandbox.io/s/admiring-margulis-5oruv?file=/index.js

@zombieJ
Copy link
Member

zombieJ commented May 1, 2020

我修了一下 3.x branch 的 CI，可以 rebase 一下。

@yoyo837
Copy link
Contributor Author

yoyo837 commented May 2, 2020

我修了一下 3.x branch 的 CI，可以 rebase 一下。

依旧是本地可以，不过这次CI是moment相关的错误

@codecov
Copy link

codecov bot commented May 4, 2020 •
edited

Codecov Report

Merging #23691 into 3.x-stable will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           3.x-stable   #23691   +/-   ##
===========================================
  Coverage       97.66%   97.66%           
===========================================
  Files             286      286           
  Lines            7783     7783           
  Branches         2149     2149           
===========================================
  Hits             7601     7601           
  Misses            182      182
Impacted Files Coverage Δ
components/typography/Editable.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 0b00640...229d79b. Read the comment docs.

@yoyo837 yoyo837 changed the title [WIP]fix: fix loading Button in Badge style fix: fix loading Button in Badge style May 4, 2020
@yoyo837
Copy link
Contributor Author

yoyo837 commented May 4, 2020

Done

@ycjcl868 ycjcl868 mentioned this pull request May 11, 2020
Closed
@afc163 afc163 merged commit 9504f5b into 3.x-stable May 16, 2020
@afc163 afc163 deleted the fix-loading-btn-in-badge branch May 16, 2020 07:24
@afc163 afc163 mentioned this pull request May 16, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@afc163 afc163 afc163 left review comments

@zombieJ zombieJ zombieJ left review comments

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@yoyo837 @afc163 @zombieJ