@liveblocks/react 2.7.2 → 2.8.0-beta2

package/dist/{chunk-TGC7HD5F.js → chunk-7GMBACXS.js}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/version.ts
 var PKG_NAME = "@liveblocks/react";
-var PKG_VERSION = "2.7.2";
+var PKG_VERSION = "2.8.0-beta2";
 var PKG_FORMAT = "cjs";
 
 // src/ClientSideSuspense.tsx
@@ -34,6 +34,7 @@ function useIsInsideRoom() {
 
 
 
+
 var _core = require('@liveblocks/core');
 
 
@@ -90,7 +91,6 @@ function matchesOperator(value, op) {
 }
 
 // src/lib/retry-error.ts
-
 var MAX_ERROR_RETRY_COUNT = 5;
 var ERROR_RETRY_INTERVAL = 5e3;
 function retryError(action, retryCount) {
@@ -100,23 +100,6 @@ function retryError(action, retryCount) {
     void action();
   }, timeout);
 }
-async function autoRetry(promiseFn, maxTries, backoff) {
-  const fallbackBackoff = backoff.length > 0 ? backoff[backoff.length - 1] : 0;
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    const promise = promiseFn();
-    try {
-      return await promise;
-    } catch (err) {
-      if (attempt >= maxTries) {
-        throw new Error(`Failed after ${maxTries} attempts: ${String(err)}`);
-      }
-    }
-    const delay = _nullishCoalesce(backoff[attempt - 1], () => ( fallbackBackoff));
-    await _core.wait.call(void 0, delay);
-  }
-}
 
 // src/lib/shallow2.ts
 
@@ -205,9 +188,6 @@ 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;
@@ -223,6 +203,7 @@ var UmbrellaStore = class {
     this.getThreads = this.getThreads.bind(this);
     this.getInboxNotifications = this.getInboxNotifications.bind(this);
     this.getInboxNotificationsAsync = this.getInboxNotificationsAsync.bind(this);
+    this.getVersions = this.getVersions.bind(this);
     this.subscribeThreads = this.subscribeThreads.bind(this);
     this.subscribeInboxNotifications = this.subscribeInboxNotifications.bind(this);
     this.subscribeNotificationSettings = this.subscribeNotificationSettings.bind(this);
@@ -272,19 +253,8 @@ var UmbrellaStore = class {
       settings: _core.nn.call(void 0, state.notificationSettingsByRoomId[roomId])
     };
   }
-  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: _core.nn.call(void 0, state.versionsByRoomId[roomId])
-    };
+  getVersions() {
+    return this.get();
   }
   /**
    * @private Only used by the E2E test suite.
@@ -629,19 +599,19 @@ var UmbrellaStore = class {
   }
 };
 function internalToExternalState(state) {
-  const computed = {
-    threadsById: { ...state.rawThreadsById },
-    inboxNotificationsById: { ...state.inboxNotificationsById },
-    notificationSettingsByRoomId: { ...state.notificationSettingsByRoomId }
+  const output = {
+    threads: { ...state.rawThreadsById },
+    inboxNotifications: { ...state.inboxNotificationsById },
+    notificationSettings: { ...state.notificationSettingsByRoomId }
   };
   for (const optimisticUpdate of state.optimisticUpdates) {
     switch (optimisticUpdate.type) {
       case "create-thread": {
-        computed.threadsById[optimisticUpdate.thread.id] = optimisticUpdate.thread;
+        output.threads[optimisticUpdate.thread.id] = optimisticUpdate.thread;
         break;
       }
       case "edit-thread-metadata": {
-        const thread = computed.threadsById[optimisticUpdate.threadId];
+        const thread = output.threads[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
@@ -651,7 +621,7 @@ function internalToExternalState(state) {
         if (thread.updatedAt !== void 0 && thread.updatedAt > optimisticUpdate.updatedAt) {
           break;
         }
-        computed.threadsById[thread.id] = {
+        output.threads[thread.id] = {
           ...thread,
           updatedAt: optimisticUpdate.updatedAt,
           metadata: {
@@ -662,51 +632,49 @@ function internalToExternalState(state) {
         break;
       }
       case "mark-thread-as-resolved": {
-        const thread = computed.threadsById[optimisticUpdate.threadId];
+        const thread = output.threads[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
         if (thread.deletedAt !== void 0) {
           break;
         }
-        computed.threadsById[thread.id] = {
+        output.threads[thread.id] = {
           ...thread,
           resolved: true
         };
         break;
       }
       case "mark-thread-as-unresolved": {
-        const thread = computed.threadsById[optimisticUpdate.threadId];
+        const thread = output.threads[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
         if (thread.deletedAt !== void 0) {
           break;
         }
-        computed.threadsById[thread.id] = {
+        output.threads[thread.id] = {
           ...thread,
           resolved: false
         };
         break;
       }
       case "create-comment": {
-        const thread = computed.threadsById[optimisticUpdate.comment.threadId];
+        const thread = output.threads[optimisticUpdate.comment.threadId];
         if (thread === void 0) {
           break;
         }
-        computed.threadsById[thread.id] = applyUpsertComment(
+        output.threads[thread.id] = applyUpsertComment(
           thread,
           optimisticUpdate.comment
         );
-        const inboxNotification = Object.values(
-          computed.inboxNotificationsById
-        ).find(
+        const inboxNotification = Object.values(output.inboxNotifications).find(
           (notification) => notification.kind === "thread" && notification.threadId === thread.id
         );
         if (inboxNotification === void 0) {
           break;
         }
-        computed.inboxNotificationsById[inboxNotification.id] = {
+        output.inboxNotifications[inboxNotification.id] = {
           ...inboxNotification,
           notifiedAt: optimisticUpdate.comment.createdAt,
           readAt: optimisticUpdate.comment.createdAt
@@ -714,22 +682,22 @@ function internalToExternalState(state) {
         break;
       }
       case "edit-comment": {
-        const thread = computed.threadsById[optimisticUpdate.comment.threadId];
+        const thread = output.threads[optimisticUpdate.comment.threadId];
         if (thread === void 0) {
           break;
         }
-        computed.threadsById[thread.id] = applyUpsertComment(
+        output.threads[thread.id] = applyUpsertComment(
           thread,
           optimisticUpdate.comment
         );
         break;
       }
       case "delete-comment": {
-        const thread = computed.threadsById[optimisticUpdate.threadId];
+        const thread = output.threads[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
-        computed.threadsById[thread.id] = applyDeleteComment(
+        output.threads[thread.id] = applyDeleteComment(
           thread,
           optimisticUpdate.commentId,
           optimisticUpdate.deletedAt
@@ -737,12 +705,12 @@ function internalToExternalState(state) {
         break;
       }
       case "delete-thread": {
-        const thread = computed.threadsById[optimisticUpdate.threadId];
+        const thread = output.threads[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
-        computed.threadsById[optimisticUpdate.threadId] = {
-          ...thread,
+        output.threads[optimisticUpdate.threadId] = {
+          ...output.threads[optimisticUpdate.threadId],
           deletedAt: optimisticUpdate.deletedAt,
           updatedAt: optimisticUpdate.deletedAt,
           comments: []
@@ -750,11 +718,11 @@ function internalToExternalState(state) {
         break;
       }
       case "add-reaction": {
-        const thread = computed.threadsById[optimisticUpdate.threadId];
+        const thread = output.threads[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
-        computed.threadsById[thread.id] = applyAddReaction(
+        output.threads[thread.id] = applyAddReaction(
           thread,
           optimisticUpdate.commentId,
           optimisticUpdate.reaction
@@ -762,11 +730,11 @@ function internalToExternalState(state) {
         break;
       }
       case "remove-reaction": {
-        const thread = computed.threadsById[optimisticUpdate.threadId];
+        const thread = output.threads[optimisticUpdate.threadId];
         if (thread === void 0) {
           break;
         }
-        computed.threadsById[thread.id] = applyRemoveReaction(
+        output.threads[thread.id] = applyRemoveReaction(
           thread,
           optimisticUpdate.commentId,
           optimisticUpdate.emoji,
@@ -776,41 +744,36 @@ function internalToExternalState(state) {
         break;
       }
       case "mark-inbox-notification-as-read": {
-        const ibn = computed.inboxNotificationsById[optimisticUpdate.inboxNotificationId];
-        if (ibn === void 0) {
-          break;
-        }
-        computed.inboxNotificationsById[optimisticUpdate.inboxNotificationId] = { ...ibn, readAt: optimisticUpdate.readAt };
+        output.inboxNotifications[optimisticUpdate.inboxNotificationId] = {
+          ...state.inboxNotificationsById[optimisticUpdate.inboxNotificationId],
+          readAt: optimisticUpdate.readAt
+        };
         break;
       }
       case "mark-all-inbox-notifications-as-read": {
-        for (const id in computed.inboxNotificationsById) {
-          const ibn = computed.inboxNotificationsById[id];
-          if (ibn === void 0) {
-            break;
-          }
-          computed.inboxNotificationsById[id] = {
-            ...ibn,
+        for (const id in output.inboxNotifications) {
+          output.inboxNotifications[id] = {
+            ...output.inboxNotifications[id],
             readAt: optimisticUpdate.readAt
           };
         }
         break;
       }
       case "delete-inbox-notification": {
-        delete computed.inboxNotificationsById[optimisticUpdate.inboxNotificationId];
+        const {
+          [optimisticUpdate.inboxNotificationId]: _,
+          ...inboxNotifications
+        } = output.inboxNotifications;
+        output.inboxNotifications = inboxNotifications;
         break;
       }
       case "delete-all-inbox-notifications": {
-        computed.inboxNotificationsById = {};
+        output.inboxNotifications = {};
         break;
       }
       case "update-notification-settings": {
-        const settings = computed.notificationSettingsByRoomId[optimisticUpdate.roomId];
-        if (settings === void 0) {
-          break;
-        }
-        computed.notificationSettingsByRoomId[optimisticUpdate.roomId] = {
-          ...settings,
+        output.notificationSettings[optimisticUpdate.roomId] = {
+          ...output.notificationSettings[optimisticUpdate.roomId],
           ...optimisticUpdate.settings
         };
       }
@@ -818,26 +781,23 @@ function internalToExternalState(state) {
   }
   const cleanedThreads = (
     // Don't expose any soft-deleted threads
-    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)
-      )
+    Object.values(output.threads).filter(
+      (thread) => !thread.deletedAt
     )
   );
   const cleanedNotifications = (
     // Sort so that the most recent notifications are first
-    Object.values(computed.inboxNotificationsById).filter(
-      (ibn) => ibn.kind === "thread" ? computed.threadsById[ibn.threadId] && _optionalChain([computed, 'access', _ => _.threadsById, 'access', _2 => _2[ibn.threadId], 'optionalAccess', _3 => _3.deletedAt]) === void 0 : true
-    ).sort((a, b) => b.notifiedAt.getTime() - a.notifiedAt.getTime())
+    Object.values(output.inboxNotifications).sort(
+      (a, b) => b.notifiedAt.getTime() - a.notifiedAt.getTime()
+    )
   );
   return {
     inboxNotifications: cleanedNotifications,
-    inboxNotificationsById: computed.inboxNotificationsById,
-    notificationSettingsByRoomId: computed.notificationSettingsByRoomId,
+    inboxNotificationsById: output.inboxNotifications,
+    notificationSettingsByRoomId: output.notificationSettings,
     queries: state.queries,
     threads: cleanedThreads,
-    threadsById: computed.threadsById,
+    threadsById: output.threads,
     versionsByRoomId: state.versionsByRoomId
   };
 }
@@ -907,7 +867,7 @@ function applyUpsertComment(thread, comment) {
   );
   if (existingComment === void 0) {
     const updatedAt = new Date(
-      Math.max(_optionalChain([thread, 'access', _4 => _4.updatedAt, 'optionalAccess', _5 => _5.getTime, 'call', _6 => _6()]) || 0, comment.createdAt.getTime())
+      Math.max(_optionalChain([thread, 'access', _2 => _2.updatedAt, 'optionalAccess', _3 => _3.getTime, 'call', _4 => _4()]) || 0, comment.createdAt.getTime())
     );
     const updatedThread = {
       ...thread,
@@ -927,8 +887,8 @@ function applyUpsertComment(thread, comment) {
       ...thread,
       updatedAt: new Date(
         Math.max(
-          _optionalChain([thread, 'access', _7 => _7.updatedAt, 'optionalAccess', _8 => _8.getTime, 'call', _9 => _9()]) || 0,
-          _optionalChain([comment, 'access', _10 => _10.editedAt, 'optionalAccess', _11 => _11.getTime, 'call', _12 => _12()]) || comment.createdAt.getTime()
+          _optionalChain([thread, 'access', _5 => _5.updatedAt, 'optionalAccess', _6 => _6.getTime, 'call', _7 => _7()]) || 0,
+          _optionalChain([comment, 'access', _8 => _8.editedAt, 'optionalAccess', _9 => _9.getTime, 'call', _10 => _10()]) || comment.createdAt.getTime()
         )
       ),
       comments: updatedComments
@@ -954,14 +914,17 @@ function applyDeleteComment(thread, commentId, deletedAt) {
     (comment) => comment.id === commentId ? {
       ...comment,
       deletedAt,
-      body: void 0
+      // We optimistically remove the comment body and attachments when marking it as deleted
+      body: void 0,
+      attachments: []
     } : comment
   );
-  if (updatedComments.every((comment) => comment.deletedAt !== void 0)) {
+  if (!updatedComments.some((comment) => comment.deletedAt === void 0)) {
     return {
       ...thread,
       deletedAt,
-      updatedAt: deletedAt
+      updatedAt: deletedAt,
+      comments: []
     };
   }
   return {
@@ -992,7 +955,7 @@ function applyAddReaction(thread, commentId, reaction) {
   return {
     ...thread,
     updatedAt: new Date(
-      Math.max(reaction.createdAt.getTime(), _optionalChain([thread, 'access', _13 => _13.updatedAt, 'optionalAccess', _14 => _14.getTime, 'call', _15 => _15()]) || 0)
+      Math.max(reaction.createdAt.getTime(), _optionalChain([thread, 'access', _11 => _11.updatedAt, 'optionalAccess', _12 => _12.getTime, 'call', _13 => _13()]) || 0)
     ),
     comments: updatedComments
   };
@@ -1025,7 +988,7 @@ function applyRemoveReaction(thread, commentId, emoji, userId, removedAt) {
   return {
     ...thread,
     updatedAt: new Date(
-      Math.max(removedAt.getTime(), _optionalChain([thread, 'access', _16 => _16.updatedAt, 'optionalAccess', _17 => _17.getTime, 'call', _18 => _18()]) || 0)
+      Math.max(removedAt.getTime(), _optionalChain([thread, 'access', _14 => _14.updatedAt, 'optionalAccess', _15 => _15.getTime, 'call', _16 => _16()]) || 0)
     ),
     comments: updatedComments
   };
@@ -1092,7 +1055,7 @@ function selectorFor_useUnreadInboxNotificationsCount(result) {
   };
 }
 function selectorFor_useUser(state, userId) {
-  if (state === void 0 || _optionalChain([state, 'optionalAccess', _19 => _19.isLoading])) {
+  if (state === void 0 || _optionalChain([state, 'optionalAccess', _17 => _17.isLoading])) {
     return _nullishCoalesce(state, () => ( { isLoading: true }));
   }
   if (state.error) {
@@ -1110,7 +1073,7 @@ function selectorFor_useUser(state, userId) {
   };
 }
 function selectorFor_useRoomInfo(state, roomId) {
-  if (state === void 0 || _optionalChain([state, 'optionalAccess', _20 => _20.isLoading])) {
+  if (state === void 0 || _optionalChain([state, 'optionalAccess', _18 => _18.isLoading])) {
     return _nullishCoalesce(state, () => ( { isLoading: true }));
   }
   if (state.error) {
@@ -1206,7 +1169,7 @@ function makeExtrasForClient(client) {
   const waitUntilInboxNotificationsLoaded = _core.memoizeOnSuccess.call(void 0, async () => {
     store.setQueryLoading(INBOX_NOTIFICATIONS_QUERY);
     try {
-      await autoRetry(
+      await _core.autoRetry.call(void 0, 
         () => fetchInboxNotifications(),
         5,
         [5e3, 5e3, 1e4, 15e3]
@@ -1220,21 +1183,23 @@ function makeExtrasForClient(client) {
     void waitUntilInboxNotificationsLoaded().catch(() => {
     });
   }
-  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();
-      }
-    };
+  function useEnableInboxNotificationsPolling() {
+    _react.useEffect.call(void 0, () => {
+      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 = _core.makePoller.call(void 0, refreshUserThreads);
   let isFetchingUserThreadsUpdates = false;
@@ -1319,7 +1284,7 @@ function makeExtrasForClient(client) {
   }
   return {
     store,
-    startPolling,
+    useEnableInboxNotificationsPolling,
     waitUntilInboxNotificationsLoaded,
     loadInboxNotifications,
     incrementUserThreadsQuerySubscribers,
@@ -1364,9 +1329,11 @@ function makeLiveblocksContextBundle(client) {
   return bundle;
 }
 function useInboxNotifications_withClient(client) {
-  const { loadInboxNotifications, store, startPolling } = getExtrasForClient(client);
-  _react.useEffect.call(void 0, loadInboxNotifications, [loadInboxNotifications]);
-  _react.useEffect.call(void 0, startPolling, [startPolling]);
+  const { loadInboxNotifications, store, useEnableInboxNotificationsPolling } = getExtrasForClient(client);
+  _react.useEffect.call(void 0, () => {
+    loadInboxNotifications();
+  }, [loadInboxNotifications]);
+  useEnableInboxNotificationsPolling();
   return _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
     store.subscribeInboxNotifications,
     store.getInboxNotificationsAsync,
@@ -1384,9 +1351,11 @@ function useInboxNotificationsSuspense_withClient(client) {
   return result;
 }
 function useUnreadInboxNotificationsCount_withClient(client) {
-  const { store, loadInboxNotifications, startPolling } = getExtrasForClient(client);
-  _react.useEffect.call(void 0, loadInboxNotifications, [loadInboxNotifications]);
-  _react.useEffect.call(void 0, startPolling, [startPolling]);
+  const { store, loadInboxNotifications, useEnableInboxNotificationsPolling } = getExtrasForClient(client);
+  _react.useEffect.call(void 0, () => {
+    loadInboxNotifications();
+  }, [loadInboxNotifications]);
+  useEnableInboxNotificationsPolling();
   return _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
     store.subscribeInboxNotifications,
     store.getInboxNotificationsAsync,
@@ -1639,7 +1608,7 @@ function createSharedContext(client) {
 }
 function useEnsureNoLiveblocksProvider(options) {
   const existing = useClientOrNull();
-  if (!_optionalChain([options, 'optionalAccess', _21 => _21.allowNesting]) && existing !== null) {
+  if (!_optionalChain([options, 'optionalAccess', _19 => _19.allowNesting]) && existing !== null) {
     throw new Error(
       "You cannot nest multiple LiveblocksProvider instances in the same React tree."
     );
@@ -1950,6 +1919,7 @@ var _client = require('@liveblocks/client');
 
 
 
+
 // src/use-scroll-to-comment-on-load-effect.ts
 
 function handleScrollToCommentOnLoad(shouldScrollOnLoad, state) {
@@ -2049,7 +2019,7 @@ function getCurrentUserId(room) {
 }
 function handleApiError(err) {
   const message = `Request failed with status ${err.status}: ${err.message}`;
-  if (_optionalChain([err, 'access', _22 => _22.details, 'optionalAccess', _23 => _23.error]) === "FORBIDDEN") {
+  if (_optionalChain([err, 'access', _20 => _20.details, 'optionalAccess', _21 => _21.error]) === "FORBIDDEN") {
     const detailedMessage = [message, err.details.suggestion, err.details.docs].filter(Boolean).join("\n");
     _core.console.error(detailedMessage);
   }
@@ -2138,7 +2108,7 @@ function makeExtrasForClient2(client) {
     }
   }
   async function getRoomVersions(room, { retryCount } = { retryCount: 0 }) {
-    const queryKey = makeVersionsQueryKey(room.id);
+    const queryKey = getVersionsQueryKey(room.id);
     const existingRequest = requestsByQuery.get(queryKey);
     if (existingRequest !== void 0) return existingRequest;
     const request = room[_core.kInternal].listTextVersions();
@@ -2289,6 +2259,7 @@ function makeRoomContextBundle(client) {
     useRemoveReaction,
     useMarkThreadAsRead,
     useThreadSubscription,
+    useAttachmentUrl,
     useHistoryVersions,
     useHistoryVersionData,
     useRoomNotificationSettings,
@@ -2334,6 +2305,7 @@ function makeRoomContextBundle(client) {
       useRemoveReaction,
       useMarkThreadAsRead,
       useThreadSubscription,
+      useAttachmentUrl: useAttachmentUrlSuspense,
       // TODO: useHistoryVersionData: useHistoryVersionDataSuspense,
       useHistoryVersions: useHistoryVersionsSuspense,
       useRoomNotificationSettings: useRoomNotificationSettingsSuspense,
@@ -2487,7 +2459,7 @@ function useStatus() {
   return useSyncExternalStore2(subscribe, getSnapshot, getServerSnapshot);
 }
 function useStorageStatus(options) {
-  const smooth = useInitial(_nullishCoalesce(_optionalChain([options, 'optionalAccess', _24 => _24.smooth]), () => ( false)));
+  const smooth = useInitial(_nullishCoalesce(_optionalChain([options, 'optionalAccess', _22 => _22.smooth]), () => ( false)));
   if (smooth) {
     return useStorageStatusSmooth();
   } else {
@@ -2800,6 +2772,7 @@ function useCreateThread() {
     (options) => {
       const body = options.body;
       const metadata = _nullishCoalesce(options.metadata, () => ( {}));
+      const attachments = options.attachments;
       const threadId = _core.createThreadId.call(void 0, );
       const commentId = _core.createCommentId.call(void 0, );
       const createdAt = /* @__PURE__ */ new Date();
@@ -2811,7 +2784,8 @@ function useCreateThread() {
         type: "comment",
         userId: getCurrentUserId(room),
         body,
-        reactions: []
+        reactions: [],
+        attachments: _nullishCoalesce(attachments, () => ( []))
       };
       const newThread = {
         id: threadId,
@@ -2829,7 +2803,8 @@ function useCreateThread() {
         thread: newThread,
         roomId: room.id
       });
-      room.createThread({ threadId, commentId, body, metadata }).then(
+      const attachmentIds = _optionalChain([attachments, 'optionalAccess', _23 => _23.map, 'call', _24 => _24((attachment) => attachment.id)]);
+      room.createThread({ threadId, commentId, body, metadata, attachmentIds }).then(
         (thread) => {
           store.createThread(optimisticUpdateId, thread);
         },
@@ -2927,7 +2902,7 @@ function useCreateComment() {
   const client = useClient();
   const room = useRoom();
   return React5.useCallback(
-    ({ threadId, body }) => {
+    ({ threadId, body, attachments }) => {
       const commentId = _core.createCommentId.call(void 0, );
       const createdAt = /* @__PURE__ */ new Date();
       const comment = {
@@ -2938,14 +2913,16 @@ function useCreateComment() {
         createdAt,
         userId: getCurrentUserId(room),
         body,
-        reactions: []
+        reactions: [],
+        attachments: _nullishCoalesce(attachments, () => ( []))
       };
       const { store, onMutationFailure } = getExtrasForClient2(client);
       const optimisticUpdateId = store.addOptimisticUpdate({
         type: "create-comment",
         comment
       });
-      room.createComment({ threadId, commentId, body }).then(
+      const attachmentIds = _optionalChain([attachments, 'optionalAccess', _28 => _28.map, 'call', _29 => _29((attachment) => attachment.id)]);
+      room.createComment({ threadId, commentId, body, attachmentIds }).then(
         (newComment) => {
           store.createComment(newComment, optimisticUpdateId);
         },
@@ -2969,7 +2946,7 @@ function useEditComment() {
   const client = useClient();
   const room = useRoom();
   return React5.useCallback(
-    ({ threadId, commentId, body }) => {
+    ({ threadId, commentId, body, attachments }) => {
       const editedAt = /* @__PURE__ */ new Date();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       const thread = store.getThreads().threadsById[threadId];
@@ -2993,10 +2970,12 @@ function useEditComment() {
         comment: {
           ...comment,
           editedAt,
-          body
+          body,
+          attachments: _nullishCoalesce(attachments, () => ( []))
         }
       });
-      room.editComment({ threadId, commentId, body }).then(
+      const attachmentIds = _optionalChain([attachments, 'optionalAccess', _30 => _30.map, 'call', _31 => _31((attachment) => attachment.id)]);
+      room.editComment({ threadId, commentId, body, attachmentIds }).then(
         (editedComment) => {
           store.editComment(threadId, optimisticUpdateId, editedComment);
         },
@@ -3356,44 +3335,34 @@ 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 state = _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
-    store.subscribeVersions,
-    getter,
-    getter,
-    identity2,
-    _client.shallow
-  );
-  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 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 = _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
     store.subscribeVersions,
-    getter,
-    getter,
-    identity2,
-    _client.shallow
+    store.getVersions,
+    store.getVersions,
+    selector
   );
-  if (state.isLoading) {
-    const { getRoomVersions } = getExtrasForClient2(client);
-    throw getRoomVersions(room);
-  } else if (state.error) {
-    throw state.error;
-  }
   return state;
 }
 function useUpdateRoomNotificationSettings() {
@@ -3526,12 +3495,104 @@ function useThreadsSuspense(options = {
   useScrollToCommentOnLoadEffect(scrollOnLoad, state);
   return state;
 }
+function selectorFor_useAttachmentUrl(state) {
+  if (state === void 0 || _optionalChain([state, 'optionalAccess', _32 => _32.isLoading])) {
+    return _nullishCoalesce(state, () => ( { isLoading: true }));
+  }
+  if (state.error) {
+    return state;
+  }
+  _core.assert.call(void 0, state.data !== void 0, "Unexpected missing attachment URL");
+  return {
+    isLoading: false,
+    url: state.data
+  };
+}
+function useAttachmentUrl(attachmentId) {
+  const room = useRoom();
+  const { attachmentUrlsStore } = room[_core.kInternal];
+  const getAttachmentUrlState = React5.useCallback(
+    () => attachmentUrlsStore.getState(attachmentId),
+    [attachmentUrlsStore, attachmentId]
+  );
+  React5.useEffect(() => {
+    void attachmentUrlsStore.get(attachmentId);
+  }, [attachmentUrlsStore, attachmentId]);
+  return _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
+    attachmentUrlsStore.subscribe,
+    getAttachmentUrlState,
+    getAttachmentUrlState,
+    selectorFor_useAttachmentUrl,
+    _client.shallow
+  );
+}
+function useAttachmentUrlSuspense(attachmentId) {
+  const room = useRoom();
+  const { attachmentUrlsStore } = room[_core.kInternal];
+  const getAttachmentUrlState = React5.useCallback(
+    () => attachmentUrlsStore.getState(attachmentId),
+    [attachmentUrlsStore, attachmentId]
+  );
+  const attachmentUrlState = getAttachmentUrlState();
+  if (!attachmentUrlState || attachmentUrlState.isLoading) {
+    throw attachmentUrlsStore.get(attachmentId);
+  }
+  if (attachmentUrlState.error) {
+    throw attachmentUrlState.error;
+  }
+  const state = useSyncExternalStore2(
+    attachmentUrlsStore.subscribe,
+    getAttachmentUrlState,
+    getAttachmentUrlState
+  );
+  _core.assert.call(void 0, state !== void 0, "Unexpected missing state");
+  _core.assert.call(void 0, !state.isLoading, "Unexpected loading state");
+  _core.assert.call(void 0, !state.error, "Unexpected error state");
+  return {
+    isLoading: false,
+    url: state.data,
+    error: void 0
+  };
+}
+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 = _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
+    store.subscribeVersions,
+    store.getVersions,
+    store.getVersions,
+    selector
+  );
+  return state;
+}
 function createRoomContext(client) {
   return getOrCreateRoomContextBundle(client);
 }
 function generateQueryKey(roomId, options) {
   return `${roomId}-${_core.stringify.call(void 0, _nullishCoalesce(options, () => ( {})))}`;
 }
+function getVersionsQueryKey(roomId) {
+  return `${roomId}-VERSIONS`;
+}
 var _RoomProvider = RoomProvider;
 var _useBroadcastEvent = useBroadcastEvent;
 var _useOthersListener = useOthersListener;
@@ -3651,5 +3712,7 @@ var _useUpdateMyPresence = useUpdateMyPresence;
 
 
 
-exports.PKG_NAME = PKG_NAME; exports.PKG_VERSION = PKG_VERSION; exports.PKG_FORMAT = PKG_FORMAT; exports.ClientSideSuspense = ClientSideSuspense; exports.RoomContext = RoomContext; exports.ClientContext = ClientContext; exports.selectThreads = selectThreads; exports.getUmbrellaStoreForClient = getUmbrellaStoreForClient; exports.useClient = useClient; exports.LiveblocksProvider = LiveblocksProvider; exports.createLiveblocksContext = createLiveblocksContext; exports.useInboxNotifications = useInboxNotifications; exports.useInboxNotificationsSuspense = useInboxNotificationsSuspense; exports.useMarkAllInboxNotificationsAsRead = useMarkAllInboxNotificationsAsRead; exports.useMarkInboxNotificationAsRead = useMarkInboxNotificationAsRead; exports.useDeleteAllInboxNotifications = useDeleteAllInboxNotifications; exports.useDeleteInboxNotification = useDeleteInboxNotification; exports.useUnreadInboxNotificationsCount = useUnreadInboxNotificationsCount; exports.useUnreadInboxNotificationsCountSuspense = useUnreadInboxNotificationsCountSuspense; exports.useRoomInfo = useRoomInfo; exports.useRoomInfoSuspense = useRoomInfoSuspense; exports._useInboxNotificationThread = _useInboxNotificationThread; exports._useUser = _useUser; exports._useUserSuspense = _useUserSuspense; exports._useUserThreads_experimental = _useUserThreads_experimental; exports._useUserThreadsSuspense_experimental = _useUserThreadsSuspense_experimental; exports.CreateThreadError = CreateThreadError; exports.useStatus = useStatus; exports.useStorageStatus = useStorageStatus; exports.useBatch = useBatch; exports.useLostConnectionListener = useLostConnectionListener; exports.useErrorListener = useErrorListener; exports.useHistory = useHistory; exports.useUndo = useUndo; exports.useRedo = useRedo; exports.useCanUndo = useCanUndo; exports.useCanRedo = useCanRedo; exports.useOthersConnectionIds = useOthersConnectionIds; exports.useCommentsErrorListener = useCommentsErrorListener; exports.useCreateComment = useCreateComment; exports.useEditComment = useEditComment; exports.useDeleteComment = useDeleteComment; exports.useRemoveReaction = useRemoveReaction; exports.useMarkThreadAsRead = useMarkThreadAsRead; exports.useMarkThreadAsResolved = useMarkThreadAsResolved; exports.useMarkThreadAsUnresolved = useMarkThreadAsUnresolved; exports.useThreadSubscription = useThreadSubscription; exports.useRoomNotificationSettings = useRoomNotificationSettings; exports.useHistoryVersionData = useHistoryVersionData; exports.useUpdateRoomNotificationSettings = useUpdateRoomNotificationSettings; exports.useOthersConnectionIdsSuspense = useOthersConnectionIdsSuspense; exports.useStorageStatusSuspense = useStorageStatusSuspense; exports.createRoomContext = createRoomContext; exports._RoomProvider = _RoomProvider; exports._useBroadcastEvent = _useBroadcastEvent; exports._useOthersListener = _useOthersListener; exports._useRoom = _useRoom; exports._useIsInsideRoom = _useIsInsideRoom; exports._useAddReaction = _useAddReaction; exports._useMutation = _useMutation; exports._useCreateThread = _useCreateThread; exports._useDeleteThread = _useDeleteThread; exports._useEditThreadMetadata = _useEditThreadMetadata; exports._useEventListener = _useEventListener; exports._useMyPresence = _useMyPresence; exports._useOthersMapped = _useOthersMapped; exports._useOthersMappedSuspense = _useOthersMappedSuspense; exports._useThreads = _useThreads; exports._useThreadsSuspense = _useThreadsSuspense; exports._useHistoryVersions = _useHistoryVersions; exports._useHistoryVersionsSuspense = _useHistoryVersionsSuspense; exports._useOther = _useOther; exports._useOthers = _useOthers; exports._useOtherSuspense = _useOtherSuspense; exports._useOthersSuspense = _useOthersSuspense; exports._useStorage = _useStorage; exports._useStorageSuspense = _useStorageSuspense; exports._useSelf = _useSelf; exports._useSelfSuspense = _useSelfSuspense; exports._useStorageRoot = _useStorageRoot; exports._useUpdateMyPresence = _useUpdateMyPresence;
-//# sourceMappingURL=chunk-TGC7HD5F.js.map
+
+
+exports.PKG_NAME = PKG_NAME; exports.PKG_VERSION = PKG_VERSION; exports.PKG_FORMAT = PKG_FORMAT; exports.ClientSideSuspense = ClientSideSuspense; exports.RoomContext = RoomContext; exports.ClientContext = ClientContext; exports.selectThreads = selectThreads; exports.getUmbrellaStoreForClient = getUmbrellaStoreForClient; exports.useClient = useClient; exports.LiveblocksProvider = LiveblocksProvider; exports.createLiveblocksContext = createLiveblocksContext; exports.useInboxNotifications = useInboxNotifications; exports.useInboxNotificationsSuspense = useInboxNotificationsSuspense; exports.useMarkAllInboxNotificationsAsRead = useMarkAllInboxNotificationsAsRead; exports.useMarkInboxNotificationAsRead = useMarkInboxNotificationAsRead; exports.useDeleteAllInboxNotifications = useDeleteAllInboxNotifications; exports.useDeleteInboxNotification = useDeleteInboxNotification; exports.useUnreadInboxNotificationsCount = useUnreadInboxNotificationsCount; exports.useUnreadInboxNotificationsCountSuspense = useUnreadInboxNotificationsCountSuspense; exports.useRoomInfo = useRoomInfo; exports.useRoomInfoSuspense = useRoomInfoSuspense; exports._useInboxNotificationThread = _useInboxNotificationThread; exports._useUser = _useUser; exports._useUserSuspense = _useUserSuspense; exports._useUserThreads_experimental = _useUserThreads_experimental; exports._useUserThreadsSuspense_experimental = _useUserThreadsSuspense_experimental; exports.CreateThreadError = CreateThreadError; exports.useStatus = useStatus; exports.useStorageStatus = useStorageStatus; exports.useBatch = useBatch; exports.useLostConnectionListener = useLostConnectionListener; exports.useErrorListener = useErrorListener; exports.useHistory = useHistory; exports.useUndo = useUndo; exports.useRedo = useRedo; exports.useCanUndo = useCanUndo; exports.useCanRedo = useCanRedo; exports.useOthersConnectionIds = useOthersConnectionIds; exports.useCommentsErrorListener = useCommentsErrorListener; exports.useCreateComment = useCreateComment; exports.useEditComment = useEditComment; exports.useDeleteComment = useDeleteComment; exports.useRemoveReaction = useRemoveReaction; exports.useMarkThreadAsRead = useMarkThreadAsRead; exports.useMarkThreadAsResolved = useMarkThreadAsResolved; exports.useMarkThreadAsUnresolved = useMarkThreadAsUnresolved; exports.useThreadSubscription = useThreadSubscription; exports.useRoomNotificationSettings = useRoomNotificationSettings; exports.useHistoryVersionData = useHistoryVersionData; exports.useUpdateRoomNotificationSettings = useUpdateRoomNotificationSettings; exports.useOthersConnectionIdsSuspense = useOthersConnectionIdsSuspense; exports.useStorageStatusSuspense = useStorageStatusSuspense; exports.useAttachmentUrl = useAttachmentUrl; exports.useAttachmentUrlSuspense = useAttachmentUrlSuspense; exports.createRoomContext = createRoomContext; exports._RoomProvider = _RoomProvider; exports._useBroadcastEvent = _useBroadcastEvent; exports._useOthersListener = _useOthersListener; exports._useRoom = _useRoom; exports._useIsInsideRoom = _useIsInsideRoom; exports._useAddReaction = _useAddReaction; exports._useMutation = _useMutation; exports._useCreateThread = _useCreateThread; exports._useDeleteThread = _useDeleteThread; exports._useEditThreadMetadata = _useEditThreadMetadata; exports._useEventListener = _useEventListener; exports._useMyPresence = _useMyPresence; exports._useOthersMapped = _useOthersMapped; exports._useOthersMappedSuspense = _useOthersMappedSuspense; exports._useThreads = _useThreads; exports._useThreadsSuspense = _useThreadsSuspense; exports._useHistoryVersions = _useHistoryVersions; exports._useHistoryVersionsSuspense = _useHistoryVersionsSuspense; exports._useOther = _useOther; exports._useOthers = _useOthers; exports._useOtherSuspense = _useOtherSuspense; exports._useOthersSuspense = _useOthersSuspense; exports._useStorage = _useStorage; exports._useStorageSuspense = _useStorageSuspense; exports._useSelf = _useSelf; exports._useSelfSuspense = _useSelfSuspense; exports._useStorageRoot = _useStorageRoot; exports._useUpdateMyPresence = _useUpdateMyPresence;
+//# sourceMappingURL=chunk-7GMBACXS.js.map