Skip to content

[CLNP-5981] fix blinking GroupChannel on switching to another #1277

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

Merged
AhyoungRyu merged 1 commit into from
Dec 6, 2024
Merged

[CLNP-5981] fix blinking GroupChannel on switching to another #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/modules/GroupChannel/context/GroupChannelProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,14 +298,14 @@ const GroupChannelManager :React.FC<React.PropsWithChildren<GroupChannelProvider
});
}, [
channelUrl,
state.currentChannel,
messageDataSource.initialized,
messageDataSource.loading,
messageDataSource.messages,
state.currentChannel?.serialize(),
configurations,
scrollState,
eventHandlers,
renderProps,
messageDataSource.initialized,
messageDataSource.loading,
messageDataSource.messages.map(it => it.serialize()),
]);

return children;
Expand Down
2 changes: 2 additions & 0 deletions src/modules/GroupChannel/context/__tests__/GroupChannelProvider.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const mockLogger = { warning: jest.fn() };
const mockChannel = {
url: 'test-channel',
members: [{ userId: '1', nickname: 'user1' }],
serialize: () => JSON.stringify(this),
};

const mockGetChannel = jest.fn().mockResolvedValue(mockChannel);
Expand All @@ -17,6 +18,7 @@ const mockMessageCollection = {
initialize: jest.fn().mockResolvedValue(null),
loadPrevious: jest.fn(),
loadNext: jest.fn(),
messages: [],
};
jest.mock('../../../../lib/Sendbird/context/hooks/useSendbird', () => ({
__esModule: true,
Expand Down
4 changes: 3 additions & 1 deletion src/modules/GroupChannel/context/__tests__/useGroupChannel.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const mockLogger = { warning: jest.fn() };
const mockChannel = {
url: 'test-channel',
members: [{ userId: '1', nickname: 'user1' }],
serialize: () => JSON.stringify(this),
};

const mockGetChannel = jest.fn().mockResolvedValue(mockChannel);
Expand All @@ -19,6 +20,7 @@ const mockMessageCollection = {
initialize: jest.fn().mockResolvedValue(null),
loadPrevious: jest.fn(),
loadNext: jest.fn(),
messages: [],
};
const mockMarkAsReadScheduler = { push: jest.fn() };
jest.mock('../../../../lib/Sendbird/context/hooks/useSendbird', () => ({
Expand Down Expand Up @@ -276,7 +278,7 @@ describe('useGroupChannel', () => {
});
});
it('scroll to message when message exists', async () => {
const mockMessage = { messageId: 123, createdAt: 1000 };
const mockMessage = { messageId: 123, createdAt: 1000, serialize: () => JSON.stringify(this) };
const mockStore = createMockStore({
messages: [mockMessage],
scrollRef: { current: document.createElement('div') },
Expand Down