Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345

This commit is contained in:
Michael Telatynski 2020-07-07 00:10:06 +01:00
commit 6bc39547c7
15 changed files with 167 additions and 58 deletions

View file

@ -68,6 +68,7 @@ interface IProps {
layout?: ListLayout;
isMinimized: boolean;
tagId: TagID;
onResize: () => void;
// TODO: Don't use this. It's for community invites, and community invites shouldn't be here.
// You should feel bad if you use this.
@ -233,6 +234,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
private toggleCollapsed = () => {
this.props.layout.isCollapsed = !this.props.layout.isCollapsed;
this.forceUpdate(); // because the layout doesn't trigger an update
setImmediate(() => this.props.onResize()); // needs to happen when the DOM is updated
};
private onHeaderKeyDown = (ev: React.KeyboardEvent) => {