@liveblocks/react 2.8.0-beta1 → 2.8.0-beta2

package/dist/{chunk-BYZWUB6M.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.8.0-beta1";
+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
 
@@ -198,6 +181,13 @@ var use = (
 
 
 
+
+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`;
+}
 var UmbrellaStore = class {
   constructor() {
     this._prevState = null;
@@ -212,7 +202,7 @@ var UmbrellaStore = class {
     });
     this.getThreads = this.getThreads.bind(this);
     this.getInboxNotifications = this.getInboxNotifications.bind(this);
-    this.getNotificationSettings = this.getNotificationSettings.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);
@@ -225,7 +215,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,8 +225,33 @@ 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: _core.nn.call(void 0, state.notificationSettingsByRoomId[roomId])
+    };
   }
   getVersions() {
     return this.get();
@@ -574,16 +589,16 @@ 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) {
+function internalToExternalState(state) {
   const output = {
     threads: { ...state.rawThreadsById },
     inboxNotifications: { ...state.inboxNotificationsById },
@@ -899,6 +914,7 @@ function applyDeleteComment(thread, commentId, deletedAt) {
     (comment) => comment.id === commentId ? {
       ...comment,
       deletedAt,
+      // We optimistically remove the comment body and attachments when marking it as deleted
       body: void 0,
       attachments: []
     } : comment
@@ -1012,55 +1028,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) {
@@ -1178,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]
@@ -1345,9 +1336,9 @@ function useInboxNotifications_withClient(client) {
   useEnableInboxNotificationsPolling();
   return _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
     store.subscribeInboxNotifications,
-    store.getInboxNotifications,
-    store.getInboxNotifications,
-    selectorFor_useInboxNotifications,
+    store.getInboxNotificationsAsync,
+    store.getInboxNotificationsAsync,
+    identity,
     _core.shallow
   );
 }
@@ -1367,8 +1358,8 @@ function useUnreadInboxNotificationsCount_withClient(client) {
   useEnableInboxNotificationsPolling();
   return _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
     store.subscribeInboxNotifications,
-    store.getInboxNotifications,
-    store.getInboxNotifications,
+    store.getInboxNotificationsAsync,
+    store.getInboxNotificationsAsync,
     selectorFor_useUnreadInboxNotificationsCount,
     _core.shallow
   );
@@ -1929,7 +1920,6 @@ var _client = require('@liveblocks/client');
 
 
 
-
 // src/use-scroll-to-comment-on-load-effect.ts
 
 function handleScrollToCommentOnLoad(shouldScrollOnLoad, state) {
@@ -1963,7 +1953,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"
@@ -1977,13 +1967,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 _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, s, gs, gss, identity);
+  return _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 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;
 }
@@ -1993,10 +1980,6 @@ function alwaysNull() {
 function selectorFor_useOthersConnectionIds(others) {
   return others.map((user) => user.connectionId);
 }
-function selectNotificationSettings(roomId, state) {
-  const notificationSettings = state.notificationSettingsByRoomId;
-  return _core.nn.call(void 0, notificationSettings[roomId]);
-}
 function makeMutationContext(room) {
   const cannotUseUntil = "This mutation cannot be used until";
   const needsPresence = `${cannotUseUntil} connected to the Liveblocks room`;
@@ -2185,7 +2168,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 {
@@ -2197,7 +2181,7 @@ function makeExtrasForClient2(client) {
     } catch (err) {
       requestsByQuery.delete(queryKey);
       retryError(() => {
-        void getInboxNotificationSettings(room, queryKey, {
+        void getInboxNotificationSettings(room, {
           retryCount: retryCount + 1
         });
       }, retryCount);
@@ -2583,7 +2567,7 @@ function useSelf(maybeSelector, isEqual) {
   const room = useRoom();
   const subscribe = room.events.self.subscribe;
   const getSnapshot = room.getSelf;
-  const selector = _nullishCoalesce(maybeSelector, () => ( identity));
+  const selector = _nullishCoalesce(maybeSelector, () => ( identity2));
   const wrappedSelector = React5.useCallback(
     (me) => me !== null ? selector(me) : null,
     [selector]
@@ -2617,7 +2601,7 @@ function useOthers(selector, isEqual) {
     subscribe,
     getSnapshot,
     getServerSnapshot,
-    _nullishCoalesce(selector, () => ( identity)),
+    _nullishCoalesce(selector, () => ( identity2)),
     isEqual
   );
 }
@@ -3270,37 +3254,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 = _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
+    store.subscribeNotificationSettings,
+    getter,
+    getter,
+    identity2,
+    _client.shallow
+  );
+  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 = _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
     store.subscribeNotificationSettings,
-    store.getThreads,
-    store.getThreads,
-    selector
+    getter,
+    getter,
+    identity2,
+    _client.shallow
   );
+  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]);
@@ -3586,38 +3584,6 @@ function useHistoryVersionsSuspense() {
   );
   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 = _withselectorjs.useSyncExternalStoreWithSelector.call(void 0, 
-    store.subscribeNotificationSettings,
-    store.getNotificationSettings,
-    store.getNotificationSettings,
-    selector
-  );
-  return React5.useMemo(() => {
-    return [settings, updateRoomNotificationSettings];
-  }, [settings, updateRoomNotificationSettings]);
-}
 function createRoomContext(client) {
   return getOrCreateRoomContextBundle(client);
 }
@@ -3749,4 +3715,4 @@ 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.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-BYZWUB6M.js.map
+//# sourceMappingURL=chunk-7GMBACXS.js.map