stream-chat-react 13.8.0 → 13.9.0

package/dist/experimental/index.node.cjs

@@ -16471,46 +16471,52 @@ var useMessageDeliveryStatus = ({
   const { client } = useChatContext();
   const [messageDeliveryStatus, setMessageDeliveryStatus] = (0, import_react34.useState)();
   const isOwnMessage = (0, import_react34.useCallback)(
-    (message) => client.user && message?.user?.id === client.user.id,
+    (message) => client.user && message && message.user?.id === client.user.id,
     [client]
   );
   (0, import_react34.useEffect)(() => {
+    if (!lastMessage) {
+      setMessageDeliveryStatus(void 0);
+    }
     const lastMessageIsOwn = isOwnMessage(lastMessage);
     if (!lastMessage?.created_at || !lastMessageIsOwn) return;
-    const lastMessageCreatedAtDate = typeof lastMessage.created_at === "string" ? new Date(lastMessage.created_at) : lastMessage.created_at;
-    const channelReadByOthersAfterLastMessageUpdate = Object.values(
-      channel.state.read
-    ).some(({ last_read: channelLastMarkedReadDate, user }) => {
-      const ignoreOwnReadStatus = client.user && user.id !== client.user.id;
-      return ignoreOwnReadStatus && lastMessageCreatedAtDate < channelLastMarkedReadDate;
-    });
+    const msgRef = {
+      msgId: lastMessage.id,
+      timestampMs: lastMessage.created_at.getTime()
+    };
     setMessageDeliveryStatus(
-      channelReadByOthersAfterLastMessageUpdate ? "read" /* READ */ : "delivered" /* DELIVERED */
+      channel.messageReceiptsTracker.readersForMessage(msgRef).length > 0 ? "read" /* READ */ : channel.messageReceiptsTracker.deliveredForMessage(msgRef).length > 0 ? "delivered" /* DELIVERED */ : "sent" /* SENT */
     );
-  }, [channel.state.read, client, isOwnMessage, lastMessage]);
+  }, [channel, isOwnMessage, lastMessage]);
   (0, import_react34.useEffect)(() => {
     const handleMessageNew = (event) => {
       if (!isOwnMessage(event.message)) {
         return setMessageDeliveryStatus(void 0);
       }
-      return setMessageDeliveryStatus("delivered" /* DELIVERED */);
+      return setMessageDeliveryStatus("sent" /* SENT */);
     };
     channel.on("message.new", handleMessageNew);
     return () => {
       channel.off("message.new", handleMessageNew);
     };
-  }, [channel, client, isOwnMessage]);
+  }, [channel, isOwnMessage]);
   (0, import_react34.useEffect)(() => {
     if (!isOwnMessage(lastMessage)) return;
+    const handleMessageDelivered = (event) => {
+      if (event.user?.id !== client.user?.id && lastMessage && lastMessage.id === event.last_delivered_message_id)
+        setMessageDeliveryStatus("delivered" /* DELIVERED */);
+    };
     const handleMarkRead = (event) => {
       if (event.user?.id !== client.user?.id)
         setMessageDeliveryStatus("read" /* READ */);
     };
+    channel.on("message.delivered", handleMessageDelivered);
     channel.on("message.read", handleMarkRead);
     return () => {
+      channel.off("message.delivered", handleMessageDelivered);
       channel.off("message.read", handleMarkRead);
     };
-  }, [channel, client, lastMessage, isOwnMessage]);
+  }, [channel, client, isOwnMessage, lastMessage]);
   return {
     messageDeliveryStatus
   };