Merge pull request #2076 from matrix-org/t3chguy/slate_cont2

Slate Fixes
matrix-org · Jul 23, 2018 · b8ca656 · b8ca656
2 parents d242935 + 93abb4b
commit b8ca656
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
@@ -983,8 +983,9 @@ export default class MessageComposerInput extends React.Component {
                     // that we will silently discard nested blocks (e.g. nested lists) :(
                     const fragment = this.html.deserialize(transfer.html);
                     return change
-                        .setOperationFlag("skip", false)
-                        .setOperationFlag("merge", false)
+                    // XXX: this somehow makes Slate barf on undo and get too empty and break entirely
+                    // .setOperationFlag("skip", false)
+                    // .setOperationFlag("merge", false)
                         .insertFragment(fragment.document);
                 } else {
                     // in MD mode we don't want the rich content pasted as the magic was annoying people so paste plain