diff --git a/src/components/views/elements/MessageEditor.js b/src/components/views/elements/MessageEditor.js index a0da298f06..bc5cd021dd 100644 --- a/src/components/views/elements/MessageEditor.js +++ b/src/components/views/elements/MessageEditor.js @@ -57,7 +57,6 @@ export default class MessageEditor extends React.Component { }; this._editorRef = null; this._autocompleteRef = null; - // document.execCommand("insertBrOnReturn", undefined, true); } _updateEditorState = (caret) => { @@ -75,8 +74,9 @@ export default class MessageEditor extends React.Component { } _onInput = (event) => { - console.log("finding newValue", this._editorRef.innerHTML); - const {caret, text} = getCaretOffsetAndText(this._editorRef, document.getSelection()); + const sel = document.getSelection(); + // console.log("finding newValue", this._editorRef.innerHTML, sel); + const {caret, text} = getCaretOffsetAndText(this._editorRef, sel); this.model.update(text, event.inputType, caret); } diff --git a/src/editor/model.js b/src/editor/model.js index e7184ad3d3..c35d55e309 100644 --- a/src/editor/model.js +++ b/src/editor/model.js @@ -80,8 +80,8 @@ export default class EditorModel { update(newValue, inputType, caret) { const diff = this._diff(newValue, inputType, caret); const position = this._positionForOffset(diff.at, caret.atNodeEnd); - const valueWithCaret = newValue.slice(0, caret.offset) + "|" + newValue.slice(caret.offset); - console.log("update at", {diff, valueWithCaret}); + // const valueWithCaret = newValue.slice(0, caret.offset) + "|" + newValue.slice(caret.offset); + // console.log("update at", {diff, valueWithCaret}); let removedOffsetDecrease = 0; if (diff.removed) { removedOffsetDecrease = this._removeText(position, diff.removed.length); @@ -93,6 +93,7 @@ export default class EditorModel { this._mergeAdjacentParts(); const caretOffset = diff.at - removedOffsetDecrease + addedLen; const newPosition = this._positionForOffset(caretOffset, true); + // console.log("caretOffset", {at: diff.at, removedOffsetDecrease, addedLen}, newPosition); this._setActivePart(newPosition); this._updateCallback(newPosition); } diff --git a/src/editor/render.js b/src/editor/render.js index ae39f62c41..bb04a4babd 100644 --- a/src/editor/render.js +++ b/src/editor/render.js @@ -74,12 +74,10 @@ export function renderModel(editor, model) { --surplusElementCount; } } else { - // empty div needs to have a BR in it + // empty div needs to have a BR in it to give it height let foundBR = false; let partNode = lineContainer.firstChild; - console.log("partNode", partNode, editor.innerHTML); while (partNode) { - console.log("partNode(in loop)", partNode); if (!foundBR && partNode.tagName === "BR") { foundBR = true; } else { @@ -88,7 +86,6 @@ export function renderModel(editor, model) { partNode = partNode.nextSibling; } if (!foundBR) { - console.log("adding a BR in an empty div because there was none already"); lineContainer.appendChild(document.createElement("br")); } }