workaround non latin character db bug

This commit is contained in:
Boof2015
2026-06-14 14:22:18 -04:00
parent 3d30a09713
commit 51b733a293
175 changed files with 178 additions and 102 deletions
+47 -7
View File
@@ -1,3 +1,4 @@
import type { ReactNode } from 'react';
import { Text as RNText, type TextProps as RNTextProps, StyleSheet } from 'react-native';
import { colors, fonts, fontSize } from '@/theme';
@@ -8,11 +9,56 @@ interface TextProps extends RNTextProps {
color?: string;
}
// Inter / JetBrains Mono are Latin-only, and a custom TTF Typeface on Android does
// not chain to the system Noto fallback, so CJK/other non-Latin glyphs render blank.
// When a string contains characters outside the ranges Inter actually covers, we drop
// the custom fontFamily so the platform default (full Noto CJK/emoji coverage) renders
// it, keeping the variant's weight via numeric fontWeight.
// Allowed (stays Inter): Latin + Latin-1/Ext-A/B (0000-024F), Greek (0370-03FF),
// Cyrillic (0400-04FF), general punctuation (2000-206F), currency (20A0-20CF),
// letterlike symbols (2100-214F). Anything else -> system font.
const NON_LATIN =
/[^\u0000-\u024F\u0370-\u03FF\u0400-\u04FF\u2000-\u206F\u20A0-\u20CF\u2100-\u214F]/;
const VARIANT_FAMILY: Record<Variant, string> = {
title: fonts.sans.bold,
heading: fonts.sans.semibold,
body: fonts.sans.regular,
label: fonts.sans.medium,
caption: fonts.sans.regular,
mono: fonts.mono.regular,
};
const VARIANT_WEIGHT: Record<Variant, '400' | '500' | '600' | '700'> = {
title: '700',
heading: '600',
body: '400',
label: '500',
caption: '400',
mono: '400',
};
function collectText(node: ReactNode): string {
if (typeof node === 'string') return node;
if (typeof node === 'number') return String(node);
if (Array.isArray(node)) return node.map(collectText).join('');
return ''; // nested elements render their own <Text> and self-detect
}
/** Themed Text — applies Astra fonts/colors. Import this instead of RN's Text. */
export function Text({ variant = 'body', color, style, ...rest }: TextProps) {
const fallback = NON_LATIN.test(collectText(rest.children));
return (
<RNText
style={[styles[variant], color ? { color } : null, style]}
style={[
styles[variant],
{
fontFamily: fallback ? undefined : VARIANT_FAMILY[variant],
fontWeight: fallback ? VARIANT_WEIGHT[variant] : undefined,
},
color ? { color } : null,
style,
]}
{...rest}
/>
);
@@ -20,32 +66,26 @@ export function Text({ variant = 'body', color, style, ...rest }: TextProps) {
const styles = StyleSheet.create({
title: {
fontFamily: fonts.sans.bold,
fontSize: fontSize.xxl,
color: colors.textPrimary,
},
heading: {
fontFamily: fonts.sans.semibold,
fontSize: fontSize.lg,
color: colors.textPrimary,
},
body: {
fontFamily: fonts.sans.regular,
fontSize: fontSize.base,
color: colors.textPrimary,
},
label: {
fontFamily: fonts.sans.medium,
fontSize: fontSize.sm,
color: colors.textSecondary,
},
caption: {
fontFamily: fonts.sans.regular,
fontSize: fontSize.xs,
color: colors.textTertiary,
},
mono: {
fontFamily: fonts.mono.regular,
fontSize: fontSize.sm,
color: colors.textSecondary,
},