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

only show chevron for non-empty lists

Browse source
This commit is contained in:
Bruno Windels 2018-10-19 14:33:51 +02:00
parent 0386a1e048
commit 14cdd723f7
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -265,12 +265,6 @@ const RoomSubList = React.createClass({
const subListNotifCount = subListNotifications[0]; const subListNotifCount = subListNotifications[0];
const subListNotifHighlight = subListNotifications[1]; const subListNotifHighlight = subListNotifications[1];
const chevronClasses = classNames({
'mx_RoomSubList_chevron': true,
'mx_RoomSubList_chevronRight': this.state.hidden,
'mx_RoomSubList_chevronDown': !this.state.hidden,
});
const badgeClasses = classNames({ const badgeClasses = classNames({
'mx_RoomSubList_badge': true, 'mx_RoomSubList_badge': true,
'mx_RoomSubList_badgeHighlight': subListNotifHighlight, 'mx_RoomSubList_badgeHighlight': subListNotifHighlight,
@ -318,11 +312,21 @@ const RoomSubList = React.createClass({
} }
const tabindex = this.props.searchFilter === "" ? "0" : "-1"; const tabindex = this.props.searchFilter === "" ? "0" : "-1";
const len = this.state.sortedList.length + this.props.extraTiles.length;
let chevron;
if (len) {
const chevronClasses = classNames({
'mx_RoomSubList_chevron': true,
'mx_RoomSubList_chevronRight': this.state.hidden,
'mx_RoomSubList_chevronDown': !this.state.hidden,
});
chevron = (<div className={chevronClasses}></div>);
}
return ( return (
<div className="mx_RoomSubList_labelContainer" title={ title } ref="header"> <div className="mx_RoomSubList_labelContainer" title={ title } ref="header">
<AccessibleButton onClick={ this.onClick } className="mx_RoomSubList_label" tabIndex={tabindex}> <AccessibleButton onClick={ this.onClick } className="mx_RoomSubList_label" tabIndex={tabindex}>
<div className={chevronClasses}></div> { chevron }
{ this.props.collapsed ? '' : this.props.label } { this.props.collapsed ? '' : this.props.label }
{ badge } { badge }
{ incomingCall } { incomingCall }