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

PR feedback

Browse source
This commit is contained in:
Germain Souquet 2021-08-24 09:09:28 +01:00
parent edd4d42e7f
commit 54a0a869bf
11 changed files with 29 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/MessagePanel.tsx
View file

@ -267,7 +267,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
componentDidMount() {
this.calculateRoomMembersCount();
this.props.room?.on("RoomState.members", this.calculateRoomMembersCount);
if (SettingsStore.getValue("experimentalThreadSupport")) {
if (SettingsStore.getValue("feature_thread")) {
this.props.room?.getThreads().forEach(thread => thread.fetchReplyChain());
}
this.isMounted = true;
@ -448,8 +448,9 @@ export default class MessagePanel extends React.Component<IProps, IState> {
// Always show highlighted event
if (this.props.highlightedEventId === mxEv.getId()) return true;
const threadingEnabled = SettingsStore.getValue("experimentalThreadSupport");
if (threadingEnabled && mxEv.replyEventId && this.props.hideThreadedMessages === true) {
if (mxEv.replyEventId
&& this.props.hideThreadedMessages
&& SettingsStore.getValue("feature_thread")) {
return false;
}

18
src/components/structures/ThreadPanel.tsx
View file

@ -1,6 +1,5 @@
/*
Copyright 2016 OpenMarket Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.
Copyright 2021 New Vector Ltd.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -37,11 +36,8 @@ interface IState {
threads?: Thread[];
}
/*
* Component which shows the filtered file using a TimelinePanel
*/
@replaceableComponent("structures.ThreadView")
class ThreadView extends React.Component<IProps, IState> {
export default class ThreadPanel extends React.Component<IProps, IState> {
private room: Room;
constructor(props: IProps) {
@ -59,15 +55,15 @@ class ThreadView extends React.Component<IProps, IState> {
this.room.removeListener("Thread.ready", this.onThreadEventReceived);
}
public onThreadEventReceived = () => this.updateThreads();
private onThreadEventReceived = () => this.updateThreads();
public updateThreads = (callback?: () => void): void => {
private updateThreads = (callback?: () => void): void => {
this.setState({
threads: this.room.getThreads(),
}, callback);
};
public renderEventTile(event: MatrixEvent): JSX.Element {
private renderEventTile(event: MatrixEvent): JSX.Element {
return <EventTile
key={event.getId()}
mxEvent={event}
@ -77,7 +73,7 @@ class ThreadView extends React.Component<IProps, IState> {
/>;
}
public render() {
public render(): JSX.Element {
return (
<BaseCard
className="mx_ThreadPanel"
@ -95,5 +91,3 @@ class ThreadView extends React.Component<IProps, IState> {
);
}
}
export default ThreadView;

19
src/components/structures/ThreadView.tsx
View file

@ -1,6 +1,5 @@
/*
Copyright 2016 OpenMarket Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.
Copyright 2021 New Vector Ltd.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -22,7 +21,6 @@ import { Thread } from 'matrix-js-sdk/src/models/thread';
import BaseCard from "../views/right_panel/BaseCard";
import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
import { replaceableComponent } from "../../utils/replaceableComponent";
import { MatrixClientPeg } from '../../MatrixClientPeg';
import ResizeNotifier from '../../utils/ResizeNotifier';
import EventTile, { TileShape } from '../views/rooms/EventTile';
@ -48,11 +46,8 @@ interface IState {
thread?: Thread;
}
/*
* Component which shows the filtered file using a TimelinePanel
*/
@replaceableComponent("structures.ThreadView")
class ThreadView extends React.Component<IProps, IState> {
export default class ThreadView extends React.Component<IProps, IState> {
private dispatcherRef: string;
constructor(props: IProps) {
@ -93,7 +88,7 @@ class ThreadView extends React.Component<IProps, IState> {
}
};
setupThread = (mxEv: MatrixEvent) => {
private setupThread = (mxEv: MatrixEvent) => {
const thread = mxEv.getThread();
if (thread) {
thread.on("Thread.update", this.updateThread);
@ -102,14 +97,14 @@ class ThreadView extends React.Component<IProps, IState> {
}
};
teardownThread = () => {
private teardownThread = () => {
if (this.state.thread) {
this.state.thread.removeListener("Thread.update", this.updateThread);
this.state.thread.removeListener("Thread.ready", this.updateThread);
}
};
updateThread = (thread?: Thread) => {
private updateThread = (thread?: Thread) => {
if (thread) {
this.setState({ thread });
} else {
@ -128,7 +123,7 @@ class ThreadView extends React.Component<IProps, IState> {
/>;
}
public render() {
public render(): JSX.Element {
return (
<BaseCard
className="mx_ThreadView"
@ -161,5 +156,3 @@ class ThreadView extends React.Component<IProps, IState> {
);
}
}
export default ThreadView;