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.

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

Jump to bottom

feat: poptip suppport multiline text, closed #1444 #1450

Merged
merged 2 commits into from
Sep 19, 2024
Merged

feat: poptip suppport multiline text, closed #1444 #1450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1daf886
feat: poptip suppport multiline text, closed #1444
neuqzxy Sep 19, 2024
6a1efda
fix: text cliped support lineClamp
neuqzxy Sep 19, 2024
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
10 changes: 10 additions & 0 deletions common/changes/@visactor/vrender-core/feat-poptip-multiline_2024-09-19-03-16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@visactor/vrender-core",
"comment": "feat: poptip suppport multiline text, closed #1444",
"type": "none"
}
],
"packageName": "@visactor/vrender-core"
}
14 changes: 10 additions & 4 deletions packages/vrender-core/src/graphic/text.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,20 @@ export class Text extends Graphic<ITextGraphicAttribute> implements IText {
get cliped(): boolean | undefined {
const textTheme = this.getGraphicTheme();
const attribute = this.attribute;
if (this.isMultiLine) {
return undefined;
}
const { maxLineWidth = textTheme.maxLineWidth } = attribute;
const { maxLineWidth = textTheme.maxLineWidth, text, whiteSpace = textTheme.whiteSpace } = attribute;
if (!Number.isFinite(maxLineWidth)) {
return false;
}
this.tryUpdateAABBBounds();
if (this.cache.layoutData.lines) {
let mergedText = '';
this.cache.layoutData.lines.forEach(item => {
mergedText += item.str;
});
const originText = Array.isArray(text) ? text.join('') : text;

return originText !== mergedText;
}
if (attribute.direction === 'vertical' && this.cache.verticalList && this.cache.verticalList[0]) {
return this.cache.verticalList[0].map(item => item.text).join('') !== attribute.text.toString();
}
Expand Down
5 changes: 4 additions & 1 deletion packages/vrender/__tests__/browser/src/pages/text.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,15 @@ export const page = () => {
// },
// background: 'red',
// backgroundCornerRadius: 10,
text: '这是一行文字',
text: ['这是一行文字', '这是第二哈那个'],
fill: 'red',
maxLineWidth: 100,
whiteSpace: 'normal',
fontSize: 36,
textBaseline: 'top'
})
);
console.log('aaa', graphics[graphics.length - 1]);
graphics.push(
createLine({
x: 300,
Expand Down
Loading