GitHub/divkit
1
0
Fork 0
mirror of https://github.com/divkit/divkit.git synced 2026-06-06 20:07:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow empty text

Browse Source
This commit is contained in:
4eb0da
2023-12-08 21:18:52 +03:00
parent 34a58d13b6
commit 5cebd115cc
5 changed files with 57 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/web/divkit/src/components/text/Text.svelte
+50 -60
View File
@@ -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<RootCtxValue>(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 @@
});
</script>
{#if !hasError}
<Outer
cls="{genClassName('text', css, mods)} {selectable ? '' : rootCss.root__unselectable}"
{json}
{origJson}
{templateContext}
{layoutParams}
>
<span class={genClassName('text__inner', css, innerMods)} style={makeStyle(style)}>
{#if renderList.length}
{#each renderList as item, index}
{#if 'text' in item}
{#if item.text}
<TextRangeView
text={item.text}
rootFontSize={fontSize}
textStyles={item.textStyles}
{singleline}
actions={item.actions}
/>
{/if}
{:else if item.image}
<span style={makeStyle(item.image.wrapperStyle)}><img
class={css.text__image}
src={item.image.url}
loading="lazy"
decoding="async"
aria-hidden="true"
alt=""
style={makeStyle({
width: item.image.width,
height: item.image.height,
// Normalizes line-height for the containing text line
'margin-top': customLineHeight ? `-${item.image.height}` : undefined,
'margin-bottom': customLineHeight ? `-${item.image.height}` : undefined,
filter: item.image.svgFilterId ? `url(#${item.image.svgFilterId})` : undefined
})}
on:error={onImgError}
></span>
<Outer
cls="{genClassName('text', css, mods)} {selectable ? '' : rootCss.root__unselectable}"
{json}
{origJson}
{templateContext}
{layoutParams}
>
<span class={genClassName('text__inner', css, innerMods)} style={makeStyle(style)}>
{#if renderList.length}
{#each renderList as item, index}
{#if 'text' in item}
{#if item.text}
<TextRangeView
text={item.text}
rootFontSize={fontSize}
textStyles={item.textStyles}
{singleline}
actions={item.actions}
/>
{/if}
{/each}
{:else}
<TextRangeView
{text}
rootFontSize={fontSize}
textStyles={$jsonRootTextStyles}
{singleline}
/>
{/if}
</span>
</Outer>
{/if}
{:else if item.image}
<span style={makeStyle(item.image.wrapperStyle)}><img
class={css.text__image}
src={item.image.url}
loading="lazy"
decoding="async"
aria-hidden="true"
alt=""
style={makeStyle({
width: item.image.width,
height: item.image.height,
// Normalizes line-height for the containing text line
'margin-top': customLineHeight ? `-${item.image.height}` : undefined,
'margin-bottom': customLineHeight ? `-${item.image.height}` : undefined,
filter: item.image.svgFilterId ? `url(#${item.image.svgFilterId})` : undefined
})}
on:error={onImgError}
></span>
{/if}
{/each}
{:else}
<TextRangeView
{text}
rootFontSize={fontSize}
textStyles={$jsonRootTextStyles}
{singleline}
/>
{/if}
</span>
</Outer>
client/web/divkit/src/utils/propToString.ts
+2 -2
View File
@@ -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;
}
client/web/divkit/tests/hermione/screens/encode/encode/chromeMobile/encode.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 43 KiB

client/web/divkit/tests/hermione/screens/encode/encode/firefoxMobile/encode.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 13 KiB

client/web/divkit/tests/utils/propToString.test.ts
+5 -5
View File
@@ -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('');
});
});