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

Merge pull request #5268 from matrix-org/t3chguy/fix/15349

Browse source 
Fix right panel for peeking rooms
This commit is contained in:
Michael Telatynski 2020-10-06 00:32:05 +01:00 • committed by GitHub
commit 1e34365caa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/structures/RoomView.tsx
View file

@ -1820,7 +1820,6 @@ export default class RoomView extends React.Component<IProps, IState> {
let aux = null; let aux = null;
let previewBar; let previewBar;
let hideCancel = false; let hideCancel = false;
let forceHideRightPanel = false;
if (this.state.forwardingEvent) { if (this.state.forwardingEvent) {
aux = <ForwardMessage onCancelClick={this.onCancelClick} />; aux = <ForwardMessage onCancelClick={this.onCancelClick} />;
} else if (this.state.searching) { } else if (this.state.searching) {
@ -1865,8 +1864,6 @@ export default class RoomView extends React.Component<IProps, IState> {
{ previewBar } { previewBar }
</div> </div>
); );
} else {
forceHideRightPanel = true;
} }
} else if (hiddenHighlightCount > 0) { } else if (hiddenHighlightCount > 0) {
aux = ( aux = (
@ -2069,7 +2066,7 @@ export default class RoomView extends React.Component<IProps, IState> {
"mx_fadable_faded": this.props.disabled, "mx_fadable_faded": this.props.disabled,
}); });
const showRightPanel = !forceHideRightPanel && this.state.room && this.state.showRightPanel; const showRightPanel = this.state.room && this.state.showRightPanel;
const rightPanel = showRightPanel const rightPanel = showRightPanel
? <RightPanel room={this.state.room} resizeNotifier={this.props.resizeNotifier} /> ? <RightPanel room={this.state.room} resizeNotifier={this.props.resizeNotifier} />
: null; : null;

4
src/components/views/rooms/MemberList.js
View file

@ -121,8 +121,8 @@ export default class MemberList extends React.Component {
this.setState(this._getMembersState(this.roomMembers())); this.setState(this._getMembersState(this.roomMembers()));
this._listenForMembersChanges(); this._listenForMembersChanges();
} }
} else if (membership === "invite") { } else {
// show the members we've got when invited // show the members we already have loaded
this.setState(this._getMembersState(this.roomMembers())); this.setState(this._getMembersState(this.roomMembers()));
} }
} }

1
src/stores/WidgetStore.ts
View file

@ -119,6 +119,7 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
} }
private loadRoomWidgets(room: Room) { private loadRoomWidgets(room: Room) {
if (!room) return;
const roomInfo = this.roomMap.get(room.roomId); const roomInfo = this.roomMap.get(room.roomId);
roomInfo.widgets = []; roomInfo.widgets = [];
this.generateApps(room).forEach(app => { this.generateApps(room).forEach(app => {