javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-14 18:12:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): font variation settings parser invalid axis (#10427)

Browse Source
This commit is contained in:
Dimitris-Rafail Katsampas
2023-11-02 22:39:52 +02:00
committed by GitHub
parent f6fda98610
commit 08478556a9
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/core/ui/styling/font-common.ts
View File

@ -1,6 +1,7 @@
import { Font as FontDefinition } from './font'; import { Font as FontDefinition } from './font';
import { ParsedFont, FontStyleType, FontWeightType, FontVariationSettingsType } from './font-interfaces'; import { ParsedFont, FontStyleType, FontWeightType, FontVariationSettingsType } from './font-interfaces';
import { makeValidator, makeParser } from '../core/properties'; import { makeValidator, makeParser } from '../core/properties';
import { Trace } from '../../trace';
export abstract class Font implements FontDefinition { export abstract class Font implements FontDefinition {
public static default = undefined; public static default = undefined;
@ -69,41 +70,47 @@ export namespace FontWeight {
export namespace FontVariationSettings { export namespace FontVariationSettings {
export function parse(fontVariationSettings: string): Array<FontVariationSettingsType> | null { export function parse(fontVariationSettings: string): Array<FontVariationSettingsType> | null {
const allowedValues = ['normal', 'inherit', 'initial', 'revert', 'revert-layer', 'unset']; if (!fontVariationSettings) {
const lower = fontVariationSettings?.toLowerCase().trim();
if (allowedValues.indexOf(lower) !== -1) {
return null; return null;
} }
const chunks = lower.split(','); const allowedValues = ['normal', 'inherit', 'initial', 'revert', 'revert-layer', 'unset'];
const variationSettingsValue: string = fontVariationSettings.trim();
if (allowedValues.indexOf(variationSettingsValue.toLowerCase()) !== -1) {
return null;
}
const chunks = variationSettingsValue.split(',');
if (chunks.length) { if (chunks.length) {
const parsed: Array<FontVariationSettingsType> = []; const parsed: Array<FontVariationSettingsType> = [];
for (const chunk of chunks) { for (const chunk of chunks) {
const axisChunks = chunk.trim(); const trimmedChunk = chunk.trim();
const axisChunks = trimmedChunk.split(' ');
if (axisChunks.length === 2) { if (axisChunks.length === 2) {
const axisName = chunk[0].trim(); const axisName = axisChunks[0].trim();
const axisValue = parseFloat(chunk[0]); const axisValue = parseFloat(axisChunks[1]);
// See https://drafts.csswg.org/css-fonts/#font-variation-settings-def. // See https://drafts.csswg.org/css-fonts/#font-variation-settings-def.
// Axis name strings longer or shorter than four characters are invalid. // Axis name strings longer or shorter than four characters are invalid.
if (!isNaN(axisValue) && axisName.length === 6 && ((axisName.startsWith("'") && axisName.endsWith("'")) || (axisName.startsWith('"') && axisName.endsWith('"')))) { if (!isNaN(axisValue) && axisName.length === 6 && ((axisName.startsWith("'") && axisName.endsWith("'")) || (axisName.startsWith('"') && axisName.endsWith('"')))) {
parsed.push({ axis: axisName, value: axisValue }); parsed.push({ axis: axisName, value: axisValue });
} else { } else {
console.error('Invalid value (font-variation-settings): ' + fontVariationSettings); Trace.write('Invalid value (font-variation-settings): ' + variationSettingsValue, Trace.categories.Error, Trace.messageType.error);
} }
} else { } else {
console.error('Invalid value (font-variation-settings): ' + fontVariationSettings); Trace.write('Invalid value (font-variation-settings): ' + variationSettingsValue, Trace.categories.Error, Trace.messageType.error);
} }
} }
return parsed; return parsed;
} }
console.error('Invalid value (font-variation-settings): ' + fontVariationSettings); Trace.write('Invalid value (font-variation-settings): ' + variationSettingsValue, Trace.categories.Error, Trace.messageType.error);
} }
export function toString(fontVariationSettings: FontVariationSettingsType[] | null): string | null { export function toString(fontVariationSettings: FontVariationSettingsType[] | null): string | null {
if (fontVariationSettings?.length) { if (fontVariationSettings?.length) {
return fontVariationSettings.map(({ axis, value }) => `'${axis}' ${value}`).join(', '); return fontVariationSettings.map(({ axis, value }) => `${axis} ${value}`).join(', ');
} }
return null; return null;

5
packages/core/ui/styling/font.android.ts
View File

@ -63,8 +63,7 @@ function computeFontCacheKey(fontFamily: string, font: Font) {
} }
function loadFontFromFile(fontFamily: string, font: Font): android.graphics.Typeface { function loadFontFromFile(fontFamily: string, font: Font): android.graphics.Typeface {
const apiLevel = android.os.Build.VERSION.SDK_INT; const cacheKey = SDK_VERSION >= 26 ? computeFontCacheKey(fontFamily, font) : fontFamily;
const cacheKey = apiLevel >= 26 ? computeFontCacheKey(fontFamily, font) : fontFamily;
appAssets = appAssets || (ad.getApplicationContext() as android.content.Context).getAssets(); appAssets = appAssets || (ad.getApplicationContext() as android.content.Context).getAssets();
if (!appAssets) { if (!appAssets) {
@ -89,7 +88,7 @@ function loadFontFromFile(fontFamily: string, font: Font): android.graphics.Type
if (fontAssetPath) { if (fontAssetPath) {
try { try {
fontAssetPath = fs.path.join(fs.knownFolders.currentApp().path, fontAssetPath); fontAssetPath = fs.path.join(fs.knownFolders.currentApp().path, fontAssetPath);
if (apiLevel >= 26) { if (SDK_VERSION >= 26) {
const builder = new android.graphics.Typeface.Builder(fontAssetPath); const builder = new android.graphics.Typeface.Builder(fontAssetPath);
if (builder) { if (builder) {
if (font.fontVariationSettings !== undefined) { if (font.fontVariationSettings !== undefined) {