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

Fix top_offset mutation

Browse Source 
a6ebade8315f640d895253a053d055dd35565764
This commit is contained in:
4eb0da
2024-06-19 18:03:43 +03:00
parent c501a5faa7
commit f3facf2fd9
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/web/divkit/src/components/text/Text.svelte
+10 -9
View File
@@ -261,12 +261,13 @@
ranges.forEach(range => {
if (range.start !== undefined && range.end !== undefined) {
if (!range.top_offset) {
range.top_offset = 0;
}
const rangeWithExplicitProps = {
top_offset: 0,
...range
};
list.push({
index: range.start,
range: range as typeof range & {
range: rangeWithExplicitProps as typeof range & {
start: number;
end: number;
},
@@ -275,7 +276,7 @@
});
list.push({
index: range.end,
range: range as typeof range & {
range: rangeWithExplicitProps as typeof range & {
start: number;
end: number;
},
@@ -328,7 +329,10 @@
let index = item.index;
if (index > prevIndex) {
let textStyles = Object.assign({ ...rootTextStyles }, ...activeRanges as any[]) as TextStyles;
let textStyles = Object.assign({ ...rootTextStyles }, ...activeRanges as any[]) as TextRange;
if (activeRanges.length && activeRanges[activeRanges.length - 1].start !== prevIndex) {
textStyles.top_offset = 0;
}
newRenderList.push({
text: content.substring(prevIndex, index),
textStyles,
@@ -340,9 +344,6 @@
activeRanges.push(range);
} else if (item.type === 'rangeEnd') {
activeRanges = activeRanges.filter(range => range !== item.range);
if (activeRanges.length) {
activeRanges[activeRanges.length - 1].top_offset = 0;
}
} else if (item.type === 'image') {
let textStyles2 = Object.assign({ ...rootTextStyles }, ...activeRanges as any[]) as TextStyles;
let imageWidth = pxToEm(