Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740

Conflicts: src/components/views/rooms/EditMessageComposer.js src/components/views/rooms/SendMessageComposer.js
2021-05-24 21:57:38 +01:00
parent 86b6fc3473 7123abc122
commit d8acc0612a
441 changed files with 17397 additions and 5941 deletions
@@ -158,7 +158,7 @@ export default class EditorModel {
        }
    }

-    reset(serializedParts: SerializedPart[], caret: Caret, inputType: string) {
+    reset(serializedParts: SerializedPart[], caret?: Caret, inputType?: string) {
        this._parts = serializedParts.map(p => this._partCreator.deserializePart(p));
        if (!caret) {
            caret = this.getPositionAtEnd();