imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into gsouquet/compact-composer-18533

Browse source
This commit is contained in:
Germain Souquet 2021-09-03 09:20:38 +01:00
commit 6d80976eae
43 changed files with 683 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/rooms/MessageComposer.tsx
View file

@ -192,6 +192,7 @@ interface IProps {
resizeNotifier: ResizeNotifier;
permalinkCreator: RoomPermalinkCreator;
replyToEvent?: MatrixEvent;
replyInThread?: boolean;
showReplyPreview?: boolean;
e2eStatus?: E2EStatus;
compact?: boolean;
@ -217,6 +218,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
private ref: React.RefObject<HTMLDivElement> = createRef();
static defaultProps = {
replyInThread: false,
showReplyPreview: true,
compact: false,
};
@ -498,6 +500,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
room={this.props.room}
placeholder={this.renderPlaceholderText()}
permalinkCreator={this.props.permalinkCreator}
replyInThread={this.props.replyInThread}
replyToEvent={this.props.replyToEvent}
onChange={this.onChange}
disabled={this.state.haveRecording}