@liveblocks/react 1.11.3 → 1.12.0-lexical2

package/dist/index.d.mts

@@ -1,8 +1,7 @@
-import { ReactElement, ReactNode, PropsWithChildren } from 'react';
+import { ReactElement, ReactNode, Provider, PropsWithChildren } from 'react';
+import { BaseMetadata, CommentBody, PartialNullable, QueryMetadata, Resolve, ToImmutable, kInternal, ThreadData, InboxNotificationData, LiveblocksError, RoomEventMessage, CommentData, RoomInfo, RoomInitializers, ResolveUsersArgs, OptionalPromise, ResolveMentionSuggestionsArgs } from '@liveblocks/core';
 import { JsonObject, LsonObject, BaseUserMeta, LiveObject, User, Json, RoomNotificationSettings, Room, Status, BroadcastOptions, OthersEvent, LostConnectionEvent, History, BaseMetadata as BaseMetadata$1, Client } from '@liveblocks/client';
 export { Json, JsonObject, shallow } from '@liveblocks/client';
-import * as _liveblocks_core from '@liveblocks/core';
-import { BaseMetadata, Resolve, ToImmutable, kInternal, ThreadData, InboxNotificationData, LiveblocksError, RoomEventMessage, CommentData, RoomInfo, CommentBody, PartialNullable, RoomInitializers, ResolveUsersArgs, OptionalPromise, ResolveMentionSuggestionsArgs, BaseUserMeta as BaseUserMeta$1 } from '@liveblocks/core';
 
 declare type Props = {
     fallback: NonNullable<ReactNode> | null;
@@ -27,7 +26,100 @@ declare type Props = {
  */
 declare function ClientSideSuspense(props: Props): ReactElement;
 
-declare type UseThreadsOptions<TThreadMetadata extends BaseMetadata> = {
+declare class CreateThreadError<M extends BaseMetadata> extends Error {
+    cause: Error;
+    context: {
+        roomId: string;
+        threadId: string;
+        commentId: string;
+        body: CommentBody;
+        metadata: M;
+    };
+    constructor(cause: Error, context: {
+        roomId: string;
+        threadId: string;
+        commentId: string;
+        body: CommentBody;
+        metadata: M;
+    });
+}
+declare class EditThreadMetadataError<M extends BaseMetadata> extends Error {
+    cause: Error;
+    context: {
+        roomId: string;
+        threadId: string;
+        metadata: PartialNullable<M>;
+    };
+    constructor(cause: Error, context: {
+        roomId: string;
+        threadId: string;
+        metadata: PartialNullable<M>;
+    });
+}
+declare class CreateCommentError extends Error {
+    cause: Error;
+    context: {
+        roomId: string;
+        threadId: string;
+        commentId: string;
+        body: CommentBody;
+    };
+    constructor(cause: Error, context: {
+        roomId: string;
+        threadId: string;
+        commentId: string;
+        body: CommentBody;
+    });
+}
+declare class EditCommentError extends Error {
+    cause: Error;
+    context: {
+        roomId: string;
+        threadId: string;
+        commentId: string;
+        body: CommentBody;
+    };
+    constructor(cause: Error, context: {
+        roomId: string;
+        threadId: string;
+        commentId: string;
+        body: CommentBody;
+    });
+}
+declare class DeleteCommentError extends Error {
+    cause: Error;
+    context: {
+        roomId: string;
+        threadId: string;
+        commentId: string;
+    };
+    constructor(cause: Error, context: {
+        roomId: string;
+        threadId: string;
+        commentId: string;
+    });
+}
+declare class MarkInboxNotificationAsReadError extends Error {
+    cause: Error;
+    context: {
+        inboxNotificationId: string;
+    };
+    constructor(cause: Error, context: {
+        inboxNotificationId: string;
+    });
+}
+declare class UpdateNotificationSettingsError extends Error {
+    cause: Error;
+    context: {
+        roomId: string;
+    };
+    constructor(cause: Error, context: {
+        roomId: string;
+    });
+}
+declare type CommentsError<M extends BaseMetadata> = CreateThreadError<M> | EditThreadMetadataError<M> | CreateCommentError | EditCommentError | DeleteCommentError | MarkInboxNotificationAsReadError | UpdateNotificationSettingsError;
+
+declare type UseThreadsOptions<M extends BaseMetadata> = {
     /**
      * 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.
@@ -37,7 +129,7 @@ declare type UseThreadsOptions<TThreadMetadata extends BaseMetadata> = {
          * The metadata to filter the threads by. If provided, only threads with metadata that matches
          * the provided metadata will be returned. If not provided, all threads will be returned.
          */
-        metadata?: Partial<TThreadMetadata>;
+        metadata?: Partial<QueryMetadata<M>>;
     };
     /**
      * Whether to scroll to a comment on load based on the URL hash. Defaults to `true`.
@@ -81,21 +173,19 @@ declare type RoomInfoStateSuccess = {
     error?: never;
 };
 declare type RoomInfoState = RoomInfoStateLoading | RoomInfoStateError | RoomInfoStateSuccess;
-declare type CreateThreadOptions<TMetadata extends BaseMetadata> = [
-    TMetadata
-] extends [never] ? {
+declare type CreateThreadOptions<M extends BaseMetadata> = [M] extends [never] ? {
     body: CommentBody;
 } : {
     body: CommentBody;
-    metadata: TMetadata;
+    metadata: M;
 };
-declare type EditThreadMetadataOptions<TMetadata extends BaseMetadata> = [
-    TMetadata
-] extends [never] ? {
+declare type EditThreadMetadataOptions<M extends BaseMetadata> = [M] extends [
+    never
+] ? {
     threadId: string;
 } : {
     threadId: string;
-    metadata: Resolve<PartialNullable<TMetadata>>;
+    metadata: Resolve<PartialNullable<M>>;
 };
 declare type CreateCommentOptions = {
     threadId: string;
@@ -120,17 +210,17 @@ declare type ThreadsStateLoading = {
     threads?: never;
     error?: never;
 };
-declare type ThreadsStateResolved<TThreadMetadata extends BaseMetadata> = {
+declare type ThreadsStateResolved<M extends BaseMetadata> = {
     isLoading: false;
-    threads: ThreadData<TThreadMetadata>[];
+    threads: ThreadData<M>[];
     error?: Error;
 };
-declare type ThreadsStateSuccess<TThreadMetadata extends BaseMetadata> = {
+declare type ThreadsStateSuccess<M extends BaseMetadata> = {
     isLoading: false;
-    threads: ThreadData<TThreadMetadata>[];
+    threads: ThreadData<M>[];
     error?: never;
 };
-declare type ThreadsState<TThreadMetadata extends BaseMetadata> = ThreadsStateLoading | ThreadsStateResolved<TThreadMetadata>;
+declare type ThreadsState<M extends BaseMetadata> = ThreadsStateLoading | ThreadsStateResolved<M>;
 declare type InboxNotificationsStateLoading = {
     isLoading: true;
     inboxNotifications?: never;
@@ -184,7 +274,7 @@ declare type RoomNotificationSettingsStateSuccess = {
     error?: never;
 };
 declare type RoomNotificationSettingsState = RoomNotificationSettingsStateLoading | RoomNotificationSettingsStateError | RoomNotificationSettingsStateSuccess;
-declare type RoomProviderProps<TPresence extends JsonObject, TStorage extends LsonObject> = Resolve<{
+declare type RoomProviderProps<P extends JsonObject, S extends LsonObject> = Resolve<{
     /**
      * The id of the room you want to connect to
      */
@@ -216,17 +306,17 @@ declare type RoomProviderProps<TPresence extends JsonObject, TStorage extends Ls
      * Not necessary when you're on React v18 or later.
      */
     unstable_batchedUpdates?: (cb: () => void) => void;
-} & RoomInitializers<TPresence, TStorage>>;
+} & RoomInitializers<P, S>>;
 /**
  * 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<TPresence extends JsonObject, TStorage extends LsonObject, TUserMeta extends BaseUserMeta> = {
-    storage: LiveObject<TStorage>;
-    self: User<TPresence, TUserMeta>;
-    others: readonly User<TPresence, TUserMeta>[];
-    setMyPresence: (patch: Partial<TPresence>, options?: {
+declare type MutationContext<P extends JsonObject, S extends LsonObject, U extends BaseUserMeta> = {
+    storage: LiveObject<S>;
+    self: User<P, U>;
+    others: readonly User<P, U>[];
+    setMyPresence: (patch: Partial<P>, options?: {
         addToHistory: boolean;
     }) => void;
 };
@@ -240,25 +330,27 @@ declare type ThreadSubscription = {
     status: "subscribed";
     unreadSince: Date;
 };
-declare type SharedContextBundle<TUserMeta extends BaseUserMeta> = {
-    /**
-     * @beta
-     *
-     * Returns user info from a given user ID.
-     *
-     * @example
-     * const { user, error, isLoading } = useUser("user-id");
-     */
-    useUser(userId: string): UserState<TUserMeta["info"]>;
-    /**
-     * @private
-     *
-     * Returns room info from a given room ID.
-     *
-     * @example
-     * const { info, error, isLoading } = useRoomInfo("room-id");
-     */
-    useRoomInfo(roomId: string): RoomInfoState;
+declare type SharedContextBundle<U extends BaseUserMeta> = {
+    classic: {
+        /**
+         * @beta
+         *
+         * Returns user info from a given user ID.
+         *
+         * @example
+         * const { user, error, isLoading } = useUser("user-id");
+         */
+        useUser(userId: string): UserState<U["info"]>;
+        /**
+         * @private
+         *
+         * Returns room info from a given room ID.
+         *
+         * @example
+         * const { info, error, isLoading } = useRoomInfo("room-id");
+         */
+        useRoomInfo(roomId: string): RoomInfoState;
+    };
     suspense: {
         /**
          * @beta
@@ -268,7 +360,7 @@ declare type SharedContextBundle<TUserMeta extends BaseUserMeta> = {
          * @example
          * const { user } = useUser("user-id");
          */
-        useUser(userId: string): UserStateSuccess<TUserMeta["info"]>;
+        useUser(userId: string): UserStateSuccess<U["info"]>;
         /**
          * @private
          *
@@ -283,24 +375,24 @@ declare type SharedContextBundle<TUserMeta extends BaseUserMeta> = {
 /**
  * Properties that are the same in RoomContext and RoomContext["suspense"].
  */
-declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage extends LsonObject, TUserMeta extends BaseUserMeta, TRoomEvent extends Json, TThreadMetadata extends BaseMetadata> = {
+declare type RoomContextBundleCommon<P extends JsonObject, S extends LsonObject, U extends BaseUserMeta, E extends Json, M extends BaseMetadata> = {
     /**
      * 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
      * set up a context bridge between two React renderers.
      */
-    RoomContext: React.Context<Room<TPresence, TStorage, TUserMeta, TRoomEvent> | null>;
+    RoomContext: React.Context<Room<P, S, U, E> | null>;
     /**
      * Makes a Room available in the component hierarchy below.
      * Joins the room when the component is mounted, and automatically leaves
      * the room when the component is unmounted.
      */
-    RoomProvider(props: RoomProviderProps<TPresence, TStorage>): JSX.Element;
+    RoomProvider(props: RoomProviderProps<P, S>): JSX.Element;
     /**
      * Returns the Room of the nearest RoomProvider above in the React component
      * tree.
      */
-    useRoom(): Room<TPresence, TStorage, TUserMeta, TRoomEvent>;
+    useRoom(): Room<P, S, U, E>;
     /**
      * Returns the current connection status for the Room, and triggers
      * a re-render whenever it changes. Can be used to render a status badge.
@@ -321,7 +413,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      *
      * broadcast({ type: "CUSTOM_EVENT", data: { x: 0, y: 0 } });
      */
-    useBroadcastEvent(): (event: TRoomEvent, options?: BroadcastOptions) => void;
+    useBroadcastEvent(): (event: E, options?: BroadcastOptions) => void;
     /**
      * Get informed when users enter or leave the room, as an event.
      *
@@ -334,7 +426,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      *   }
      * })
      */
-    useOthersListener(callback: (event: OthersEvent<TPresence, TUserMeta>) => void): void;
+    useOthersListener(callback: (event: OthersEvent<P, U>) => void): void;
     /**
      * Get informed when reconnecting to the Liveblocks servers is taking
      * longer than usual. This typically is a sign of a client that has lost
@@ -377,7 +469,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      *   }
      * });
      */
-    useEventListener(callback: (data: RoomEventMessage<TPresence, TUserMeta, TRoomEvent>) => void): void;
+    useEventListener(callback: (data: RoomEventMessage<P, U, E>) => void): void;
     /**
      * Returns the room.history
      */
@@ -407,7 +499,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      * @example
      * const [root] = useStorageRoot();
      */
-    useStorageRoot(): [root: LiveObject<TStorage> | null];
+    useStorageRoot(): [root: LiveObject<S> | null];
     /**
      * Returns the presence of the current user of the current room, and a function to update it.
      * It is different from the setState function returned by the useState hook from React.
@@ -421,8 +513,8 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      * // At the next render, "myPresence" will be equal to "{ x: 0, y: 0 }"
      */
     useMyPresence(): [
-        TPresence,
-        (patch: Partial<TPresence>, options?: {
+        P,
+        (patch: Partial<P>, options?: {
             addToHistory: boolean;
         }) => void
     ];
@@ -437,7 +529,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      *
      * // At the next render, the presence of the current user will be equal to "{ x: 0, y: 0 }"
      */
-    useUpdateMyPresence(): (patch: Partial<TPresence>, options?: {
+    useUpdateMyPresence(): (patch: Partial<P>, options?: {
         addToHistory: boolean;
     }) => void;
     /**
@@ -484,7 +576,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      *
      * deleteLayers();
      */
-    useMutation<F extends (context: MutationContext<TPresence, TStorage, TUserMeta>, ...args: any[]) => any>(callback: F, deps: readonly unknown[]): OmitFirstArg<F>;
+    useMutation<F extends (context: MutationContext<P, S, U>, ...args: any[]) => any>(callback: F, deps: readonly unknown[]): OmitFirstArg<F>;
     /**
      * Returns an object that lets you get information about all the users
      * currently connected in the room.
@@ -504,7 +596,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      *   </>
      * )
      */
-    useOthers(): readonly User<TPresence, TUserMeta>[];
+    useOthers(): readonly User<P, U>[];
     /**
      * Extract arbitrary data based on all the users currently connected in the
      * room (except yourself).
@@ -526,7 +618,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      * const someoneIsTyping = useOthers(users => users.some(u => u.presence.isTyping));
      *
      */
-    useOthers<T>(selector: (others: readonly User<TPresence, TUserMeta>[]) => T, isEqual?: (prev: T, curr: T) => boolean): T;
+    useOthers<T>(selector: (others: readonly User<P, U>[]) => T, isEqual?: (prev: T, curr: T) => boolean): T;
     /**
      * Returns an array of connection IDs. This matches the values you'll get by
      * using the `useOthers()` hook.
@@ -566,7 +658,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      *   shallow,  // 👈
      * );
      */
-    useOthersMapped<T>(itemSelector: (other: User<TPresence, TUserMeta>) => T, itemIsEqual?: (prev: T, curr: T) => boolean): ReadonlyArray<readonly [connectionId: number, data: T]>;
+    useOthersMapped<T>(itemSelector: (other: User<P, U>) => T, itemIsEqual?: (prev: T, curr: T) => boolean): ReadonlyArray<readonly [connectionId: number, data: T]>;
     /**
      * Given a connection ID (as obtained by using `useOthersConnectionIds`), you
      * can call this selector deep down in your component stack to only have the
@@ -576,7 +668,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      * // Returns only the selected values re-renders whenever that selection changes)
      * const { x, y } = useOther(2, user => user.presence.cursor);
      */
-    useOther<T>(connectionId: number, selector: (other: User<TPresence, TUserMeta>) => T, isEqual?: (prev: T, curr: T) => boolean): T;
+    useOther<T>(connectionId: number, selector: (other: User<P, U>) => T, isEqual?: (prev: T, curr: T) => boolean): T;
     /**
      * @beta
      *
@@ -586,7 +678,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      * const createThread = useCreateThread();
      * createThread({ body: {}, metadata: {} });
      */
-    useCreateThread(): (options: CreateThreadOptions<TThreadMetadata>) => ThreadData<TThreadMetadata>;
+    useCreateThread(): (options: CreateThreadOptions<M>) => ThreadData<M>;
     /**
      * @beta
      *
@@ -597,7 +689,7 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      * const editThreadMetadata = useEditThreadMetadata();
      * editThreadMetadata({ threadId: "th_xxx", metadata: {} })
      */
-    useEditThreadMetadata(): (options: EditThreadMetadataOptions<TThreadMetadata>) => void;
+    useEditThreadMetadata(): (options: EditThreadMetadataOptions<M>) => void;
     /**
      * @beta
      *
@@ -680,6 +772,10 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
      */
     useThreadSubscription(threadId: string): ThreadSubscription;
 };
+declare type ThreadCreateCallback = (threadId: string) => void;
+declare type ThreadDeleteCallback = (threadId: string) => void;
+declare type ComposerFocusCallback = (commentId: string | undefined, threadId: string | undefined) => void;
+declare type IsThreadActiveCallback = (threadId: string) => boolean;
 /**
  * @private
  *
@@ -688,11 +784,19 @@ declare type RoomContextBundleCommon<TPresence extends JsonObject, TStorage exte
  * will probably happen if you do.
  */
 declare type PrivateRoomContextApi = {
-    hasResolveMentionSuggestions: boolean;
     useMentionSuggestions(search?: string): string[] | undefined;
     useCurrentUserId(): string | null;
+    useCommentsErrorListener<M extends BaseMetadata>(callback: (err: CommentsError<M>) => void): void;
+    ThreadCreateCallbackProvider: Provider<ThreadCreateCallback | null>;
+    useThreadCreateCallback(): ThreadCreateCallback | null;
+    ThreadDeleteCallbackProvider: Provider<ThreadDeleteCallback | null>;
+    useThreadDeleteCallback(): ThreadDeleteCallback | null;
+    ComposerFocusCallbackProvider: Provider<ComposerFocusCallback | null>;
+    useComposerFocusCallback(): ComposerFocusCallback | null;
+    IsThreadActiveCallbackProvider: Provider<IsThreadActiveCallback | null>;
+    useIsThreadActiveCallback(): IsThreadActiveCallback | null;
 };
-declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends LsonObject, TUserMeta extends BaseUserMeta, TRoomEvent extends Json, TThreadMetadata extends BaseMetadata> = Resolve<RoomContextBundleCommon<TPresence, TStorage, TUserMeta, TRoomEvent, TThreadMetadata> & Omit<SharedContextBundle<TUserMeta>, "suspense"> & {
+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"] & {
     /**
      * Extract arbitrary data from the Liveblocks Storage state, using an
      * arbitrary selector function.
@@ -712,7 +816,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
      * return the result of a .map() or .filter() call from the selector. In
      * those cases, you'll probably want to use a `shallow` comparison check.
      */
-    useStorage<T>(selector: (root: ToImmutable<TStorage>) => T, isEqual?: (prev: T | null, curr: T | null) => boolean): T | null;
+    useStorage<T>(selector: (root: ToImmutable<S>) => T, isEqual?: (prev: T | null, curr: T | null) => boolean): T | null;
     /**
      * Gets the current user once it is connected to the room.
      *
@@ -720,7 +824,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
      * const me = useSelf();
      * const { x, y } = me.presence.cursor;
      */
-    useSelf(): User<TPresence, TUserMeta> | null;
+    useSelf(): User<P, U> | null;
     /**
      * Extract arbitrary data based on the current user.
      *
@@ -744,7 +848,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
      * }
      *
      */
-    useSelf<T>(selector: (me: User<TPresence, TUserMeta>) => T, isEqual?: (prev: T, curr: T) => boolean): T | null;
+    useSelf<T>(selector: (me: User<P, U>) => T, isEqual?: (prev: T, curr: T) => boolean): T | null;
     /**
      * @beta
      *
@@ -753,7 +857,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
      * @example
      * const { threads, error, isLoading } = useThreads();
      */
-    useThreads(options?: UseThreadsOptions<TThreadMetadata>): ThreadsState<TThreadMetadata>;
+    useThreads(options?: UseThreadsOptions<M>): ThreadsState<M>;
     /**
      * @beta
      *
@@ -782,7 +886,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
      * @deprecated We no longer recommend using `useList`. Prefer `useStorage`
      * for reading and `useMutation` for writing.
      */
-    useList<TKey extends Extract<keyof TStorage, string>>(key: TKey): TStorage[TKey] | null;
+    useList<TKey extends Extract<keyof S, string>>(key: TKey): S[TKey] | null;
     /**
      * Returns the LiveMap associated with the provided key. If the LiveMap
      * does not exist, a new empty LiveMap will be created. The hook triggers
@@ -799,7 +903,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
      * @deprecated We no longer recommend using `useMap`. Prefer `useStorage`
      * for reading and `useMutation` for writing.
      */
-    useMap<TKey extends Extract<keyof TStorage, string>>(key: TKey): TStorage[TKey] | null;
+    useMap<TKey extends Extract<keyof S, string>>(key: TKey): S[TKey] | null;
     /**
      * Returns the LiveObject associated with the provided key.
      * The hook triggers a re-render if the LiveObject is updated, however it does not triggers a re-render if a nested CRDT is updated.
@@ -814,8 +918,8 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
      * @deprecated We no longer recommend using `useObject`. Prefer `useStorage`
      * for reading and `useMutation` for writing.
      */
-    useObject<TKey extends Extract<keyof TStorage, string>>(key: TKey): TStorage[TKey] | null;
-    suspense: Resolve<RoomContextBundleCommon<TPresence, TStorage, TUserMeta, TRoomEvent, TThreadMetadata> & SharedContextBundle<TUserMeta>["suspense"] & {
+    useObject<TKey extends Extract<keyof S, string>>(key: TKey): S[TKey] | null;
+    suspense: Resolve<RoomContextBundleCommon<P, S, U, E, M> & SharedContextBundle<U>["suspense"] & {
         /**
          * Extract arbitrary data from the Liveblocks Storage state, using an
          * arbitrary selector function.
@@ -835,7 +939,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
          * return the result of a .map() or .filter() call from the selector. In
          * those cases, you'll probably want to use a `shallow` comparison check.
          */
-        useStorage<T>(selector: (root: ToImmutable<TStorage>) => T, isEqual?: (prev: T, curr: T) => boolean): T;
+        useStorage<T>(selector: (root: ToImmutable<S>) => T, isEqual?: (prev: T, curr: T) => boolean): T;
         /**
          * Gets the current user once it is connected to the room.
          *
@@ -843,7 +947,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
          * const me = useSelf();
          * const { x, y } = me.presence.cursor;
          */
-        useSelf(): User<TPresence, TUserMeta>;
+        useSelf(): User<P, U>;
         /**
          * Extract arbitrary data based on the current user.
          *
@@ -867,7 +971,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
          * }
          *
          */
-        useSelf<T>(selector: (me: User<TPresence, TUserMeta>) => T, isEqual?: (prev: T, curr: T) => boolean): T;
+        useSelf<T>(selector: (me: User<P, U>) => T, isEqual?: (prev: T, curr: T) => boolean): T;
         /**
          * @beta
          *
@@ -876,7 +980,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
          * @example
          * const { threads } = useThreads();
          */
-        useThreads(options?: UseThreadsOptions<TThreadMetadata>): ThreadsStateSuccess<TThreadMetadata>;
+        useThreads(options?: UseThreadsOptions<M>): ThreadsStateSuccess<M>;
         /**
          * @beta
          *
@@ -905,7 +1009,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
          * @deprecated We no longer recommend using `useList`. Prefer `useStorage`
          * for reading and `useMutation` for writing.
          */
-        useList<TKey extends Extract<keyof TStorage, string>>(key: TKey): TStorage[TKey];
+        useList<TKey extends Extract<keyof S, string>>(key: TKey): S[TKey];
         /**
          * Returns the LiveMap associated with the provided key. If the LiveMap
          * does not exist, a new empty LiveMap will be created. The hook triggers
@@ -922,7 +1026,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
          * @deprecated We no longer recommend using `useMap`. Prefer `useStorage`
          * for reading and `useMutation` for writing.
          */
-        useMap<TKey extends Extract<keyof TStorage, string>>(key: TKey): TStorage[TKey];
+        useMap<TKey extends Extract<keyof S, string>>(key: TKey): S[TKey];
         /**
          * Returns the LiveObject associated with the provided key.
          * The hook triggers a re-render if the LiveObject is updated, however it does not triggers a re-render if a nested CRDT is updated.
@@ -937,7 +1041,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
          * @deprecated We no longer recommend using `useObject`. Prefer `useStorage`
          * for reading and `useMutation` for writing.
          */
-        useObject<TKey extends Extract<keyof TStorage, string>>(key: TKey): TStorage[TKey];
+        useObject<TKey extends Extract<keyof S, string>>(key: TKey): S[TKey];
     }>;
 }> & {
     /**
@@ -952,7 +1056,7 @@ declare type RoomContextBundle<TPresence extends JsonObject, TStorage extends Ls
 /**
  * Properties that are the same in LiveblocksContext and LiveblocksContext["suspense"].
  */
-declare type LiveblocksContextBundleCommon = {
+declare type LiveblocksContextBundleCommon<M extends BaseMetadata> = {
     /**
      * @beta
      *
@@ -980,6 +1084,15 @@ declare type LiveblocksContextBundleCommon = {
      * markAllInboxNotificationsAsRead();
      */
     useMarkAllInboxNotificationsAsRead(): () => void;
+    /**
+     * @beta
+     *
+     * Returns the thread associated with a `"thread"` inbox notification.
+     *
+     * @example
+     * const thread = useInboxNotificationThread("in_xxx");
+     */
+    useInboxNotificationThread(inboxNotificationId: string): ThreadData<M>;
 };
 /**
  * @private
@@ -989,15 +1102,6 @@ declare type LiveblocksContextBundleCommon = {
  * will probably happen if you do.
  */
 declare type PrivateLiveblocksContextApi = {
-    /**
-     * @private
-     *
-     * Returns a thread from the cache.
-     *
-     * @example
-     * const thread = useThreadFromCache("th_xxx");
-     */
-    useThreadFromCache(threadId: string): ThreadData<BaseMetadata>;
     /**
      * @private
      *
@@ -1005,7 +1109,7 @@ declare type PrivateLiveblocksContextApi = {
      */
     useCurrentUserId(): string | null;
 };
-declare type LiveblocksContextBundle<TUserMeta extends BaseUserMeta> = Resolve<LiveblocksContextBundleCommon & Omit<SharedContextBundle<TUserMeta>, "suspense"> & {
+declare type LiveblocksContextBundle<U extends BaseUserMeta, M extends BaseMetadata> = Resolve<LiveblocksContextBundleCommon<M> & SharedContextBundle<U>["classic"] & {
     /**
      * @beta
      *
@@ -1024,7 +1128,7 @@ declare type LiveblocksContextBundle<TUserMeta extends BaseUserMeta> = Resolve<L
      * const { count, error, isLoading } = useUnreadInboxNotificationsCount();
      */
     useUnreadInboxNotificationsCount(): UnreadInboxNotificationsCountState;
-    suspense: Resolve<LiveblocksContextBundleCommon & SharedContextBundle<TUserMeta>["suspense"] & {
+    suspense: Resolve<LiveblocksContextBundleCommon<M> & SharedContextBundle<U>["suspense"] & {
         /**
          * @beta
          *
@@ -1055,28 +1159,53 @@ declare type LiveblocksContextBundle<TUserMeta extends BaseUserMeta> = Resolve<L
     readonly [kInternal]: PrivateLiveblocksContextApi;
 };
 
+/** DP = Default Presence type */
+declare type DP = JsonObject;
+/** DS = Default Storage type */
+declare type DS = LsonObject;
+/** DU = Default UserMeta type */
+declare type DU = BaseUserMeta;
+/**
+ * @private
+ *
+ * This is an internal API, use `createLiveblocksContext` or `createRoomContext` instead.
+ */
+declare function useSharedContextBundle(): RoomContextBundle<JsonObject, LsonObject, BaseUserMeta, Json, BaseMetadata$1> | LiveblocksContextBundle<BaseUserMeta, BaseMetadata$1>;
+
+declare type OpaqueClient$1 = Client<BaseUserMeta>;
+/**
+ * @beta This is an internal API for now, but it will become public eventually.
+ */
+declare function useClient(): OpaqueClient$1;
+/**
+ * @private
+ *
+ * This is an internal API, use "createLiveblocksContext" instead.
+ */
+declare function useLiveblocksContextBundleOrNull(): LiveblocksContextBundle<BaseUserMeta, BaseMetadata$1> | null;
 /**
  * @private
  *
  * This is an internal API, use "createLiveblocksContext" instead.
  */
-declare function useLiveblocksContextBundle(): LiveblocksContextBundle<BaseUserMeta>;
-declare function createLiveblocksContext<TUserMeta extends BaseUserMeta = BaseUserMeta, TThreadMetadata extends BaseMetadata$1 = never>(client: Client): LiveblocksContextBundle<TUserMeta>;
+declare function useLiveblocksContextBundle(): LiveblocksContextBundle<BaseUserMeta, BaseMetadata$1>;
+declare function createLiveblocksContext<U extends BaseUserMeta = DU, M extends BaseMetadata$1 = never>(client: OpaqueClient$1): LiveblocksContextBundle<U, M>;
 
+declare type OpaqueClient = Client<BaseUserMeta>;
 /**
  * @private
  *
  * This is an internal API, use `createRoomContext` instead.
  */
-declare function useRoomContextBundle(): RoomContextBundle<JsonObject, LsonObject, BaseUserMeta, never, BaseMetadata>;
-declare type Options<TUserMeta extends BaseUserMeta> = {
+declare function useRoomContextBundle(): RoomContextBundle<JsonObject, LsonObject, BaseUserMeta, Json, BaseMetadata$1>;
+declare type Options<U extends BaseUserMeta> = {
     /**
      * @deprecated Define 'resolveUsers' in 'createClient' from '@liveblocks/client' instead.
      * Please refer to our Upgrade Guide to learn more, see https://liveblocks.io/docs/platform/upgrading/1.10.
      *
      * A function that returns user info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(TUserMeta["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
     /**
      * @deprecated Define 'resolveMentionSuggestions' in 'createClient' from '@liveblocks/client' instead.
      * Please refer to our Upgrade Guide to learn more, see https://liveblocks.io/docs/platform/upgrading/1.10.
@@ -1085,13 +1214,7 @@ declare type Options<TUserMeta extends BaseUserMeta> = {
      */
     resolveMentionSuggestions?: (args: ResolveMentionSuggestionsArgs) => OptionalPromise<string[]>;
 };
-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>;
-
-/**
- * @private
- *
- * This is an internal API, use `createLiveblocksContext` or `createRoomContext` instead.
- */
-declare function useSharedContextBundle(): RoomContextBundle<_liveblocks_core.JsonObject, _liveblocks_core.LsonObject, BaseUserMeta$1, never, _liveblocks_core.BaseMetadata> | LiveblocksContextBundle<BaseUserMeta$1>;
+declare function createRoomContext<P extends JsonObject = DP, S extends LsonObject = DS, U extends BaseUserMeta = DU, E extends Json = never, // TODO Change this to DE for 2.0
+M extends BaseMetadata$1 = never>(client: OpaqueClient, options?: Options<U>): RoomContextBundle<P, S, U, E, M>;
 
-export { ClientSideSuspense, type MutationContext, type UseThreadsOptions, createLiveblocksContext, createRoomContext, useLiveblocksContextBundle, useRoomContextBundle, useSharedContextBundle };
+export { ClientSideSuspense, CreateThreadError, DeleteCommentError, type MutationContext, type UseThreadsOptions, createLiveblocksContext, createRoomContext, useClient, useLiveblocksContextBundle, useLiveblocksContextBundleOrNull, useRoomContextBundle, useSharedContextBundle };