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

fix: TreeNode not aligned when disabled and draggable #37534

Merged
merged 3 commits into from
Sep 13, 2022
Merged

Conversation

MadCcc
Copy link
Member

@MadCcc MadCcc commented Sep 13, 2022

[中文版模板 / 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

ref: react-component/tree#632
解决 TreeNode disabled 时 draggable icon 没有宽度导致不对齐的问题,在 disabled 状态依然赋予 draggable className
这里结合 disabled className 将 draggable icon 隐藏

📝 Changelog

Language Changelog
🇺🇸 English Fix Tree that TreeNodes not aligned when draggable and some node is disabled.
🇨🇳 Chinese 修复 Tree 组件 TreeNode 在可拖拽并且禁用状态下不对齐的问题。

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

@github-actions
Copy link
Contributor

github-actions bot commented Sep 13, 2022

@github-actions
Copy link
Contributor

github-actions bot commented Sep 13, 2022

Size Change: +62 B (0%)

Total Size: 961 kB

Filename Size Change
./dist/antd-with-locales.min.js 373 kB +1 B (0%)
./dist/antd.compact.min.css 67.5 kB +17 B (0%)
./dist/antd.dark.min.css 68.8 kB +15 B (0%)
./dist/antd.min.css 67.5 kB +16 B (0%)
./dist/antd.min.js 316 kB +1 B (0%)
./dist/antd.variable.min.css 68.1 kB +12 B (0%)

compressed-size-action

@codecov
Copy link

codecov bot commented Sep 13, 2022

Codecov Report

Merging #37534 (910c1d2) into master (986bd02) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##            master    #37534   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          443       443           
  Lines         8174      8203   +29     
  Branches      2402      2410    +8     
=========================================
+ Hits          8174      8203   +29     
Impacted Files Coverage Δ
components/index.tsx 100.00% <0.00%> (ø)
components/modal/confirm.tsx 100.00% <0.00%> (ø)
components/_util/reactNode.ts 100.00% <0.00%> (ø)

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

@MadCcc MadCcc merged commit 851a61a into master Sep 13, 2022
@MadCcc MadCcc deleted the fix/draggable-icon branch September 13, 2022 13:24
@MadCcc MadCcc mentioned this pull request Sep 14, 2022
19 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.

1 participant