@liveblocks/react 2.7.1 → 2.7.2

package/dist/{chunk-XK5NTOJJ.mjs → chunk-QC6HYSYS.mjs}

@@ -1,6 +1,6 @@
 // src/version.ts
 var PKG_NAME = "@liveblocks/react";
-var PKG_VERSION = "2.7.1";
+var PKG_VERSION = "2.7.2";
 var PKG_FORMAT = "esm";
 
 // src/ClientSideSuspense.tsx
@@ -196,8 +196,18 @@ import {
   console as console2,
   createStore,
   mapValues,
-  nanoid
+  nanoid,
+  nn
 } from "@liveblocks/core";
+var QUERY_STATE_LOADING = Object.freeze({ isLoading: true });
+var QUERY_STATE_OK = Object.freeze({ isLoading: false, data: void 0 });
+var INBOX_NOTIFICATIONS_QUERY = "INBOX_NOTIFICATIONS";
+function makeNotificationSettingsQueryKey(roomId) {
+  return `${roomId}:NOTIFICATION_SETTINGS`;
+}
+function makeVersionsQueryKey(roomId) {
+  return `${roomId}-VERSIONS`;
+}
 var UmbrellaStore = class {
   constructor() {
     this._prevState = null;
@@ -212,8 +222,7 @@ var UmbrellaStore = class {
     });
     this.getThreads = this.getThreads.bind(this);
     this.getInboxNotifications = this.getInboxNotifications.bind(this);
-    this.getNotificationSettings = this.getNotificationSettings.bind(this);
-    this.getVersions = this.getVersions.bind(this);
+    this.getInboxNotificationsAsync = this.getInboxNotificationsAsync.bind(this);
     this.subscribeThreads = this.subscribeThreads.bind(this);
     this.subscribeInboxNotifications = this.subscribeInboxNotifications.bind(this);
     this.subscribeNotificationSettings = this.subscribeNotificationSettings.bind(this);
@@ -225,7 +234,7 @@ var UmbrellaStore = class {
     const rawState = this._store.get();
     if (this._prevState !== rawState || this._stateCached === null) {
       this._prevState = rawState;
-      this._stateCached = applyOptimisticUpdates(rawState);
+      this._stateCached = internalToExternalState(rawState);
     }
     return this._stateCached;
   }
@@ -235,11 +244,47 @@ var UmbrellaStore = class {
   getInboxNotifications() {
     return this.get();
   }
-  getNotificationSettings() {
-    return this.get();
+  // NOTE: This will read the async result, but WILL NOT start loading at the moment!
+  getInboxNotificationsAsync() {
+    const internalState = this._store.get();
+    const query = internalState.queries[INBOX_NOTIFICATIONS_QUERY];
+    if (query === void 0 || query.isLoading) {
+      return QUERY_STATE_LOADING;
+    }
+    if (query.error !== void 0) {
+      return query;
+    }
+    const inboxNotifications = this.get().inboxNotifications;
+    return { isLoading: false, inboxNotifications };
+  }
+  // NOTE: This will read the async result, but WILL NOT start loading at the moment!
+  getNotificationSettingsAsync(roomId) {
+    const state = this.get();
+    const query = state.queries[makeNotificationSettingsQueryKey(roomId)];
+    if (query === void 0 || query.isLoading) {
+      return QUERY_STATE_LOADING;
+    }
+    if (query.error !== void 0) {
+      return query;
+    }
+    return {
+      isLoading: false,
+      settings: nn(state.notificationSettingsByRoomId[roomId])
+    };
   }
-  getVersions() {
-    return this.get();
+  getVersionsAsync(roomId) {
+    const state = this.get();
+    const query = state.queries[makeVersionsQueryKey(roomId)];
+    if (query === void 0 || query.isLoading) {
+      return QUERY_STATE_LOADING;
+    }
+    if (query.error !== void 0) {
+      return query;
+    }
+    return {
+      isLoading: false,
+      versions: nn(state.versionsByRoomId[roomId])
+    };
   }
   /**
    * @private Only used by the E2E test suite.
@@ -574,29 +619,29 @@ var UmbrellaStore = class {
   // Query State APIs
   //
   setQueryLoading(queryKey) {
-    this.setQueryState(queryKey, { isLoading: true });
+    this.setQueryState(queryKey, QUERY_STATE_LOADING);
   }
   setQueryOK(queryKey) {
-    this.setQueryState(queryKey, { isLoading: false, data: void 0 });
+    this.setQueryState(queryKey, QUERY_STATE_OK);
   }
   setQueryError(queryKey, error) {
     this.setQueryState(queryKey, { isLoading: false, error });
   }
 };
-function applyOptimisticUpdates(state) {
-  const output = {
-    threads: { ...state.rawThreadsById },
-    inboxNotifications: { ...state.inboxNotificationsById },
-    notificationSettings: { ...state.notificationSettingsByRoomId }
+function internalToExternalState(state) {
+  const computed = {
+    threadsById: { ...state.rawThreadsById },
+    inboxNotificationsById: { ...state.inboxNotificationsById },
+    notificationSettingsByRoomId: { ...state.notificationSettingsByRoomId }
   };
   for (const optimisticUpdate of state.optimisticUpdates) {
     switch (optimisticUpdate.type) {
       case "create-thread": {
-        output.threads[optimisticUpdate.thread.id] = optimisticUpdate.thread;
+        computed.threadsById[optimisticUpdate.thread.id] = optimisticUpdate.thread;
         break;
       }
       case "edit-thread-metadata": {
-        const thread = output.threads[optimisticUpdate.threadId];
+        const thread = computed.threadsById[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
@@ -606,7 +651,7 @@ function applyOptimisticUpdates(state) {
         if (thread.updatedAt !== void 0 && thread.updatedAt > optimisticUpdate.updatedAt) {
           break;
         }
-        output.threads[thread.id] = {
+        computed.threadsById[thread.id] = {
           ...thread,
           updatedAt: optimisticUpdate.updatedAt,
           metadata: {
@@ -617,49 +662,51 @@ function applyOptimisticUpdates(state) {
         break;
       }
       case "mark-thread-as-resolved": {
-        const thread = output.threads[optimisticUpdate.threadId];
+        const thread = computed.threadsById[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
         if (thread.deletedAt !== void 0) {
           break;
         }
-        output.threads[thread.id] = {
+        computed.threadsById[thread.id] = {
           ...thread,
           resolved: true
         };
         break;
       }
       case "mark-thread-as-unresolved": {
-        const thread = output.threads[optimisticUpdate.threadId];
+        const thread = computed.threadsById[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
         if (thread.deletedAt !== void 0) {
           break;
         }
-        output.threads[thread.id] = {
+        computed.threadsById[thread.id] = {
           ...thread,
           resolved: false
         };
         break;
       }
       case "create-comment": {
-        const thread = output.threads[optimisticUpdate.comment.threadId];
+        const thread = computed.threadsById[optimisticUpdate.comment.threadId];
         if (thread === void 0) {
           break;
         }
-        output.threads[thread.id] = applyUpsertComment(
+        computed.threadsById[thread.id] = applyUpsertComment(
           thread,
           optimisticUpdate.comment
         );
-        const inboxNotification = Object.values(output.inboxNotifications).find(
+        const inboxNotification = Object.values(
+          computed.inboxNotificationsById
+        ).find(
           (notification) => notification.kind === "thread" && notification.threadId === thread.id
         );
         if (inboxNotification === void 0) {
           break;
         }
-        output.inboxNotifications[inboxNotification.id] = {
+        computed.inboxNotificationsById[inboxNotification.id] = {
           ...inboxNotification,
           notifiedAt: optimisticUpdate.comment.createdAt,
           readAt: optimisticUpdate.comment.createdAt
@@ -667,22 +714,22 @@ function applyOptimisticUpdates(state) {
         break;
       }
       case "edit-comment": {
-        const thread = output.threads[optimisticUpdate.comment.threadId];
+        const thread = computed.threadsById[optimisticUpdate.comment.threadId];
         if (thread === void 0) {
           break;
         }
-        output.threads[thread.id] = applyUpsertComment(
+        computed.threadsById[thread.id] = applyUpsertComment(
           thread,
           optimisticUpdate.comment
         );
         break;
       }
       case "delete-comment": {
-        const thread = output.threads[optimisticUpdate.threadId];
+        const thread = computed.threadsById[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
-        output.threads[thread.id] = applyDeleteComment(
+        computed.threadsById[thread.id] = applyDeleteComment(
           thread,
           optimisticUpdate.commentId,
           optimisticUpdate.deletedAt
@@ -690,12 +737,12 @@ function applyOptimisticUpdates(state) {
         break;
       }
       case "delete-thread": {
-        const thread = output.threads[optimisticUpdate.threadId];
+        const thread = computed.threadsById[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
-        output.threads[optimisticUpdate.threadId] = {
-          ...output.threads[optimisticUpdate.threadId],
+        computed.threadsById[optimisticUpdate.threadId] = {
+          ...thread,
           deletedAt: optimisticUpdate.deletedAt,
           updatedAt: optimisticUpdate.deletedAt,
           comments: []
@@ -703,11 +750,11 @@ function applyOptimisticUpdates(state) {
         break;
       }
       case "add-reaction": {
-        const thread = output.threads[optimisticUpdate.threadId];
+        const thread = computed.threadsById[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
-        output.threads[thread.id] = applyAddReaction(
+        computed.threadsById[thread.id] = applyAddReaction(
           thread,
           optimisticUpdate.commentId,
           optimisticUpdate.reaction
@@ -715,11 +762,11 @@ function applyOptimisticUpdates(state) {
         break;
       }
       case "remove-reaction": {
-        const thread = output.threads[optimisticUpdate.threadId];
+        const thread = computed.threadsById[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
-        output.threads[thread.id] = applyRemoveReaction(
+        computed.threadsById[thread.id] = applyRemoveReaction(
           thread,
           optimisticUpdate.commentId,
           optimisticUpdate.emoji,
@@ -729,36 +776,41 @@ function applyOptimisticUpdates(state) {
         break;
       }
       case "mark-inbox-notification-as-read": {
-        output.inboxNotifications[optimisticUpdate.inboxNotificationId] = {
-          ...state.inboxNotificationsById[optimisticUpdate.inboxNotificationId],
-          readAt: optimisticUpdate.readAt
-        };
+        const ibn = computed.inboxNotificationsById[optimisticUpdate.inboxNotificationId];
+        if (ibn === void 0) {
+          break;
+        }
+        computed.inboxNotificationsById[optimisticUpdate.inboxNotificationId] = { ...ibn, readAt: optimisticUpdate.readAt };
         break;
       }
       case "mark-all-inbox-notifications-as-read": {
-        for (const id in output.inboxNotifications) {
-          output.inboxNotifications[id] = {
-            ...output.inboxNotifications[id],
+        for (const id in computed.inboxNotificationsById) {
+          const ibn = computed.inboxNotificationsById[id];
+          if (ibn === void 0) {
+            break;
+          }
+          computed.inboxNotificationsById[id] = {
+            ...ibn,
             readAt: optimisticUpdate.readAt
           };
         }
         break;
       }
       case "delete-inbox-notification": {
-        const {
-          [optimisticUpdate.inboxNotificationId]: _,
-          ...inboxNotifications
-        } = output.inboxNotifications;
-        output.inboxNotifications = inboxNotifications;
+        delete computed.inboxNotificationsById[optimisticUpdate.inboxNotificationId];
         break;
       }
       case "delete-all-inbox-notifications": {
-        output.inboxNotifications = {};
+        computed.inboxNotificationsById = {};
         break;
       }
       case "update-notification-settings": {
-        output.notificationSettings[optimisticUpdate.roomId] = {
-          ...output.notificationSettings[optimisticUpdate.roomId],
+        const settings = computed.notificationSettingsByRoomId[optimisticUpdate.roomId];
+        if (settings === void 0) {
+          break;
+        }
+        computed.notificationSettingsByRoomId[optimisticUpdate.roomId] = {
+          ...settings,
           ...optimisticUpdate.settings
         };
       }
@@ -766,23 +818,26 @@ function applyOptimisticUpdates(state) {
   }
   const cleanedThreads = (
     // Don't expose any soft-deleted threads
-    Object.values(output.threads).filter(
-      (thread) => !thread.deletedAt
+    Object.values(computed.threadsById).filter((thread) => !thread.deletedAt).filter(
+      (thread) => (
+        // Only keep a thread if there is at least one non-deleted comment
+        thread.comments.some((c) => c.deletedAt === void 0)
+      )
     )
   );
   const cleanedNotifications = (
     // Sort so that the most recent notifications are first
-    Object.values(output.inboxNotifications).sort(
-      (a, b) => b.notifiedAt.getTime() - a.notifiedAt.getTime()
-    )
+    Object.values(computed.inboxNotificationsById).filter(
+      (ibn) => ibn.kind === "thread" ? computed.threadsById[ibn.threadId] && computed.threadsById[ibn.threadId]?.deletedAt === void 0 : true
+    ).sort((a, b) => b.notifiedAt.getTime() - a.notifiedAt.getTime())
   );
   return {
     inboxNotifications: cleanedNotifications,
-    inboxNotificationsById: output.inboxNotifications,
-    notificationSettingsByRoomId: output.notificationSettings,
+    inboxNotificationsById: computed.inboxNotificationsById,
+    notificationSettingsByRoomId: computed.notificationSettingsByRoomId,
     queries: state.queries,
     threads: cleanedThreads,
-    threadsById: output.threads,
+    threadsById: computed.threadsById,
     versionsByRoomId: state.versionsByRoomId
   };
 }
@@ -902,12 +957,11 @@ function applyDeleteComment(thread, commentId, deletedAt) {
       body: void 0
     } : comment
   );
-  if (!updatedComments.some((comment) => comment.deletedAt === void 0)) {
+  if (updatedComments.every((comment) => comment.deletedAt !== void 0)) {
     return {
       ...thread,
       deletedAt,
-      updatedAt: deletedAt,
-      comments: []
+      updatedAt: deletedAt
     };
   }
   return {
@@ -1011,55 +1065,30 @@ function missingRoomInfoError(roomId) {
     `resolveRoomsInfo didn't return anything for room '${roomId}'`
   );
 }
+function identity(x) {
+  return x;
+}
 var _umbrellaStores = /* @__PURE__ */ new WeakMap();
 var _extras = /* @__PURE__ */ new WeakMap();
 var _bundles = /* @__PURE__ */ new WeakMap();
 var POLLING_INTERVAL = 60 * 1e3;
-var INBOX_NOTIFICATIONS_QUERY = "INBOX_NOTIFICATIONS";
 var USER_THREADS_QUERY = "USER_THREADS";
-function selectorFor_useInboxNotifications(state) {
-  const query = state.queries[INBOX_NOTIFICATIONS_QUERY];
-  if (query === void 0 || query.isLoading) {
-    return {
-      isLoading: true
-    };
-  }
-  if (query.error !== void 0) {
-    return {
-      error: query.error,
-      isLoading: false
-    };
-  }
-  return {
-    inboxNotifications: state.inboxNotifications,
-    isLoading: false
-  };
-}
-function selectUnreadInboxNotificationsCount(state) {
+function selectUnreadInboxNotificationsCount(inboxNotifications) {
   let count = 0;
-  for (const notification of state.inboxNotifications) {
+  for (const notification of inboxNotifications) {
     if (notification.readAt === null || notification.readAt < notification.notifiedAt) {
       count++;
     }
   }
   return count;
 }
-function selectorFor_useUnreadInboxNotificationsCount(state) {
-  const query = state.queries[INBOX_NOTIFICATIONS_QUERY];
-  if (query === void 0 || query.isLoading) {
-    return {
-      isLoading: true
-    };
-  }
-  if (query.error !== void 0) {
-    return {
-      error: query.error,
-      isLoading: false
-    };
+function selectorFor_useUnreadInboxNotificationsCount(result) {
+  if (!result.inboxNotifications) {
+    return result;
   }
   return {
     isLoading: false,
-    count: selectUnreadInboxNotificationsCount(state)
+    count: selectUnreadInboxNotificationsCount(result.inboxNotifications)
   };
 }
 function selectorFor_useUser(state, userId) {
@@ -1191,23 +1220,21 @@ function makeExtrasForClient(client) {
     void waitUntilInboxNotificationsLoaded().catch(() => {
     });
   }
-  function useEnableInboxNotificationsPolling() {
-    useEffect3(() => {
-      pollerSubscribers++;
-      poller.start(POLLING_INTERVAL);
-      return () => {
-        if (pollerSubscribers <= 0) {
-          console.warn(
-            `Internal unexpected behavior. Cannot decrease subscriber count for query "${INBOX_NOTIFICATIONS_QUERY}"`
-          );
-          return;
-        }
-        pollerSubscribers--;
-        if (pollerSubscribers <= 0) {
-          poller.stop();
-        }
-      };
-    }, []);
+  function startPolling() {
+    pollerSubscribers++;
+    poller.start(POLLING_INTERVAL);
+    return () => {
+      if (pollerSubscribers <= 0) {
+        console.warn(
+          `Internal unexpected behavior. Cannot decrease subscriber count for query "${INBOX_NOTIFICATIONS_QUERY}"`
+        );
+        return;
+      }
+      pollerSubscribers--;
+      if (pollerSubscribers <= 0) {
+        poller.stop();
+      }
+    };
   }
   const userThreadsPoller = makePoller(refreshUserThreads);
   let isFetchingUserThreadsUpdates = false;
@@ -1292,7 +1319,7 @@ function makeExtrasForClient(client) {
   }
   return {
     store,
-    useEnableInboxNotificationsPolling,
+    startPolling,
     waitUntilInboxNotificationsLoaded,
     loadInboxNotifications,
     incrementUserThreadsQuerySubscribers,
@@ -1337,16 +1364,14 @@ function makeLiveblocksContextBundle(client) {
   return bundle;
 }
 function useInboxNotifications_withClient(client) {
-  const { loadInboxNotifications, store, useEnableInboxNotificationsPolling } = getExtrasForClient(client);
-  useEffect3(() => {
-    loadInboxNotifications();
-  }, [loadInboxNotifications]);
-  useEnableInboxNotificationsPolling();
+  const { loadInboxNotifications, store, startPolling } = getExtrasForClient(client);
+  useEffect3(loadInboxNotifications, [loadInboxNotifications]);
+  useEffect3(startPolling, [startPolling]);
   return useSyncExternalStoreWithSelector(
     store.subscribeInboxNotifications,
-    store.getInboxNotifications,
-    store.getInboxNotifications,
-    selectorFor_useInboxNotifications,
+    store.getInboxNotificationsAsync,
+    store.getInboxNotificationsAsync,
+    identity,
     shallow3
   );
 }
@@ -1359,15 +1384,13 @@ function useInboxNotificationsSuspense_withClient(client) {
   return result;
 }
 function useUnreadInboxNotificationsCount_withClient(client) {
-  const { store, loadInboxNotifications, useEnableInboxNotificationsPolling } = getExtrasForClient(client);
-  useEffect3(() => {
-    loadInboxNotifications();
-  }, [loadInboxNotifications]);
-  useEnableInboxNotificationsPolling();
+  const { store, loadInboxNotifications, startPolling } = getExtrasForClient(client);
+  useEffect3(loadInboxNotifications, [loadInboxNotifications]);
+  useEffect3(startPolling, [startPolling]);
   return useSyncExternalStoreWithSelector(
     store.subscribeInboxNotifications,
-    store.getInboxNotifications,
-    store.getInboxNotifications,
+    store.getInboxNotificationsAsync,
+    store.getInboxNotificationsAsync,
     selectorFor_useUnreadInboxNotificationsCount,
     shallow3
   );
@@ -1920,7 +1943,6 @@ import {
   kInternal as kInternal2,
   makeEventSource,
   makePoller as makePoller2,
-  nn,
   NotificationsApiError,
   ServerMsgCode,
   stringify as stringify2
@@ -1961,7 +1983,7 @@ function useScrollToCommentOnLoadEffect(shouldScrollOnLoad, state) {
 var SMOOTH_DELAY = 1e3;
 var noop2 = () => {
 };
-var identity = (x) => x;
+var identity2 = (x) => x;
 var missing_unstable_batchedUpdates = (reactVersion, roomId) => `We noticed you\u2019re using React ${reactVersion}. Please pass unstable_batchedUpdates at the RoomProvider level until you\u2019re ready to upgrade to React 18:
 
     import { unstable_batchedUpdates } from "react-dom";  // or "react-native"
@@ -1975,13 +1997,10 @@ var missing_unstable_batchedUpdates = (reactVersion, roomId) => `We noticed you\
 Why? Please see https://liveblocks.io/docs/platform/troubleshooting#stale-props-zombie-child for more information`;
 var superfluous_unstable_batchedUpdates = "You don\u2019t need to pass unstable_batchedUpdates to RoomProvider anymore, since you\u2019re on React 18+ already.";
 function useSyncExternalStore2(s, gs, gss) {
-  return useSyncExternalStoreWithSelector2(s, gs, gss, identity);
+  return useSyncExternalStoreWithSelector2(s, gs, gss, identity2);
 }
 var STABLE_EMPTY_LIST = Object.freeze([]);
 var POLLING_INTERVAL2 = 5 * 60 * 1e3;
-function makeNotificationSettingsQueryKey(roomId) {
-  return `${roomId}:NOTIFICATION_SETTINGS`;
-}
 function alwaysEmptyList() {
   return STABLE_EMPTY_LIST;
 }
@@ -1991,10 +2010,6 @@ function alwaysNull() {
 function selectorFor_useOthersConnectionIds(others) {
   return others.map((user) => user.connectionId);
 }
-function selectNotificationSettings(roomId, state) {
-  const notificationSettings = state.notificationSettingsByRoomId;
-  return nn(notificationSettings[roomId]);
-}
 function makeMutationContext(room) {
   const cannotUseUntil = "This mutation cannot be used until";
   const needsPresence = `${cannotUseUntil} connected to the Liveblocks room`;
@@ -2123,7 +2138,7 @@ function makeExtrasForClient2(client) {
     }
   }
   async function getRoomVersions(room, { retryCount } = { retryCount: 0 }) {
-    const queryKey = getVersionsQueryKey(room.id);
+    const queryKey = makeVersionsQueryKey(room.id);
     const existingRequest = requestsByQuery.get(queryKey);
     if (existingRequest !== void 0) return existingRequest;
     const request = room[kInternal2].listTextVersions();
@@ -2183,7 +2198,8 @@ function makeExtrasForClient2(client) {
     }
     return;
   }
-  async function getInboxNotificationSettings(room, queryKey, { retryCount } = { retryCount: 0 }) {
+  async function getInboxNotificationSettings(room, { retryCount } = { retryCount: 0 }) {
+    const queryKey = makeNotificationSettingsQueryKey(room.id);
     const existingRequest = requestsByQuery.get(queryKey);
     if (existingRequest !== void 0) return existingRequest;
     try {
@@ -2195,7 +2211,7 @@ function makeExtrasForClient2(client) {
     } catch (err) {
       requestsByQuery.delete(queryKey);
       retryError(() => {
-        void getInboxNotificationSettings(room, queryKey, {
+        void getInboxNotificationSettings(room, {
           retryCount: retryCount + 1
         });
       }, retryCount);
@@ -2579,7 +2595,7 @@ function useSelf(maybeSelector, isEqual) {
   const room = useRoom();
   const subscribe = room.events.self.subscribe;
   const getSnapshot = room.getSelf;
-  const selector = maybeSelector ?? identity;
+  const selector = maybeSelector ?? identity2;
   const wrappedSelector = React5.useCallback(
     (me) => me !== null ? selector(me) : null,
     [selector]
@@ -2613,7 +2629,7 @@ function useOthers(selector, isEqual) {
     subscribe,
     getSnapshot,
     getServerSnapshot,
-    selector ?? identity,
+    selector ?? identity2,
     isEqual
   );
 }
@@ -3259,37 +3275,51 @@ function useThreadSubscription(threadId) {
   );
 }
 function useRoomNotificationSettings() {
+  const updateRoomNotificationSettings = useUpdateRoomNotificationSettings();
   const client = useClient();
   const room = useRoom();
   const { store } = getExtrasForClient2(client);
+  const getter = React5.useCallback(
+    () => store.getNotificationSettingsAsync(room.id),
+    [store, room.id]
+  );
   React5.useEffect(() => {
     const { getInboxNotificationSettings } = getExtrasForClient2(client);
-    const queryKey = makeNotificationSettingsQueryKey(room.id);
-    void getInboxNotificationSettings(room, queryKey);
+    void getInboxNotificationSettings(room);
   }, [client, room]);
+  const settings = useSyncExternalStoreWithSelector2(
+    store.subscribeNotificationSettings,
+    getter,
+    getter,
+    identity2,
+    shallow4
+  );
+  return React5.useMemo(() => {
+    return [settings, updateRoomNotificationSettings];
+  }, [settings, updateRoomNotificationSettings]);
+}
+function useRoomNotificationSettingsSuspense() {
   const updateRoomNotificationSettings = useUpdateRoomNotificationSettings();
-  const selector = React5.useCallback(
-    (state) => {
-      const query = state.queries[makeNotificationSettingsQueryKey(room.id)];
-      if (query === void 0 || query.isLoading) {
-        return { isLoading: true };
-      }
-      if (query.error !== void 0) {
-        return { isLoading: false, error: query.error };
-      }
-      return {
-        isLoading: false,
-        settings: selectNotificationSettings(room.id, state)
-      };
-    },
-    [room]
+  const client = useClient();
+  const room = useRoom();
+  const { store } = getExtrasForClient2(client);
+  const getter = React5.useCallback(
+    () => store.getNotificationSettingsAsync(room.id),
+    [store, room.id]
   );
   const settings = useSyncExternalStoreWithSelector2(
     store.subscribeNotificationSettings,
-    store.getThreads,
-    store.getThreads,
-    selector
+    getter,
+    getter,
+    identity2,
+    shallow4
   );
+  if (settings.isLoading) {
+    const { getInboxNotificationSettings } = getExtrasForClient2(client);
+    throw getInboxNotificationSettings(room);
+  } else if (settings.error) {
+    throw settings.error;
+  }
   return React5.useMemo(() => {
     return [settings, updateRoomNotificationSettings];
   }, [settings, updateRoomNotificationSettings]);
@@ -3326,34 +3356,44 @@ function useHistoryVersionData(versionId) {
 function useHistoryVersions() {
   const client = useClient();
   const room = useRoom();
-  const queryKey = getVersionsQueryKey(room.id);
   const { store, getRoomVersions } = getExtrasForClient2(client);
+  const getter = React5.useCallback(
+    () => store.getVersionsAsync(room.id),
+    [store, room.id]
+  );
   React5.useEffect(() => {
     void getRoomVersions(room);
   }, [room]);
-  const selector = React5.useCallback(
-    (state2) => {
-      const query = state2.queries[queryKey];
-      if (query === void 0 || query.isLoading) {
-        return {
-          isLoading: true
-        };
-      }
-      return {
-        versions: state2.versionsByRoomId[room.id],
-        isLoading: false,
-        error: query.error
-      };
-    },
-    [room, queryKey]
-    // eslint-disable-line react-hooks/exhaustive-deps
+  const state = useSyncExternalStoreWithSelector2(
+    store.subscribeVersions,
+    getter,
+    getter,
+    identity2,
+    shallow4
+  );
+  return state;
+}
+function useHistoryVersionsSuspense() {
+  const client = useClient();
+  const room = useRoom();
+  const { store } = getExtrasForClient2(client);
+  const getter = React5.useCallback(
+    () => store.getVersionsAsync(room.id),
+    [store, room.id]
   );
   const state = useSyncExternalStoreWithSelector2(
     store.subscribeVersions,
-    store.getVersions,
-    store.getVersions,
-    selector
+    getter,
+    getter,
+    identity2,
+    shallow4
   );
+  if (state.isLoading) {
+    const { getRoomVersions } = getExtrasForClient2(client);
+    throw getRoomVersions(room);
+  } else if (state.error) {
+    throw state.error;
+  }
   return state;
 }
 function useUpdateRoomNotificationSettings() {
@@ -3486,77 +3526,12 @@ function useThreadsSuspense(options = {
   useScrollToCommentOnLoadEffect(scrollOnLoad, state);
   return state;
 }
-function useHistoryVersionsSuspense() {
-  const client = useClient();
-  const room = useRoom();
-  const queryKey = getVersionsQueryKey(room.id);
-  const { store, getRoomVersions } = getExtrasForClient2(client);
-  const query = store.getVersions().queries[queryKey];
-  if (query === void 0 || query.isLoading) {
-    throw getRoomVersions(room);
-  }
-  if (query.error) {
-    throw query.error;
-  }
-  const selector = React5.useCallback(
-    (state2) => {
-      return {
-        versions: state2.versionsByRoomId[room.id],
-        isLoading: false
-      };
-    },
-    [room, queryKey]
-    // eslint-disable-line react-hooks/exhaustive-deps
-  );
-  const state = useSyncExternalStoreWithSelector2(
-    store.subscribeVersions,
-    store.getVersions,
-    store.getVersions,
-    selector
-  );
-  return state;
-}
-function useRoomNotificationSettingsSuspense() {
-  const updateRoomNotificationSettings = useUpdateRoomNotificationSettings();
-  const client = useClient();
-  const room = useRoom();
-  const queryKey = makeNotificationSettingsQueryKey(room.id);
-  const { store, getInboxNotificationSettings } = getExtrasForClient2(client);
-  const query = store.getNotificationSettings().queries[queryKey];
-  if (query === void 0 || query.isLoading) {
-    throw getInboxNotificationSettings(room, queryKey);
-  }
-  if (query.error) {
-    throw query.error;
-  }
-  const selector = React5.useCallback(
-    (state) => {
-      return {
-        isLoading: false,
-        settings: selectNotificationSettings(room.id, state)
-      };
-    },
-    [room]
-  );
-  const settings = useSyncExternalStoreWithSelector2(
-    store.subscribeNotificationSettings,
-    store.getNotificationSettings,
-    store.getNotificationSettings,
-    selector
-  );
-  return React5.useMemo(() => {
-    return [settings, updateRoomNotificationSettings];
-  }, [settings, updateRoomNotificationSettings]);
-}
 function createRoomContext(client) {
   return getOrCreateRoomContextBundle(client);
 }
 function generateQueryKey(roomId, options) {
   return `${roomId}-${stringify2(options ?? {})}`;
 }
-function getVersionsQueryKey(roomId) {
-  return `${roomId}-VERSIONS`;
-}
 var _RoomProvider = RoomProvider;
 var _useBroadcastEvent = useBroadcastEvent;
 var _useOthersListener = useOthersListener;
@@ -3677,4 +3652,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-XK5NTOJJ.mjs.map
+//# sourceMappingURL=chunk-QC6HYSYS.mjs.map