PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1299 from matrix-org/luke/fix-text-offsets-to-selection-state

Browse source 
Fix bugs in textOffsetsToSelectionState
This commit is contained in:
Luke Barnard 2017-08-15 11:37:35 +01:00 • committed by GitHub
commit 472b5b5350
1 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/RichText.js
View file

@ -202,25 +202,34 @@ 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();
// Subtract block lengths from `start` and `end` until they are less than the current
// block length (accounting for the NL at the end of each block). Set them to -1 to
// indicate that the corresponding selection state has been determined.
for (const block of contentBlocks) { for (const block of contentBlocks) {
const blockLength = block.getLength(); const blockLength = block.getLength();
if (start !== -1 && start < blockLength) { // -1 indicating that the position start position has been found
selectionState = selectionState.merge({ if (start !== -1) {
anchorKey: block.getKey(), if (start < blockLength + 1) {
anchorOffset: start, selectionState = selectionState.merge({
}); anchorKey: block.getKey(),
start = -1; anchorOffset: start,
} else { });
start -= blockLength + 1; // +1 to account for newline between blocks start = -1; // selection state for the start calculated
} else {
start -= blockLength + 1; // +1 to account for newline between blocks
}
} }
if (end !== -1 && end <= blockLength) { // -1 indicating that the position end position has been found
selectionState = selectionState.merge({ if (end !== -1) {
focusKey: block.getKey(), if (end < blockLength + 1) {
focusOffset: end, selectionState = selectionState.merge({
}); focusKey: block.getKey(),
end = -1; focusOffset: end,
} else { });
end -= blockLength + 1; // +1 to account for newline between blocks end = -1; // selection state for the end calculated
} else {
end -= blockLength + 1; // +1 to account for newline between blocks
}
} }
} }
return selectionState; return selectionState;