matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00
Code Activity

Merge branch 'develop' into joriks/room-list-breadcrumbs

Browse Source
This commit is contained in:
Travis Ralston
2020-07-02 13:22:51 -06:00
parent 1c0d46b6e1 4a03b464d6
commit 43db4b98df
38 changed files with 2362 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/LeftPanel2.tsx
View File

@ -208,6 +208,11 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
"mx_LeftPanel2_minimized": this.props.isMinimized,
});
const roomListClasses = classNames(
"mx_LeftPanel2_actualRoomListContainer",
"mx_AutoHideScrollbar",
);
return (
<div className={containerClasses}>
{tagPanel}
@ -215,7 +220,7 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
{this.renderHeader()}
{this.renderSearchExplore()}
<div
className="mx_LeftPanel2_actualRoomListContainer"
className={roomListClasses}
onScroll={this.onScroll}
ref={this.listContainerRef}
>{roomList}</div>