@natoe/colab 0.1.14 → 0.1.16

package/dist/index.mjs

@@ -57,6 +57,19 @@ function toCamelKey(key) {
 }
 
 // src/core/socket.ts
+function normalizeUnreadPayload(payload) {
+  if (payload && typeof payload === "object") {
+    const obj = payload;
+    if (obj.conversation && typeof obj.conversation === "object") {
+      return {
+        conversation: obj.conversation,
+        order: obj.order && typeof obj.order === "object" ? obj.order : {}
+      };
+    }
+    return { conversation: payload, order: {} };
+  }
+  return { conversation: {}, order: {} };
+}
 var CollabSocket = class {
   constructor() {
     this.socket = null;
@@ -122,7 +135,7 @@ var CollabSocket = class {
     if (!this.socket || !this.config) return;
     this.userChannel = this.socket.channel("user_notifications", {});
     this.userChannel.on("unread_update", (payload) => {
-      this.onUnreadUpdate?.(payload);
+      this.onUnreadUpdate?.(normalizeUnreadPayload(payload));
     });
     this.userChannel.join().receive("ok", () => {
     }).receive("error", (reason) => {
@@ -133,7 +146,9 @@ var CollabSocket = class {
       });
     });
   }
-  /** Register callback for unread count changes */
+  /** Register callback for unread count changes. The callback receives
+   *  the normalised {@link UnreadCounts} shape regardless of which
+   *  payload format the backend pushed. */
   onUnreadCountUpdate(callback) {
     this.onUnreadUpdate = callback;
   }
@@ -577,6 +592,7 @@ function CollabProvider({ config, apiBaseUrl, children }) {
     return new CollabSocket();
   });
   const [unreadCounts, setUnreadCounts] = useState({});
+  const [unreadCountsByOrder, setUnreadCountsByOrder] = useState({});
   const pendingOrderIds = useRef(/* @__PURE__ */ new Set());
   const pendingResolvers = useRef(/* @__PURE__ */ new Map());
   const previewCache = useRef(/* @__PURE__ */ new Map());
@@ -592,7 +608,8 @@ function CollabProvider({ config, apiBaseUrl, children }) {
       setSocket(s);
     }
     s.onUnreadCountUpdate((counts) => {
-      setUnreadCounts(counts);
+      setUnreadCounts(counts.conversation);
+      setUnreadCountsByOrder(counts.order);
       previewCache.current.clear();
     });
     if (!s.isConnected()) {
@@ -800,6 +817,7 @@ function CollabProvider({ config, apiBaseUrl, children }) {
         apiBaseUrl,
         totalUnread,
         unreadCounts,
+        unreadCountsByOrder,
         requestPreview,
         invalidatePreview,
         fetchMessages,
@@ -6321,7 +6339,7 @@ function useUnreadCount() {
   const [counts, setCounts] = useState({});
   useEffect(() => {
     socket.onUnreadCountUpdate((serverCounts) => {
-      setCounts(serverCounts);
+      setCounts(serverCounts.conversation);
     });
   }, [socket]);
   const getCountForConversation = useCallback(