tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix:set fixed lineHeight for maxLines

Browse Source
This commit is contained in:
钱泽虹 2023-09-14 11:15:57 +08:00 committed by osborn
parent d71e55e673
commit 310f5d0ff7
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
doric-web/dist/index.js vendored
View File

@ -7204,6 +7204,7 @@ var doric_web = (function (exports, axios, sandbox) {
const div = document.createElement('div'); const div = document.createElement('div');
div.style.display = "flex"; div.style.display = "flex";
div.style.overflow = "hidden"; div.style.overflow = "hidden";
div.style.lineHeight = `${this.lineHeight()}em`;
this.textElement = document.createElement('span'); this.textElement = document.createElement('span');
div.appendChild(this.textElement); div.appendChild(this.textElement);
div.style.justifyContent = "center"; div.style.justifyContent = "center";
@ -7299,33 +7300,29 @@ var doric_web = (function (exports, axios, sandbox) {
configSize() { configSize() {
if (this.maxLines > 0) { if (this.maxLines > 0) {
const computedStyle = window.getComputedStyle(this.view); const computedStyle = window.getComputedStyle(this.view);
const lineHeight = this.lineHeight(computedStyle); const lineHeight = this.lineHeight() * parseFloat(computedStyle.getPropertyValue('font-size'));
let allowedMaxLines = this.maxLines; let allowedMaxLines = this.maxLines;
const contentHeight = this.view.clientHeight - pixelString2Number(computedStyle.paddingTop) - pixelString2Number(computedStyle.paddingBottom); const contentHeight = this.view.clientHeight - pixelString2Number(computedStyle.paddingTop) - pixelString2Number(computedStyle.paddingBottom);
if (contentHeight > 0) { if (contentHeight > 0) {
const contentAllowedLines = Math.floor(contentHeight / lineHeight); const contentAllowedLines = Math.round(contentHeight / lineHeight);
allowedMaxLines = Math.min(this.maxLines, contentAllowedLines); allowedMaxLines = Math.min(this.maxLines, contentAllowedLines);
} }
const originalLines = Math.floor(this.originalHeight(computedStyle) / lineHeight); const originalLines = Math.round(this.originalHeight(computedStyle) / lineHeight);
if (originalLines > allowedMaxLines) { if (originalLines > allowedMaxLines) {
this.textElement.innerText = this.truncationText(computedStyle, lineHeight, allowedMaxLines); this.textElement.innerText = this.truncationText(computedStyle, lineHeight, allowedMaxLines);
} }
} }
} }
lineHeight(style) { lineHeight() {
const canvas = document.createElement('canvas'); return 1.3;
const ctx = canvas.getContext('2d');
ctx.font = style.font;
const pureText = this.textElement.innerText.replace(/\n/g, '');
const metrics = ctx.measureText(pureText);
return metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent;
} }
originalHeight(style) { originalHeight(style) {
const tempEle = document.createElement('div'); const tempEle = document.createElement('div');
tempEle.style.font = style.font; tempEle.style.font = style.font;
tempEle.textContent = this.textElement.innerText; tempEle.textContent = this.textElement.innerText;
tempEle.style.whiteSpace = style.whiteSpace; tempEle.style.whiteSpace = style.whiteSpace;
this.view.style.overflow = style.overflow; tempEle.style.overflow = style.overflow;
tempEle.style.lineHeight = style.lineHeight;
tempEle.style.width = style.width; tempEle.style.width = style.width;
document.body.appendChild(tempEle); document.body.appendChild(tempEle);
const height = tempEle.offsetHeight; const height = tempEle.offsetHeight;
@ -7338,13 +7335,14 @@ var doric_web = (function (exports, axios, sandbox) {
const tempEle = document.createElement('div'); const tempEle = document.createElement('div');
tempEle.style.font = style.font; tempEle.style.font = style.font;
tempEle.style.whiteSpace = style.whiteSpace; tempEle.style.whiteSpace = style.whiteSpace;
this.view.style.overflow = style.overflow; tempEle.style.overflow = style.overflow;
tempEle.style.lineHeight = style.lineHeight;
tempEle.style.width = style.width; tempEle.style.width = style.width;
document.body.appendChild(tempEle); document.body.appendChild(tempEle);
while (start <= end) { while (start <= end) {
const mid = Math.floor((start + end) / 2); const mid = Math.floor((start + end) / 2);
tempEle.textContent = originalText.slice(0, mid) + '...'; tempEle.textContent = originalText.slice(0, mid) + '...';
const lines = Math.floor(tempEle.offsetHeight / lineHeight); const lines = Math.round(tempEle.offsetHeight / lineHeight);
if (lines > maxLines) { if (lines > maxLines) {
end = mid - 1; end = mid - 1;
} }

2
doric-web/dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

24
doric-web/src/shader/DoricTextNode.ts
View File

@ -8,6 +8,7 @@ export class DoricTextNode extends DoricViewNode {
const div = document.createElement('div') const div = document.createElement('div')
div.style.display = "flex" div.style.display = "flex"
div.style.overflow = "hidden" div.style.overflow = "hidden"
div.style.lineHeight = `${this.lineHeight()}em`
this.textElement = document.createElement('span') this.textElement = document.createElement('span')
div.appendChild(this.textElement) div.appendChild(this.textElement)
div.style.justifyContent = "center" div.style.justifyContent = "center"
@ -100,29 +101,24 @@ export class DoricTextNode extends DoricViewNode {
configSize() { configSize() {
if (this.maxLines > 0) { if (this.maxLines > 0) {
const computedStyle = window.getComputedStyle(this.view) const computedStyle = window.getComputedStyle(this.view)
const lineHeight = this.lineHeight(computedStyle) const lineHeight = this.lineHeight() * parseFloat(computedStyle.getPropertyValue('font-size'))
let allowedMaxLines = this.maxLines let allowedMaxLines = this.maxLines
const contentHeight = this.view.clientHeight - pixelString2Number(computedStyle.paddingTop) - pixelString2Number(computedStyle.paddingBottom) const contentHeight = this.view.clientHeight - pixelString2Number(computedStyle.paddingTop) - pixelString2Number(computedStyle.paddingBottom)
if (contentHeight > 0) { if (contentHeight > 0) {
const contentAllowedLines = Math.floor(contentHeight / lineHeight) const contentAllowedLines = Math.round(contentHeight / lineHeight)
allowedMaxLines = Math.min(this.maxLines, contentAllowedLines) allowedMaxLines = Math.min(this.maxLines, contentAllowedLines)
} }
const originalLines = Math.floor(this.originalHeight(computedStyle) / lineHeight) const originalLines = Math.round(this.originalHeight(computedStyle) / lineHeight)
if (originalLines > allowedMaxLines) { if (originalLines > allowedMaxLines) {
this.textElement.innerText = this.truncationText(computedStyle, lineHeight, allowedMaxLines) this.textElement.innerText = this.truncationText(computedStyle, lineHeight, allowedMaxLines)
} }
} }
} }
lineHeight(style: CSSStyleDeclaration) { lineHeight() {
const canvas = document.createElement('canvas') return 1.3
const ctx = canvas.getContext('2d')
ctx!.font = style.font
const pureText = this.textElement.innerText.replace(/\n/g, '')
const metrics = ctx!.measureText(pureText)
return metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent
} }
originalHeight(style:CSSStyleDeclaration) { originalHeight(style:CSSStyleDeclaration) {
@ -130,7 +126,8 @@ export class DoricTextNode extends DoricViewNode {
tempEle.style.font = style.font tempEle.style.font = style.font
tempEle.textContent = this.textElement.innerText tempEle.textContent = this.textElement.innerText
tempEle.style.whiteSpace = style.whiteSpace tempEle.style.whiteSpace = style.whiteSpace
this.view.style.overflow = style.overflow tempEle.style.overflow = style.overflow
tempEle.style.lineHeight = style.lineHeight
tempEle.style.width = style.width tempEle.style.width = style.width
document.body.appendChild(tempEle) document.body.appendChild(tempEle)
@ -146,14 +143,15 @@ export class DoricTextNode extends DoricViewNode {
const tempEle = document.createElement('div') const tempEle = document.createElement('div')
tempEle.style.font = style.font tempEle.style.font = style.font
tempEle.style.whiteSpace = style.whiteSpace tempEle.style.whiteSpace = style.whiteSpace
this.view.style.overflow = style.overflow tempEle.style.overflow = style.overflow
tempEle.style.lineHeight = style.lineHeight
tempEle.style.width = style.width tempEle.style.width = style.width
document.body.appendChild(tempEle); document.body.appendChild(tempEle);
while(start <= end) { while(start <= end) {
const mid = Math.floor((start + end) / 2) const mid = Math.floor((start + end) / 2)
tempEle.textContent = originalText.slice(0,mid) + '...' tempEle.textContent = originalText.slice(0,mid) + '...'
const lines = Math.floor(tempEle.offsetHeight / lineHeight) const lines = Math.round(tempEle.offsetHeight / lineHeight)
if (lines > maxLines) { if (lines > maxLines) {
end = mid - 1 end = mid - 1
} else { } else {