diff --git a/src/app/components/TextComponent.tsx b/src/app/components/TextComponent.tsx index 4b4fa151..5e008ca5 100644 --- a/src/app/components/TextComponent.tsx +++ b/src/app/components/TextComponent.tsx @@ -22,8 +22,9 @@ interface PartData extends StyleData { interface Props { component: unknown, base?: StyleData, + oneline?: boolean, } -export function TextComponent({ component, base = { color: 'white' } }: Props) { +export function TextComponent({ component, base = { color: 'white' }, oneline }: Props) { const { version } = useVersion() const { lang } = useLocale() @@ -37,7 +38,7 @@ export function TextComponent({ component, base = { color: 'white' } }: Props) { const { value: language } = useAsync(() => getLanguage(version, lang), [version, lang]) return
- {parts.map(p => )} + {parts.map(p => )}
} @@ -102,12 +103,12 @@ const TextColors: Record = { white: ['#FFF', '#3F3F3F'], } -function TextPart({ part, lang }: { part: PartData, lang: Record }) { - if (part.translate) { - const str = resolveTranslate(part.translate, part.fallback, part.with, lang) - return {str} - } - return {part.text} +function TextPart({ part, lang, oneline }: { part: PartData, lang: Record, oneline?: boolean }) { + let text = part.translate + ? resolveTranslate(part.translate, part.fallback, part.with, lang) + : (part.text ?? '') + text = oneline ? text.replaceAll('\n', '␊') : text + return {text} } function resolveTranslate(translate: string, fallback: string | undefined, with_: any[] | undefined, lang: Record): string { diff --git a/src/app/components/previews/DialogPreview.tsx b/src/app/components/previews/DialogPreview.tsx index d9aa17d6..9c77e297 100644 --- a/src/app/components/previews/DialogPreview.tsx +++ b/src/app/components/previews/DialogPreview.tsx @@ -205,7 +205,7 @@ interface ButtonProps { function Button({ label, width }: ButtonProps) { // TODO: add tooltip return
- +
}