Skip to content

Commit 87d11d0

Browse files
committed
fix: return channel.updated to SDK and fix stale query check
1 parent 966387f commit 87d11d0

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

package/src/components/ChannelList/ChannelList.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { ChannelListMessenger, ChannelListMessengerProps } from './ChannelListMe
1414
// import { useChannelHidden } from './hooks/listeners/useChannelHidden';
1515
// import { useChannelMemberUpdated } from './hooks/listeners/useChannelMemberUpdated';
1616
// import { useChannelTruncated } from './hooks/listeners/useChannelTruncated';
17-
// import { useChannelUpdated } from './hooks/listeners/useChannelUpdated';
17+
import { useChannelUpdated } from './hooks/listeners/useChannelUpdated';
1818
// import { useChannelVisible } from './hooks/listeners/useChannelVisible';
1919
// import { useNewMessage } from './hooks/listeners/useNewMessage';
2020
// import { useNewMessageNotification } from './hooks/listeners/useNewMessageNotification';
@@ -298,7 +298,6 @@ export const ChannelList = <
298298
channelDeletedHandler: onChannelDeleted,
299299
channelHiddenHandler: onChannelHidden,
300300
channelTruncatedHandler: onChannelTruncated,
301-
channelUpdatedHandler: onChannelUpdated,
302301
channelVisibleHandler: onChannelVisible,
303302
memberUpdatedHandler: onChannelMemberUpdated
304303
? (setChannels, event) =>
@@ -376,10 +375,10 @@ export const ChannelList = <
376375
// setForceUpdate,
377376
// });
378377
//
379-
// useChannelUpdated({
380-
// onChannelUpdated,
381-
// setChannels,
382-
// });
378+
useChannelUpdated({
379+
onChannelUpdated,
380+
setChannels: channelManager.setChannels,
381+
});
383382
//
384383
// useChannelVisible({
385384
// onChannelVisible,

package/src/components/ChannelList/hooks/listeners/useChannelUpdated.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import type { DefaultStreamChatGenerics } from '../../../../types/types';
88

99
type Parameters<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> =
1010
{
11-
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>;
11+
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[]>>;
1212
onChannelUpdated?: (
13-
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
13+
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[]>>,
1414
event: Event<StreamChatGenerics>,
1515
) => void;
1616
};

package/src/components/ChannelList/hooks/usePaginatedChannels.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ export const usePaginatedChannels = <
122122
};
123123

124124
try {
125+
if (isQueryStale() || !isMountedRef.current) {
126+
return;
127+
}
125128
/**
126129
* We skipInitialization here for handling race condition between ChannelList, Channel (and Thread)
127130
* when they all (may) update the channel state at the same time (when connection state recovers)
@@ -134,9 +137,6 @@ export const usePaginatedChannels = <
134137
skipInitialization: enableOfflineSupport ? undefined : activeChannels.current,
135138
});
136139
}
137-
if (isQueryStale() || !isMountedRef.current) {
138-
return;
139-
}
140140

141141
// const newChannels =
142142
// queryType === 'loadChannels' && !staticChannelsActive && channels

0 commit comments

Comments
 (0)