@liveblocks/react 2.24.0-sub1 → 2.24.1

package/dist/{chunk-ZWYRZR44.js → chunk-N6OQQVYV.js}

@@ -107,7 +107,7 @@ import {
   kInternal as kInternal2,
   makePoller,
   raise,
-  shallow as shallow4
+  shallow as shallow3
 } from "@liveblocks/core";
 import {
   createContext as createContext2,
@@ -247,7 +247,8 @@ import {
   nanoid,
   nn,
   patchNotificationSettings,
-  shallow as shallow3,
+  shallow,
+  shallow2,
   Signal,
   stableStringify
 } from "@liveblocks/core";
@@ -269,21 +270,6 @@ function autobind(self) {
   } while ((obj = Reflect.getPrototypeOf(obj)) && obj !== Object.prototype);
 }
 
-// src/lib/shallow2.ts
-import { isPlainObject, shallow } from "@liveblocks/core";
-function shallow2(a, b) {
-  if (!isPlainObject(a) || !isPlainObject(b)) {
-    return shallow(a, b);
-  }
-  const keysA = Object.keys(a);
-  if (keysA.length !== Object.keys(b).length) {
-    return false;
-  }
-  return keysA.every(
-    (key) => Object.prototype.hasOwnProperty.call(b, key) && shallow(a[key], b[key])
-  );
-}
-
 // src/ThreadDB.ts
 import { batch, MutableSignal, SortedList } from "@liveblocks/core";
 
@@ -932,7 +918,7 @@ var UmbrellaStore = class {
         sortedNotifications: s.sortedNotifications,
         notificationsById: s.notificationsById
       }),
-      shallow3
+      shallow
     );
     const threadSubscriptions = DerivedSignal.from(
       notifications,
@@ -1067,7 +1053,7 @@ var UmbrellaStore = class {
               nn(this.roomSubscriptionSettings.signal.get()[roomId])
             );
           }
-        }, shallow3);
+        }, shallow);
         return { signal, waitUntilLoaded: resource.waitUntilLoaded };
       }
     );
@@ -1098,7 +1084,7 @@ var UmbrellaStore = class {
               Object.values(this.historyVersions.signal.get()[roomId] ?? {})
             );
           }
-        }, shallow3);
+        }, shallow);
         return { signal, waitUntilLoaded: resource.waitUntilLoaded };
       }
     );
@@ -1112,7 +1098,7 @@ var UmbrellaStore = class {
           "settings",
           nn(this.notificationSettings.signal.get())
         );
-      }, shallow3),
+      }, shallow),
       waitUntilLoaded: this.#notificationSettings.waitUntilLoaded
     };
     this.outputs = {
@@ -1168,7 +1154,7 @@ var UmbrellaStore = class {
     });
   }
   /**
-   * Creates a existing subscription, replacing the corresponding
+   * Creates an existing subscription, replacing the corresponding
    * optimistic update.
    */
   createSubscription(subscription, optimisticId) {
@@ -1593,47 +1579,45 @@ function applyOptimisticUpdates_forRoomSubscriptionSettings(settingsLUT, optimis
 function applyOptimisticUpdates_forSubscriptions(subscriptionsLUT, threads, optimisticUpdates) {
   const subscriptions = Object.fromEntries(subscriptionsLUT);
   for (const update of optimisticUpdates) {
-    if (update.type === "update-room-subscription-settings") {
-      if (update.settings.threads) {
+    switch (update.type) {
+      case "update-room-subscription-settings": {
+        if (!update.settings.threads) {
+          continue;
+        }
         const roomThreads = threads.findMany(update.roomId, void 0, "desc");
         for (const thread of roomThreads) {
           const subscriptionKey = getSubscriptionKey("thread", thread.id);
-          if (update.settings.threads === "all") {
-            subscriptions[subscriptionKey] = {
-              kind: "thread",
-              subjectId: thread.id,
-              createdAt: /* @__PURE__ */ new Date()
-            };
-          } else if (update.settings.threads === "none") {
-            delete subscriptions[subscriptionKey];
-          } else if (update.settings.threads === "replies_and_mentions") {
-            let isParticipant = false;
-            for (const comment of thread.comments) {
-              if (comment.deletedAt) {
-                continue;
-              }
-              if (comment.userId === update.userId) {
-                isParticipant = true;
-                break;
-              }
-              const mentionedIds = getMentionedIdsFromCommentBody(comment.body);
-              if (mentionedIds.includes(update.userId)) {
-                isParticipant = true;
-                break;
-              }
-            }
-            if (isParticipant && !subscriptions[subscriptionKey]) {
+          switch (update.settings.threads) {
+            // Create subscriptions for all existing threads in the room
+            case "all": {
               subscriptions[subscriptionKey] = {
                 kind: "thread",
                 subjectId: thread.id,
                 createdAt: /* @__PURE__ */ new Date()
               };
+              break;
             }
-          } else {
-            assertNever(
-              update.settings.threads,
-              "Unexpected room subscription settings."
-            );
+            // Delete subscriptions for all existing threads in the room
+            case "none": {
+              delete subscriptions[subscriptionKey];
+              break;
+            }
+            // Create subscriptions for every threads in the room which the user participates in but doesn't have a subscription for yet
+            case "replies_and_mentions": {
+              if (isThreadParticipant(thread, update.userId) && !subscriptions[subscriptionKey]) {
+                subscriptions[subscriptionKey] = {
+                  kind: "thread",
+                  subjectId: thread.id,
+                  createdAt: /* @__PURE__ */ new Date()
+                };
+              }
+              break;
+            }
+            default:
+              assertNever(
+                update.settings.threads,
+                "Unexpected thread subscription settings."
+              );
           }
         }
       }
@@ -1827,6 +1811,24 @@ function upsertReaction(reactions, reaction) {
   }
   return reactions;
 }
+function isThreadParticipant(thread, userId) {
+  let isParticipant = false;
+  for (const comment of thread.comments) {
+    if (comment.deletedAt) {
+      continue;
+    }
+    if (comment.userId === userId) {
+      isParticipant = true;
+      break;
+    }
+    const mentionedIds = getMentionedIdsFromCommentBody(comment.body);
+    if (mentionedIds.includes(userId)) {
+      isParticipant = true;
+      break;
+    }
+  }
+  return isParticipant;
+}
 
 // src/liveblocks.tsx
 import { jsx } from "react/jsx-runtime";
@@ -1978,7 +1980,7 @@ function makeLiveblocksContextBundle(client) {
   const shared = createSharedContext(client);
   const bundle = {
     LiveblocksProvider: LiveblocksProvider2,
-    useInboxNotifications: () => useInboxNotifications_withClient(client, identity2, shallow4),
+    useInboxNotifications: () => useInboxNotifications_withClient(client, identity2, shallow3),
     useUnreadInboxNotificationsCount: () => useUnreadInboxNotificationsCount_withClient(client),
     useMarkInboxNotificationAsRead: useMarkInboxNotificationAsRead2,
     useMarkAllInboxNotificationsAsRead: useMarkAllInboxNotificationsAsRead2,
@@ -2036,7 +2038,7 @@ function useInboxNotificationsSuspense_withClient(client) {
   ensureNotServerSide();
   const store = getLiveblocksExtrasForClient(client).store;
   use(store.outputs.loadingNotifications.waitUntilLoaded());
-  const result = useInboxNotifications_withClient(client, identity2, shallow4);
+  const result = useInboxNotifications_withClient(client, identity2, shallow3);
   assert(!result.error, "Did not expect error");
   assert(!result.isLoading, "Did not expect loading");
   return result;
@@ -2045,7 +2047,7 @@ function useUnreadInboxNotificationsCount_withClient(client) {
   return useInboxNotifications_withClient(
     client,
     selectorFor_useUnreadInboxNotificationsCount,
-    shallow4
+    shallow3
   );
 }
 function useUnreadInboxNotificationsCountSuspense_withClient(client) {
@@ -2265,7 +2267,7 @@ function useUser_withClient(client, userId) {
     getUserState,
     getUserState,
     selector,
-    shallow4
+    shallow3
   );
   useEffect3(
     () => void usersStore.enqueue(userId)
@@ -2326,7 +2328,7 @@ function useRoomInfo_withClient(client, roomId) {
     getRoomInfoState,
     getRoomInfoState,
     selector,
-    shallow4
+    shallow3
   );
   useEffect3(
     () => void roomsInfoStore.enqueue(roomId)
@@ -2486,7 +2488,7 @@ function useUserThreadsSuspense_experimental(options = {}) {
   return result;
 }
 function useInboxNotifications() {
-  return useInboxNotifications_withClient(useClient(), identity2, shallow4);
+  return useInboxNotifications_withClient(useClient(), identity2, shallow3);
 }
 function useInboxNotificationsSuspense() {
   return useInboxNotificationsSuspense_withClient(useClient());
@@ -2593,7 +2595,7 @@ function useErrorListener(callback) {
 }
 
 // src/room.tsx
-import { shallow as shallow5 } from "@liveblocks/client";
+import { shallow as shallow4 } from "@liveblocks/client";
 import {
   assert as assert2,
   console as console3,
@@ -3255,7 +3257,7 @@ function useOthersMapped(itemSelector, itemIsEqual) {
   return useOthers(wrappedSelector, wrappedIsEqual);
 }
 function useOthersConnectionIds() {
-  return useOthers(selectorFor_useOthersConnectionIds, shallow5);
+  return useOthers(selectorFor_useOthersConnectionIds, shallow4);
 }
 var NOT_FOUND = Symbol();
 function useOther(connectionId, selector, isEqual) {
@@ -3945,7 +3947,7 @@ function useRoomThreadSubscription(roomId, threadId) {
     },
     [subscriptionKey, threadId, subscribe, unsubscribe]
   );
-  return useSignal(signal, selector, shallow5);
+  return useSignal(signal, selector, shallow4);
 }
 function useRoomNotificationSettings() {
   const updateRoomNotificationSettings = useUpdateRoomNotificationSettings();
@@ -4264,7 +4266,7 @@ function useRoomAttachmentUrl(attachmentId, roomId) {
     getAttachmentUrlState,
     getAttachmentUrlState,
     selectorFor_useAttachmentUrl,
-    shallow5
+    shallow4
   );
 }
 function useAttachmentUrlSuspense(attachmentId) {
@@ -4459,4 +4461,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-ZWYRZR44.js.map
+//# sourceMappingURL=chunk-N6OQQVYV.js.map