Remove mx_GroupLayout (#8876)

This commit is contained in:
Suguru Hirahara 2022-06-25 11:51:07 +00:00 committed by GitHub
parent eca14dea57
commit 4b2a922e2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 19 deletions

View file

@ -1752,7 +1752,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
private get messagePanelClassNames(): string {
return classNames("mx_RoomView_messagePanel", {
mx_IRCLayout: this.state.layout === Layout.IRC,
mx_GroupLayout: this.state.layout === Layout.Group,
});
}

View file

@ -298,7 +298,7 @@ const ThreadPanel: React.FC<IProps> = ({
hideThreadedMessages={false}
hidden={false}
showReactions={false}
className="mx_RoomView_messagePanel mx_GroupLayout"
className="mx_RoomView_messagePanel"
membersLoaded={true}
permalinkCreator={permalinkCreator}
disableGrouping={true}

View file

@ -21,7 +21,6 @@ import { IEventRelation, MatrixEvent } from 'matrix-js-sdk/src/models/event';
import { TimelineWindow } from 'matrix-js-sdk/src/timeline-window';
import { Direction } from 'matrix-js-sdk/src/models/event-timeline';
import { IRelationsRequestOpts } from 'matrix-js-sdk/src/@types/requests';
import classNames from "classnames";
import { logger } from 'matrix-js-sdk/src/logger';
import BaseCard from "../views/right_panel/BaseCard";
@ -314,10 +313,6 @@ export default class ThreadView extends React.Component<IProps, IState> {
const threadRelation = this.threadRelation;
const messagePanelClassNames = classNames("mx_RoomView_messagePanel", {
"mx_GroupLayout": this.state.layout === Layout.Group,
});
let timeline: JSX.Element;
if (this.state.thread) {
if (this.props.initialEvent && this.props.initialEvent.getRoomId() !== this.state.thread.roomId) {
@ -345,7 +340,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
hideThreadedMessages={false}
hidden={false}
showReactions={true}
className={messagePanelClassNames}
className="mx_RoomView_messagePanel"
permalinkCreator={this.props.permalinkCreator}
membersLoaded={true}
editState={this.state.editState}

View file

@ -276,7 +276,6 @@ const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCr
<h3>{ _t("Message preview") }</h3>
<div className={classnames("mx_ForwardDialog_preview", {
"mx_IRCLayout": previewLayout == Layout.IRC,
"mx_GroupLayout": previewLayout == Layout.Group,
})}>
<EventTile
mxEvent={mockEvent}

View file

@ -20,7 +20,6 @@ import { IEventRelation, MatrixEvent } from 'matrix-js-sdk/src/models/event';
import { EventTimelineSet } from 'matrix-js-sdk/src/models/event-timeline-set';
import { NotificationCountType, Room } from 'matrix-js-sdk/src/models/room';
import { Thread } from 'matrix-js-sdk/src/models/thread';
import classNames from 'classnames';
import BaseCard from "./BaseCard";
import ResizeNotifier from '../../../utils/ResizeNotifier';
@ -203,11 +202,6 @@ export default class TimelineCard extends React.Component<IProps, IState> {
? this.state.initialEventId
: null;
const messagePanelClassNames = classNames({
"mx_RoomView_messagePanel": true,
"mx_GroupLayout": this.state.layout === Layout.Group,
});
let jumpToBottom;
if (!this.state.atEndOfLiveTimeline) {
jumpToBottom = (<JumpToBottomButton
@ -254,7 +248,7 @@ export default class TimelineCard extends React.Component<IProps, IState> {
hideThreadedMessages={false}
hidden={false}
showReactions={true}
className={messagePanelClassNames}
className="mx_RoomView_messagePanel"
permalinkCreator={this.props.permalinkCreator}
membersLoaded={true}
editState={this.state.editState}

View file

@ -440,7 +440,6 @@ export default class MessageComposer extends React.Component<IProps, IState> {
const classes = classNames({
"mx_MessageComposer": true,
"mx_GroupLayout": true,
"mx_MessageComposer--compact": this.props.compact,
"mx_MessageComposer_e2eStatus": this.props.e2eStatus != undefined,
});

View file

@ -185,7 +185,6 @@ export default class HTMLExporter extends Exporter {
mx_AutoHideScrollbar
mx_ScrollPanel
mx_RoomView_messagePanel
mx_GroupLayout
"
>
<div class="mx_RoomView_messageListWrapper">
@ -464,4 +463,3 @@ export default class HTMLExporter extends Exporter {
this.cleanUp();
}
}