Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix composition area link previews with multiline text

Browse Source
This commit is contained in:
Ken Powers
2019-08-22 16:42:03 -04:00
committed by Scott Nonnenberg
parent 6cd3165c1b
commit eec0fce62a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ts/components/CompositionInput.tsx
View File

@@ -205,23 +205,23 @@ export const CompositionInput = ({
const updateExternalStateListeners = React.useCallback(
(newState: EditorState) => {
const plainText = newState.getCurrentContent().getPlainText();
const currentBlockKey = newState.getSelection().getStartKey();
const currentBlockIndex = editorStateRef.current
const cursorBlockKey = newState.getSelection().getStartKey();
const cursorBlockIndex = editorStateRef.current
.getCurrentContent()
.getBlockMap()
.keySeq()
.findIndex(key => key === currentBlockKey);
.findIndex(key => key === cursorBlockKey);
const caretLocation = newState
.getCurrentContent()
.getBlockMap()
.valueSeq()
.toArray()
.reduce((sum: number, block: ContentBlock, index: number) => {
if (currentBlockIndex < index) {
.reduce((sum: number, block: ContentBlock, currentIndex: number) => {
if (currentIndex < cursorBlockIndex) {
return sum + block.getText().length + 1; // +1 for newline
}
if (currentBlockIndex === index) {
if (currentIndex === cursorBlockIndex) {
return sum + newState.getSelection().getStartOffset();
}
@@ -235,6 +235,7 @@ export const CompositionInput = ({
onDirtyChange(isDirty);
}
}
if (onEditorStateChange) {
onEditorStateChange(plainText, caretLocation);
}