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(tooltip): Tooltip textStyle lineHeight does not work in default #20398

Merged
merged 4 commits into from
Oct 30, 2024

Conversation

sz-p
Copy link
Contributor

@sz-p sz-p commented Oct 8, 2024

Brief Information

This pull request is in the type of:

  • bug fixing
  • new feature
  • others

What does this PR do?

Fixed issues

#20391

Details

Before: What was the problem?

lineHeight not work

After: How does it behave after the fixing?

add line-height in css

Document Info

One of the following should be checked.

  • This PR doesn't relate to document changes
  • The document should be updated later
  • The document changes have been made in apache/echarts-doc#xxx

Misc

ZRender Changes

  • This PR depends on ZRender changes (ecomfe/zrender#xxx).

Related test cases or examples to use the new APIs

N.A.

Others

Merging options

  • Please squash the commits into a single one when merging.

Other information

Copy link

echarts-bot bot commented Oct 8, 2024

Thanks for your contribution!
The community will review it ASAP. In the meanwhile, please checkout the coding standard and Wiki about How to make a pull request.

Copy link
Contributor

github-actions bot commented Oct 9, 2024

The changes brought by this PR can be previewed at: https://echarts.apache.org/examples/editor?version=PR-20398@234fb4b

Copy link
Contributor

@Ovilia Ovilia left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution. It seems Okay to me only with a few small changes.

@@ -151,9 +151,11 @@ function assembleFont(textStyleModel: Model<TooltipOption['textStyle']>): string

cssText.push('font:' + textStyleModel.getFont());

// @ts-ignore, leave it to the tooltip refactor.
const lineHeight = textStyleModel.get('lineHeight') ?? Math.round(fontSize * 3 / 2);
Copy link
Contributor

Choose a reason for hiding this comment

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

Use zrUtil.retrive2 instead.

textStyle: TooltipOption['textStyle']
) {
const lineHeight = textStyle.lineHeight;
if (lineHeight === undefined) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Use == null to check undefined or null values.

@sz-p
Copy link
Contributor Author

sz-p commented Oct 24, 2024

Done

@@ -46,7 +46,7 @@ function getTooltipLineHeight(
textStyle: TooltipOption['textStyle']
) {
const lineHeight = textStyle.lineHeight;
if (lineHeight === undefined) {
if (lineHeight === undefined || lineHeight === null) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Use lineHeight == null should be enough.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, that's work well

@Ovilia Ovilia merged commit ca12fb4 into apache:master Oct 30, 2024
1 of 2 checks passed
Copy link

echarts-bot bot commented Oct 30, 2024

Congratulations! Your PR has been merged. Thanks for your contribution! 👍

@Ovilia Ovilia added this to the 5.5.2 milestone Oct 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants