PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2206 from matrix-org/dbkr/slate_update_fix_quote

Browse source 
Fix quote post slate update
This commit is contained in:
David Baker 2018-10-11 11:09:25 +01:00 committed by GitHub
commit 9c8e5119ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/rooms/MessageComposerInput.js
View file

@ -423,12 +423,12 @@ export default class MessageComposerInput extends React.Component {
focus: { focus: {
key: quote.key, key: quote.key,
}, },
})).collapseToEndOfBlock().insertBlock(Block.create(DEFAULT_NODE)).focus(); })).moveToEndOfBlock().insertBlock(Block.create(DEFAULT_NODE)).focus();
this.onChange(change); this.onChange(change);
} else { } else {
let fragmentChange = fragment.change(); let fragmentChange = fragment.change();
fragmentChange.moveToRangeOf(fragment.document) fragmentChange.moveToRangeOfNode(fragment.document)
.wrapBlock(quote); .wrapBlock(quote);
// FIXME: handle pills and use commonmark rather than md-serialize // FIXME: handle pills and use commonmark rather than md-serialize
@ -838,7 +838,7 @@ export default class MessageComposerInput extends React.Component {
parent.object !== 'document') parent.object !== 'document')
{ {
return change.replaceNodeByKey(editorState.anchorBlock.key, editorState.anchorText) return change.replaceNodeByKey(editorState.anchorBlock.key, editorState.anchorText)
.collapseToEndOf(parent) .moveToEndOfNode(parent)
.focus(); .focus();
} }
} }
@ -1293,7 +1293,7 @@ export default class MessageComposerInput extends React.Component {
} }
// Move selection to the end of the selected history // Move selection to the end of the selected history
const change = editorState.change().collapseToEndOf(editorState.document); const change = editorState.change().moveToEndOfNode(editorState.document);
// We don't call this.onChange(change) now, as fixups on stuff like emoji // We don't call this.onChange(change) now, as fixups on stuff like emoji
// should already have been done and persisted in the history. // should already have been done and persisted in the history.