From 71286b5610454dfdf8cb1c8282a1a61361d9db3b Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 7 Aug 2019 15:14:50 +0200 Subject: [PATCH] restore reply_to_event action --- res/css/views/rooms/_SendMessageComposer.scss | 5 +++++ src/components/views/rooms/SendMessageComposer.js | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/res/css/views/rooms/_SendMessageComposer.scss b/res/css/views/rooms/_SendMessageComposer.scss index ffa20d29fa..3304003d84 100644 --- a/res/css/views/rooms/_SendMessageComposer.scss +++ b/res/css/views/rooms/_SendMessageComposer.scss @@ -45,5 +45,10 @@ limitations under the License. overflow-y: auto; } } + + .mx_SendMessageComposer_overlayWrapper { + position: relative; + height: 0; + } } diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js index 301a0f08d1..c45ecaa9f3 100644 --- a/src/components/views/rooms/SendMessageComposer.js +++ b/src/components/views/rooms/SendMessageComposer.js @@ -24,7 +24,7 @@ import {PartCreator} from '../../../editor/parts'; import EditorStateTransfer from '../../../utils/EditorStateTransfer'; import {MatrixClient} from 'matrix-js-sdk'; import BasicMessageComposer from "./BasicMessageComposer"; -import { _t } from '../../../languageHandler'; +import ReplyPreview from "./ReplyPreview"; function createMessageContent(model, editedEvent) { const body = textSerialize(model); @@ -93,6 +93,7 @@ export default class SendMessageComposer extends React.Component { onAction = (payload) => { switch (payload.action) { + case 'reply_to_event': case 'focus_composer': this._editorRef.focus(); break; @@ -100,11 +101,11 @@ export default class SendMessageComposer extends React.Component { }; render() { - //
- //
- // return (
+
+ +