@liveblocks/react 1.2.2-comments4 → 1.2.2-comments6

package/dist/index.d.mts

@@ -530,10 +530,6 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
      * const { user, error, isLoading } = useUser("user-id");
      */
     useUser(userId: string): UserState<TUserMeta["info"]>;
-    /**
-     * @private
-     */
-    useMentionSuggestions(search?: string): string[] | undefined;
     /**
      * Returns the LiveList associated with the provided key. The hook triggers
      * a re-render if the LiveList is updated, however it does not triggers
@@ -686,6 +682,11 @@ declare type Options<TUserMeta extends BaseUserMeta> = {
      */
     resolveMentionSuggestions?: (options: ResolveMentionSuggestionsOptions) => Promise<string[]>;
 };
+/**
+ * @private
+ *
+ * This is an internal API, use `createRoomContext` instead.
+ */
 declare function useRoomContextBundle(): {
     RoomContext: React$1.Context<Room<JsonObject, LsonObject, BaseUserMeta, never> | null>;
     RoomProvider: (props: {
@@ -1038,7 +1039,6 @@ declare function useRoomContextBundle(): {
         name?: string | undefined;
         avatar?: string | undefined;
     } | undefined>;
-    useMentionSuggestions: (search?: string | undefined) => string[] | undefined;
     useList: <TKey extends string>(key: TKey) => _liveblocks_core.Lson | undefined;
     useMap: <TKey_1 extends string>(key: TKey_1) => _liveblocks_core.Lson | undefined;
     useObject: <TKey_2 extends string>(key: TKey_2) => _liveblocks_core.Lson | undefined;
@@ -1402,6 +1402,8 @@ declare function useRoomContextBundle(): {
         useMap: <TKey_4 extends string>(key: TKey_4) => _liveblocks_core.Lson | undefined;
         useObject: <TKey_5 extends string>(key: TKey_5) => _liveblocks_core.Lson | undefined;
     };
+    hasResolveMentionSuggestions: boolean;
+    useMentionSuggestions: (search?: string | undefined) => string[] | undefined;
 };
 declare function createRoomContext<TPresence extends JsonObject, TStorage extends LsonObject = LsonObject, TUserMeta extends BaseUserMeta = BaseUserMeta, TRoomEvent extends Json = never, TThreadMetadata extends BaseMetadata = never>(client: Client, options?: Options<TUserMeta>): RoomContextBundle<TPresence, TStorage, TUserMeta, TRoomEvent, TThreadMetadata>;
 

package/dist/index.d.ts

@@ -530,10 +530,6 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
      * const { user, error, isLoading } = useUser("user-id");
      */
     useUser(userId: string): UserState<TUserMeta["info"]>;
-    /**
-     * @private
-     */
-    useMentionSuggestions(search?: string): string[] | undefined;
     /**
      * Returns the LiveList associated with the provided key. The hook triggers
      * a re-render if the LiveList is updated, however it does not triggers
@@ -686,6 +682,11 @@ declare type Options<TUserMeta extends BaseUserMeta> = {
      */
     resolveMentionSuggestions?: (options: ResolveMentionSuggestionsOptions) => Promise<string[]>;
 };
+/**
+ * @private
+ *
+ * This is an internal API, use `createRoomContext` instead.
+ */
 declare function useRoomContextBundle(): {
     RoomContext: React$1.Context<Room<JsonObject, LsonObject, BaseUserMeta, never> | null>;
     RoomProvider: (props: {
@@ -1038,7 +1039,6 @@ declare function useRoomContextBundle(): {
         name?: string | undefined;
         avatar?: string | undefined;
     } | undefined>;
-    useMentionSuggestions: (search?: string | undefined) => string[] | undefined;
     useList: <TKey extends string>(key: TKey) => _liveblocks_core.Lson | undefined;
     useMap: <TKey_1 extends string>(key: TKey_1) => _liveblocks_core.Lson | undefined;
     useObject: <TKey_2 extends string>(key: TKey_2) => _liveblocks_core.Lson | undefined;
@@ -1402,6 +1402,8 @@ declare function useRoomContextBundle(): {
         useMap: <TKey_4 extends string>(key: TKey_4) => _liveblocks_core.Lson | undefined;
         useObject: <TKey_5 extends string>(key: TKey_5) => _liveblocks_core.Lson | undefined;
     };
+    hasResolveMentionSuggestions: boolean;
+    useMentionSuggestions: (search?: string | undefined) => string[] | undefined;
 };
 declare function createRoomContext<TPresence extends JsonObject, TStorage extends LsonObject = LsonObject, TUserMeta extends BaseUserMeta = BaseUserMeta, TRoomEvent extends Json = never, TThreadMetadata extends BaseMetadata = never>(client: Client, options?: Options<TUserMeta>): RoomContextBundle<TPresence, TStorage, TUserMeta, TRoomEvent, TThreadMetadata>;
 

package/dist/index.js

@@ -1,11 +1,11 @@
-"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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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; }"use client";
+"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; }"use client";
 
 // src/index.ts
 var _core = require('@liveblocks/core');
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/react";
-var PKG_VERSION = "1.2.2-comments4";
+var PKG_VERSION = "1.2.2-comments6";
 var PKG_FORMAT = "cjs";
 
 // src/ClientSideSuspense.tsx
@@ -32,38 +32,7 @@ var _withselectorjs = require('use-sync-external-store/shim/with-selector.js');
 
 // src/comments/CommentsRoom.ts
 
-
-// ../../node_modules/nanoid/index.js
-var _crypto = require('crypto'); var _crypto2 = _interopRequireDefault(_crypto);
-
-// ../../node_modules/nanoid/url-alphabet/index.js
-var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
-
-// ../../node_modules/nanoid/index.js
-var POOL_SIZE_MULTIPLIER = 128;
-var pool;
-var poolOffset;
-var fillPool = (bytes) => {
-  if (!pool || pool.length < bytes) {
-    pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER);
-    _crypto2.default.randomFillSync(pool);
-    poolOffset = 0;
-  } else if (poolOffset + bytes > pool.length) {
-    _crypto2.default.randomFillSync(pool);
-    poolOffset = 0;
-  }
-  poolOffset += bytes;
-};
-var nanoid = (size = 21) => {
-  fillPool(size -= 0);
-  let id = "";
-  for (let i = poolOffset - size; i < poolOffset; i++) {
-    id += urlAlphabet[pool[i] & 63];
-  }
-  return id;
-};
-
-// src/comments/CommentsRoom.ts
+var _nanoid = require('nanoid');
 var _indexjs = require('use-sync-external-store/shim/index.js');
 
 // src/comments/errors.ts
@@ -137,17 +106,19 @@ function createStore(initialState) {
 }
 
 // src/comments/CommentsRoom.ts
+
 var POLLING_INTERVAL_REALTIME = 3e4;
 var POLLING_INTERVAL = 5e3;
 var THREAD_ID_PREFIX = "th";
 var COMMENT_ID_PREFIX = "cm";
 function createOptimisticId(prefix) {
-  return `${prefix}_${nanoid()}`;
+  return `${prefix}_${_nanoid.nanoid.call(void 0, )}`;
 }
 function createCommentsRoom(room, errorEventSource) {
   const store = createStore({
     isLoading: true
   });
+  let fetchThreadsPromise = null;
   let numberOfMutations = 0;
   function endMutation() {
     numberOfMutations--;
@@ -181,7 +152,11 @@ function createCommentsRoom(room, errorEventSource) {
   async function revalidateThreads() {
     pollingHub.threads.pause();
     if (numberOfMutations === 0) {
-      setThreads(await room.getThreads());
+      if (fetchThreadsPromise === null) {
+        fetchThreadsPromise = room.getThreads();
+      }
+      setThreads(await fetchThreadsPromise);
+      fetchThreadsPromise = null;
     }
     pollingHub.threads.resume();
   }
@@ -202,8 +177,10 @@ function createCommentsRoom(room, errorEventSource) {
       });
     }
     pollingHub.threads.start(getPollingInterval());
-    revalidateThreads();
     return () => {
+      if (store.subscribersCount() > 1) {
+        return;
+      }
       pollingHub.threads.stop();
       _optionalChain([unsubscribeRealtimeEvents, 'optionalCall', _ => _()]);
       unsubscribeRealtimeEvents = void 0;
@@ -217,6 +194,30 @@ function createCommentsRoom(room, errorEventSource) {
       isLoading: false
     });
   }
+  function useThreadsInternal() {
+    _react.useEffect.call(void 0, subscribe, []);
+    return _indexjs.useSyncExternalStore.call(void 0, 
+      store.subscribe,
+      store.get,
+      store.get
+    );
+  }
+  function useThreads() {
+    _react.useEffect.call(void 0, () => {
+      void revalidateThreads();
+    }, []);
+    return useThreadsInternal();
+  }
+  function useThreadsSuspense() {
+    const result = useThreadsInternal();
+    if (result.isLoading) {
+      throw revalidateThreads();
+    }
+    if (result.error) {
+      throw result.error;
+    }
+    return result.threads;
+  }
   function getCurrentUserId() {
     const self = room.getSelf();
     if (self === null || self.id === void 0) {
@@ -390,23 +391,6 @@ function createCommentsRoom(room, errorEventSource) {
       )
     ).finally(endMutation);
   }
-  function useThreads() {
-    return _indexjs.useSyncExternalStore.call(void 0, 
-      store.subscribe,
-      store.get,
-      store.get
-    );
-  }
-  function useThreadsSuspense() {
-    const result = useThreads();
-    if (result.isLoading) {
-      throw new Promise(store.subscribeOnce);
-    }
-    if (result.error) {
-      throw result.error;
-    }
-    return result.threads;
-  }
   return {
     useThreads,
     useThreadsSuspense,
@@ -414,8 +398,7 @@ function createCommentsRoom(room, errorEventSource) {
     editThreadMetadata,
     createComment,
     editComment,
-    deleteComment,
-    subscribe
+    deleteComment
   };
 }
 
@@ -519,6 +502,18 @@ function useInitial2(value) {
   return _react.useRef.call(void 0, value).current;
 }
 
+// src/lib/stable-stringify.ts
+function stableStringify(object, ...args) {
+  const sortedObject = Object.keys(object).sort().reduce(
+    (sortedObject2, key) => {
+      sortedObject2[key] = object[key];
+      return sortedObject2;
+    },
+    {}
+  );
+  return JSON.stringify(sortedObject, ...args);
+}
+
 // src/factory.tsx
 var noop2 = () => {
 };
@@ -573,24 +568,21 @@ function makeMutationContext(room) {
   };
 }
 var hasWarnedIfNoResolveUser = false;
-var hasWarnedIfNoResolveMentionSuggestions = false;
 function warnIfNoResolveUser(usersCache) {
   if (!hasWarnedIfNoResolveUser && !usersCache && process.env.NODE_ENV !== "production") {
-    console.warn("The resolveUser option wasn't set in createRoomContext.");
-    hasWarnedIfNoResolveUser = true;
-  }
-}
-function warnIfNoResolveMentionSuggestions(mentionSuggestionsCache) {
-  if (!hasWarnedIfNoResolveMentionSuggestions && !mentionSuggestionsCache && process.env.NODE_ENV !== "production") {
     console.warn(
-      "The resolveMentionSuggestions option wasn't set in createRoomContext."
+      "Set the resolveUser option in createRoomContext to specify user info."
     );
-    hasWarnedIfNoResolveMentionSuggestions = true;
+    hasWarnedIfNoResolveUser = true;
   }
 }
 var ContextBundle = React2.createContext(null);
 function useRoomContextBundle() {
-  return React2.useContext(ContextBundle);
+  const bundle = React2.useContext(ContextBundle);
+  if (bundle === null) {
+    throw new Error("RoomProvider is missing from the React tree.");
+  }
+  return bundle;
 }
 function createRoomContext(client, options) {
   const RoomContext = React2.createContext(null);
@@ -647,14 +639,21 @@ function createRoomContext(client, options) {
         }
       );
       setRoom(room2);
-      const unsubscribe = getCommentsRoom(room2).subscribe();
       return () => {
-        unsubscribe();
-        commentsRooms.delete(room2.id);
+        const commentsRoom = commentsRooms.get(roomId);
+        if (commentsRoom) {
+          commentsRooms.delete(roomId);
+        }
         client.leave(roomId);
       };
     }, [roomId, frozen]);
-    return /* @__PURE__ */ React2.createElement(RoomContext.Provider, { value: room }, /* @__PURE__ */ React2.createElement(ContextBundle.Provider, { value: bundle }, props.children));
+    return /* @__PURE__ */ React2.createElement(RoomContext.Provider, { value: room }, /* @__PURE__ */ React2.createElement(
+      ContextBundle.Provider,
+      {
+        value: internalBundle
+      },
+      props.children
+    ));
   }
   function connectionIdSelector(others) {
     return others.map((user) => user.connectionId);
@@ -1064,7 +1063,7 @@ function createRoomContext(client, options) {
   }) : void 0;
   function useUser(userId) {
     const resolverKey = React2.useMemo(
-      () => JSON.stringify({ userId }),
+      () => stableStringify({ userId }),
       [userId]
     );
     const state = useAsyncCache(usersCache, resolverKey);
@@ -1083,7 +1082,7 @@ function createRoomContext(client, options) {
   }
   function useUserSuspense(userId) {
     const resolverKey = React2.useMemo(
-      () => JSON.stringify({ userId }),
+      () => stableStringify({ userId }),
       [userId]
     );
     const state = useAsyncCache(usersCache, resolverKey, {
@@ -1107,16 +1106,12 @@ function createRoomContext(client, options) {
     const room = useRoom();
     const debouncedSearch = useDebounce(search, 500);
     const resolverKey = React2.useMemo(
-      () => debouncedSearch !== void 0 ? JSON.stringify({ text: debouncedSearch, roomId: room.id }) : null,
+      () => debouncedSearch !== void 0 ? stableStringify({ text: debouncedSearch, roomId: room.id }) : null,
       [debouncedSearch, room.id]
     );
     const { data } = useAsyncCache(mentionSuggestionsCache, resolverKey, {
       keepPreviousDataWhileLoading: true
     });
-    React2.useEffect(
-      () => warnIfNoResolveMentionSuggestions(mentionSuggestionsCache),
-      []
-    );
     return data;
   }
   const bundle = {
@@ -1155,7 +1150,6 @@ function createRoomContext(client, options) {
     useCreateComment,
     useEditComment,
     useDeleteComment,
-    useMentionSuggestions,
     suspense: {
       RoomContext,
       RoomProvider,
@@ -1194,6 +1188,11 @@ function createRoomContext(client, options) {
       useDeleteComment
     }
   };
+  const internalBundle = {
+    ...bundle,
+    hasResolveMentionSuggestions: resolveMentionSuggestions !== void 0,
+    useMentionSuggestions
+  };
   return bundle;
 }