r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix displaying other entities in monospace text

Browse Source 
Fix formatting
This commit is contained in:
Eduard Kuzmenko 2022-06-28 03:41:29 +02:00
parent c7e0cd4759
commit 20b2525d51
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/chat/bubbles.ts
View File

@ -4178,13 +4178,14 @@ export default class ChatBubbles {
} }
default: default:
attachmentDiv = undefined;
bubble.classList.remove('is-message-empty'); bubble.classList.remove('is-message-empty');
messageDiv.append(i18n(UNSUPPORTED_LANG_PACK_KEY), timeSpan); messageDiv.append(i18n(UNSUPPORTED_LANG_PACK_KEY), timeSpan);
this.log.warn('unrecognized media type:', messageMedia._, message); this.log.warn('unrecognized media type:', messageMedia._, message);
break; break;
} }
if(!processingWebPage) { if(!processingWebPage && attachmentDiv) {
bubbleContainer.append(attachmentDiv); bubbleContainer.append(attachmentDiv);
} }

19
src/lib/richTextProcessor/findConflictingEntity.ts
View File

@ -7,11 +7,22 @@
import { PASS_CONFLICTING_ENTITIES } from "."; import { PASS_CONFLICTING_ENTITIES } from ".";
import { MessageEntity } from "../../layer"; import { MessageEntity } from "../../layer";
export default function findConflictingEntity(currentEntities: MessageEntity[], newEntity: MessageEntity) { const SINGLE_ENTITIES: Set<MessageEntity['_']> = new Set(['messageEntityPre', 'messageEntityCode']);
return currentEntities.find((currentEntity) => {
const isConflictingTypes = newEntity._ === currentEntity._ ||
(!PASS_CONFLICTING_ENTITIES.has(newEntity._) && !PASS_CONFLICTING_ENTITIES.has(currentEntity._));
export default function findConflictingEntity(currentEntities: MessageEntity[], newEntity: MessageEntity) {
let singleEnd = -1;
return currentEntities.find((currentEntity) => {
if(SINGLE_ENTITIES.has(currentEntity._)) {
singleEnd = currentEntity.offset + currentEntity.length;
}
if(newEntity.offset < singleEnd && !PASS_CONFLICTING_ENTITIES.has(newEntity._)) {
return true;
}
const isConflictingTypes = newEntity._ === currentEntity._ ||
(!PASS_CONFLICTING_ENTITIES.has(newEntity._) && !PASS_CONFLICTING_ENTITIES.has(currentEntity._));
if(!isConflictingTypes) { if(!isConflictingTypes) {
return false; return false;
} }

12
src/lib/richTextProcessor/wrapRichText.ts
View File

@ -434,7 +434,15 @@ export default function wrapRichText(text: string, options: Partial<{
// (lastElement || fragment).append(element ?? partText); // (lastElement || fragment).append(element ?? partText);
// } // }
if(entity.length > partText.length && element) { if(nasty.usedLength <= endOffset) {
if(nasty.usedLength < endOffset) {
(element || fragment).append(nasty.text.slice(nasty.usedLength, endOffset));
nasty.usedLength = endOffset;
}
lastElement = fragment;
nasty.lastEntity = undefined;
} else if(entity.length > partText.length && element) {
lastElement = element; lastElement = element;
} else { } else {
lastElement = fragment; lastElement = fragment;
@ -455,3 +463,5 @@ export default function wrapRichText(text: string, options: Partial<{
return fragment; return fragment;
} }
(window as any).wrapRichText = wrapRichText;