stream-chat-react 12.0.0-rc.8 → 12.0.0-rc.9

package/dist/index.node.cjs

@@ -49441,7 +49441,11 @@ var ChannelInner = (props) => {
     channelReducer,
     // channel.initialized === false if client.channel().query() was not called, e.g. ChannelList is not used
     // => Channel will call channel.watch() in useLayoutEffect => state.loading is used to signal the watch() call state
-    { ...initialState, loading: !channel.initialized }
+    {
+      ...initialState,
+      hasMore: channel.state.messagePagination.hasPrev,
+      loading: !channel.initialized
+    }
   );
   const isMounted = useIsMounted();
   const originalTitle = (0, import_react164.useRef)("");
@@ -49563,7 +49567,6 @@ var ChannelInner = (props) => {
   (0, import_react164.useLayoutEffect)(() => {
     let errored = false;
     let done = false;
-    let channelInitializedExternally = true;
     (async () => {
       if (!channel.initialized && initializeOnMount) {
         try {
@@ -49585,7 +49588,6 @@ var ChannelInner = (props) => {
           await getChannel({ channel, client, members, options: channelQueryOptions });
           const config = channel.getConfig();
           setChannelConfig(config);
-          channelInitializedExternally = false;
         } catch (e2) {
           dispatch({ error: e2, type: "setError" });
           errored = true;
@@ -49596,10 +49598,7 @@ var ChannelInner = (props) => {
       if (!errored) {
         dispatch({
           channel,
-          hasMore: channelInitializedExternally || hasMoreMessagesProbably(
-            channel.state.messages.length,
-            channelQueryOptions.messages.limit
-          ),
+          hasMore: channel.state.messagePagination.hasPrev,
           type: "initStateFromChannel"
         });
         if (client.user?.id && channel.state.read[client.user.id]) {
@@ -49656,7 +49655,7 @@ var ChannelInner = (props) => {
     []
   );
   const loadMore = async (limit = DEFAULT_NEXT_CHANNEL_PAGE_SIZE) => {
-    if (!online.current || !window.navigator.onLine || !state.hasMore)
+    if (!online.current || !window.navigator.onLine || !channel.state.messagePagination.hasPrev)
       return 0;
     const oldestMessage = state?.messages?.[0];
     if (state.loadingMore || state.loadingMoreNewer || oldestMessage?.status !== "received") {
@@ -49676,12 +49675,11 @@ var ChannelInner = (props) => {
       dispatch({ loadingMore: false, type: "setLoadingMore" });
       return 0;
     }
-    const hasMoreMessages = queryResponse.messages.length === perPage;
-    loadMoreFinished(hasMoreMessages, channel.state.messages);
+    loadMoreFinished(channel.state.messagePagination.hasPrev, channel.state.messages);
     return queryResponse.messages.length;
   };
   const loadMoreNewer = async (limit = DEFAULT_NEXT_CHANNEL_PAGE_SIZE) => {
-    if (!online.current || !window.navigator.onLine || !state.hasMoreNewer)
+    if (!online.current || !window.navigator.onLine || !channel.state.messagePagination.hasNext)
       return 0;
     const newestMessage = state?.messages?.[state?.messages?.length - 1];
     if (state.loadingMore || state.loadingMoreNewer)
@@ -49700,9 +49698,8 @@ var ChannelInner = (props) => {
       dispatch({ loadingMoreNewer: false, type: "setLoadingMoreNewer" });
       return 0;
     }
-    const hasMoreNewerMessages = channel.state.messages !== channel.state.latestMessages;
     dispatch({
-      hasMoreNewer: hasMoreNewerMessages,
+      hasMoreNewer: channel.state.messagePagination.hasNext,
       messages: channel.state.messages,
       type: "loadMoreNewerFinished"
     });
@@ -49713,13 +49710,9 @@ var ChannelInner = (props) => {
     async (messageId, messageLimit = DEFAULT_JUMP_TO_PAGE_SIZE, highlightDuration = DEFAULT_HIGHLIGHT_DURATION) => {
       dispatch({ loadingMore: true, type: "setLoadingMore" });
       await channel.state.loadMessageIntoState(messageId, void 0, messageLimit);
-      const indexOfMessage = channel.state.messages.findIndex(
-        (message) => message.id === messageId
-      );
-      const hasMoreMessages = indexOfMessage >= Math.floor(messageLimit / 2);
-      loadMoreFinished(hasMoreMessages, channel.state.messages);
+      loadMoreFinished(channel.state.messagePagination.hasPrev, channel.state.messages);
       dispatch({
-        hasMoreNewer: channel.state.messages !== channel.state.latestMessages,
+        hasMoreNewer: channel.state.messagePagination.hasNext,
         highlightedMessageId: messageId,
         type: "jumpToMessageFinished"
       });
@@ -49735,8 +49728,7 @@ var ChannelInner = (props) => {
   );
   const jumpToLatestMessage = (0, import_react164.useCallback)(async () => {
     await channel.state.loadMessageIntoState("latest");
-    const hasMoreOlder = channel.state.messages.length >= 25;
-    loadMoreFinished(hasMoreOlder, channel.state.messages);
+    loadMoreFinished(channel.state.messagePagination.hasPrev, channel.state.messages);
     dispatch({
       type: "jumpToLatestMessage"
     });
@@ -49748,7 +49740,6 @@ var ChannelInner = (props) => {
       let lastReadMessageId = channelUnreadUiState?.last_read_message_id;
       let firstUnreadMessageId = channelUnreadUiState?.first_unread_message_id;
       let isInCurrentMessageSet = false;
-      let hasMoreMessages = true;
       if (firstUnreadMessageId) {
         const result = findInMsgSetById(firstUnreadMessageId, channel.state.messages);
         isInCurrentMessageSet = result.index !== -1;
@@ -49782,13 +49773,13 @@ var ChannelInner = (props) => {
             )).messages;
           } catch (e2) {
             addNotification(t2("Failed to jump to the first unread message"), "error");
-            loadMoreFinished(hasMoreMessages, channel.state.messages);
+            loadMoreFinished(channel.state.messagePagination.hasPrev, channel.state.messages);
             return;
           }
           const firstMessageWithCreationDate = messages.find((msg) => msg.created_at);
           if (!firstMessageWithCreationDate) {
             addNotification(t2("Failed to jump to the first unread message"), "error");
-            loadMoreFinished(hasMoreMessages, channel.state.messages);
+            loadMoreFinished(channel.state.messagePagination.hasPrev, channel.state.messages);
             return;
           }
           const firstMessageTimestamp = new Date(
@@ -49796,13 +49787,11 @@ var ChannelInner = (props) => {
           ).getTime();
           if (lastReadTimestamp < firstMessageTimestamp) {
             firstUnreadMessageId = firstMessageWithCreationDate.id;
-            hasMoreMessages = false;
           } else {
             const result = findInMsgSetByDate(channelUnreadUiState.last_read, messages);
             lastReadMessageId = result.target?.id;
-            hasMoreMessages = result.index >= Math.floor(queryMessageLimit / 2);
           }
-          loadMoreFinished(hasMoreMessages, channel.state.messages);
+          loadMoreFinished(channel.state.messagePagination.hasPrev, channel.state.messages);
         }
       }
       if (!firstUnreadMessageId && !lastReadMessageId) {
@@ -49817,12 +49806,11 @@ var ChannelInner = (props) => {
           const indexOfTarget = channel.state.messages.findIndex(
             (message) => message.id === targetId
           );
-          hasMoreMessages = indexOfTarget >= Math.floor(queryMessageLimit / 2);
-          loadMoreFinished(hasMoreMessages, channel.state.messages);
+          loadMoreFinished(channel.state.messagePagination.hasPrev, channel.state.messages);
           firstUnreadMessageId = firstUnreadMessageId ?? channel.state.messages[indexOfTarget + 1]?.id;
         } catch (e2) {
           addNotification(t2("Failed to jump to the first unread message"), "error");
-          loadMoreFinished(hasMoreMessages, channel.state.messages);
+          loadMoreFinished(channel.state.messagePagination.hasPrev, channel.state.messages);
           return;
         }
       }
@@ -49837,7 +49825,7 @@ var ChannelInner = (props) => {
           last_read_message_id: lastReadMessageId
         });
       dispatch({
-        hasMoreNewer: channel.state.messages !== channel.state.latestMessages,
+        hasMoreNewer: channel.state.messagePagination.hasNext,
         highlightedMessageId: firstUnreadMessageId,
         type: "jumpToMessageFinished"
       });