Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: adjust the first message rendering for DateSeparator in empty VirtualizedMessageList #2271

Merged
merged 2 commits into from
Feb 13, 2024
Merged

fix: adjust the first message rendering for DateSeparator in empty VirtualizedMessageList #2271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ecb43a
fix: adjust the first message rendering for DateSeparator in empty Vi…
MartinCupela Feb 13, 2024
f10a9e3
Merge branch 'master' into fix/adjust-for-date-separator-in-empty-vml
MartinCupela Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/components/MessageList/hooks/VirtualizedMessageList/usePrependMessagesCount.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ export function usePrependedMessagesCount<
// That in turn leads to incorrect index calculation in VirtualizedMessageList trying to access a message
// at non-existent index. Therefore, we ignore messages of status "sending" / "failed" in order they are
// not considered as prepended messages.
const firstMsgMovedAfterMessagesInExcludedStatus =
currentFirstMessage?.status && STATUSES_EXCLUDED_FROM_PREPEND[currentFirstMessage.status];
const firstMsgMovedAfterMessagesInExcludedStatus = !!(
currentFirstMessage?.status && STATUSES_EXCLUDED_FROM_PREPEND[currentFirstMessage.status]
);

if (noNewMessages || firstMsgMovedAfterMessagesInExcludedStatus) {
return previousNumItemsPrepended.current;
Expand All @@ -61,8 +62,8 @@ export function usePrependedMessagesCount<
messages[prependedMessageCount].id === firstMessageOnFirstLoadedPage.current?.id;

if (messageIsFirstOnFirstLoadedPage) {
previousNumItemsPrepended.current = prependedMessageCount;
return prependedMessageCount;
previousNumItemsPrepended.current = prependedMessageCount - firstRealMessageIndex;
return previousNumItemsPrepended.current;
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/MessageList/hooks/__tests__/usePrependMessagesCount.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe('usePrependMessagesCount', function () {
hasDateSeparator,
messages: page1,
});
expect(result.current).toBe(1);
expect(result.current).toBe(0);
});

it('is 0 when re-rendered with no new messages and date separator disabled', () => {
Expand All @@ -69,7 +69,7 @@ describe('usePrependMessagesCount', function () {
};
const { rerender, result } = render(props);
rerender(props);
expect(result.current).toBe(1);
expect(result.current).toBe(0);
});

it('is 0 when re-rendered with no new but swapped messages and date separator disabled', () => {
Expand Down Expand Up @@ -123,7 +123,7 @@ describe('usePrependMessagesCount', function () {
hasDateSeparator,
messages: messagesWithDateSeparator({ messages: [...page2, ...page1] }),
});
expect(result.current).toBe(page2.length + 1);
expect(result.current).toBe(page2.length);
});

it('is 0 when jumped to a message and date separator disabled', () => {
Expand Down
Loading