OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1267 from matrix-org/luke/fix-complete-after-blocks 

Account for `\n` after each block
pull/21833/head
Luke Barnard 2017-08-02 16:41:47 +01:00 committed by GitHub
parent c914f1607b 1512aff326
commit 700dd51584
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/RichText.js
View File

@ -201,10 +201,8 @@ export function selectionStateToTextOffsets(selectionState: SelectionState,
export function textOffsetsToSelectionState({start, end}: SelectionRange, export function textOffsetsToSelectionState({start, end}: SelectionRange,
contentBlocks: Array<ContentBlock>): SelectionState { contentBlocks: Array<ContentBlock>): SelectionState {
let selectionState = SelectionState.createEmpty(); let selectionState = SelectionState.createEmpty();
for (const block of contentBlocks) {
for (let block of contentBlocks) { const blockLength = block.getLength();
let blockLength = block.getLength();
if (start !== -1 && start < blockLength) { if (start !== -1 && start < blockLength) {
selectionState = selectionState.merge({ selectionState = selectionState.merge({
anchorKey: block.getKey(), anchorKey: block.getKey(),
@ -212,9 +210,8 @@ export function textOffsetsToSelectionState({start, end}: SelectionRange,
}); });
start = -1; start = -1;
} else { } else {
start -= blockLength; start -= blockLength + 1; // +1 to account for newline between blocks
} }
if (end !== -1 && end <= blockLength) { if (end !== -1 && end <= blockLength) {
selectionState = selectionState.merge({ selectionState = selectionState.merge({
focusKey: block.getKey(), focusKey: block.getKey(),
@ -222,10 +219,9 @@ export function textOffsetsToSelectionState({start, end}: SelectionRange,
}); });
end = -1; end = -1;
} else { } else {
end -= blockLength; end -= blockLength + 1; // +1 to account for newline between blocks
} }
} }
return selectionState; return selectionState;
} }