@realtimexsco/live-chat 1.3.1 → 1.3.2

package/dist/index.mjs

@@ -555,7 +555,7 @@ var init_group_display_helpers = __esm({
 });
 
 // src/store/helpers/message.helpers.ts
-var getMessageSenderId, extractMessageData, mergeLastMessage, messageHasPreviewBody, getLatestMessageFromList, isOwnMessage, getMessageContent, getMessageTimestamp, statusRank, preferHigherStatus, resolveMessageStatus, mergeChatMessages;
+var getMessageSenderId, extractMessageData, statusRank, preferHigherStatus, mergeLastMessage, messageHasPreviewBody, getLatestMessageFromList, isOwnMessage, getMessageContent, getMessageTimestamp, resolveMessageStatus, mergeChatMessages;
 var init_message_helpers = __esm({
   "src/store/helpers/message.helpers.ts"() {
     getMessageSenderId = (message) => String(message?.sender?._id || message?.sender?.id || message?.senderId || message?.fromUserId || message?.sender || "");
@@ -570,21 +570,32 @@ var init_message_helpers = __esm({
       const caption = payload.caption ?? payload.message?.caption ?? null;
       return { messageId, content, conversationId, status, isPinned, isStarred, attachmentId, caption };
     };
+    statusRank = { sent: 0, delivered: 1, read: 2 };
+    preferHigherStatus = (base, incoming) => {
+      const baseRank = statusRank[base?.status] ?? 0;
+      const incomingRank = statusRank[incoming?.status] ?? 0;
+      if (incomingRank > baseRank) {
+        return { ...base, status: incoming.status };
+      }
+      return base;
+    };
     mergeLastMessage = (existing, incoming) => {
       if (!incoming) return existing ?? null;
       if (!existing) return incoming;
       const content = incoming.content?.trim() ? incoming.content : existing.content;
       const createdAt = incoming.createdAt ?? incoming.timestamp ?? existing.createdAt ?? existing.timestamp;
-      const existingTime = new Date(existing.createdAt || existing.timestamp || 0).getTime();
-      const incomingTime = new Date(incoming.createdAt || incoming.timestamp || 0).getTime();
-      const newer = incomingTime >= existingTime ? incoming : existing;
+      const incomingSenderId = getMessageSenderId(incoming);
+      const resolvedSender = incomingSenderId ? incoming.sender ?? incoming.senderId ?? incoming.fromUserId : existing.sender ?? existing.senderId ?? existing.fromUserId ?? incoming.sender;
       return {
         ...existing,
         ...incoming,
         ...content !== void 0 ? { content } : {},
         ...createdAt !== void 0 ? { createdAt } : {},
         attachments: incoming.attachments?.length ? incoming.attachments : existing.attachments,
-        status: newer.status ?? existing.status ?? incoming.status
+        status: preferHigherStatus(existing, incoming).status ?? existing.status ?? incoming.status,
+        ...resolvedSender !== void 0 ? { sender: resolvedSender } : {},
+        senderId: incoming.senderId ?? existing.senderId,
+        fromUserId: incoming.fromUserId ?? existing.fromUserId
       };
     };
     messageHasPreviewBody = (message) => Boolean(String(message?.content || "").trim()) || Array.isArray(message?.attachments) && message.attachments.length > 0;
@@ -607,15 +618,6 @@ var init_message_helpers = __esm({
       const time = value ? new Date(value).getTime() : NaN;
       return Number.isFinite(time) ? time : 0;
     };
-    statusRank = { sent: 0, delivered: 1, read: 2 };
-    preferHigherStatus = (base, incoming) => {
-      const baseRank = statusRank[base?.status] ?? 0;
-      const incomingRank = statusRank[incoming?.status] ?? 0;
-      if (incomingRank > baseRank) {
-        return { ...base, status: incoming.status };
-      }
-      return base;
-    };
     resolveMessageStatus = (message, conversation, loggedUserId) => {
       const existing = message?.status || "sent";
       if (!loggedUserId || !isOwnMessage(message, loggedUserId)) return existing;
@@ -790,7 +792,7 @@ var init_unread_helpers = __esm({
 });
 
 // src/store/helpers/conversation.helpers.ts
-var findConversationIdByMessageId, isGroupConversation, normalizeConversationRecord, resolveConversationLastMessage, syncConversationLastMessage, upsertConversationInList, findConversationById, findConversationForChannel, resolveConversationIdForChannel;
+var findConversationIdByMessageId, applyMessageStatusToStore, isGroupConversation, normalizeConversationRecord, resolveConversationLastMessage, syncConversationLastMessage, upsertConversationInList, findConversationById, findConversationIdByLastMessageId, findConversationForChannel, resolveConversationIdForChannel;
 var init_conversation_helpers = __esm({
   "src/store/helpers/conversation.helpers.ts"() {
     init_group_display_helpers();
@@ -804,6 +806,40 @@ var init_conversation_helpers = __esm({
         )
       );
     };
+    applyMessageStatusToStore = (state, messageId, status, conversationId) => {
+      const normalizedMessageId = String(messageId);
+      const resolvedConversationId = conversationId ? String(conversationId) : findConversationIdByMessageId(state.messagesByConversation, normalizedMessageId) || findConversationIdByLastMessageId(state.conversations, normalizedMessageId) || null;
+      const nextConversations = state.conversations.map((conversation) => {
+        const lastMessageId = String(
+          conversation?.lastMessage?._id || conversation?.lastMessage?.id || ""
+        );
+        if (lastMessageId !== normalizedMessageId) return conversation;
+        return {
+          ...conversation,
+          lastMessage: mergeLastMessage(conversation.lastMessage, { status })
+        };
+      });
+      const nextMessagesByConversation = { ...state.messagesByConversation };
+      const patchMessages = (messages) => messages.map(
+        (message) => String(message._id || message.id) === normalizedMessageId ? preferHigherStatus(message, { status }) : message
+      );
+      if (resolvedConversationId && nextMessagesByConversation[resolvedConversationId]) {
+        nextMessagesByConversation[resolvedConversationId] = patchMessages(
+          nextMessagesByConversation[resolvedConversationId]
+        );
+      } else {
+        for (const cid of Object.keys(nextMessagesByConversation)) {
+          const patched = patchMessages(nextMessagesByConversation[cid]);
+          if (patched !== nextMessagesByConversation[cid]) {
+            nextMessagesByConversation[cid] = patched;
+          }
+        }
+      }
+      return {
+        conversations: nextConversations,
+        messagesByConversation: nextMessagesByConversation
+      };
+    };
     isGroupConversation = (conversation) => {
       if (!conversation) return false;
       return conversation.conversationType === "group" || !!conversation.isGroup;
@@ -893,6 +929,14 @@ var init_conversation_helpers = __esm({
       if (!conversationId) return void 0;
       return conversations.find((c) => String(c._id) === String(conversationId));
     };
+    findConversationIdByLastMessageId = (conversations, messageId) => {
+      if (!messageId) return null;
+      const normalizedMessageId = String(messageId);
+      const match = conversations.find(
+        (conversation) => String(conversation?.lastMessage?._id || conversation?.lastMessage?.id || "") === normalizedMessageId
+      );
+      return match?._id ? String(match._id) : null;
+    };
     findConversationForChannel = (channel, loggedUserId, conversations) => {
       if (!channel || !loggedUserId) return void 0;
       if (channel.conversationId) {
@@ -2965,28 +3009,16 @@ var init_dm_actions = __esm({
       },
       receivedStatusUpdate: (payload) => {
         const data = extractMessageData(payload);
-        let { conversationId } = data;
         const { messageId, status } = data;
-        if (!messageId) return;
+        let { conversationId } = data;
+        if (!messageId || !status) return;
         set({ lastStatusUpdate: payload });
         if (!conversationId) {
-          conversationId = findConversationIdByMessageId(get().messagesByConversation, messageId);
+          conversationId = findConversationIdByMessageId(get().messagesByConversation, messageId) || findConversationIdByLastMessageId(get().conversations, messageId) || void 0;
         }
-        if (!conversationId || !status) return;
-        set((state) => {
-          const messages = state.messagesByConversation[conversationId] || [];
-          return {
-            messagesByConversation: {
-              ...state.messagesByConversation,
-              [conversationId]: messages.map(
-                (m) => String(m._id || m.id) === String(messageId) ? preferHigherStatus(m, { status }) : m
-              )
-            },
-            conversations: state.conversations.map(
-              (c) => String(c._id) === String(conversationId) && c.lastMessage && String(c.lastMessage._id || c.lastMessage.id) === String(messageId) ? { ...c, lastMessage: mergeLastMessage(c.lastMessage, { status }) } : c
-            )
-          };
-        });
+        set((state) => ({
+          ...applyMessageStatusToStore(state, String(messageId), status, conversationId)
+        }));
       },
       receivedDMMarkRead: (payload) => {
         const { conversationId } = payload;
@@ -3247,25 +3279,14 @@ var init_group_actions2 = __esm({
         let { conversationId } = data;
         const { messageId, status } = data;
         set({ lastStatusUpdate: payload });
+        if (!status) return;
         if (messageId) {
           if (!conversationId) {
-            conversationId = findConversationIdByMessageId(get().messagesByConversation, messageId);
+            conversationId = findConversationIdByMessageId(get().messagesByConversation, messageId) || findConversationIdByLastMessageId(get().conversations, messageId) || void 0;
           }
-          if (!conversationId) return;
-          set((state) => {
-            const messages = state.messagesByConversation[conversationId] || [];
-            return {
-              messagesByConversation: {
-                ...state.messagesByConversation,
-                [conversationId]: messages.map(
-                  (m) => String(m._id || m.id) === String(messageId) ? { ...m, status } : m
-                )
-              },
-              conversations: state.conversations.map(
-                (c) => String(c._id) === String(conversationId) && c.lastMessage && String(c.lastMessage._id || c.lastMessage.id) === String(messageId) ? { ...c, lastMessage: { ...c.lastMessage, status } } : c
-              )
-            };
-          });
+          set((state) => ({
+            ...applyMessageStatusToStore(state, String(messageId), status, conversationId)
+          }));
           return;
         }
         if (conversationId && status === "read") {
@@ -3280,7 +3301,7 @@ var init_group_actions2 = __esm({
               if (String(c._id) !== String(conversationId)) return c;
               let nextLastMessage = c.lastMessage;
               if (nextLastMessage && String(nextLastMessage.sender?._id || nextLastMessage.sender) === String(myId)) {
-                nextLastMessage = { ...nextLastMessage, status: "read" };
+                nextLastMessage = mergeLastMessage(nextLastMessage, { status: "read" });
               }
               return { ...c, lastMessage: nextLastMessage };
             });
@@ -6795,15 +6816,13 @@ function useChannelList({ debouncedSearch = "" }) {
         }
       }
       const draftPreview = getConversationDraftPreview(conversationId);
-      const lastMsgSenderId = String(
-        resolvedLastMessage?.sender?._id || resolvedLastMessage?.sender || ""
-      );
-      const isOwnLastMessage = lastMsgSenderId === String(loggedUserDetails?._id);
-      const lastMessageStatus = resolveMessageStatus(
-        resolvedLastMessage,
-        c,
-        loggedUserDetails?._id
-      );
+      const storedLastMessage = c.lastMessage;
+      const storedLastMessageId = String(storedLastMessage?._id || storedLastMessage?.id || "");
+      const resolvedLastMessageId = String(resolvedLastMessage?._id || resolvedLastMessage?.id || "");
+      const lastMessageStatus = storedLastMessageId && resolvedLastMessageId && storedLastMessageId === resolvedLastMessageId ? preferHigherStatus(
+        { status: storedLastMessage?.status },
+        { status: resolvedLastMessage?.status }
+      ).status ?? storedLastMessage?.status ?? resolvedLastMessage?.status : storedLastMessage?.status;
       return {
         id: isGroup ? conversationId : otherParticipantId,
         conversationId,
@@ -6817,12 +6836,11 @@ function useChannelList({ debouncedSearch = "" }) {
         unreadCount,
         isTyping,
         draftPreview,
-        isOwnLastMessage,
         pinnedCount: c.pinnedCount,
         starredCount: c.starredCount,
         lastMessage: {
           content: lastMessageContent,
-          timestamp: resolvedLastMessage?.createdAt ? formatSidebarTime(resolvedLastMessage.createdAt) : "",
+          timestamp: resolvedLastMessage?.createdAt ? formatSidebarTime(resolvedLastMessage.createdAt) : c.lastMessage?.createdAt ? formatSidebarTime(c.lastMessage.createdAt) : "",
           status: lastMessageStatus,
           sender: "User"
         }
@@ -6851,7 +6869,7 @@ function useChannelList({ debouncedSearch = "" }) {
 init_store_helpers();
 function ChannelListItem({ channel, activeChannel, onChannelSelect }) {
   const isActive = activeChannel?.conversationId ? String(activeChannel.conversationId) === String(channel.conversationId) : activeChannel?.id === channel.id;
-  const showReadReceipt = channel.isOwnLastMessage && !channel.unreadCount && !channel.isTyping && !channel.draftPreview;
+  const showReadReceipt = !!channel.lastMessage?.status && !channel.unreadCount && !channel.isTyping && !channel.draftPreview;
   const lastStatus = channel.lastMessage?.status;
   return /* @__PURE__ */ jsxs(
     "div",
@@ -8520,24 +8538,11 @@ function GroupSenderName({ name, className }) {
 }
 
 // src/chat/lib/chat-message-bubble.ts
-function getBubbleCornerClasses(isSender, isGroupedWithPrev, isGroupedWithNext) {
-  if (isSender) {
-    return cn(
-      "rounded-tl-[18px] rounded-bl-[18px]",
-      isGroupedWithPrev ? "rounded-tr-[6px]" : "rounded-tr-[18px]",
-      isGroupedWithNext ? "rounded-br-[6px]" : "rounded-br-[4px]"
-    );
-  }
-  return cn(
-    "rounded-tr-[18px] rounded-br-[18px]",
-    isGroupedWithPrev ? "rounded-tl-[6px]" : "rounded-tl-[18px]",
-    isGroupedWithNext ? "rounded-bl-[6px]" : "rounded-bl-[4px]"
-  );
+function getBubbleCornerClasses() {
+  return "rounded-tl-[18px] rounded-tr-[18px] rounded-br-[18px] rounded-bl-none";
 }
 function getChatBubbleClasses({
   isSender = false,
-  isGroupedWithPrev = false,
-  isGroupedWithNext = false,
   surface,
   className
 }) {
@@ -8545,7 +8550,7 @@ function getChatBubbleClasses({
   const isNeutral = resolvedSurface === "neutral";
   return cn(
     "relative",
-    getBubbleCornerClasses(isSender, isGroupedWithPrev, isGroupedWithNext),
+    getBubbleCornerClasses(),
     resolvedSurface === "sent" && "chat-bubble-sent bg-(--chat-theme) text-white",
     resolvedSurface === "received" && "chat-bubble-received border border-(--chat-border)/60 bg-(--chat-incoming-bubble) text-(--chat-incoming-text)",
     isNeutral && "chat-bubble-received border border-(--chat-border)/60 bg-(--chat-incoming-bubble) text-(--chat-incoming-text)",
@@ -10360,8 +10365,6 @@ function MessageAttachmentsView({
               "relative w-full",
               isBubbleLayout && getChatBubbleClasses({
                 isSender,
-                isGroupedWithPrev,
-                isGroupedWithNext,
                 surface: bubbleSurface,
                 className: cn(
                   isImageOnlyBubble ? "p-0" : isForwarded ? "px-2 py-0.5" : "px-2.5 py-1"
@@ -13822,8 +13825,6 @@ function MessageItemTextBubble({
 }) {
   const bubbleClasses = (extra) => getChatBubbleClasses({
     isSender,
-    isGroupedWithPrev,
-    isGroupedWithNext,
     className: extra
   });
   return /* @__PURE__ */ jsxs(
@@ -14116,8 +14117,6 @@ function MessageItemView(props) {
   const showMessageSelectionRadio = selectionMode && !isDeletedForEveryone && !!mid && !hasMultiAttachments;
   const bubbleClasses = (extra) => getChatBubbleClasses({
     isSender,
-    isGroupedWithPrev,
-    isGroupedWithNext,
     className: extra
   });
   return /* @__PURE__ */ jsxs(
@@ -16871,7 +16870,7 @@ var DefaultChannelListItem = ({
   onSelect
 }) => {
   const { slotClassName } = useChatCustomizationOptional();
-  const showReadReceipt = channel.isOwnLastMessage && !channel.unreadCount && !channel.isTyping && !channel.draftPreview;
+  const showReadReceipt = !!channel.lastMessage?.status && !channel.unreadCount && !channel.isTyping && !channel.draftPreview;
   const lastStatus = channel.lastMessage?.status;
   return /* @__PURE__ */ jsxs(
     "div",