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

Tidy up timelineRenderingType to be passed over context (#7872)

Browse source
This commit is contained in:
Michael Telatynski 2022-02-24 11:25:13 +00:00 • committed by GitHub
parent f4cd71fd47
commit fe2fceb0ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/rooms/EventTile.tsx
View file

@ -322,8 +322,6 @@ interface IProps {
// whether or not to display thread info
showThreadInfo?: boolean;
timelineRenderingType?: TimelineRenderingType;
// if specified and `true`, the message his behing
// hidden for moderation from other users but is
// displayed to the current user either because they're
@ -672,7 +670,7 @@ export default class EventTile extends React.Component<IProps, IState> {
}
private renderThreadInfo(): React.ReactNode {
if (this.props.timelineRenderingType === TimelineRenderingType.Search && this.props.mxEvent.threadRootId) {
if (this.context.timelineRenderingType === TimelineRenderingType.Search && this.props.mxEvent.threadRootId) {
return (
<p className="mx_ThreadSummaryIcon">{ _t("From a thread") }</p>
);
@ -986,11 +984,10 @@ export default class EventTile extends React.Component<IProps, IState> {
}
private onSenderProfileClick = () => {
if (!this.props.timelineRenderingType) return;
dis.dispatch<ComposerInsertPayload>({
action: Action.ComposerInsert,
userId: this.props.mxEvent.getSender(),
timelineRenderingType: this.props.timelineRenderingType,
timelineRenderingType: this.context.timelineRenderingType,
});
};
@ -1016,7 +1013,7 @@ export default class EventTile extends React.Component<IProps, IState> {
event_id: this.props.mxEvent.getId(),
highlighted: true,
room_id: this.props.mxEvent.getRoomId(),
metricsTrigger: this.props.timelineRenderingType === TimelineRenderingType.Search
metricsTrigger: this.context.timelineRenderingType === TimelineRenderingType.Search
? "MessageSearch"
: undefined,
});