@@ -35,7 +35,7 @@ export const useMarkRead = <
35
35
} : UseMarkReadParams ) => {
36
36
const { client } = useChatContext < StreamChatGenerics > ( 'useMarkRead' ) ;
37
37
const { markRead, setChannelUnreadUiState } = useChannelActionContext ( 'useMarkRead' ) ;
38
- const { channel } = useChannelStateContext ( 'useMarkRead' ) ;
38
+ const { channel } = useChannelStateContext < StreamChatGenerics > ( 'useMarkRead' ) ;
39
39
const previousRenderMessageListScrolledToBottom = useRef ( isMessageListScrolledToBottom ) ;
40
40
41
41
useEffect ( ( ) => {
@@ -51,7 +51,6 @@ export const useMarkRead = <
51
51
} ;
52
52
53
53
const handleMessageNew = ( event : Event < StreamChatGenerics > ) => {
54
- const newMessageToCurrentChannel = event . cid === channel . cid ;
55
54
const isOwnMessage = event . user ?. id && event . user . id === client . user ?. id ;
56
55
const mainChannelUpdated = ! event . message ?. parent_id || event . message ?. show_in_channel ;
57
56
if ( isOwnMessage ) return ;
@@ -72,16 +71,12 @@ export const useMarkRead = <
72
71
unread_messages : previousUnreadCount + 1 ,
73
72
} ;
74
73
} ) ;
75
- } else if (
76
- newMessageToCurrentChannel &&
77
- mainChannelUpdated &&
78
- shouldMarkRead ( channel . countUnread ( ) )
79
- ) {
74
+ } else if ( mainChannelUpdated && shouldMarkRead ( channel . countUnread ( ) ) ) {
80
75
markRead ( ) ;
81
76
}
82
77
} ;
83
78
84
- client . on ( 'message.new' , handleMessageNew ) ;
79
+ channel . on ( 'message.new' , handleMessageNew ) ;
85
80
document . addEventListener ( 'visibilitychange' , onVisibilityChange ) ;
86
81
87
82
const hasScrolledToBottom =
@@ -92,7 +87,7 @@ export const useMarkRead = <
92
87
previousRenderMessageListScrolledToBottom . current = isMessageListScrolledToBottom ;
93
88
94
89
return ( ) => {
95
- client . off ( 'message.new' , handleMessageNew ) ;
90
+ channel . off ( 'message.new' , handleMessageNew ) ;
96
91
document . removeEventListener ( 'visibilitychange' , onVisibilityChange ) ;
97
92
} ;
98
93
} , [
0 commit comments