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

Merge branch 'develop' into fix/17164/remember-collapsed-state

Browse source
This commit is contained in:
Šimon Brandner 2021-05-11 07:38:08 +02:00
commit bc0ff5bbea
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
107 changed files with 2956 additions and 1051 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/spaces/SpaceTreeLevel.tsx
View file

@ -307,15 +307,19 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
const isActive = activeSpaces.includes(space);
const itemClasses = classNames({
"mx_SpaceItem": true,
"mx_SpaceItem_narrow": isNarrow,
"collapsed": collapsed,
"hasSubSpaces": childSpaces && childSpaces.length,
});
const isInvite = space.getMyMembership() === "invite";
const classes = classNames("mx_SpaceButton", {
mx_SpaceButton_active: isActive,
mx_SpaceButton_hasMenuOpen: !!this.state.contextMenuPosition,
mx_SpaceButton_narrow: isNarrow,
mx_SpaceButton_invite: isInvite,
});
const notificationState = space.getMyMembership() === "invite"
const notificationState = isInvite
? StaticNotificationState.forSymbol("!", NotificationColor.Red)
: SpaceStore.instance.getNotificationState(space.roomId);