diff --git a/client/web/divkit/src/components/text/Text.svelte b/client/web/divkit/src/components/text/Text.svelte index 6dfa11ea4..db70ae12a 100644 --- a/client/web/divkit/src/components/text/Text.svelte +++ b/client/web/divkit/src/components/text/Text.svelte @@ -16,7 +16,6 @@ import TextRangeView from './TextRange.svelte'; import { makeStyle } from '../../utils/makeStyle'; import { pxToEm } from '../../utils/pxToEm'; - import { wrapError } from '../../utils/wrapError'; import { genClassName } from '../../utils/genClassName'; import { getBackground } from '../../utils/background'; import { correctPositiveNumber } from '../../utils/correctPositiveNumber'; @@ -35,17 +34,10 @@ const rootCtx = getContext(ROOT_CTX); - let hasError = false; $: jsonText = rootCtx.getDerivedFromVars(json.text); let text = ''; $: { - text = propToString($jsonText, text); - if (!text) { - hasError = true; - rootCtx.logError(wrapError(new Error('Missing "text" prop for div "text"'))); - } else { - hasError = false; - } + text = propToString($jsonText); } $: jsonRanges = rootCtx.getDerivedFromVars(json.ranges); $: jsonImages = rootCtx.getDerivedFromVars(json.images); @@ -398,55 +390,53 @@ }); -{#if !hasError} - - - {#if renderList.length} - {#each renderList as item, index} - {#if 'text' in item} - {#if item.text} - - {/if} - {:else if item.image} - + + + {#if renderList.length} + {#each renderList as item, index} + {#if 'text' in item} + {#if item.text} + {/if} - {/each} - {:else} - - {/if} - - -{/if} + {:else if item.image} + + {/if} + {/each} + {:else} + + {/if} + + diff --git a/client/web/divkit/src/utils/propToString.ts b/client/web/divkit/src/utils/propToString.ts index 204c23b4a..78bb5ac1b 100644 --- a/client/web/divkit/src/utils/propToString.ts +++ b/client/web/divkit/src/utils/propToString.ts @@ -1,7 +1,7 @@ import { VariableValue } from '../expressions/variable'; -export function propToString(val: VariableValue | undefined, defaultVal: string): string { +export function propToString(val: VariableValue | undefined): string { const valToString = String(val ?? ''); - return valToString || defaultVal; + return valToString; } diff --git a/client/web/divkit/tests/hermione/screens/encode/encode/chromeMobile/encode.png b/client/web/divkit/tests/hermione/screens/encode/encode/chromeMobile/encode.png index ac5dc51b2..06003005b 100644 Binary files a/client/web/divkit/tests/hermione/screens/encode/encode/chromeMobile/encode.png and b/client/web/divkit/tests/hermione/screens/encode/encode/chromeMobile/encode.png differ diff --git a/client/web/divkit/tests/hermione/screens/encode/encode/firefoxMobile/encode.png b/client/web/divkit/tests/hermione/screens/encode/encode/firefoxMobile/encode.png index 500a8ab89..bf0577dbb 100644 Binary files a/client/web/divkit/tests/hermione/screens/encode/encode/firefoxMobile/encode.png and b/client/web/divkit/tests/hermione/screens/encode/encode/firefoxMobile/encode.png differ diff --git a/client/web/divkit/tests/utils/propToString.test.ts b/client/web/divkit/tests/utils/propToString.test.ts index 05013693c..d5a222f07 100644 --- a/client/web/divkit/tests/utils/propToString.test.ts +++ b/client/web/divkit/tests/utils/propToString.test.ts @@ -2,10 +2,10 @@ import { propToString } from '../../src/utils/propToString'; describe('expressions', () => { test('valToString', () => { - expect(propToString('a', 'b')).toBe('a'); - expect(propToString(1, 'b')).toBe('1'); - expect(propToString(0, 'b')).toBe('0'); - expect(propToString(undefined, 'b')).toBe('b'); - expect(propToString('', 'b')).toBe('b'); + expect(propToString('a')).toBe('a'); + expect(propToString(1)).toBe('1'); + expect(propToString(0)).toBe('0'); + expect(propToString(undefined)).toBe(''); + expect(propToString('')).toBe(''); }); });