PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix bold rooms not bolding

Browse source
This commit is contained in:
Travis Ralston 2020-05-14 09:34:31 -06:00
parent e8c33161ec
commit c37352679d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/rooms/RoomTile2.tsx
View file

@ -42,6 +42,7 @@ interface IProps {
interface IBadgeState { interface IBadgeState {
showBadge: boolean; // if numUnread > 0 && !showBadge -> bold room showBadge: boolean; // if numUnread > 0 && !showBadge -> bold room
numUnread: number; // used only if showBadge or showBadgeHighlight is true numUnread: number; // used only if showBadge or showBadgeHighlight is true
hasUnread: number; // used to make the room bold
showBadgeHighlight: boolean; // make the badge red showBadgeHighlight: boolean; // make the badge red
isInvite: boolean; // show a `!` instead of a number isInvite: boolean; // show a `!` instead of a number
} }
@ -98,6 +99,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
return { return {
showBadge: (showBadge && shouldShowNotifBadge) || isInvite, showBadge: (showBadge && shouldShowNotifBadge) || isInvite,
numUnread, numUnread,
hasUnread: showBadge,
showBadgeHighlight: (highlightCount > 0 && shouldShowHighlightBadge) || isInvite, showBadgeHighlight: (highlightCount > 0 && shouldShowHighlightBadge) || isInvite,
isInvite, isInvite,
}; };
@ -130,7 +132,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
const classes = classNames({ const classes = classNames({
'mx_RoomTile': true, 'mx_RoomTile': true,
// 'mx_RoomTile_selected': this.state.selected, // 'mx_RoomTile_selected': this.state.selected,
'mx_RoomTile_unread': this.state.numUnread > 0, 'mx_RoomTile_unread': this.state.numUnread > 0 || this.state.hasUnread,
'mx_RoomTile_unreadNotify': this.state.showBadge, 'mx_RoomTile_unreadNotify': this.state.showBadge,
'mx_RoomTile_highlight': this.state.showBadgeHighlight, 'mx_RoomTile_highlight': this.state.showBadgeHighlight,
'mx_RoomTile_invited': this.state.isInvite, 'mx_RoomTile_invited': this.state.isInvite,