Skip to content

Commit 569346f

Browse files
committed
fix: error passing string array to resolveFonts
1 parent 1ba96a5 commit 569346f

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

packages/troika-three-text/src/FontResolver.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export function createFontResolver(fontParser, unicodeFontResolverClient) {
131131
if (userFonts && !Array.isArray(userFonts)) {
132132
userFonts = [userFonts]
133133
}
134-
userFonts = userFonts.slice()
134+
userFonts = userFonts.map((f) => typeof f === 'string' ? {src: f} : f)
135135
// filter by language
136136
.filter(def => !def.lang || def.lang.test(lang))
137137
// switch order for easier iteration
@@ -200,7 +200,7 @@ export function createFontResolver(fontParser, unicodeFontResolverClient) {
200200
// Check each character to see if this userFont supports it
201201
charResolutions[i] = j;
202202
// Find default font
203-
const { src, unicodeRange } = userFonts.find(f => f.label === 'default');
203+
const { src, unicodeRange } = userFonts.find(f => f.label === 'default') || userFonts[0] || {};
204204
// Filter by optional explicit unicode ranges
205205
if (src && (!unicodeRange || isCodeInRanges(codePoint, unicodeRange))) {
206206
const fontObj = parsedFonts[src];

0 commit comments

Comments
 (0)