Skip to content

fix(treemap): align rich bottom labels. close #17591 #21704

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.

Sign up for GitHub

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

Open
rahul37wallst-sudo wants to merge 1 commit into
base: master
Choose a base branch
from
+225 −3
Open

fix(treemap): align rich bottom labels. close #17591 #21704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/chart/treemap/TreemapView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,6 +1004,14 @@ function renderNode(
}
const textStyle = textEl.style;
const textPadding = normalizeCssArray(textStyle.padding || 0);
const textPosition = normalLabelModel.getShallow('position');
// An explicit rich text height becomes the block height, leaving its tokens
// at the top of the block even when that block is aligned to the bottom.
const isRichTextBottomPosition = textStyle.rich && (
textPosition === 'insideBottom'
|| textPosition === 'insideBottomLeft'
|| textPosition === 'insideBottomRight'
);

if (upperLabelRect) {
rectEl.setTextConfig({
Expand All @@ -1015,9 +1023,12 @@ function renderNode(
const width = Math.max(
(upperLabelRect ? upperLabelRect.width : rectEl.shape.width) - textPadding[1] - textPadding[3], 0
);
const height = Math.max(
(upperLabelRect ? upperLabelRect.height : rectEl.shape.height) - textPadding[0] - textPadding[2], 0
);
const height = isRichTextBottomPosition
? null
: Math.max(
(upperLabelRect ? upperLabelRect.height : rectEl.shape.height)
- textPadding[0] - textPadding[2], 0
);
if (textStyle.width !== width || textStyle.height !== height) {
textEl.setStyle({
width,
Expand Down
98 changes: 98 additions & 0 deletions test/treemap-label-position-rich.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

113 changes: 113 additions & 0 deletions test/ut/spec/series/treemap.test.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.