Skip to content

Commit 09bd439

Browse files
committed
feat: rework spacing of room list item
1 parent 76d7f6a commit 09bd439

File tree

4 files changed

+11
-23
lines changed

4 files changed

+11
-23
lines changed

res/css/views/rooms/RoomListPanel/_RoomListItemView.pcss

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
cursor: pointer;
2020

2121
.mx_RoomListItemView_container {
22-
padding-left: var(--cpd-space-2x);
22+
padding-left: var(--cpd-space-3x);
2323
font: var(--cpd-font-body-md-regular);
2424
height: 100%;
2525

@@ -30,6 +30,7 @@
3030
border-bottom: var(--cpd-border-width-0-5) solid var(--cpd-color-bg-subtle-secondary);
3131
box-sizing: border-box;
3232
min-width: 0;
33+
padding-right: var(--cpd-space-5x);
3334

3435
.mx_RoomListItemView_text {
3536
min-width: 0;
@@ -56,26 +57,18 @@
5657
background-color: var(--cpd-color-bg-action-secondary-hovered);
5758
}
5859

59-
.mx_RoomListItemView_menu_open .mx_RoomListItemView_content {
60-
padding-right: var(--cpd-space-1-5x);
60+
.mx_RoomListItemView_menu_open .mx_RoomListItemView_container .mx_RoomListItemView_content {
61+
// The figma uses 16px padding (--cpd-space-4x) but due to https://github.com/element-hq/compound-web/issues/331
62+
// the icon size of the menu is 18px instead of 20px with a different internal padding
63+
// We need to use 18px to align the icon with the others icons
64+
// 18px is not available in compound spacing
65+
padding-right: 18px;
6166
}
6267

6368
.mx_RoomListItemView_selected {
6469
background-color: var(--cpd-color-bg-action-secondary-pressed);
6570
}
6671

67-
.mx_RoomListItemView_notification_decoration {
68-
.mx_RoomListItemView_content {
69-
padding-right: var(--cpd-space-2x);
70-
}
71-
}
72-
73-
.mx_RoomListItemView_empty {
74-
.mx_RoomListItemView_content {
75-
padding-right: var(--cpd-space-3x);
76-
}
77-
}
78-
7972
.mx_RoomListItemView_bold .mx_RoomListItemView_roomName {
8073
font: var(--cpd-font-body-md-semibold);
8174
}

src/components/views/rooms/NotificationDecoration.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export function NotificationDecoration({
6464
<Flex
6565
align="center"
6666
justify="center"
67-
gap="var(--cpd-space-1-5x)"
67+
gap="var(--cpd-space-1x)"
6868
{...props}
6969
data-testid="notification-decoration"
7070
>

src/components/views/rooms/RoomListPanel/RoomListItemMenuView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export function RoomListItemMenuView({ room, setMenuOpen }: RoomListItemMenuView
4747
const vm = useRoomListItemMenuViewModel(room);
4848

4949
return (
50-
<Flex className="mx_RoomListItemMenuView" align="center" gap="var(--cpd-space-0-5x)">
50+
<Flex className="mx_RoomListItemMenuView" align="center" gap="var(--cpd-space-1x)">
5151
{vm.showMoreOptionsMenu && <MoreOptionsMenu setMenuOpen={setMenuOpen} vm={vm} />}
5252
{vm.showNotificationMenu && <NotificationMenu setMenuOpen={setMenuOpen} vm={vm} />}
5353
</Flex>

src/components/views/rooms/RoomListPanel/RoomListItemView.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,10 @@ export const RoomListItemView = memo(function RoomListItemView({
4747
const showHoverDecoration = isMenuOpen || isHover;
4848
const showHoverMenu = showHoverDecoration && vm.showHoverMenu;
4949

50-
const isInvitation = vm.notificationState.invited;
51-
const isNotificationDecorationVisible = isInvitation || (!showHoverDecoration && vm.showNotificationDecoration);
52-
5350
return (
5451
<button
5552
ref={ref}
5653
className={classNames("mx_RoomListItemView", {
57-
mx_RoomListItemView_empty: !isNotificationDecorationVisible && !showHoverDecoration,
58-
mx_RoomListItemView_notification_decoration: isNotificationDecorationVisible,
5954
mx_RoomListItemView_hover: showHoverDecoration,
6055
mx_RoomListItemView_menu_open: showHoverMenu,
6156
mx_RoomListItemView_selected: isSelected,
@@ -83,7 +78,7 @@ export const RoomListItemView = memo(function RoomListItemView({
8378
<RoomAvatarView room={room} />
8479
<Flex
8580
className="mx_RoomListItemView_content"
86-
gap="var(--cpd-space-3x)"
81+
gap="var(--cpd-space-2x)"
8782
align="center"
8883
justify="space-between"
8984
>

0 commit comments

Comments
 (0)