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: 修复表头存在自定义 icon 时, 文本换行高度自适应不准确 #3065

Merged
merged 1 commit into from
Jan 3, 2025

Conversation

lijinke666
Copy link
Member

👀 PR includes

🐛 Bugfix

  • Solve the issue and close #0

📝 Description

预渲染文本时, 由于此时还没有生成 icon 配置, 所以文本最大宽度就是 cell - padding, 实际渲染时是 cell - padding - icon, 所以两者不一致, 导致测量自适应的高度必实际小

🖼️ Screenshot

Before After
image image

🔗 Related issue link

🔍 Self-Check before the merge

  • Add or update relevant docs.
  • Add or update relevant demos.
  • Add or update test case.
  • Add or update relevant TypeScript definitions.

Copy link

vercel bot commented Jan 3, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
antvis-s2 ❌ Failed (Inspect) Jan 3, 2025 3:46am

Copy link
Contributor

github-actions bot commented Jan 3, 2025

你好 @lijinke666,非常感谢你的贡献.
为了让代码更健壮, 请根据 贡献指南 补充相应单元测试 (文档改动或其他特殊场景除外), 如果有 API 改动, 请修改 相应的文档.
同时请检查 linttest 相关 CI 是否通过, 如果失败, 请点击 [Details] 按钮查看, 并根据日志修复.

Hello, @lijinke666, Thanks for your contribution. In order to make the code more robust, please add the corresponding unit tests, and update the docs if there are API changes.
At the same time, please check whether the CI related to lint and test passes. If the CI fails, please click [Details] button to check and repair according to the log.

@github-actions github-actions bot added next 2.0-next 版本的问题 pr(fix) bug fix labels Jan 3, 2025
@github-actions github-actions bot requested a review from wjgogogo January 3, 2025 03:46
Copy link

Walkthrough

此PR修复了在表头存在自定义图标时,文本换行高度自适应不准确的问题。通过在预渲染阶段生成图标配置,确保文本的最大宽度计算正确,避免了高度测量不准确的问题。

Changes

文件 概要
packages/s2-core/tests/spreadsheet/multi-line-text-spec.ts 添加了多个测试用例以验证表头图标的最大文本宽度计算是否正确。
packages/s2-core/src/cell/header-cell.ts generateIconConfig方法的访问级别从protected改为public,并在浅渲染时返回查询。
packages/s2-core/src/facet/base-facet.ts 在绘制文本形状之前预生成图标配置,以确保文本的最大可用宽度计算正确。
packages/s2-react/playground/config.tsx 添加了headerActionIcons配置以支持自定义图标。
packages/s2-react/playground/index.tsx 根据showDefaultHeaderActionIcon的状态更新headerActionIcons配置。

@@ -112,7 +112,7 @@ export abstract class HeaderCell<
this.generateIconConfig();
}

protected generateIconConfig() {
public generateIconConfig() {

Choose a reason for hiding this comment

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

Changing the access level of generateIconConfig from protected to public may expose this method to unintended usage. Ensure that this change is necessary and does not introduce any security or functional issues.

@codecov-commenter
Copy link

codecov-commenter commented Jan 3, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.77%. Comparing base (ecdc9c8) to head (44d7223).
Report is 586 commits behind head on next.

Additional details and impacted files
@@            Coverage Diff             @@
##             next    #3065      +/-   ##
==========================================
  Coverage   75.77%   75.77%              
==========================================
  Files         257       51     -206     
  Lines       11994     1490   -10504     
  Branches     2464      284    -2180     
==========================================
- Hits         9088     1129    -7959     
+ Misses       1398      210    -1188     
+ Partials     1508      151    -1357     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

github-actions bot commented Jan 3, 2025

Size Change: +31 B (+0.01%)

Total Size: 619 kB

Filename Size Change
./packages/s2-core/dist/s2-extends.min.js 154 kB +6 B (0%)
./packages/s2-core/dist/s2.min.js 257 kB +25 B (+0.01%)
ℹ️ View Unchanged
Filename Size
./packages/s2-core/dist/s2.min.css 581 B
./packages/s2-react-components/dist/s2-react-components.min.css 2.55 kB
./packages/s2-react-components/dist/s2-react-components.min.js 124 kB
./packages/s2-react/dist/s2-react.min.css 1.74 kB
./packages/s2-react/dist/s2-react.min.js 38.3 kB
./packages/s2-vue/dist/s2-vue.min.css 2.05 kB
./packages/s2-vue/dist/s2-vue.min.js 38.3 kB

compressed-size-action

@lijinke666 lijinke666 merged commit e2ab646 into next Jan 3, 2025
14 of 16 checks passed
@lijinke666 lijinke666 deleted the fix-tet-wrap-with-icons branch January 3, 2025 08:43
@lijinke666
Copy link
Member Author

🎉 This PR is included in version @antv/s2-v2.1.8 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member Author

🎉 This PR is included in version @antv/s2-react-v2.1.6 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
next 2.0-next 版本的问题 pr(fix) bug fix released on @latest
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants