@liveblocks/react 2.8.0-beta1 → 2.8.0-beta3

package/dist/{chunk-WVLHQ6LC.mjs → chunk-76MOGPE3.mjs}

@@ -1,6 +1,6 @@
 // src/version.ts
 var PKG_NAME = "@liveblocks/react";
-var PKG_VERSION = "2.8.0-beta1";
+var PKG_VERSION = "2.8.0-beta3";
 var PKG_FORMAT = "esm";
 
 // src/ClientSideSuspense.tsx
@@ -27,6 +27,7 @@ function useIsInsideRoom() {
 // src/liveblocks.tsx
 import {
   assert,
+  autoRetry,
   createClient,
   kInternal,
   makePoller,
@@ -90,7 +91,6 @@ function matchesOperator(value, op) {
 }
 
 // src/lib/retry-error.ts
-import { wait } from "@liveblocks/core";
 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 = backoff[attempt - 1] ?? fallbackBackoff;
-    await wait(delay);
-  }
-}
 
 // src/lib/shallow2.ts
 import { isPlainObject as isPlainObject2, shallow } from "@liveblocks/core";
@@ -196,8 +179,15 @@ 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`;
+}
 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: nn(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) {
@@ -1345,9 +1336,9 @@ function useInboxNotifications_withClient(client) {
   useEnableInboxNotificationsPolling();
   return useSyncExternalStoreWithSelector(
     store.subscribeInboxNotifications,
-    store.getInboxNotifications,
-    store.getInboxNotifications,
-    selectorFor_useInboxNotifications,
+    store.getInboxNotificationsAsync,
+    store.getInboxNotificationsAsync,
+    identity,
     shallow3
   );
 }
@@ -1367,8 +1358,8 @@ function useUnreadInboxNotificationsCount_withClient(client) {
   useEnableInboxNotificationsPolling();
   return useSyncExternalStoreWithSelector(
     store.subscribeInboxNotifications,
-    store.getInboxNotifications,
-    store.getInboxNotifications,
+    store.getInboxNotificationsAsync,
+    store.getInboxNotificationsAsync,
     selectorFor_useUnreadInboxNotificationsCount,
     shallow3
   );
@@ -1922,7 +1913,6 @@ import {
   kInternal as kInternal2,
   makeEventSource,
   makePoller as makePoller2,
-  nn,
   NotificationsApiError,
   ServerMsgCode,
   stringify as stringify2
@@ -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 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;
 }
@@ -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 nn(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 = maybeSelector ?? identity;
+  const selector = maybeSelector ?? identity2;
   const wrappedSelector = React5.useCallback(
     (me) => me !== null ? selector(me) : null,
     [selector]
@@ -2617,7 +2601,7 @@ function useOthers(selector, isEqual) {
     subscribe,
     getSnapshot,
     getServerSnapshot,
-    selector ?? identity,
+    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 = 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]);
@@ -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 = useSyncExternalStoreWithSelector2(
-    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 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-WVLHQ6LC.mjs.map
+//# sourceMappingURL=chunk-76MOGPE3.mjs.map