@liveblocks/react 3.6.2 → 3.7.0

package/dist/{chunk-I2UW4JM4.js → chunk-WGUV4Z4E.js}

@@ -295,7 +295,6 @@ import {
   createNotificationSettings,
   DefaultMap,
   DerivedSignal,
-  getMentionsFromCommentBody,
   getSubscriptionKey,
   kInternal as kInternal2,
   MutableSignal as MutableSignal3,
@@ -492,6 +491,9 @@ function makeUserThreadsQueryKey(query) {
 function makeAiChatsQueryKey(query) {
   return stableStringify(query ?? {});
 }
+function makeInboxNotificationsQueryKey(query) {
+  return stableStringify(query ?? {});
+}
 function usify(promise) {
   if ("status" in promise) {
     return promise;
@@ -920,7 +922,6 @@ var UmbrellaStore = class {
   // Notifications
   #notificationsLastRequestedAt = null;
   // Keeps track of when we successfully requested an inbox notifications update for the last time. Will be `null` as long as the first successful fetch hasn't happened yet.
-  #notificationsPaginationState;
   // Room Threads
   #roomThreadsLastRequestedAtByRoom = /* @__PURE__ */ new Map();
   // User Threads
@@ -933,21 +934,6 @@ var UmbrellaStore = class {
     this.#client = client[kInternal2].as();
     this.optimisticUpdates = createStore_forOptimistic(this.#client);
     this.permissionHints = createStore_forPermissionHints();
-    this.#notificationsPaginationState = new PaginatedResource(
-      async (cursor) => {
-        const result = await this.#client.getInboxNotifications({ cursor });
-        this.updateThreadifications(
-          result.threads,
-          result.inboxNotifications,
-          result.subscriptions
-        );
-        if (this.#notificationsLastRequestedAt === null) {
-          this.#notificationsLastRequestedAt = result.requestedAt;
-        }
-        const nextCursor = result.nextCursor;
-        return nextCursor;
-      }
-    );
     const notificationSettingsFetcher = async () => {
       const result = await this.#client.getNotificationSettings();
       this.notificationSettings.update(result);
@@ -1077,25 +1063,46 @@ var UmbrellaStore = class {
         return { signal, waitUntilLoaded: resource.waitUntilLoaded };
       }
     );
-    const loadingNotifications = {
-      signal: DerivedSignal.from(() => {
-        const resource = this.#notificationsPaginationState;
-        const result = resource.get();
-        if (result.isLoading || result.error) {
-          return result;
-        }
-        const page = result.data;
+    const loadingNotifications = new DefaultMap(
+      (queryKey) => {
+        const query = JSON.parse(queryKey);
+        const resource = new PaginatedResource(async (cursor) => {
+          const result = await this.#client.getInboxNotifications({
+            cursor,
+            query
+          });
+          this.updateThreadifications(
+            result.threads,
+            result.inboxNotifications,
+            result.subscriptions
+          );
+          if (this.#notificationsLastRequestedAt === null) {
+            this.#notificationsLastRequestedAt = result.requestedAt;
+          }
+          const nextCursor = result.nextCursor;
+          return nextCursor;
+        });
+        const signal = DerivedSignal.from(() => {
+          const result = resource.get();
+          if (result.isLoading || result.error) {
+            return result;
+          }
+          const page = result.data;
+          return {
+            isLoading: false,
+            inboxNotifications: this.outputs.notifications.get().sortedNotifications,
+            hasFetchedAll: page.hasFetchedAll,
+            isFetchingMore: page.isFetchingMore,
+            fetchMoreError: page.fetchMoreError,
+            fetchMore: page.fetchMore
+          };
+        }, shallow2);
         return {
-          isLoading: false,
-          inboxNotifications: this.outputs.notifications.get().sortedNotifications,
-          hasFetchedAll: page.hasFetchedAll,
-          isFetchingMore: page.isFetchingMore,
-          fetchMoreError: page.fetchMoreError,
-          fetchMore: page.fetchMore
+          signal,
+          waitUntilLoaded: resource.waitUntilLoaded
         };
-      }),
-      waitUntilLoaded: this.#notificationsPaginationState.waitUntilLoaded
-    };
+      }
+    );
     const roomSubscriptionSettingsByRoomId = new DefaultMap(
       (roomId) => {
         const resource = new SinglePageResource(async () => {
@@ -1741,15 +1748,7 @@ function applyOptimisticUpdates_forSubscriptions(subscriptionsLUT, threads, opti
               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:
@@ -1950,27 +1949,6 @@ 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 mentions = getMentionsFromCommentBody(
-      comment.body,
-      (mention) => mention.kind === "user" && mention.id === userId
-    );
-    if (mentions.length > 0) {
-      isParticipant = true;
-      break;
-    }
-  }
-  return isParticipant;
-}
 
 // src/liveblocks.tsx
 import { jsx } from "react/jsx-runtime";
@@ -1982,6 +1960,11 @@ function missingRoomInfoError(roomId) {
     `resolveRoomsInfo didn't return anything for room '${roomId}'`
   );
 }
+function missingGroupInfoError(groupId) {
+  return new Error(
+    `resolveGroupsInfo didn't return anything for group '${groupId}'`
+  );
+}
 function identity2(x) {
   return x;
 }
@@ -2036,6 +2019,24 @@ function selectorFor_useRoomInfo(state, roomId) {
     info: state.data
   };
 }
+function selectorFor_useGroupInfo(state, groupId) {
+  if (state === void 0 || state?.isLoading) {
+    return state ?? { isLoading: true };
+  }
+  if (state.error) {
+    return state;
+  }
+  if (!state.data) {
+    return {
+      isLoading: false,
+      error: missingGroupInfoError(groupId)
+    };
+  }
+  return {
+    isLoading: false,
+    info: state.data
+  };
+}
 function getOrCreateContextBundle(client) {
   let bundle = _bundles.get(client);
   if (!bundle) {
@@ -2126,7 +2127,7 @@ function makeLiveblocksContextBundle(client) {
   const shared = createSharedContext(client);
   const bundle = {
     LiveblocksProvider: LiveblocksProvider2,
-    useInboxNotifications: () => useInboxNotifications_withClient(client, identity2, shallow3),
+    useInboxNotifications: (options) => useInboxNotifications_withClient(client, identity2, shallow3, options),
     useUnreadInboxNotificationsCount: () => useUnreadInboxNotificationsCount_withClient(client),
     useMarkInboxNotificationAsRead: useMarkInboxNotificationAsRead2,
     useMarkAllInboxNotificationsAsRead: useMarkAllInboxNotificationsAsRead2,
@@ -2145,7 +2146,7 @@ function makeLiveblocksContextBundle(client) {
     ...shared.classic,
     suspense: {
       LiveblocksProvider: LiveblocksProvider2,
-      useInboxNotifications: () => useInboxNotificationsSuspense_withClient(client),
+      useInboxNotifications: (options) => useInboxNotificationsSuspense_withClient(client, options),
       useUnreadInboxNotificationsCount: () => useUnreadInboxNotificationsCountSuspense_withClient(client),
       useMarkInboxNotificationAsRead: useMarkInboxNotificationAsRead2,
       useMarkAllInboxNotificationsAsRead: useMarkAllInboxNotificationsAsRead2,
@@ -2166,10 +2167,11 @@ function makeLiveblocksContextBundle(client) {
   };
   return bundle;
 }
-function useInboxNotifications_withClient(client, selector, isEqual) {
+function useInboxNotifications_withClient(client, selector, isEqual, options) {
   const { store, notificationsPoller: poller } = getLiveblocksExtrasForClient(client);
+  const queryKey = makeInboxNotificationsQueryKey(options?.query);
   useEffect4(
-    () => void store.outputs.loadingNotifications.waitUntilLoaded()
+    () => void store.outputs.loadingNotifications.getOrCreate(queryKey).waitUntilLoaded()
     // NOTE: Deliberately *not* using a dependency array here!
     //
     // It is important to call waitUntil on *every* render.
@@ -2187,16 +2189,24 @@ function useInboxNotifications_withClient(client, selector, isEqual) {
     };
   }, [poller]);
   return useSignal(
-    store.outputs.loadingNotifications.signal,
+    store.outputs.loadingNotifications.getOrCreate(queryKey).signal,
     selector,
     isEqual
   );
 }
-function useInboxNotificationsSuspense_withClient(client) {
+function useInboxNotificationsSuspense_withClient(client, options) {
   ensureNotServerSide();
   const store = getLiveblocksExtrasForClient(client).store;
-  use(store.outputs.loadingNotifications.waitUntilLoaded());
-  const result = useInboxNotifications_withClient(client, identity2, shallow3);
+  const queryKey = makeInboxNotificationsQueryKey(options?.query);
+  use(
+    store.outputs.loadingNotifications.getOrCreate(queryKey).waitUntilLoaded()
+  );
+  const result = useInboxNotifications_withClient(
+    client,
+    identity2,
+    shallow3,
+    options
+  );
   assert(!result.error, "Did not expect error");
   assert(!result.isLoading, "Did not expect loading");
   return result;
@@ -2211,7 +2221,10 @@ function useUnreadInboxNotificationsCount_withClient(client) {
 function useUnreadInboxNotificationsCountSuspense_withClient(client) {
   ensureNotServerSide();
   const store = getLiveblocksExtrasForClient(client).store;
-  use(store.outputs.loadingNotifications.waitUntilLoaded());
+  const queryKey = makeInboxNotificationsQueryKey(void 0);
+  use(
+    store.outputs.loadingNotifications.getOrCreate(queryKey).waitUntilLoaded()
+  );
   const result = useUnreadInboxNotificationsCount_withClient(client);
   assert(!result.isLoading, "Did not expect loading");
   assert(!result.error, "Did not expect error");
@@ -2533,6 +2546,68 @@ function useRoomInfoSuspense_withClient(client, roomId) {
     error: void 0
   };
 }
+function useGroupInfo_withClient(client, groupId) {
+  const groupsInfoStore = client[kInternal3].groupsInfoStore;
+  const getGroupInfoState = useCallback2(
+    () => groupsInfoStore.getItemState(groupId),
+    [groupsInfoStore, groupId]
+  );
+  const selector = useCallback2(
+    (state) => selectorFor_useGroupInfo(state, groupId),
+    [groupId]
+  );
+  const result = useSyncExternalStoreWithSelector(
+    groupsInfoStore.subscribe,
+    getGroupInfoState,
+    getGroupInfoState,
+    selector,
+    shallow3
+  );
+  useEffect4(
+    () => void groupsInfoStore.enqueue(groupId)
+    // NOTE: Deliberately *not* using a dependency array here!
+    //
+    // It is important to call groupsInfoStore.enqueue on *every* render.
+    // This is harmless though, on most renders, except:
+    // 1. The very first render, in which case we'll want to trigger evaluation
+    //    of the groupId.
+    // 2. All other subsequent renders now are a no-op (from the implementation
+    //    of .enqueue)
+    // 3. If ever the groupId gets invalidated, the group info would be fetched again.
+  );
+  return result;
+}
+function useGroupInfoSuspense_withClient(client, groupId) {
+  const groupsInfoStore = client[kInternal3].groupsInfoStore;
+  const getGroupInfoState = useCallback2(
+    () => groupsInfoStore.getItemState(groupId),
+    [groupsInfoStore, groupId]
+  );
+  const groupInfoState = getGroupInfoState();
+  if (!groupInfoState || groupInfoState.isLoading) {
+    throw groupsInfoStore.enqueue(groupId);
+  }
+  if (groupInfoState.error) {
+    throw groupInfoState.error;
+  }
+  if (!groupInfoState.data) {
+    throw missingGroupInfoError(groupId);
+  }
+  const state = useSyncExternalStore2(
+    groupsInfoStore.subscribe,
+    getGroupInfoState,
+    getGroupInfoState
+  );
+  assert(state !== void 0, "Unexpected missing state");
+  assert(!state.isLoading, "Unexpected loading state");
+  assert(!state.error, "Unexpected error state");
+  assert(state.data !== void 0, "Unexpected missing group info data");
+  return {
+    isLoading: false,
+    info: state.data,
+    error: void 0
+  };
+}
 function useAiChats(options) {
   const client = useClient();
   const store = getUmbrellaStoreForClient(client);
@@ -2736,6 +2811,7 @@ function createSharedContext(client) {
       useClient: useClient2,
       useUser: (userId) => useUser_withClient(client, userId),
       useRoomInfo: (roomId) => useRoomInfo_withClient(client, roomId),
+      useGroupInfo: (groupId) => useGroupInfo_withClient(client, groupId),
       useIsInsideRoom,
       useErrorListener,
       useSyncStatus: useSyncStatus2,
@@ -2746,6 +2822,7 @@ function createSharedContext(client) {
       useClient: useClient2,
       useUser: (userId) => useUserSuspense_withClient(client, userId),
       useRoomInfo: (roomId) => useRoomInfoSuspense_withClient(client, roomId),
+      useGroupInfo: (groupId) => useGroupInfoSuspense_withClient(client, groupId),
       useIsInsideRoom,
       useErrorListener,
       useSyncStatus: useSyncStatus2,
@@ -2783,6 +2860,7 @@ function LiveblocksProvider(props) {
     ),
     resolveUsers: useInitialUnlessFunction(o.resolveUsers),
     resolveRoomsInfo: useInitialUnlessFunction(o.resolveRoomsInfo),
+    resolveGroupsInfo: useInitialUnlessFunction(o.resolveGroupsInfo),
     baseUrl: useInitial(
       // @ts-expect-error - Hidden config options
       o.baseUrl
@@ -2840,11 +2918,16 @@ function useUserThreadsSuspense_experimental(options = {}) {
   assert(!result.isLoading, "Did not expect loading");
   return result;
 }
-function useInboxNotifications() {
-  return useInboxNotifications_withClient(useClient(), identity2, shallow3);
+function useInboxNotifications(options) {
+  return useInboxNotifications_withClient(
+    useClient(),
+    identity2,
+    shallow3,
+    options
+  );
 }
-function useInboxNotificationsSuspense() {
-  return useInboxNotificationsSuspense_withClient(useClient());
+function useInboxNotificationsSuspense(options) {
+  return useInboxNotificationsSuspense_withClient(useClient(), options);
 }
 function useInboxNotificationThread(inboxNotificationId) {
   return useInboxNotificationThread_withClient(
@@ -2893,6 +2976,12 @@ function useRoomInfo(roomId) {
 function useRoomInfoSuspense(roomId) {
   return useRoomInfoSuspense_withClient(useClient(), roomId);
 }
+function useGroupInfo(groupId) {
+  return useGroupInfo_withClient(useClient(), groupId);
+}
+function useGroupInfoSuspense(groupId) {
+  return useGroupInfoSuspense_withClient(useClient(), groupId);
+}
 var _useInboxNotificationThread = useInboxNotificationThread;
 var _useUser = useUser;
 var _useUserSuspense = useUserSuspense;
@@ -3424,10 +3513,10 @@ function useYjsProvider() {
 function useCreateTextMention() {
   const room = useRoom();
   return useCallback3(
-    (userId, mentionId) => {
-      room[kInternal4].createTextMention(userId, mentionId).catch((err) => {
+    (mentionId, mention) => {
+      room[kInternal4].createTextMention(mentionId, mention).catch((err) => {
         console3.error(
-          `Cannot create text mention for user '${userId}' and mention '${mentionId}'`,
+          `Cannot create text mention for mention '${mentionId}'`,
           err
         );
       });
@@ -4604,6 +4693,8 @@ export {
   useUpdateNotificationSettings,
   useRoomInfo,
   useRoomInfoSuspense,
+  useGroupInfo,
+  useGroupInfoSuspense,
   _useInboxNotificationThread,
   _useUser,
   _useUserSuspense,
@@ -4692,4 +4783,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-I2UW4JM4.js.map
+//# sourceMappingURL=chunk-WGUV4Z4E.js.map