Move to a fragment

pull/21833/head
Travis Ralston 2020-07-07 06:52:44 -06:00
parent 29aeea2974
commit 994d8708f2
1 changed files with 25 additions and 27 deletions

View File

@ -315,34 +315,32 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
const isAlphabetical = RoomListStore.instance.getTagSorting(this.props.tagId) === SortAlgorithm.Alphabetic; const isAlphabetical = RoomListStore.instance.getTagSorting(this.props.tagId) === SortAlgorithm.Alphabetic;
const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance; const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance;
// Invites don't get some nonsense options, so only add them if we have to. We do // Invites don't get some nonsense options, so only add them if we have to.
// this with an array instead of a containing div to ensure that the DOM structure let otherSections = null;
// is relatively sane.
let otherSections = [];
if (this.props.tagId !== DefaultTagID.Invite) { if (this.props.tagId !== DefaultTagID.Invite) {
otherSections.push(<hr key={otherSections.length} />); otherSections = (
otherSections.push( <React.Fragment>
<div key={otherSections.length}> <hr />
<div className='mx_RoomSublist2_contextMenu_title'>{_t("Unread rooms")}</div> <div>
<StyledCheckbox <div className='mx_RoomSublist2_contextMenu_title'>{_t("Unread rooms")}</div>
onChange={this.onUnreadFirstChanged} <StyledCheckbox
checked={isUnreadFirst} onChange={this.onUnreadFirstChanged}
> checked={isUnreadFirst}
{_t("Always show first")} >
</StyledCheckbox> {_t("Always show first")}
</div>, </StyledCheckbox>
); </div>
otherSections.push(<hr key={otherSections.length} />); <hr />
otherSections.push( <div>
<div key={otherSections.length}> <div className='mx_RoomSublist2_contextMenu_title'>{_t("Show")}</div>
<div className='mx_RoomSublist2_contextMenu_title'>{_t("Show")}</div> <StyledCheckbox
<StyledCheckbox onChange={this.onMessagePreviewChanged}
onChange={this.onMessagePreviewChanged} checked={this.props.layout.showPreviews}
checked={this.props.layout.showPreviews} >
> {_t("Message preview")}
{_t("Message preview")} </StyledCheckbox>
</StyledCheckbox> </div>
</div>, </React.Fragment>
); );
} }