-
Notifications
You must be signed in to change notification settings - Fork 19.6k
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
Conversation
Thanks for your contribution! |
The changes brought by this PR can be previewed at: https://echarts.apache.org/examples/editor?version=PR-20398@234fb4b |
There was a problem hiding this 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); |
There was a problem hiding this comment.
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) { |
There was a problem hiding this comment.
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.
Done |
@@ -46,7 +46,7 @@ function getTooltipLineHeight( | |||
textStyle: TooltipOption['textStyle'] | |||
) { | |||
const lineHeight = textStyle.lineHeight; | |||
if (lineHeight === undefined) { | |||
if (lineHeight === undefined || lineHeight === null) { |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
Congratulations! Your PR has been merged. Thanks for your contribution! 👍 |
Brief Information
This pull request is in the type of:
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.
Misc
ZRender Changes
Related test cases or examples to use the new APIs
N.A.
Others
Merging options
Other information