ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Message: Fix duplicating text with nested markup (#1314)

Browse Source
This commit is contained in:
Alexander Zinchuk 2021-07-23 17:01:56 +03:00
parent 4e0d706384
commit 6b803a45f1
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/common/helpers/renderMessageText.tsx
View File

@ -44,12 +44,27 @@ function organizeEntity(
} }
// Determine any nested entities inside current entity // Determine any nested entities inside current entity
const nestedEntities = entities const nestedEntities: IOrganizedEntity[] = [];
const parsedNestedEntities = entities
.filter((e, i) => i > index && e.offset >= offset && e.offset < offset + length) .filter((e, i) => i > index && e.offset >= offset && e.offset < offset + length)
.map((e) => organizeEntity(e, entities.indexOf(e), entities, organizedEntityIndexes)) .map((e) => organizeEntity(e, entities.indexOf(e), entities, organizedEntityIndexes))
.filter<IOrganizedEntity>(Boolean as any); .filter<IOrganizedEntity>(Boolean as any);
nestedEntities.forEach((e) => e.organizedIndexes.forEach((i) => organizedIndexes.add(i))); parsedNestedEntities.forEach((parsedEntity) => {
let isChanged = false;
parsedEntity.organizedIndexes.forEach((organizedIndex) => {
if (!isChanged && !organizedIndexes.has(organizedIndex)) {
isChanged = true;
}
organizedIndexes.add(organizedIndex);
});
if (isChanged) {
nestedEntities.push(parsedEntity);
}
});
return { return {
entity, entity,
@ -95,7 +110,7 @@ export function renderTextWithEntities(
const result: TextPart[] = []; const result: TextPart[] = [];
let deleteLineBreakAfterPre = false; let deleteLineBreakAfterPre = false;
const organizedEntites = organizeEntities(entities); const organizedEntities = organizeEntities(entities);
// Recursive function to render regular and nested entities // Recursive function to render regular and nested entities
function renderEntity( function renderEntity(
@ -192,12 +207,12 @@ export function renderTextWithEntities(
// Process highest-level entities // Process highest-level entities
let index = 0; let index = 0;
organizedEntites.forEach((entity, arrayIndex) => { organizedEntities.forEach((entity, arrayIndex) => {
const { renderResult, entityEndIndex } = renderEntity( const { renderResult, entityEndIndex } = renderEntity(
index, index,
text.length, text.length,
entity, entity,
arrayIndex === organizedEntites.length - 1, arrayIndex === organizedEntities.length - 1,
); );
result.push(...renderResult); result.push(...renderResult);