matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-04 11:51:45 +03:00
Code Activity

use AutoHideScrollbar in memberlist

Browse Source
This commit is contained in:
Bruno Windels
2019-03-12 16:38:30 +01:00
parent 1bdbf3086f
commit dad382a4b7
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/css/views/rooms/_MemberList.scss
View File

@@ -20,6 +20,7 @@ limitations under the License.
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: 0;
.mx_Spinner { .mx_Spinner {
flex: 1 0 auto; flex: 1 0 auto;
@@ -35,6 +36,10 @@ limitations under the License.
margin-top: 8px; margin-top: 8px;
margin-bottom: 4px; margin-bottom: 4px;
} }
.mx_AutoHideScrollbar {
flex: 1 1 0;
}
} }
.mx_MemberList_chevron { .mx_MemberList_chevron {

7
src/components/views/rooms/MemberList.js
View File

@@ -20,6 +20,8 @@ import React from 'react';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import SdkConfig from '../../../SdkConfig'; import SdkConfig from '../../../SdkConfig';
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
const MatrixClientPeg = require("../../../MatrixClientPeg"); const MatrixClientPeg = require("../../../MatrixClientPeg");
const sdk = require('../../../index'); const sdk = require('../../../index');
const rate_limited_func = require('../../../ratelimitedfunc'); const rate_limited_func = require('../../../ratelimitedfunc');
@@ -439,7 +441,6 @@ module.exports = React.createClass({
const SearchBox = sdk.getComponent('structures.SearchBox'); const SearchBox = sdk.getComponent('structures.SearchBox');
const TruncatedList = sdk.getComponent("elements.TruncatedList"); const TruncatedList = sdk.getComponent("elements.TruncatedList");
const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
const room = cli.getRoom(this.props.roomId); const room = cli.getRoom(this.props.roomId);
@@ -466,7 +467,7 @@ module.exports = React.createClass({
return ( return (
<div className="mx_MemberList"> <div className="mx_MemberList">
{ inviteButton } { inviteButton }
<GeminiScrollbarWrapper autoshow={true}> <AutoHideScrollbar>
<div className="mx_MemberList_wrapper"> <div className="mx_MemberList_wrapper">
<TruncatedList className="mx_MemberList_section mx_MemberList_joined" truncateAt={this.state.truncateAtJoined} <TruncatedList className="mx_MemberList_section mx_MemberList_joined" truncateAt={this.state.truncateAtJoined}
createOverflowElement={this._createOverflowTileJoined} createOverflowElement={this._createOverflowTileJoined}
@@ -475,7 +476,7 @@ module.exports = React.createClass({
{ invitedHeader } { invitedHeader }
{ invitedSection } { invitedSection }
</div> </div>
</GeminiScrollbarWrapper> </AutoHideScrollbar>
<SearchBox className="mx_MemberList_query mx_textinput_icon mx_textinput_search" <SearchBox className="mx_MemberList_query mx_textinput_icon mx_textinput_search"
placeholder={ _t('Filter room members') } placeholder={ _t('Filter room members') }