jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed positioning of emoji popper - avoids range error 

Co-authored-by: Alvaro <110414366+alvaro-signal@users.noreply.github.com>
This commit is contained in:
automated-signal 2022-09-12 09:11:10 -07:00 committed by GitHub
parent dff3633257
commit 2454432d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ts/quill/emoji/completion.tsx
View File

@ -281,21 +281,21 @@ export class EmojiCompletion {
range.collapse(true);
// if we can, position the popper at the beginning of the emoji text (:word)
const endContainerTextContent = range.endContainer.textContent;
const startOfEmojiText = endContainerTextContent?.lastIndexOf(':');
const textBeforeCursor = range.endContainer.textContent?.slice(
0,
range.startOffset
);
const startOfEmojiText = textBeforeCursor?.lastIndexOf(':');
if (
endContainerTextContent &&
textBeforeCursor &&
isNumber(startOfEmojiText) &&
startOfEmojiText !== -1
) {
range.setStart(
range.endContainer,
range.endOffset -
(endContainerTextContent.length - startOfEmojiText)
);
range.setStart(range.endContainer, startOfEmojiText);
} else {
log.warn(
`Could not find the beginning of the emoji word to be completed. startOfEmojiText=${startOfEmojiText}, endContainerTextContent.length=${endContainerTextContent?.length}, range.offsets=${range.startOffset}-${range.endOffset}`
`Could not find the beginning of the emoji word to be completed. startOfEmojiText=${startOfEmojiText}, textBeforeCursor.length=${textBeforeCursor?.length}, range.offsets=${range.startOffset}-${range.endOffset}`
);
}
return range.getClientRects()[0];