diff --git a/packages/shared-components/.gitignore b/packages/shared-components/.gitignore
index 1ec1623885..aea5132513 100644
--- a/packages/shared-components/.gitignore
+++ b/packages/shared-components/.gitignore
@@ -10,3 +10,5 @@
/coverage/
# Ignore generated docs
typedoc
+# Build storybook
+storybook-static
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/mention-with-count-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/mention-with-count-auto.png
deleted file mode 100644
index 571b86c600..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/mention-with-count-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/notification-with-count-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/notification-with-count-auto.png
deleted file mode 100644
index 0c2c4bbe5a..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/notification-with-count-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/bold-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/bold-auto.png
deleted file mode 100644
index 7c5fa14a48..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/bold-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/default-auto.png
deleted file mode 100644
index e045a22515..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/default-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/invitation-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/invitation-auto.png
deleted file mode 100644
index b9613435e8..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/invitation-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/no-message-preview-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/no-message-preview-auto.png
deleted file mode 100644
index c1caeadc05..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/no-message-preview-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/selected-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/selected-auto.png
deleted file mode 100644
index c44d733d2f..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/selected-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/unsent-message-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/unsent-message-auto.png
deleted file mode 100644
index 30ad387147..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/unsent-message-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/with-hover-menu-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/with-hover-menu-auto.png
deleted file mode 100644
index e045a22515..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/with-hover-menu-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/with-mention-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/with-mention-auto.png
deleted file mode 100644
index 345a8775f8..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/with-mention-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/with-notification-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/with-notification-auto.png
deleted file mode 100644
index d6ff5c8493..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/with-notification-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/without-hover-menu-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/without-hover-menu-auto.png
deleted file mode 100644
index e045a22515..0000000000
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/RoomListItem.stories.tsx/without-hover-menu-auto.png and /dev/null differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/activity-indicator-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/activity-indicator-auto.png
similarity index 100%
rename from packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/activity-indicator-auto.png
rename to packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/activity-indicator-auto.png
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/invited-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/invited-auto.png
similarity index 100%
rename from packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/invited-auto.png
rename to packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/invited-auto.png
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/mention-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/mention-auto.png
similarity index 100%
rename from packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/mention-auto.png
rename to packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/mention-auto.png
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/mention-with-count-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/mention-with-count-auto.png
new file mode 100644
index 0000000000..de18d302eb
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/mention-with-count-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/muted-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/muted-auto.png
similarity index 100%
rename from packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/muted-auto.png
rename to packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/muted-auto.png
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/muted-without-activity-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/muted-without-activity-auto.png
similarity index 100%
rename from packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/muted-without-activity-auto.png
rename to packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/muted-without-activity-auto.png
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/no-notification-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/no-notification-auto.png
similarity index 100%
rename from packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/no-notification-auto.png
rename to packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/no-notification-auto.png
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/notification-with-count-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/notification-with-count-auto.png
new file mode 100644
index 0000000000..06aff02b98
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/notification-with-count-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/unsent-message-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/unsent-message-auto.png
similarity index 100%
rename from packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/unsent-message-auto.png
rename to packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/unsent-message-auto.png
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/video-call-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/video-call-auto.png
similarity index 100%
rename from packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/video-call-auto.png
rename to packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/video-call-auto.png
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/video-call-without-activity-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/video-call-without-activity-auto.png
similarity index 100%
rename from packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/video-call-without-activity-auto.png
rename to packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/video-call-without-activity-auto.png
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/voice-call-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/voice-call-auto.png
similarity index 100%
rename from packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx/voice-call-auto.png
rename to packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx/voice-call-auto.png
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/bold-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/bold-auto.png
new file mode 100644
index 0000000000..aea65dfd2e
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/bold-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/default-auto.png
new file mode 100644
index 0000000000..c91eaae678
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/invitation-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/invitation-auto.png
new file mode 100644
index 0000000000..33a58c0186
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/invitation-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/no-message-preview-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/no-message-preview-auto.png
new file mode 100644
index 0000000000..f550ca61ae
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/no-message-preview-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/selected-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/selected-auto.png
new file mode 100644
index 0000000000..aa8b1f52fb
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/selected-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/unsent-message-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/unsent-message-auto.png
new file mode 100644
index 0000000000..4cd7639e8d
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/unsent-message-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/with-hover-menu-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/with-hover-menu-auto.png
new file mode 100644
index 0000000000..c91eaae678
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/with-hover-menu-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/with-mention-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/with-mention-auto.png
new file mode 100644
index 0000000000..d59c818760
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/with-mention-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/with-notification-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/with-notification-auto.png
new file mode 100644
index 0000000000..c680323a32
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/with-notification-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/without-hover-menu-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/without-hover-menu-auto.png
new file mode 100644
index 0000000000..c91eaae678
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room-list/RoomListItemView/RoomListItemView.stories.tsx/without-hover-menu-auto.png differ
diff --git a/packages/shared-components/src/index.ts b/packages/shared-components/src/index.ts
index 96216b8ee2..9c51cf74d2 100644
--- a/packages/shared-components/src/index.ts
+++ b/packages/shared-components/src/index.ts
@@ -28,7 +28,7 @@ export * from "./rich-list/RichList";
export * from "./room-list/RoomListHeaderView";
export * from "./room-list/RoomListSearchView";
export * from "./room-list/RoomListView";
-export * from "./room-list/RoomListItem";
+export * from "./room-list/RoomListItemView";
export * from "./room-list/RoomListPrimaryFilters";
export * from "./room-list/VirtualizedRoomListView";
export * from "./utils/Box";
diff --git a/packages/shared-components/src/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx b/packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx
similarity index 100%
rename from packages/shared-components/src/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.stories.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.stories.tsx
diff --git a/packages/shared-components/src/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.test.tsx b/packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.test.tsx
similarity index 100%
rename from packages/shared-components/src/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.test.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.test.tsx
diff --git a/packages/shared-components/src/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.tsx b/packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.tsx
similarity index 100%
rename from packages/shared-components/src/room-list/RoomListItem/NotificationDecoration/NotificationDecoration.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.tsx
diff --git a/packages/shared-components/src/room-list/RoomListItem/NotificationDecoration/__snapshots__/NotificationDecoration.test.tsx.snap b/packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/__snapshots__/NotificationDecoration.test.tsx.snap
similarity index 100%
rename from packages/shared-components/src/room-list/RoomListItem/NotificationDecoration/__snapshots__/NotificationDecoration.test.tsx.snap
rename to packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/__snapshots__/NotificationDecoration.test.tsx.snap
diff --git a/packages/shared-components/src/room-list/RoomListItem/NotificationDecoration/index.tsx b/packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/index.tsx
similarity index 100%
rename from packages/shared-components/src/room-list/RoomListItem/NotificationDecoration/index.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/index.tsx
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomListItemContextMenu.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemContextMenu.tsx
similarity index 100%
rename from packages/shared-components/src/room-list/RoomListItem/RoomListItemContextMenu.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/RoomListItemContextMenu.tsx
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomListItemHoverMenu.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemHoverMenu.tsx
similarity index 96%
rename from packages/shared-components/src/room-list/RoomListItem/RoomListItemHoverMenu.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/RoomListItemHoverMenu.tsx
index 9a453b2014..ea2b2ef9d0 100644
--- a/packages/shared-components/src/room-list/RoomListItem/RoomListItemHoverMenu.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemHoverMenu.tsx
@@ -10,7 +10,7 @@ import React, { type JSX } from "react";
import { Flex } from "../../utils/Flex";
import { RoomListItemMoreOptionsMenu, type RoomItemViewModel } from "./RoomListItemMoreOptionsMenu";
import { RoomListItemNotificationMenu } from "./RoomListItemNotificationMenu";
-import styles from "./RoomListItem.module.css";
+import styles from "./RoomListItemView.module.css";
/**
* Props for RoomListItemHoverMenu component
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomListItemMoreOptionsMenu.test.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.test.tsx
similarity index 99%
rename from packages/shared-components/src/room-list/RoomListItem/RoomListItemMoreOptionsMenu.test.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.test.tsx
index 40b9917c5b..2885706cd1 100644
--- a/packages/shared-components/src/room-list/RoomListItem/RoomListItemMoreOptionsMenu.test.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.test.tsx
@@ -12,7 +12,7 @@ import { describe, it, expect, vi } from "vitest";
import { RoomListItemMoreOptionsMenu } from "./RoomListItemMoreOptionsMenu";
import { useMockedViewModel } from "../../viewmodel";
-import type { RoomListItemSnapshot } from "./RoomListItem";
+import type { RoomListItemSnapshot } from "./RoomListItemView";
import { defaultSnapshot } from "./default-snapshot";
describe("", () => {
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomListItemMoreOptionsMenu.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.tsx
similarity index 99%
rename from packages/shared-components/src/room-list/RoomListItem/RoomListItemMoreOptionsMenu.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.tsx
index d10b5c32ec..10f7df2414 100644
--- a/packages/shared-components/src/room-list/RoomListItem/RoomListItemMoreOptionsMenu.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.tsx
@@ -20,7 +20,7 @@ import {
import { _t } from "../../utils/i18n";
import { useViewModel, type ViewModel } from "../../viewmodel";
-import type { RoomListItemSnapshot, RoomListItemActions } from "./RoomListItem";
+import type { RoomListItemSnapshot, RoomListItemActions } from "./RoomListItemView";
/**
* View model type for room list item
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomListItemNotificationMenu.test.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.test.tsx
similarity index 99%
rename from packages/shared-components/src/room-list/RoomListItem/RoomListItemNotificationMenu.test.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.test.tsx
index 3f88e2f8a1..e2a0036ef3 100644
--- a/packages/shared-components/src/room-list/RoomListItem/RoomListItemNotificationMenu.test.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.test.tsx
@@ -13,7 +13,7 @@ import { describe, it, expect, vi } from "vitest";
import { RoomListItemNotificationMenu } from "./RoomListItemNotificationMenu";
import { RoomNotifState } from "./RoomNotifs";
import { useMockedViewModel } from "../../viewmodel";
-import type { RoomListItemSnapshot } from "./RoomListItem";
+import type { RoomListItemSnapshot } from "./RoomListItemView";
import { defaultSnapshot } from "./default-snapshot";
describe("", () => {
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomListItemNotificationMenu.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.tsx
similarity index 99%
rename from packages/shared-components/src/room-list/RoomListItem/RoomListItemNotificationMenu.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.tsx
index e4038fae6c..1011bac4ff 100644
--- a/packages/shared-components/src/room-list/RoomListItem/RoomListItemNotificationMenu.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.tsx
@@ -16,7 +16,7 @@ import {
import { _t } from "../../utils/i18n";
import { RoomNotifState } from "./RoomNotifs";
import { useViewModel, type ViewModel } from "../../viewmodel";
-import type { RoomListItemSnapshot, RoomListItemActions } from "./RoomListItem";
+import type { RoomListItemSnapshot, RoomListItemActions } from "./RoomListItemView";
/**
* View model type for room list item
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomListItem.module.css b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.module.css
similarity index 100%
rename from packages/shared-components/src/room-list/RoomListItem/RoomListItem.module.css
rename to packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.module.css
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomListItem.stories.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.stories.tsx
similarity index 97%
rename from packages/shared-components/src/room-list/RoomListItem/RoomListItem.stories.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.stories.tsx
index fcc4017fb1..dc2428d823 100644
--- a/packages/shared-components/src/room-list/RoomListItem/RoomListItem.stories.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.stories.tsx
@@ -9,8 +9,8 @@ import React, { type JSX } from "react";
import { fn } from "storybook/test";
import type { Meta, StoryObj } from "@storybook/react-vite";
-import type { Room } from "./RoomListItem";
-import { RoomListItemView, type RoomListItemSnapshot, type RoomListItemActions } from "./RoomListItem";
+import type { Room } from "./RoomListItemView";
+import { RoomListItemView, type RoomListItemSnapshot, type RoomListItemActions } from "./RoomListItemView";
import { useMockedViewModel } from "../../viewmodel";
import { defaultSnapshot } from "./default-snapshot";
import { renderAvatar } from "../story-mocks";
@@ -69,7 +69,7 @@ const RoomListItemWrapper = ({
};
const meta = {
- title: "Room List/RoomListItem",
+ title: "Room List/RoomListItemView",
component: RoomListItemWrapper,
tags: ["autodocs"],
decorators: [
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomListItem.test.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.test.tsx
similarity index 98%
rename from packages/shared-components/src/room-list/RoomListItem/RoomListItem.test.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.test.tsx
index 788c9f317f..691ea07648 100644
--- a/packages/shared-components/src/room-list/RoomListItem/RoomListItem.test.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.test.tsx
@@ -11,7 +11,7 @@ import userEvent from "@testing-library/user-event";
import { composeStories } from "@storybook/react-vite";
import { describe, it, expect } from "vitest";
-import * as stories from "./RoomListItem.stories";
+import * as stories from "./RoomListItemView.stories";
const {
Default,
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomListItem.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.tsx
similarity index 99%
rename from packages/shared-components/src/room-list/RoomListItem/RoomListItem.tsx
rename to packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.tsx
index bc16d15cd3..e4da17e3ee 100644
--- a/packages/shared-components/src/room-list/RoomListItem/RoomListItem.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.tsx
@@ -13,7 +13,7 @@ import { NotificationDecoration, type NotificationDecorationData } from "./Notif
import { RoomListItemHoverMenu } from "./RoomListItemHoverMenu";
import { RoomListItemContextMenu } from "./RoomListItemContextMenu";
import { type RoomNotifState } from "./RoomNotifs";
-import styles from "./RoomListItem.module.css";
+import styles from "./RoomListItemView.module.css";
import { useViewModel, type ViewModel } from "../../viewmodel";
import { _t } from "../../utils/i18n";
diff --git a/packages/shared-components/src/room-list/RoomListItem/RoomNotifs.ts b/packages/shared-components/src/room-list/RoomListItemView/RoomNotifs.ts
similarity index 100%
rename from packages/shared-components/src/room-list/RoomListItem/RoomNotifs.ts
rename to packages/shared-components/src/room-list/RoomListItemView/RoomNotifs.ts
diff --git a/packages/shared-components/src/room-list/RoomListItem/__snapshots__/RoomListItem.test.tsx.snap b/packages/shared-components/src/room-list/RoomListItemView/__snapshots__/RoomListItemView.test.tsx.snap
similarity index 100%
rename from packages/shared-components/src/room-list/RoomListItem/__snapshots__/RoomListItem.test.tsx.snap
rename to packages/shared-components/src/room-list/RoomListItemView/__snapshots__/RoomListItemView.test.tsx.snap
diff --git a/packages/shared-components/src/room-list/RoomListItem/default-snapshot.ts b/packages/shared-components/src/room-list/RoomListItemView/default-snapshot.ts
similarity index 94%
rename from packages/shared-components/src/room-list/RoomListItem/default-snapshot.ts
rename to packages/shared-components/src/room-list/RoomListItemView/default-snapshot.ts
index b5e263567f..2a4338795d 100644
--- a/packages/shared-components/src/room-list/RoomListItem/default-snapshot.ts
+++ b/packages/shared-components/src/room-list/RoomListItemView/default-snapshot.ts
@@ -5,7 +5,7 @@
* Please see LICENSE files in the repository root for full details.
*/
-import { type RoomListItemSnapshot } from "./RoomListItem";
+import { type RoomListItemSnapshot } from "./RoomListItemView";
import { RoomNotifState } from "./RoomNotifs";
export const mockRoom = { name: "General" };
diff --git a/packages/shared-components/src/room-list/RoomListItem/index.ts b/packages/shared-components/src/room-list/RoomListItemView/index.ts
similarity index 93%
rename from packages/shared-components/src/room-list/RoomListItem/index.ts
rename to packages/shared-components/src/room-list/RoomListItemView/index.ts
index edf17066b8..1a5e5ae45b 100644
--- a/packages/shared-components/src/room-list/RoomListItem/index.ts
+++ b/packages/shared-components/src/room-list/RoomListItemView/index.ts
@@ -5,14 +5,14 @@
* Please see LICENSE files in the repository root for full details.
*/
-export { RoomListItemView } from "./RoomListItem";
+export { RoomListItemView } from "./RoomListItemView";
export type {
Room,
RoomListItemSnapshot,
RoomItemViewModel,
RoomListItemActions,
RoomListItemViewProps,
-} from "./RoomListItem";
+} from "./RoomListItemView";
export { RoomListItemNotificationMenu } from "./RoomListItemNotificationMenu";
export type { RoomListItemNotificationMenuProps } from "./RoomListItemNotificationMenu";
export { RoomListItemMoreOptionsMenu, MoreOptionContent } from "./RoomListItemMoreOptionsMenu";
diff --git a/packages/shared-components/src/room-list/RoomListView/RoomListView.stories.tsx b/packages/shared-components/src/room-list/RoomListView/RoomListView.stories.tsx
index 206307262e..8e183fff4a 100644
--- a/packages/shared-components/src/room-list/RoomListView/RoomListView.stories.tsx
+++ b/packages/shared-components/src/room-list/RoomListView/RoomListView.stories.tsx
@@ -9,7 +9,7 @@ import React, { type JSX } from "react";
import { fn } from "storybook/test";
import type { Meta, StoryObj } from "@storybook/react-vite";
-import type { Room } from "../RoomListItem/RoomListItem";
+import type { Room } from "../RoomListItemView";
import type { FilterId } from "../RoomListPrimaryFilters";
import { RoomListView, type RoomListSnapshot, type RoomListViewActions } from "./RoomListView";
import { useMockedViewModel } from "../../viewmodel";
diff --git a/packages/shared-components/src/room-list/RoomListView/RoomListView.tsx b/packages/shared-components/src/room-list/RoomListView/RoomListView.tsx
index 491c28d7d1..1a08813f24 100644
--- a/packages/shared-components/src/room-list/RoomListView/RoomListView.tsx
+++ b/packages/shared-components/src/room-list/RoomListView/RoomListView.tsx
@@ -12,7 +12,7 @@ import { RoomListPrimaryFilters, type FilterId } from "../RoomListPrimaryFilters
import { RoomListLoadingSkeleton } from "./RoomListLoadingSkeleton";
import { RoomListEmptyStateView } from "./RoomListEmptyStateView";
import { VirtualizedRoomListView, type RoomListViewState } from "../VirtualizedRoomListView";
-import { type Room } from "../RoomListItem";
+import { type Room } from "../RoomListItemView";
/**
* Snapshot for the room list view
diff --git a/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.stories.tsx b/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.stories.tsx
index 3ea908cb55..aa12524a97 100644
--- a/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.stories.tsx
+++ b/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.stories.tsx
@@ -9,7 +9,7 @@ import React, { type JSX } from "react";
import { fn } from "storybook/test";
import type { Meta, StoryObj } from "@storybook/react-vite";
-import type { Room } from "../RoomListItem/RoomListItem";
+import type { Room } from "../RoomListItemView";
import { VirtualizedRoomListView, type RoomListViewState } from "./VirtualizedRoomListView";
import type { RoomListSnapshot, RoomListViewActions } from "../RoomListView";
import { useMockedViewModel } from "../../viewmodel";
diff --git a/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.tsx b/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.tsx
index 7b27df0f28..4ef430520a 100644
--- a/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.tsx
+++ b/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.tsx
@@ -9,11 +9,10 @@ import React, { useCallback, useMemo, useRef, type JSX, type ReactNode } from "r
import { type ScrollIntoViewLocation } from "react-virtuoso";
import { isEqual } from "lodash";
-import type { Room } from "../RoomListItem/RoomListItem";
+import { RoomListItemView, type Room } from "../RoomListItemView";
import { useViewModel } from "../../viewmodel";
import { _t } from "../../utils/i18n";
import { VirtualizedList, type VirtualizedListContext } from "../../utils/VirtualizedList";
-import { RoomListItemView } from "../RoomListItem";
import type { RoomListViewModel } from "../RoomListView";
/**
diff --git a/packages/shared-components/src/room-list/story-mocks.tsx b/packages/shared-components/src/room-list/story-mocks.tsx
index 83a8eb1b94..de2a4262f4 100644
--- a/packages/shared-components/src/room-list/story-mocks.tsx
+++ b/packages/shared-components/src/room-list/story-mocks.tsx
@@ -8,9 +8,7 @@
import React from "react";
import { fn } from "storybook/test";
-import type { Room } from "./RoomListItem/RoomListItem";
-import type { RoomListItemSnapshot } from "./RoomListItem";
-import { RoomNotifState } from "./RoomListItem/RoomNotifs";
+import { type Room, type RoomListItemSnapshot, RoomNotifState } from "./RoomListItemView";
/**
* Mock avatar component for stories