fix: Added asset path fallback null value inside an else clause

CatchABus · NathanWalker · commit 8726d026fef9 · 2025-01-28T23:26:24.000-08:00
diff --git a/packages/core/ui/styling/font-common.ts b/packages/core/ui/styling/font-common.ts
@@ -3,7 +3,7 @@ import { ParsedFont, FontStyleType, FontWeightType, FontVariationSettingsType }
 import { makeValidator, makeParser } from '../core/properties';
 import { Trace } from '../../trace';
 
-export const FONTS_BASE_PATH = '/fonts/';
+export const FONTS_BASE_PATH = '/fonts';
 
 export abstract class Font implements FontDefinition {
 	public static default = undefined;
diff --git a/packages/core/ui/styling/font.android.ts b/packages/core/ui/styling/font.android.ts
@@ -78,9 +78,12 @@ function loadFontFromFile(fontFamily: string, font: Font): android.graphics.Type
 			fontAssetPath = basePath + '.ttf';
 		} else if (fs.File.exists(basePath + '.otf')) {
 			fontAssetPath = basePath + '.otf';
-		} else if (Trace.isEnabled()) {
+		} else {
 			fontAssetPath = null;
-			Trace.write('Could not find font file for ' + fontFamily, Trace.categories.Error, Trace.messageType.error);
+
+			if (Trace.isEnabled()) {
+				Trace.write('Could not find font file for ' + fontFamily, Trace.categories.Error, Trace.messageType.error);
+			}
 		}
 
 		result = null; // Default
@@ -108,7 +111,7 @@ function loadFontFromFile(fontFamily: string, font: Font): android.graphics.Type
 			}
 		}
 
-		// The value might be null if there has already been an attempt to load the font but failed
+		// The value will be null if there has already been an attempt to load the font but failed
 		typefaceCache.set(cacheKey, result);
 	}
 
diff --git a/packages/core/ui/styling/font.d.ts b/packages/core/ui/styling/font.d.ts
@@ -1,7 +1,7 @@
 ﻿import { Font as FontBase } from './font-common';
 export type { FontStyleType, FontWeightType, ParsedFont, FontVariationSettingsType } from './font-interfaces';
 
-export const FONTS_BASE_PATH = '/fonts/';
+export const FONTS_BASE_PATH = '/fonts';
 
 export declare class Font extends FontBase {
 	public static default: Font;

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,12 @@ function loadFontFromFile(fontFamily: string, font: Font): android.graphics.Type`
`78`	`78`	`fontAssetPath = basePath + '.ttf';`
`79`	`79`	`} else if (fs.File.exists(basePath + '.otf')) {`
`80`	`80`	`fontAssetPath = basePath + '.otf';`
`81`		`- } else if (Trace.isEnabled()) {`
	`81`	`+ } else {`
`82`	`82`	`fontAssetPath = null;`
`83`		`- Trace.write('Could not find font file for ' + fontFamily, Trace.categories.Error, Trace.messageType.error);`
	`83`	`+`
	`84`	`+ if (Trace.isEnabled()) {`
	`85`	`+ Trace.write('Could not find font file for ' + fontFamily, Trace.categories.Error, Trace.messageType.error);`
	`86`	`+ }`
`84`	`87`	`}`
`85`	`88`
`86`	`89`	`result = null; // Default`
`@@ -108,7 +111,7 @@ function loadFontFromFile(fontFamily: string, font: Font): android.graphics.Type`
`108`	`111`	`}`
`109`	`112`	`}`
`110`	`113`
`111`		`- // The value might be null if there has already been an attempt to load the font but failed`
	`114`	`+ // The value will be null if there has already been an attempt to load the font but failed`
`112`	`115`	`typefaceCache.set(cacheKey, result);`
`113`	`116`	`}`
`114`	`117`