mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-18 11:22:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3029 from matrix-org/bwindels/pill-n-newlines

Browse source 
Fix: maintain caret at current line when position is on newline part
This commit is contained in:
Bruno Windels 2019-05-31 08:44:02 +00:00 committed by GitHub
commit eb8dd52437
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/editor/caret.js
View file

@ -20,13 +20,23 @@ export function setCaretPosition(editor, model, caretPosition) {
sel.removeAllRanges(); sel.removeAllRanges();
const range = document.createRange(); const range = document.createRange();
const {parts} = model; const {parts} = model;
const {index} = caretPosition;
let {offset} = caretPosition;
let lineIndex = 0; let lineIndex = 0;
let nodeIndex = -1; let nodeIndex = -1;
for (let i = 0; i <= caretPosition.index; ++i) { for (let i = 0; i <= index; ++i) {
const part = parts[i]; const part = parts[i];
if (part && part.type === "newline") { if (part && part.type === "newline") {
lineIndex += 1; if (i < index) {
nodeIndex = -1; lineIndex += 1;
nodeIndex = -1;
} else {
// if index points at a newline part,
// put the caret at the end of the previous part
// so it stays on the same line
const prevPart = parts[i - 1];
offset = prevPart ? prevPart.text.length : 0;
}
} else { } else {
nodeIndex += 1; nodeIndex += 1;
} }
@ -34,14 +44,11 @@ export function setCaretPosition(editor, model, caretPosition) {
let focusNode; let focusNode;
const lineNode = editor.childNodes[lineIndex]; const lineNode = editor.childNodes[lineIndex];
if (lineNode) { if (lineNode) {
if (lineNode.childNodes.length === 0 && caretPosition.offset === 0) { focusNode = lineNode.childNodes[nodeIndex];
if (!focusNode) {
focusNode = lineNode; focusNode = lineNode;
} else { } else if (focusNode.nodeType === Node.ELEMENT_NODE) {
focusNode = lineNode.childNodes[nodeIndex]; focusNode = focusNode.childNodes[0];
if (focusNode && focusNode.nodeType === Node.ELEMENT_NODE) {
focusNode = focusNode.childNodes[0];
}
} }
} }
// node not found, set caret at end // node not found, set caret at end
@ -50,7 +57,7 @@ export function setCaretPosition(editor, model, caretPosition) {
range.collapse(false); range.collapse(false);
} else { } else {
// make sure we have a text node // make sure we have a text node
range.setStart(focusNode, caretPosition.offset); range.setStart(focusNode, offset);
range.collapse(true); range.collapse(true);
} }
sel.addRange(range); sel.addRange(range);

3
src/editor/render.js
View file

@ -61,12 +61,13 @@ export function renderModel(editor, model) {
let foundBR = false; let foundBR = false;
let partNode = lineContainer.firstChild; let partNode = lineContainer.firstChild;
while (partNode) { while (partNode) {
const nextNode = partNode.nextSibling;
if (!foundBR && partNode.tagName === "BR") { if (!foundBR && partNode.tagName === "BR") {
foundBR = true; foundBR = true;
} else { } else {
lineContainer.removeChild(partNode); lineContainer.removeChild(partNode);
} }
partNode = partNode.nextSibling; partNode = nextNode;
} }
if (!foundBR) { if (!foundBR) {
lineContainer.appendChild(document.createElement("br")); lineContainer.appendChild(document.createElement("br"));