Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/contain/text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export function measureCharWidth(fontMeasureInfo: FontMeasureInfo, charCode: num
return (0 <= charCode && charCode <= 127)
? (fontMeasureInfo.asciiWidthMap != null
? fontMeasureInfo.asciiWidthMap[charCode]
: fontMeasureInfo.asciiCharWidth
: measureWidth(fontMeasureInfo, String.fromCharCode(charCode))
)
: fontMeasureInfo.stWideCharWidth;
}
Expand Down
32 changes: 32 additions & 0 deletions test/ut/spec/graphic/TextWidthFallback.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { platformApi } from '../../../../src/core/platform';
import { parsePlainText } from '../../../../src/graphic/helper/parseText';

describe('slow ASCII width map fallback', () => {
it('uses cached widths of actual characters for subsequent fonts', () => {
jest.useFakeTimers();
const originalMeasureText = platformApi.measureText;
const counts: Record<string, number> = {};
platformApi.measureText = (text, font) => {
const key = font + ':' + text;
counts[key] = (counts[key] || 0) + 1;
if (font === 'slow-test-font' && text === '\0') {
jest.advanceTimersByTime(17);
}
return {width: Array.from(text).reduce((sum, ch) => sum + (ch === 'i' ? 1 : ch === 'W' ? 10 : 5), 0)};
};
try {
parsePlainText('warmup', {font: 'slow-test-font', width: 100, overflow: 'breakAll'}, null, null);
const style = {font: 'later-test-font', width: 12, overflow: 'breakAll' as const};
const first = parsePlainText('iiiiWWWW', style, null, null);
expect(first.lines).toEqual(['iiii', 'W', 'W', 'W', 'W']);
const second = parsePlainText('iiiiWWWW', style, null, null);
expect(second.lines).toEqual(first.lines);
expect(counts['later-test-font:i']).toBe(1);
expect(counts['later-test-font:W']).toBe(1);
}
finally {
platformApi.measureText = originalMeasureText;
jest.useRealTimers();
}
});
});