@liveblocks/react 2.15.1 → 2.16.0-toolbars1

package/dist/{room-XbmI0Hoh.d.mts → room-ne1TCZyH.d.mts}

@@ -1,14 +1,24 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as react from 'react';
 import { Context, PropsWithChildren, ReactNode } from 'react';
-import { JsonObject, LsonObject, BaseUserMeta, LiveObject, User, Json, RoomNotificationSettings, Room, Status, BroadcastOptions, OthersEvent, LostConnectionEvent, History, BaseMetadata as BaseMetadata$1, Client as Client$1, ClientOptions, StorageStatus as StorageStatus$1, ThreadData as ThreadData$1, CommentData as CommentData$1 } from '@liveblocks/client';
+import { JsonObject, LsonObject, BaseUserMeta, Json, BaseMetadata, Room, LiveObject, User, RoomNotificationSettings, Status, BroadcastOptions, OthersEvent, LostConnectionEvent, History, Client as Client$1, ClientOptions, StorageStatus as StorageStatus$1, ThreadData as ThreadData$1, CommentData as CommentData$1 } from '@liveblocks/client';
 import * as _liveblocks_core from '@liveblocks/core';
-import { BaseMetadata, CommentBody, Patchable, StorageStatus, QueryMetadata, AsyncResult, DRI, AsyncSuccess, Resolve, CommentAttachment, PartialUnless, InboxNotificationData, ToImmutable, AsyncLoading, AsyncError, ThreadData, HistoryVersion, Client, SyncStatus, LiveblocksError, RoomEventMessage, CommentData, MutableSignal, ThreadDataWithDeleteInfo, ThreadDeleteInfo, DerivedSignal, OpaqueClient, CommentUserReaction, InboxNotificationDeleteInfo, RoomNotificationSettings as RoomNotificationSettings$1, Permission, BaseUserMeta as BaseUserMeta$1, DistributiveOmit, DU, DM, OpaqueRoom, TextEditorType, IYjsProvider, DP, DS, DE } from '@liveblocks/core';
+import { OpaqueRoom, BaseMetadata as BaseMetadata$1, CommentBody, Patchable, StorageStatus, QueryMetadata, AsyncResult, DRI, AsyncSuccess, Resolve, CommentAttachment, PartialUnless, InboxNotificationData, ToImmutable, AsyncLoading, AsyncError, ThreadData, HistoryVersion, Client, SyncStatus, LiveblocksError, RoomEventMessage, CommentData, MutableSignal, ThreadDataWithDeleteInfo, ThreadDeleteInfo, DerivedSignal, DefaultMap, OpaqueClient, CommentUserReaction, InboxNotificationDeleteInfo, RoomNotificationSettings as RoomNotificationSettings$1, ISignal, Permission, BaseUserMeta as BaseUserMeta$1, DistributiveOmit, DU, DM, TextEditorType, IYjsProvider, DP, DS, DE } from '@liveblocks/core';
+import * as react_jsx_runtime from 'react/jsx-runtime';
+
+/**
+ * Raw access to the React context where the RoomProvider stores the current
+ * room. Exposed for advanced use cases only.
+ *
+ * @private This is a private/advanced API. Do not rely on it.
+ */
+declare const RoomContext: react.Context<OpaqueRoom | null>;
+/** @private */
+declare function useRoomOrNull<P extends JsonObject, S extends LsonObject, U extends BaseUserMeta, E extends Json, M extends BaseMetadata>(): Room<P, S, U, E, M> | null;
 
 /**
  * @private Internal API, do not rely on it.
  */
-declare class CreateThreadError<M extends BaseMetadata> extends Error {
+declare class CreateThreadError<M extends BaseMetadata$1> extends Error {
     cause: Error;
     context: {
         roomId: string;
@@ -28,7 +38,7 @@ declare class CreateThreadError<M extends BaseMetadata> extends Error {
 /**
  * @private Internal API, do not rely on it.
  */
-declare class EditThreadMetadataError<M extends BaseMetadata> extends Error {
+declare class EditThreadMetadataError<M extends BaseMetadata$1> extends Error {
     cause: Error;
     context: {
         roomId: string;
@@ -120,9 +130,9 @@ declare class UpdateNotificationSettingsError extends Error {
 /**
  * @private Internal API, do not rely on it.
  */
-declare type CommentsError<M extends BaseMetadata> = CreateThreadError<M> | EditThreadMetadataError<M> | CreateCommentError | EditCommentError | DeleteCommentError | MarkInboxNotificationAsReadError | UpdateNotificationSettingsError;
+type CommentsError<M extends BaseMetadata$1> = CreateThreadError<M> | EditThreadMetadataError<M> | CreateCommentError | EditCommentError | DeleteCommentError | MarkInboxNotificationAsReadError | UpdateNotificationSettingsError;
 
-declare type UseSyncStatusOptions = {
+type UseSyncStatusOptions = {
     /**
      * When setting smooth, the hook will not update immediately as status
      * changes. This is because in typical applications, these states can change
@@ -131,9 +141,9 @@ declare type UseSyncStatusOptions = {
      */
     smooth?: boolean;
 };
-declare type UseStorageStatusOptions = UseSyncStatusOptions;
-declare type StorageStatusSuccess = Exclude<StorageStatus, "not-loaded" | "loading">;
-declare type ThreadsQuery<M extends BaseMetadata> = {
+type UseStorageStatusOptions = UseSyncStatusOptions;
+type StorageStatusSuccess = Exclude<StorageStatus, "not-loaded" | "loading">;
+type ThreadsQuery<M extends BaseMetadata$1> = {
     /**
      * Whether to only return threads marked as resolved or unresolved. If not provided,
      * all threads will be returned.
@@ -145,14 +155,14 @@ declare type ThreadsQuery<M extends BaseMetadata> = {
      */
     metadata?: Partial<QueryMetadata<M>>;
 };
-declare type UseUserThreadsOptions<M extends BaseMetadata> = {
+type UseUserThreadsOptions<M extends BaseMetadata$1> = {
     /**
      * The query (including metadata) to filter the threads by. If provided, only threads
      * that match the query will be returned. If not provided, all threads will be returned.
      */
     query?: ThreadsQuery<M>;
 };
-declare type UseThreadsOptions<M extends BaseMetadata> = {
+type UseThreadsOptions<M extends BaseMetadata$1> = {
     /**
      * The query (including metadata) to filter the threads by. If provided, only threads
      * that match the query will be returned. If not provided, all threads will be returned.
@@ -167,68 +177,68 @@ declare type UseThreadsOptions<M extends BaseMetadata> = {
      */
     scrollOnLoad?: boolean;
 };
-declare type UserAsyncResult<T> = AsyncResult<T, "user">;
-declare type UserAsyncSuccess<T> = AsyncSuccess<T, "user">;
-declare type RoomInfoAsyncResult = AsyncResult<DRI, "info">;
-declare type RoomInfoAsyncSuccess = AsyncSuccess<DRI, "info">;
-declare type AttachmentUrlAsyncResult = AsyncResult<string, "url">;
-declare type AttachmentUrlAsyncSuccess = AsyncSuccess<string, "url">;
-declare type CreateThreadOptions<M extends BaseMetadata> = Resolve<{
+type UserAsyncResult<T> = AsyncResult<T, "user">;
+type UserAsyncSuccess<T> = AsyncSuccess<T, "user">;
+type RoomInfoAsyncResult = AsyncResult<DRI, "info">;
+type RoomInfoAsyncSuccess = AsyncSuccess<DRI, "info">;
+type AttachmentUrlAsyncResult = AsyncResult<string, "url">;
+type AttachmentUrlAsyncSuccess = AsyncSuccess<string, "url">;
+type CreateThreadOptions<M extends BaseMetadata$1> = Resolve<{
     body: CommentBody;
     attachments?: CommentAttachment[];
 } & PartialUnless<M, {
     metadata: M;
 }>>;
-declare type EditThreadMetadataOptions<M extends BaseMetadata> = {
+type EditThreadMetadataOptions<M extends BaseMetadata$1> = {
     threadId: string;
     metadata: Patchable<M>;
 };
-declare type CreateCommentOptions = {
+type CreateCommentOptions = {
     threadId: string;
     body: CommentBody;
     attachments?: CommentAttachment[];
 };
-declare type EditCommentOptions = {
+type EditCommentOptions = {
     threadId: string;
     commentId: string;
     body: CommentBody;
     attachments?: CommentAttachment[];
 };
-declare type DeleteCommentOptions = {
+type DeleteCommentOptions = {
     threadId: string;
     commentId: string;
 };
-declare type CommentReactionOptions = {
+type CommentReactionOptions = {
     threadId: string;
     commentId: string;
     emoji: string;
 };
-declare type NoPaginationFields = {
+type NoPaginationFields = {
     hasFetchedAll?: never;
     isFetchingMore?: never;
     fetchMore?: never;
     fetchMoreError?: never;
 };
-declare type PaginationFields = {
+type PaginationFields = {
     hasFetchedAll: boolean;
     isFetchingMore: boolean;
     fetchMore: () => void;
     fetchMoreError?: Error;
 };
-declare type PagedAsyncSuccess<T, F extends string> = Resolve<AsyncSuccess<T, F> & PaginationFields>;
-declare type PagedAsyncResult<T, F extends string> = Resolve<AsyncLoading<F> & NoPaginationFields> | Resolve<AsyncError<F> & NoPaginationFields> | PagedAsyncSuccess<T, F>;
-declare type ThreadsAsyncSuccess<M extends BaseMetadata> = PagedAsyncSuccess<ThreadData<M>[], "threads">;
-declare type ThreadsAsyncResult<M extends BaseMetadata> = PagedAsyncResult<ThreadData<M>[], "threads">;
-declare type InboxNotificationsAsyncSuccess = PagedAsyncSuccess<InboxNotificationData[], "inboxNotifications">;
-declare type InboxNotificationsAsyncResult = PagedAsyncResult<InboxNotificationData[], "inboxNotifications">;
-declare type UnreadInboxNotificationsCountAsyncSuccess = AsyncSuccess<number, "count">;
-declare type UnreadInboxNotificationsCountAsyncResult = AsyncResult<number, "count">;
-declare type RoomNotificationSettingsAsyncSuccess = AsyncSuccess<RoomNotificationSettings, "settings">;
-declare type RoomNotificationSettingsAsyncResult = AsyncResult<RoomNotificationSettings, "settings">;
-declare type HistoryVersionDataAsyncResult = AsyncResult<Uint8Array>;
-declare type HistoryVersionsAsyncSuccess = AsyncSuccess<HistoryVersion[], "versions">;
-declare type HistoryVersionsAsyncResult = AsyncResult<HistoryVersion[], "versions">;
-declare type RoomProviderProps<P extends JsonObject, S extends LsonObject> = Resolve<{
+type PagedAsyncSuccess<T, F extends string> = Resolve<AsyncSuccess<T, F> & PaginationFields>;
+type PagedAsyncResult<T, F extends string> = Resolve<AsyncLoading<F> & NoPaginationFields> | Resolve<AsyncError<F> & NoPaginationFields> | PagedAsyncSuccess<T, F>;
+type ThreadsAsyncSuccess<M extends BaseMetadata$1> = PagedAsyncSuccess<ThreadData<M>[], "threads">;
+type ThreadsAsyncResult<M extends BaseMetadata$1> = PagedAsyncResult<ThreadData<M>[], "threads">;
+type InboxNotificationsAsyncSuccess = PagedAsyncSuccess<InboxNotificationData[], "inboxNotifications">;
+type InboxNotificationsAsyncResult = PagedAsyncResult<InboxNotificationData[], "inboxNotifications">;
+type UnreadInboxNotificationsCountAsyncSuccess = AsyncSuccess<number, "count">;
+type UnreadInboxNotificationsCountAsyncResult = AsyncResult<number, "count">;
+type RoomNotificationSettingsAsyncSuccess = AsyncSuccess<RoomNotificationSettings, "settings">;
+type RoomNotificationSettingsAsyncResult = AsyncResult<RoomNotificationSettings, "settings">;
+type HistoryVersionDataAsyncResult = AsyncResult<Uint8Array>;
+type HistoryVersionsAsyncSuccess = AsyncSuccess<HistoryVersion[], "versions">;
+type HistoryVersionsAsyncResult = AsyncResult<HistoryVersion[], "versions">;
+type RoomProviderProps<P extends JsonObject, S extends LsonObject> = Resolve<{
     /**
      * The id of the room you want to connect to
      */
@@ -259,8 +269,8 @@ declare type RoomProviderProps<P extends JsonObject, S extends LsonObject> = Res
  * For any function type, returns a similar function type, but without the
  * first argument.
  */
-declare type OmitFirstArg<F> = F extends (first: any, ...rest: infer A) => infer R ? (...args: A) => R : never;
-declare type MutationContext<P extends JsonObject, S extends LsonObject, U extends BaseUserMeta> = {
+type OmitFirstArg<F> = F extends (first: any, ...rest: infer A) => infer R ? (...args: A) => R : never;
+type MutationContext<P extends JsonObject, S extends LsonObject, U extends BaseUserMeta> = {
     storage: LiveObject<S>;
     self: User<P, U>;
     others: readonly User<P, U>[];
@@ -268,7 +278,7 @@ declare type MutationContext<P extends JsonObject, S extends LsonObject, U exten
         addToHistory: boolean;
     }) => void;
 };
-declare type ThreadSubscription = {
+type ThreadSubscription = {
     status: "not-subscribed";
     unreadSince?: never;
 } | {
@@ -278,7 +288,7 @@ declare type ThreadSubscription = {
     status: "subscribed";
     unreadSince: Date;
 };
-declare type SharedContextBundle<U extends BaseUserMeta> = {
+type SharedContextBundle<U extends BaseUserMeta> = {
     classic: {
         /**
          * Obtains a reference to the current Liveblocks client.
@@ -359,7 +369,7 @@ declare type SharedContextBundle<U extends BaseUserMeta> = {
 /**
  * Properties that are the same in RoomContext and RoomContext["suspense"].
  */
-declare type RoomContextBundleCommon<P extends JsonObject, S extends LsonObject, U extends BaseUserMeta, E extends Json, M extends BaseMetadata> = {
+type RoomContextBundleCommon<P extends JsonObject, S extends LsonObject, U extends BaseUserMeta, E extends Json, M extends BaseMetadata$1> = {
     /**
      * You normally don't need to directly interact with the RoomContext, but
      * it can be necessary if you're building an advanced app where you need to
@@ -775,10 +785,10 @@ declare type RoomContextBundleCommon<P extends JsonObject, S extends LsonObject,
  * of Liveblocks, NEVER USE ANY OF THESE DIRECTLY, because bad things
  * will probably happen if you do.
  */
-declare type PrivateRoomContextApi = {
-    useCommentsErrorListener<M extends BaseMetadata>(callback: (err: CommentsError<M>) => void): void;
+type PrivateRoomContextApi = {
+    useCommentsErrorListener<M extends BaseMetadata$1>(callback: (err: CommentsError<M>) => void): void;
 };
-declare type RoomContextBundle<P extends JsonObject, S extends LsonObject, U extends BaseUserMeta, E extends Json, M extends BaseMetadata> = Resolve<RoomContextBundleCommon<P, S, U, E, M> & SharedContextBundle<U>["classic"] & {
+type RoomContextBundle<P extends JsonObject, S extends LsonObject, U extends BaseUserMeta, E extends Json, M extends BaseMetadata$1> = Resolve<RoomContextBundleCommon<P, S, U, E, M> & SharedContextBundle<U>["classic"] & {
     /**
      * Returns the current storage status for the Room, and triggers
      * a re-render whenever it changes. Can be used to render a "Saving..."
@@ -974,7 +984,7 @@ declare type RoomContextBundle<P extends JsonObject, S extends LsonObject, U ext
 /**
  * Properties that are the same in LiveblocksContext and LiveblocksContext["suspense"].
  */
-declare type LiveblocksContextBundleCommon<M extends BaseMetadata> = {
+type LiveblocksContextBundleCommon<M extends BaseMetadata$1> = {
     /**
      * Makes Liveblocks features outside of rooms (e.g. Notifications) available
      * in the component hierarchy below.
@@ -1040,7 +1050,7 @@ declare type LiveblocksContextBundleCommon<M extends BaseMetadata> = {
      */
     useSyncStatus(options?: UseSyncStatusOptions): SyncStatus;
 };
-declare type LiveblocksContextBundle<U extends BaseUserMeta, M extends BaseMetadata> = Resolve<LiveblocksContextBundleCommon<M> & SharedContextBundle<U>["classic"] & {
+type LiveblocksContextBundle<U extends BaseUserMeta, M extends BaseMetadata$1> = Resolve<LiveblocksContextBundleCommon<M> & SharedContextBundle<U>["classic"] & {
     /**
      * Returns the inbox notifications for the current user.
      *
@@ -1087,7 +1097,7 @@ declare type LiveblocksContextBundle<U extends BaseUserMeta, M extends BaseMetad
     }>;
 }>;
 
-declare type ReadonlyThreadDB<M extends BaseMetadata> = Omit<ThreadDB<M>, "upsert" | "delete" | "signal">;
+type ReadonlyThreadDB<M extends BaseMetadata$1> = Omit<ThreadDB<M>, "upsert" | "delete" | "signal">;
 /**
  * This class implements a lightweight, in-memory, "database" for all Thread
  * instances.
@@ -1105,7 +1115,7 @@ declare type ReadonlyThreadDB<M extends BaseMetadata> = Omit<ThreadDB<M>, "upser
  *          optimistic updates without losing the original thread contents.
  *
  */
-declare class ThreadDB<M extends BaseMetadata> {
+declare class ThreadDB<M extends BaseMetadata$1> {
     #private;
     readonly signal: MutableSignal<this>;
     constructor();
@@ -1118,10 +1128,7 @@ declare class ThreadDB<M extends BaseMetadata> {
     upsert(thread: ThreadDataWithDeleteInfo<M>): void;
     /** Like .upsert(), except it won't update if a thread by this ID already exists. */
     upsertIfNewer(thread: ThreadDataWithDeleteInfo<M>): void;
-    applyDelta(updates: {
-        newThreads: ThreadData<M>[];
-        deletedThreads: ThreadDeleteInfo[];
-    }): void;
+    applyDelta(newThreads: ThreadData<M>[], deletedThreads: ThreadDeleteInfo[]): void;
     /**
      * Marks a thread as deleted. It will no longer pop up in .findMany()
      * queries, but it can still be accessed via `.getEvenIfDeleted()`.
@@ -1141,50 +1148,50 @@ declare class ThreadDB<M extends BaseMetadata> {
     findMany(roomId: string | undefined, query: ThreadsQuery<M>, direction: "asc" | "desc"): ThreadData<M>[];
 }
 
-declare type OptimisticUpdate<M extends BaseMetadata> = CreateThreadOptimisticUpdate<M> | DeleteThreadOptimisticUpdate | EditThreadMetadataOptimisticUpdate<M> | MarkThreadAsResolvedOptimisticUpdate | MarkThreadAsUnresolvedOptimisticUpdate | CreateCommentOptimisticUpdate | EditCommentOptimisticUpdate | DeleteCommentOptimisticUpdate | AddReactionOptimisticUpdate | RemoveReactionOptimisticUpdate | MarkInboxNotificationAsReadOptimisticUpdate | MarkAllInboxNotificationsAsReadOptimisticUpdate | DeleteInboxNotificationOptimisticUpdate | DeleteAllInboxNotificationsOptimisticUpdate | UpdateNotificationSettingsOptimisticUpdate;
-declare type CreateThreadOptimisticUpdate<M extends BaseMetadata> = {
+type OptimisticUpdate<M extends BaseMetadata$1> = CreateThreadOptimisticUpdate<M> | DeleteThreadOptimisticUpdate | EditThreadMetadataOptimisticUpdate<M> | MarkThreadAsResolvedOptimisticUpdate | MarkThreadAsUnresolvedOptimisticUpdate | CreateCommentOptimisticUpdate | EditCommentOptimisticUpdate | DeleteCommentOptimisticUpdate | AddReactionOptimisticUpdate | RemoveReactionOptimisticUpdate | MarkInboxNotificationAsReadOptimisticUpdate | MarkAllInboxNotificationsAsReadOptimisticUpdate | DeleteInboxNotificationOptimisticUpdate | DeleteAllInboxNotificationsOptimisticUpdate | UpdateNotificationSettingsOptimisticUpdate;
+type CreateThreadOptimisticUpdate<M extends BaseMetadata$1> = {
     type: "create-thread";
     id: string;
     roomId: string;
     thread: ThreadData<M>;
 };
-declare type DeleteThreadOptimisticUpdate = {
+type DeleteThreadOptimisticUpdate = {
     type: "delete-thread";
     id: string;
     roomId: string;
     threadId: string;
     deletedAt: Date;
 };
-declare type EditThreadMetadataOptimisticUpdate<M extends BaseMetadata> = {
+type EditThreadMetadataOptimisticUpdate<M extends BaseMetadata$1> = {
     type: "edit-thread-metadata";
     id: string;
     threadId: string;
     metadata: Resolve<Patchable<M>>;
     updatedAt: Date;
 };
-declare type MarkThreadAsResolvedOptimisticUpdate = {
+type MarkThreadAsResolvedOptimisticUpdate = {
     type: "mark-thread-as-resolved";
     id: string;
     threadId: string;
     updatedAt: Date;
 };
-declare type MarkThreadAsUnresolvedOptimisticUpdate = {
+type MarkThreadAsUnresolvedOptimisticUpdate = {
     type: "mark-thread-as-unresolved";
     id: string;
     threadId: string;
     updatedAt: Date;
 };
-declare type CreateCommentOptimisticUpdate = {
+type CreateCommentOptimisticUpdate = {
     type: "create-comment";
     id: string;
     comment: CommentData;
 };
-declare type EditCommentOptimisticUpdate = {
+type EditCommentOptimisticUpdate = {
     type: "edit-comment";
     id: string;
     comment: CommentData;
 };
-declare type DeleteCommentOptimisticUpdate = {
+type DeleteCommentOptimisticUpdate = {
     type: "delete-comment";
     id: string;
     roomId: string;
@@ -1192,14 +1199,14 @@ declare type DeleteCommentOptimisticUpdate = {
     deletedAt: Date;
     commentId: string;
 };
-declare type AddReactionOptimisticUpdate = {
+type AddReactionOptimisticUpdate = {
     type: "add-reaction";
     id: string;
     threadId: string;
     commentId: string;
     reaction: CommentUserReaction;
 };
-declare type RemoveReactionOptimisticUpdate = {
+type RemoveReactionOptimisticUpdate = {
     type: "remove-reaction";
     id: string;
     threadId: string;
@@ -1208,29 +1215,29 @@ declare type RemoveReactionOptimisticUpdate = {
     userId: string;
     removedAt: Date;
 };
-declare type MarkInboxNotificationAsReadOptimisticUpdate = {
+type MarkInboxNotificationAsReadOptimisticUpdate = {
     type: "mark-inbox-notification-as-read";
     id: string;
     inboxNotificationId: string;
     readAt: Date;
 };
-declare type MarkAllInboxNotificationsAsReadOptimisticUpdate = {
+type MarkAllInboxNotificationsAsReadOptimisticUpdate = {
     type: "mark-all-inbox-notifications-as-read";
     id: string;
     readAt: Date;
 };
-declare type DeleteInboxNotificationOptimisticUpdate = {
+type DeleteInboxNotificationOptimisticUpdate = {
     type: "delete-inbox-notification";
     id: string;
     inboxNotificationId: string;
     deletedAt: Date;
 };
-declare type DeleteAllInboxNotificationsOptimisticUpdate = {
+type DeleteAllInboxNotificationsOptimisticUpdate = {
     type: "delete-all-inbox-notifications";
     id: string;
     deletedAt: Date;
 };
-declare type UpdateNotificationSettingsOptimisticUpdate = {
+type UpdateNotificationSettingsOptimisticUpdate = {
     type: "update-notification-settings";
     id: string;
     roomId: string;
@@ -1241,7 +1248,7 @@ declare type UpdateNotificationSettingsOptimisticUpdate = {
  * field, indicating the status of the promise.
  * This is compatible with React's `use()` promises, hence the name.
  */
-declare type UsablePromise<T> = Promise<T> & ({
+type UsablePromise<T> = Promise<T> & ({
     status: "pending";
 } | {
     status: "rejected";
@@ -1250,24 +1257,17 @@ declare type UsablePromise<T> = Promise<T> & ({
     status: "fulfilled";
     value: T;
 });
-declare type RoomId = string;
-/**
- * A lookup table (LUT) for all the history versions.
- */
-declare type VersionsLUT = Map<RoomId, Map<string, HistoryVersion>>;
-/**
- * Versions by roomId
- * e.g. { 'room-abc': {versions: "all versions"}}
- */
-declare type VersionsByRoomId = Record<RoomId, Record<string, HistoryVersion>>;
+type LoadableResource<T> = {
+    signal: ISignal<T>;
+    waitUntilLoaded: () => UsablePromise<void>;
+};
+type RoomId = string;
+type UserQueryKey = string;
+type RoomQueryKey = string;
 /**
  * A lookup table (LUT) for all the inbox notifications.
  */
-declare type NotificationsLUT = Map<string, InboxNotificationData>;
-/**
- * A lookup table (LUT) for all the room notification settings.
- */
-declare type SettingsLUT = Map<RoomId, RoomNotificationSettings$1>;
+type NotificationsLUT = Map<string, InboxNotificationData>;
 /**
  * Notification settings by room ID.
  * e.g. { 'room-abc': { threads: "all" },
@@ -1275,10 +1275,10 @@ declare type SettingsLUT = Map<RoomId, RoomNotificationSettings$1>;
  *        'room-xyz': { threads: "none" },
  *      }
  */
-declare type SettingsByRoomId = Record<RoomId, RoomNotificationSettings$1>;
-declare type PermissionHintsByRoomId = Record<RoomId, Set<Permission>>;
-declare type CleanThreadifications<M extends BaseMetadata> = CleanThreads<M> & CleanNotifications;
-declare type CleanThreads<M extends BaseMetadata> = {
+type SettingsByRoomId = Record<RoomId, RoomNotificationSettings$1>;
+type PermissionHintsLUT = DefaultMap<RoomId, Set<Permission>>;
+type CleanThreadifications<M extends BaseMetadata$1> = CleanThreads<M> & CleanNotifications;
+type CleanThreads<M extends BaseMetadata$1> = {
     /**
      * Keep track of loading and error status of all the queries made by the client.
      * e.g. 'room-abc-{"color":"red"}'  - ok
@@ -1286,7 +1286,7 @@ declare type CleanThreads<M extends BaseMetadata> = {
      */
     threadsDB: ReadonlyThreadDB<M>;
 };
-declare type CleanNotifications = {
+type CleanNotifications = {
     /**
      * All inbox notifications in a sorted array, optimistic updates applied.
      */
@@ -1298,39 +1298,37 @@ declare type CleanNotifications = {
     notificationsById: Record<string, InboxNotificationData>;
 };
 declare function createStore_forNotifications(): {
-    signal: _liveblocks_core.ISignal<NotificationsLUT>;
+    signal: ISignal<NotificationsLUT>;
     markAllRead: (readAt: Date) => void;
     markRead: (notificationId: string, readAt: Date) => void;
     delete: (inboxNotificationId: string) => void;
-    applyDelta: (newInboxNotifications: InboxNotificationData[], deletedNotifications: InboxNotificationDeleteInfo[]) => void;
+    applyDelta: (newNotifications: InboxNotificationData[], deletedNotifications: InboxNotificationDeleteInfo[]) => void;
     clear: () => void;
     updateAssociatedNotification: (newComment: CommentData) => void;
-    force_set: (mutationCallback: (lut: NotificationsLUT) => void | undefined | boolean) => void;
-    invalidate: () => void;
+    upsert: (notification: InboxNotificationData) => void;
 };
-declare function createStore_forRoomNotificationSettings(): {
-    signal: _liveblocks_core.ISignal<SettingsLUT>;
+declare function createStore_forRoomNotificationSettings(updates: ISignal<readonly OptimisticUpdate<BaseMetadata$1>[]>): {
+    signal: DerivedSignal<SettingsByRoomId>;
     update: (roomId: string, settings: RoomNotificationSettings$1) => void;
-    invalidate: () => void;
 };
 declare function createStore_forHistoryVersions(): {
-    signal: _liveblocks_core.ISignal<VersionsLUT>;
+    signal: DerivedSignal<{
+        [k: string]: {
+            [k: string]: HistoryVersion;
+        };
+    }>;
     update: (roomId: string, versions: HistoryVersion[]) => void;
-    force_set: (callback: (lut: VersionsLUT) => void | boolean) => void;
-    invalidate: () => void;
 };
 declare function createStore_forPermissionHints(): {
-    signal: _liveblocks_core.ISignal<PermissionHintsByRoomId>;
+    signal: ISignal<PermissionHintsLUT>;
     update: (newHints: Record<string, Permission[]>) => void;
-    invalidate: () => void;
 };
-declare function createStore_forOptimistic<M extends BaseMetadata>(client: Client<BaseUserMeta$1, M>): {
-    signal: _liveblocks_core.ISignal<readonly OptimisticUpdate<M>[]>;
+declare function createStore_forOptimistic<M extends BaseMetadata$1>(client: Client<BaseUserMeta$1, M>): {
+    signal: ISignal<readonly OptimisticUpdate<M>[]>;
     add: (optimisticUpdate: DistributiveOmit<OptimisticUpdate<M>, "id">) => string;
     remove: (optimisticId: string) => void;
-    invalidate: () => void;
 };
-declare class UmbrellaStore<M extends BaseMetadata> {
+declare class UmbrellaStore<M extends BaseMetadata$1> {
     #private;
     readonly threads: ThreadDB<M>;
     readonly notifications: ReturnType<typeof createStore_forNotifications>;
@@ -1340,32 +1338,15 @@ declare class UmbrellaStore<M extends BaseMetadata> {
     readonly optimisticUpdates: ReturnType<typeof createStore_forOptimistic<M>>;
     readonly outputs: {
         readonly threadifications: DerivedSignal<CleanThreadifications<M>>;
-        readonly threads: DerivedSignal<CleanThreads<M>>;
+        readonly threads: DerivedSignal<ReadonlyThreadDB<M>>;
+        readonly loadingRoomThreads: DefaultMap<RoomQueryKey, LoadableResource<ThreadsAsyncResult<M>>>;
+        readonly loadingUserThreads: DefaultMap<UserQueryKey, LoadableResource<ThreadsAsyncResult<M>>>;
         readonly notifications: DerivedSignal<CleanNotifications>;
-        readonly settingsByRoomId: DerivedSignal<SettingsByRoomId>;
-        readonly versionsByRoomId: DerivedSignal<VersionsByRoomId>;
+        readonly loadingNotifications: LoadableResource<InboxNotificationsAsyncResult>;
+        readonly settingsByRoomId: DefaultMap<RoomId, LoadableResource<RoomNotificationSettingsAsyncResult>>;
+        readonly versionsByRoomId: DefaultMap<RoomId, LoadableResource<HistoryVersionsAsyncResult>>;
     };
     constructor(client: OpaqueClient);
-    get1_both(): CleanThreadifications<M>;
-    subscribe1_both(callback: () => void): () => void;
-    get1_threads(): CleanThreads<M>;
-    subscribe1_threads(callback: () => void): () => void;
-    get1_notifications(): CleanNotifications;
-    subscribe1_notifications(callback: () => void): () => void;
-    get2(): SettingsByRoomId;
-    subscribe2(callback: () => void): () => void;
-    get3(): VersionsByRoomId;
-    subscribe3(callback: () => void): () => void;
-    /**
-     * Returns the async result of the given query and room id. If the query is success,
-     * then it will return the threads that match that provided query and room id.
-     *
-     */
-    getRoomThreadsLoadingState(roomId: string, query: ThreadsQuery<M> | undefined): ThreadsAsyncResult<M>;
-    getUserThreadsLoadingState(query: ThreadsQuery<M> | undefined): ThreadsAsyncResult<M>;
-    getInboxNotificationsLoadingState(): InboxNotificationsAsyncResult;
-    getNotificationSettingsLoadingState(roomId: string): RoomNotificationSettingsAsyncResult;
-    getRoomVersionsLoadingState(roomId: string): AsyncResult<HistoryVersion[], "versions">;
     /**
      * Updates an existing inbox notification with a new value, replacing the
      * corresponding optimistic update.
@@ -1417,15 +1398,9 @@ declare class UmbrellaStore<M extends BaseMetadata> {
      */
     updateRoomNotificationSettings(roomId: string, optimisticId: string, settings: Readonly<RoomNotificationSettings$1>): void;
     fetchNotificationsDeltaUpdate(signal: AbortSignal): Promise<void>;
-    waitUntilNotificationsLoaded(): UsablePromise<void>;
-    waitUntilRoomThreadsLoaded(roomId: string, query: ThreadsQuery<M> | undefined): UsablePromise<void>;
     fetchRoomThreadsDeltaUpdate(roomId: string, signal: AbortSignal): Promise<void>;
-    waitUntilUserThreadsLoaded(query: ThreadsQuery<M> | undefined): UsablePromise<void>;
-    invalidateEntireStore(): void;
     fetchUserThreadsDeltaUpdate(signal: AbortSignal): Promise<void>;
-    waitUntilRoomVersionsLoaded(roomId: string): UsablePromise<void>;
     fetchRoomVersionsDeltaUpdate(roomId: string, signal: AbortSignal): Promise<void>;
-    waitUntilRoomNotificationSettingsLoaded(roomId: string): UsablePromise<void>;
     refreshRoomNotificationSettings(roomId: string, signal: AbortSignal): Promise<void>;
 }
 
@@ -1441,15 +1416,15 @@ declare const ClientContext: react.Context<OpaqueClient | null>;
  *
  * @private
  */
-declare function getUmbrellaStoreForClient<M extends BaseMetadata$1>(client: OpaqueClient): UmbrellaStore<M>;
+declare function getUmbrellaStoreForClient<M extends BaseMetadata>(client: OpaqueClient): UmbrellaStore<M>;
 /**
  * @private This is an internal API.
  */
-declare function useClientOrNull<U extends BaseUserMeta>(): Client$1<U, BaseMetadata$1> | null;
+declare function useClientOrNull<U extends BaseUserMeta>(): Client$1<U> | null;
 /**
  * Obtains a reference to the current Liveblocks client.
  */
-declare function useClient<U extends BaseUserMeta>(): Client$1<U, BaseMetadata$1>;
+declare function useClient<U extends BaseUserMeta>(): Client$1<U>;
 /**
  * Sets up a client for connecting to Liveblocks, and is the recommended way to do
  * this for React apps. You must define either `authEndpoint` or `publicApiKey`.
@@ -1464,7 +1439,7 @@ declare function LiveblocksProvider<U extends BaseUserMeta = DU>(props: PropsWit
  * LiveblocksProvider created in this way takes no props, because it uses
  * settings from the given client instead.
  */
-declare function createLiveblocksContext<U extends BaseUserMeta = DU, M extends BaseMetadata$1 = DM>(client: OpaqueClient): LiveblocksContextBundle<U, M>;
+declare function createLiveblocksContext<U extends BaseUserMeta = DU, M extends BaseMetadata = DM>(client: OpaqueClient): LiveblocksContextBundle<U, M>;
 /**
  * Returns the inbox notifications for the current user.
  *
@@ -1480,7 +1455,7 @@ declare function useInboxNotifications(): InboxNotificationsAsyncResult;
  */
 declare function useInboxNotificationsSuspense(): {
     readonly isLoading: false;
-    readonly inboxNotifications: InboxNotificationData[];
+    readonly inboxNotifications: _liveblocks_core.InboxNotificationData[];
     readonly error?: undefined;
     hasFetchedAll: boolean;
     isFetchingMore: boolean;
@@ -1551,7 +1526,7 @@ declare function useRoomInfo(roomId: string): RoomInfoAsyncResult;
  * const { info } = useRoomInfo("room-id");
  */
 declare function useRoomInfoSuspense(roomId: string): RoomInfoAsyncSuccess;
-declare type TypedBundle$1 = LiveblocksContextBundle<DU, DM>;
+type TypedBundle$1 = LiveblocksContextBundle<DU, DM>;
 /**
  * Returns the thread associated with a `"thread"` inbox notification.
  *
@@ -1626,16 +1601,6 @@ declare const _useUserThreadsSuspense_experimental: TypedBundle$1["suspense"]["u
  */
 declare function useSyncStatus(options?: UseSyncStatusOptions): SyncStatus;
 
-/**
- * Raw access to the React context where the RoomProvider stores the current
- * room. Exposed for advanced use cases only.
- *
- * @private This is a private/advanced API. Do not rely on it.
- */
-declare const RoomContext: react.Context<OpaqueRoom | null>;
-/** @private */
-declare function useRoomOrNull<P extends JsonObject, S extends LsonObject, U extends BaseUserMeta, E extends Json, M extends BaseMetadata$1>(): Room<P, S, U, E, M> | null;
-
 /**
  * Returns the current connection status for the Room, and triggers
  * a re-render whenever it changes. Can be used to render a status badge.
@@ -1742,13 +1707,13 @@ declare function useOthersConnectionIds(): readonly number[];
 /**
  * @private Internal API, do not rely on it.
  */
-declare function useCommentsErrorListener<M extends BaseMetadata$1>(callback: (error: CommentsError<M>) => void): void;
+declare function useCommentsErrorListener<M extends BaseMetadata>(callback: (error: CommentsError<M>) => void): void;
 /**
  * @private
  */
-declare function useCreateRoomThread<M extends BaseMetadata$1>(roomId: string): (options: CreateThreadOptions<M>) => ThreadData$1<M>;
+declare function useCreateRoomThread<M extends BaseMetadata>(roomId: string): (options: CreateThreadOptions<M>) => ThreadData$1<M>;
 declare function useDeleteRoomThread(roomId: string): (threadId: string) => void;
-declare function useEditRoomThreadMetadata<M extends BaseMetadata$1>(roomId: string): (options: EditThreadMetadataOptions<M>) => void;
+declare function useEditRoomThreadMetadata<M extends BaseMetadata>(roomId: string): (options: EditThreadMetadataOptions<M>) => void;
 /**
  * Returns a function that adds a comment to a thread.
  *
@@ -1789,7 +1754,7 @@ declare function useDeleteRoomComment(roomId: string): ({ threadId, commentId }:
 /**
  * @private
  */
-declare function useAddRoomCommentReaction<M extends BaseMetadata$1>(roomId: string): ({ threadId, commentId, emoji }: CommentReactionOptions) => void;
+declare function useAddRoomCommentReaction<M extends BaseMetadata>(roomId: string): ({ threadId, commentId, emoji }: CommentReactionOptions) => void;
 /**
  * Returns a function that removes a reaction on a comment.
  *
@@ -1915,8 +1880,8 @@ declare function useRoomPermissions(roomId: string): Set<unknown>;
  * that any RoomProvider created in this way does not need to be nested in
  * LiveblocksProvider, as it already has access to the client.
  */
-declare function createRoomContext<P extends JsonObject = DP, S extends LsonObject = DS, U extends BaseUserMeta = DU, E extends Json = DE, M extends BaseMetadata$1 = DM>(client: OpaqueClient): RoomContextBundle<P, S, U, E, M>;
-declare type TypedBundle = RoomContextBundle<DP, DS, DU, DE, DM>;
+declare function createRoomContext<P extends JsonObject = DP, S extends LsonObject = DS, U extends BaseUserMeta = DU, E extends Json = DE, M extends BaseMetadata = DM>(client: OpaqueClient): RoomContextBundle<P, S, U, E, M>;
+type TypedBundle = RoomContextBundle<DP, DS, DU, DE, DM>;
 /**
  * Makes a Room available in the component hierarchy below.
  * Joins the room when the component is mounted, and automatically leaves