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: button support ref #23571

Merged
merged 3 commits into from Apr 25, 2020
Merged

feat: button support ref #23571

merged 3 commits into from Apr 25, 2020

Conversation

hengkx
Copy link
Member

@hengkx hengkx commented Apr 24, 2020

🤔 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

💡 Background and solution

close #23509
后面解决这个好像也需要#22493

📝 Changelog

Language Changelog
🇺🇸 English fix Button cannot be directly called by react-dnd
🇨🇳 Chinese 解决 Button 无法直接被 react-dnd 调用的问题

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

@ant-design-bot
Copy link
Contributor

@ant-design-bot ant-design-bot commented Apr 24, 2020

@codesandbox-ci
Copy link

@codesandbox-ci codesandbox-ci bot commented Apr 24, 2020

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

Sandbox Source
antd reproduction template Configuration

@hengkx
Copy link
Member Author

@hengkx hengkx commented Apr 24, 2020

feature 分支没改之前 test也跑不通

@zombieJ
Copy link
Member

@zombieJ zombieJ commented Apr 24, 2020

export default 的时候 forward 吧,这样记录干净些。

@afc163
Copy link
Member

@afc163 afc163 commented Apr 25, 2020

image

写解决什么问题。

@hengkx
Copy link
Member Author

@hengkx hengkx commented Apr 25, 2020

解决什么问题还真不太好描述,在dnd中可以直接使用?

@afc163
Copy link
Member

@afc163 afc163 commented Apr 25, 2020

解决 Button 无法直接被 react-dnd 调用的问题。

@hengkx
Copy link
Member Author

@hengkx hengkx commented Apr 25, 2020

changed

@afc163
Copy link
Member

@afc163 afc163 commented Apr 25, 2020

感觉其他改造成 hooks 然后加了 forwardRef 的组件也要修复一下。

@hengkx
Copy link
Member Author

@hengkx hengkx commented Apr 25, 2020

ok 后面我改一下

afc163
afc163 approved these changes Apr 25, 2020
@codecov
Copy link

@codecov codecov bot commented Apr 25, 2020

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff            @@
##           feature   #23571   +/-   ##
========================================
  Coverage    98.48%   98.48%           
========================================
  Files          364      364           
  Lines         7326     7327    +1     
  Branches      2014     1965   -49     
========================================
+ Hits          7215     7216    +1     
  Misses         111      111           
Impacted Files Coverage Δ
components/button/button.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 f09686d...a275d49. Read the comment docs.

@hengkx
Copy link
Member Author

@hengkx hengkx commented Apr 25, 2020

请问下合并分支的话 是用的哪个
image

@hengkx
Copy link
Member Author

@hengkx hengkx commented Apr 25, 2020

在我自己的项目,效果和你们操作的都不一样

@afc163
Copy link
Member

@afc163 afc163 commented Apr 25, 2020

一般用 squash 就行,commits 会合并成一个。

大分支之间合并用第一个。

@hengkx
Copy link
Member Author

@hengkx hengkx commented Apr 25, 2020

我看你们wiki里面写的不建议用那个…

@afc163
Copy link
Member

@afc163 afc163 commented Apr 25, 2020

image

image

@hengkx
Copy link
Member Author

@hengkx hengkx commented Apr 25, 2020

我理解错了😓

@hengkx hengkx merged commit 7379cfa into feature Apr 25, 2020
32 checks passed
@hengkx hengkx deleted the feat/button-ref branch Apr 25, 2020
@hengkx hengkx mentioned this pull request Apr 27, 2020
14 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.

None yet

4 participants