@liveblocks/react 3.7.0-preview1 → 3.7.0

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

@@ -491,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;
@@ -919,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
@@ -932,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);
@@ -1076,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 () => {
@@ -2119,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,
@@ -2138,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,
@@ -2159,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.
@@ -2180,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;
@@ -2204,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");
@@ -2898,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(
@@ -4758,4 +4783,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-LYWCKEAX.js.map
+//# sourceMappingURL=chunk-WGUV4Z4E.js.map