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

Merge pull request #2226 from matrix-org/bwindels/resizeroomsublists

Browse source 
Redesign: 1st go at resizing room sublists
This commit is contained in:
Bruno Windels 2018-10-19 13:33:28 +00:00 • committed by GitHub
commit 73d9a71b29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 176 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/components/structures/RoomSubList.js
View file

@ -19,8 +19,6 @@ limitations under the License.
import React from 'react';
import classNames from 'classnames';
import sdk from '../../index';
import { Droppable } from 'react-beautiful-dnd';
import { _t } from '../../languageHandler';
import dis from '../../dispatcher';
import Unread from '../../Unread';
import * as RoomNotifs from '../../RoomNotifs';
@ -364,14 +362,27 @@ const RoomSubList = React.createClass({
}
}
if (this.state.sortedList.length > 0 || this.props.extraTiles.length > 0) {
const len = this.state.sortedList.length + this.props.extraTiles.length;
const subList = this.state.hidden ? undefined : content;
return <div className={"mx_RoomSubList"}>
{this._getHeaderJsx()}
{subList}
</div>;
if (len) {
if (this.state.hidden) {
return <div className={["mx_RoomSubList", "mx_RoomSubList_hidden"]}>
{this._getHeaderJsx()}
</div>;
} else {
const heightEstimation = (len * 40) + 31;
const style = {
flexBasis: `${heightEstimation}px`,
maxHeight: `${heightEstimation}px`,
};
const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
return <div className={"mx_RoomSubList"} style={style}>
{this._getHeaderJsx()}
<GeminiScrollbarWrapper>
{ content }
</GeminiScrollbarWrapper>
</div>;
}
} else {
const Loader = sdk.getComponent("elements.Spinner");
if (this.props.showSpinner) {