Mirrors/gomuks
1
0
Fork 1
mirror of https://github.com/tulir/gomuks.git synced 2025-04-20 10:33:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

web/timeline: fix all small events being treated as hidden events

Browse source
This commit is contained in:
Tulir Asokan 2024-11-26 23:16:29 +02:00
parent ba6574fdb1
commit 8ecbd2316c
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
web/src/ui/timeline/TimelineEvent.css
View file

@ -125,7 +125,7 @@ div.timeline-event {
} }
} }
&.hidden-event { &.small-event {
grid-template: grid-template:
"cmc cmc cmc cmc" 0 "cmc cmc cmc cmc" 0
"timestamp avatar content status" auto "timestamp avatar content status" auto
@ -144,7 +144,7 @@ div.timeline-event {
display: flex; display: flex;
} }
+ div.timeline-event.hidden-event { + div.timeline-event.small-event {
margin-top: 0; margin-top: 0;
} }
} }
@ -193,7 +193,7 @@ div.event-content > div.event-reactions {
} }
} }
div.hidden-event > div.sender-avatar, blockquote.reply-body > div.reply-sender > div.sender-avatar { div.small-event > div.sender-avatar, blockquote.reply-body > div.reply-sender > div.sender-avatar {
margin-top: 0; margin-top: 0;
display: flex; display: flex;
align-items: center; align-items: center;

5
web/src/ui/timeline/TimelineEvent.tsx
View file

@ -91,6 +91,9 @@ const TimelineEvent = ({ evt, prevEvt, disableMenu }: TimelineEventProps) => {
if (evt.type === "m.room.member") { if (evt.type === "m.room.member") {
wrapperClassNames.push("membership-event") wrapperClassNames.push("membership-event")
} }
if (BodyType === HiddenEvent) {
wrapperClassNames.push("hidden-event")
}
let dateSeparator = null let dateSeparator = null
const prevEvtDate = prevEvt ? new Date(prevEvt.timestamp) : null const prevEvtDate = prevEvt ? new Date(prevEvt.timestamp) : null
if (prevEvtDate && ( if (prevEvtDate && (
@ -107,7 +110,7 @@ const TimelineEvent = ({ evt, prevEvt, disableMenu }: TimelineEventProps) => {
let renderAvatar = true let renderAvatar = true
let eventTimeOnly = false let eventTimeOnly = false
if (isSmallEvent(BodyType)) { if (isSmallEvent(BodyType)) {
wrapperClassNames.push("hidden-event") wrapperClassNames.push("small-event")
smallAvatar = true smallAvatar = true
eventTimeOnly = true eventTimeOnly = true
} else if (prevEvt?.sender === evt.sender && } else if (prevEvt?.sender === evt.sender &&