matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-19 20:23:18 +03:00
Code Activity

Fix hover behaviour of space invites

Browse Source
This commit is contained in:
Michael Telatynski
2021-05-04 14:01:26 +01:00
parent d14ea1bd58
commit 4489f8a6ea
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/css/structures/_SpacePanel.scss
View File

@ -277,7 +277,7 @@ $activeBorderColor: $secondary-fg-color;
.mx_SpaceButton:hover, .mx_SpaceButton:hover,
.mx_SpaceButton:focus-within, .mx_SpaceButton:focus-within,
.mx_SpaceButton_hasMenuOpen { .mx_SpaceButton_hasMenuOpen {
&:not(.mx_SpaceButton_home) { &:not(.mx_SpaceButton_home):not(.mx_SpaceButton_invite) {
// Hide the badge container on hover because it'll be a menu button // Hide the badge container on hover because it'll be a menu button
.mx_SpacePanel_badgeContainer { .mx_SpacePanel_badgeContainer {
width: 0; width: 0;

5
src/components/views/spaces/SpaceTreeLevel.tsx
View File

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