michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Fix show msg header after new msgs divider

Browse source 
Signed-off-by: Ajay Bura <ajbura@gmail.com>
This commit is contained in:
Ajay Bura 2021-12-15 17:05:45 +05:30
parent ca15e69ae0
commit 181382b2b7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/app/organisms/room/RoomViewContent.jsx
View file

@ -90,10 +90,10 @@ function handleOnClickCapture(e) {
function renderEvent(roomTimeline, mEvent, prevMEvent, isFocus = false) { function renderEvent(roomTimeline, mEvent, prevMEvent, isFocus = false) {
const isBodyOnly = (prevMEvent !== null const isBodyOnly = (prevMEvent !== null
&& prevMEvent.getSender() === mEvent.getSender()
&& prevMEvent.getType() !== 'm.room.member' && prevMEvent.getType() !== 'm.room.member'
&& prevMEvent.getType() !== 'm.room.create' && prevMEvent.getType() !== 'm.room.create'
&& diffMinutes(mEvent.getDate(), prevMEvent.getDate()) <= MAX_MSG_DIFF_MINUTES && diffMinutes(mEvent.getDate(), prevMEvent.getDate()) <= MAX_MSG_DIFF_MINUTES
&& prevMEvent.getSender() === mEvent.getSender()
); );
const mDate = mEvent.getDate(); const mDate = mEvent.getDate();
const isToday = isInSameDay(mDate, new Date()); const isToday = isInSameDay(mDate, new Date());
@ -608,11 +608,13 @@ function RoomViewContent({ eventId, roomTimeline }) {
} }
} }
let isNewEvent = false;
if (!unreadDivider) { if (!unreadDivider) {
unreadDivider = (readEvent unreadDivider = (readEvent
&& prevMEvent?.getTs() <= readEvent.getTs() && prevMEvent?.getTs() <= readEvent.getTs()
&& readEvent.getTs() < mEvent.getTs()); && readEvent.getTs() < mEvent.getTs());
if (unreadDivider) { if (unreadDivider) {
isNewEvent = true;
tl.push(<Divider key={`new-${mEvent.getId()}`} variant="positive" text="New messages" />); tl.push(<Divider key={`new-${mEvent.getId()}`} variant="positive" text="New messages" />);
itemCountIndex += 1; itemCountIndex += 1;
if (jumpToItemIndex === -1) jumpToItemIndex = itemCountIndex; if (jumpToItemIndex === -1) jumpToItemIndex = itemCountIndex;
@ -628,7 +630,7 @@ function RoomViewContent({ eventId, roomTimeline }) {
const isFocus = focusId === mEvent.getId(); const isFocus = focusId === mEvent.getId();
if (isFocus) jumpToItemIndex = itemCountIndex; if (isFocus) jumpToItemIndex = itemCountIndex;
tl.push(renderEvent(roomTimeline, mEvent, prevMEvent, isFocus)); tl.push(renderEvent(roomTimeline, mEvent, isNewEvent ? null : prevMEvent, isFocus));
itemCountIndex += 1; itemCountIndex += 1;
} }
if (roomTimeline.canPaginateForward() || limit.getEndIndex() < timeline.length) { if (roomTimeline.canPaginateForward() || limit.getEndIndex() < timeline.length) {