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

Revert recent composer changes (#8840)

Browse source 
* Revert "Prevent new composer from overflowing from non-breakable text (#8829)"

This reverts commit 57dff8131c.

* Revert "Fix scroll jump issue with the composer (#8791)"

This reverts commit 5167521ea4.

* Revert "Fix scroll jump issue with the composer (#8788)"

This reverts commit f568a76dc6.

* Revert "Revert link color change in composer (#8784)"

This reverts commit aedbeb2995.

* Revert "Improve composer visiblity (#8578)"

This reverts commit f14374a51c.
This commit is contained in:
Michael Telatynski 2022-06-27 09:43:58 +01:00 • committed by GitHub
parent 7d3c750247
commit e7a8dbd04c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 174 additions and 325 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/components/views/rooms/ReplyPreview.tsx
View file

@ -22,9 +22,7 @@ import { _t } from '../../../languageHandler';
import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
import ReplyTile from './ReplyTile';
import RoomContext, { TimelineRenderingType } from '../../../contexts/RoomContext';
import SenderProfile from '../messages/SenderProfile';
import { Icon as ReplyIcon } from "../../../../res/img/element-icons/room/message-bar/reply.svg";
import CancelButton from '../buttons/Cancel';
import AccessibleButton from "../elements/AccessibleButton";
function cancelQuoting(context: TimelineRenderingType) {
dis.dispatch({
@ -46,19 +44,19 @@ export default class ReplyPreview extends React.Component<IProps> {
if (!this.props.replyToEvent) return null;
return <div className="mx_ReplyPreview">
<div className="mx_ReplyPreview_header">
<ReplyIcon />
{ _t('Reply to <User />', {}, {
'User': () => <SenderProfile mxEvent={this.props.replyToEvent} as="span" />,
}) } &nbsp;
<CancelButton onClick={() => cancelQuoting(this.context.timelineRenderingType)} />
<div className="mx_ReplyPreview_section">
<div className="mx_ReplyPreview_header">
<span>{ _t('Replying') }</span>
<AccessibleButton
className="mx_ReplyPreview_header_cancel"
onClick={() => cancelQuoting(this.context.timelineRenderingType)}
/>
</div>
<ReplyTile
mxEvent={this.props.replyToEvent}
permalinkCreator={this.props.permalinkCreator}
/>
</div>
<ReplyTile
mxEvent={this.props.replyToEvent}
permalinkCreator={this.props.permalinkCreator}
showSenderProfile={false}
/>
</div>;
}
}