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

pass caret to history manager upon initial render 

otherwise caret is put at editor start when undoing last step
pull/21833/head
Bruno Windels 2019-08-01 11:28:01 +02:00
parent 234404e598
commit 9d49a5bb73
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/elements/MessageEditor.js
View File

@ -315,9 +315,7 @@ export default class MessageEditor extends React.Component {
componentDidMount() { componentDidMount() {
this._createEditorModel(); this._createEditorModel();
// initial render of model // initial render of model
this._updateEditorState(); this._updateEditorState(this._getInitialCaretPosition());
// initial caret position
this._initializeCaret();
// attach input listener by hand so React doesn't proxy the events, // attach input listener by hand so React doesn't proxy the events,
// as the proxied event doesn't support inputType, which we need. // as the proxied event doesn't support inputType, which we need.
this._editorRef.addEventListener("input", this._onInput, true); this._editorRef.addEventListener("input", this._onInput, true);
@ -350,7 +348,7 @@ export default class MessageEditor extends React.Component {
); );
} }
_initializeCaret() { _getInitialCaretPosition() {
const {editState} = this.props; const {editState} = this.props;
let caretPosition; let caretPosition;
if (editState.hasEditorState()) { if (editState.hasEditorState()) {
@ -362,7 +360,7 @@ export default class MessageEditor extends React.Component {
// otherwise, set it at the end // otherwise, set it at the end
caretPosition = this.model.getPositionAtEnd(); caretPosition = this.model.getPositionAtEnd();
} }
setCaretPosition(this._editorRef, this.model, caretPosition); return caretPosition;
} }
render() { render() {