n/nyxmuks
1
0
Fork 0
forked from Mirrors/gomuks
Code Pull requests Activity

web/roomlist: remove separate inner component in room lists

Browse source
This commit is contained in:
Tulir Asokan 2024-12-22 20:32:19 +02:00
parent d359bd02d3
commit c5f78c6133
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
web/src/ui/roomlist/Entry.tsx
View file

@ -28,11 +28,12 @@ export interface RoomListEntryProps {
hidden: boolean hidden: boolean
} }
function usePreviewText(evt?: MemDBEvent, senderMemberEvt?: MemDBEvent | null): [string, string] { function getPreviewText(evt?: MemDBEvent, senderMemberEvt?: MemDBEvent | null): [string, string] {
if (!evt) { if (!evt) {
return ["", ""] return ["", ""]
} }
if ((evt.type === "m.room.message" || evt.type === "m.sticker") && typeof evt.content.body === "string") { if ((evt.type === "m.room.message" || evt.type === "m.sticker") && typeof evt.content.body === "string") {
// eslint-disable-next-line react-hooks/rules-of-hooks
const client = use(ClientContext)! const client = use(ClientContext)!
const displayname = evt.sender === client.userID const displayname = evt.sender === client.userID
? "You" ? "You"
@ -49,12 +50,8 @@ function usePreviewText(evt?: MemDBEvent, senderMemberEvt?: MemDBEvent | null):
return ["", ""] return ["", ""]
} }
interface InnerProps { function renderEntry(room: RoomListEntry) {
room: RoomListEntry const [previewText, croppedPreviewText] = getPreviewText(room.preview_event, room.preview_sender)
}
const EntryInner = ({ room }: InnerProps) => {
const [previewText, croppedPreviewText] = usePreviewText(room.preview_event, room.preview_sender)
const unreadCount = room.unread_messages || room.unread_notifications || room.unread_highlights const unreadCount = room.unread_messages || room.unread_notifications || room.unread_highlights
const countIsBig = Boolean(room.unread_notifications || room.unread_highlights) const countIsBig = Boolean(room.unread_notifications || room.unread_highlights)
let unreadCountDisplay = unreadCount.toString() let unreadCountDisplay = unreadCount.toString()
@ -97,7 +94,7 @@ const Entry = ({ room, isActive, hidden }: RoomListEntryProps) => {
onClick={use(MainScreenContext).clickRoom} onClick={use(MainScreenContext).clickRoom}
data-room-id={room.room_id} data-room-id={room.room_id}
> >
{isVisible ? <EntryInner room={room}/> : null} {isVisible ? renderEntry(room) : null}
</div> </div>
} }