From e9cabf0e8564a30f7e0432fac063144e4a28a8be Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 20 May 2018 03:17:51 +0100 Subject: [PATCH] add pill and emoji serialisation to Md --- .../views/rooms/MessageComposerInput.js | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 8c5ab2394f..d1bf4e4544 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -177,8 +177,23 @@ export default class MessageComposerInput extends React.Component { this.plainWithMdPills = new PlainWithPillsSerializer({ pillFormat: 'md' }); this.plainWithIdPills = new PlainWithPillsSerializer({ pillFormat: 'id' }); this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' }); - this.md = new Md(); - this.html = new Html({ + + this.md = new Md({ + rules: [ + { + serialize: (obj, children) => { + switch (obj.type) { + case 'pill': + return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`; + case 'emoji': + return obj.data.get('emojiUnicode'); + } + } + } + ] + }); + + this.html = new Html({ rules: [ { deserialize: (el, next) => { @@ -567,8 +582,13 @@ export default class MessageComposerInput extends React.Component { if (enabled) { // for simplicity when roundtripping, we use slate-md-serializer rather than commonmark const markdown = this.plainWithMdPills.serialize(this.state.editorState); + + // weirdly, the Md serializer can't deserialize '' to a valid Value... if (markdown !== '') { - // weirdly, the Md serializer can't deserialize '' to a valid Value... + // FIXME: the MD deserializer doesn't know how to deserialize pills + // and gives no hooks for doing so, so we should manually fix up + // the editorState first in order to preserve them. + editorState = this.md.deserialize(markdown); } else {