@assistant-ui/react-native 0.1.42 → 0.1.44

package/src/primitives/messagePart/MessagePartText.test.tsx

@@ -0,0 +1,80 @@
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import type { ThreadMessageLike } from "@assistant-ui/core";
+import {
+  AssistantRuntimeProvider,
+  MessageByIndexProvider,
+  PartByIndexProvider,
+  useExternalStoreRuntime,
+} from "@assistant-ui/core/react";
+import { MessagePartPrimitiveText } from "./MessagePartText";
+
+(globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
+
+const messages: ThreadMessageLike[] = [
+  {
+    role: "assistant",
+    content: [
+      { type: "text", text: "Answer" },
+      { type: "reasoning", text: "Thinking" },
+      { type: "image", image: "https://example.com/image.png" },
+    ],
+  },
+];
+
+const App = ({ partIndex }: { partIndex: number }) => {
+  const runtime = useExternalStoreRuntime({
+    messages,
+    convertMessage: (message) => message,
+    onNew: async () => {
+      throw new Error("This thread is read-only");
+    },
+  });
+
+  return (
+    <AssistantRuntimeProvider runtime={runtime}>
+      <MessageByIndexProvider index={0}>
+        <PartByIndexProvider index={partIndex}>
+          <MessagePartPrimitiveText testID="text" />
+        </PartByIndexProvider>
+      </MessageByIndexProvider>
+    </AssistantRuntimeProvider>
+  );
+};
+
+describe("MessagePartPrimitiveText", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    container.remove();
+  });
+
+  const mount = async (partIndex: number) => {
+    await act(async () => root.render(<App partIndex={partIndex} />));
+    return container.querySelector('[data-testid="text"]') as HTMLElement;
+  };
+
+  it("renders text from the current text part", async () => {
+    const text = await mount(0);
+    expect(text.textContent).toBe("Answer");
+  });
+
+  it("renders text from the current reasoning part", async () => {
+    const text = await mount(1);
+    expect(text.textContent).toBe("Thinking");
+  });
+
+  it("renders empty text for a non-text part", async () => {
+    const text = await mount(2);
+    expect(text.textContent).toBe("");
+  });
+});

package/src/primitives/messagePart/MessagePartText.tsx

@@ -0,0 +1,36 @@
+import {
+  type ComponentRef,
+  type ForwardRefExoticComponent,
+  forwardRef,
+  type RefAttributes,
+} from "react";
+import { Text, type TextProps } from "react-native";
+import { useAuiState } from "@assistant-ui/store";
+
+export namespace MessagePartPrimitiveText {
+  export type Element = ComponentRef<typeof Text>;
+  export type Props = Omit<TextProps, "children">;
+}
+
+export const MessagePartPrimitiveText: ForwardRefExoticComponent<
+  MessagePartPrimitiveText.Props &
+    RefAttributes<MessagePartPrimitiveText.Element>
+> = forwardRef<
+  MessagePartPrimitiveText.Element,
+  MessagePartPrimitiveText.Props
+>((props, forwardedRef) => {
+  const text = useAuiState((s) => {
+    const part = s.part;
+    return part.type === "text" || part.type === "reasoning" ? part.text : "";
+  });
+
+  return (
+    <Text {...props} ref={forwardedRef}>
+      {text}
+    </Text>
+  );
+});
+
+MessagePartPrimitiveText.displayName = "MessagePartPrimitive.Text";
+
+export type MessagePartTextProps = MessagePartPrimitiveText.Props;

package/src/primitives/messagePart.ts

@@ -0,0 +1,10 @@
+export {
+  MessagePartPrimitiveText as Text,
+  type MessagePartTextProps as TextProps,
+} from "./messagePart/MessagePartText";
+export {
+  MessagePartPrimitiveImage as Image,
+  type MessagePartImageProps as ImageProps,
+} from "./messagePart/MessagePartImage";
+export { MessagePartPrimitiveInProgress as InProgress } from "./messagePart/MessagePartInProgress";
+export { PartPrimitiveMessages as Messages } from "@assistant-ui/core/react";

package/src/primitives/thread/ThreadMessages.test.tsx

@@ -1,8 +1,9 @@
 import { act, createRef } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type { FlatList } from "react-native";
+import type { FlatList, FlatListProps } from "react-native";
 import type { ThreadMessage } from "@assistant-ui/core";
+import type { MessageState } from "@assistant-ui/core/store";
 import { ThreadMessages, ThreadMessagesFlatList } from "./ThreadMessages";
 
 type Msg = { id: string; role: string };
@@ -12,7 +13,7 @@ const h = vi.hoisted(() => ({
     thread: { messages: [] as Msg[] },
     message: { role: "user" as string, composer: { isEditing: false } },
   },
-  itemState: { role: "user" } as { role: string },
+  itemState: { role: "user" } as { role: string; parts?: unknown[] },
   events: {} as Record<string, Set<() => void>>,
   flatListProps: null as Record<string, unknown> | null,
   scrollToOffset: vi.fn(),
@@ -154,6 +155,10 @@ describe("ThreadMessages", () => {
       onContentSizeChange?: (width: number, height: number) => void;
       onLayout?: (event: unknown) => void;
       onScroll?: (event: unknown) => void;
+      onStartReached?: NonNullable<
+        FlatListProps<ThreadMessage>["onStartReached"]
+      >;
+      onStartReachedThreshold?: number;
       scrollEventThrottle?: number;
     } | null;
     if (!props) throw new Error("FlatList was not rendered");
@@ -299,13 +304,15 @@ describe("ThreadMessages", () => {
   describe("children mode", () => {
     it("renders via the children render prop", async () => {
       h.state.thread.messages = [{ id: "1", role: "user" }];
-      h.itemState = { role: "user" };
-      const children = vi.fn(({ message }: { message: { role: string } }) => (
-        <span data-testid="child">child:{message.role}</span>
+      h.itemState = { role: "user", parts: [] };
+      const children = vi.fn(({ message }: { message: MessageState }) => (
+        <span data-testid="child">
+          child:{message.role}:{message.parts.length}
+        </span>
       ));
       await mount({ children });
       const el = container.querySelector('[data-testid="child"]');
-      expect(el?.textContent).toBe("child:user");
+      expect(el?.textContent).toBe("child:user:0");
       expect(children).toHaveBeenCalled();
     });
   });
@@ -392,6 +399,183 @@ describe("ThreadMessages", () => {
     expect(h.scrollToOffset).not.toHaveBeenCalled();
   });
 
+  describe("MessagesFlatList history", () => {
+    it("wires loadMore only while history can load more", async () => {
+      const loadMore = vi.fn();
+
+      await mountFlatList({
+        components: messageComponents,
+        history: { hasMore: true, isLoadingMore: false, loadMore },
+      });
+      getFlatListProps().onStartReached?.({ distanceFromStart: 0 });
+      expect(loadMore).toHaveBeenCalledOnce();
+
+      await mountFlatList({
+        components: messageComponents,
+        history: { hasMore: false, isLoadingMore: false, loadMore },
+      });
+      expect(getFlatListProps().onStartReached).toBeUndefined();
+
+      await mountFlatList({
+        components: messageComponents,
+        history: { hasMore: true, isLoadingMore: true, loadMore },
+      });
+      expect(getFlatListProps().onStartReached).toBeUndefined();
+    });
+
+    it("loads one page when start reached fires again before rerender", async () => {
+      const loadMore = vi.fn();
+      const callerOnStartReached = vi.fn();
+
+      await mountFlatList({
+        components: messageComponents,
+        history: { hasMore: true, isLoadingMore: false, loadMore },
+        onStartReached: callerOnStartReached,
+      });
+      const installedOnStartReached = getFlatListProps().onStartReached;
+
+      installedOnStartReached?.({ distanceFromStart: 0 });
+      installedOnStartReached?.({ distanceFromStart: 0 });
+
+      expect(loadMore).toHaveBeenCalledOnce();
+      expect(callerOnStartReached).toHaveBeenCalledTimes(2);
+    });
+
+    it("loads again after a commit without a loading transition", async () => {
+      const loadMore = vi.fn();
+      const history = { hasMore: true, isLoadingMore: false, loadMore };
+
+      await mountFlatList({ components: messageComponents, history });
+      getFlatListProps().onStartReached?.({ distanceFromStart: 0 });
+
+      await mountFlatList({ components: messageComponents, history });
+      getFlatListProps().onStartReached?.({ distanceFromStart: 0 });
+
+      expect(loadMore).toHaveBeenCalledTimes(2);
+    });
+
+    it("does not carry a request latch to another history source", async () => {
+      const firstLoadMore = vi.fn();
+      const secondLoadMore = vi.fn();
+
+      await mountFlatList({
+        components: messageComponents,
+        history: {
+          hasMore: true,
+          isLoadingMore: false,
+          loadMore: firstLoadMore,
+        },
+      });
+      getFlatListProps().onStartReached?.({ distanceFromStart: 0 });
+
+      await mountFlatList({
+        components: messageComponents,
+        history: {
+          hasMore: true,
+          isLoadingMore: false,
+          loadMore: secondLoadMore,
+        },
+      });
+      getFlatListProps().onStartReached?.({ distanceFromStart: 0 });
+
+      expect(firstLoadMore).toHaveBeenCalledOnce();
+      expect(secondLoadMore).toHaveBeenCalledOnce();
+    });
+
+    it("loads again after the previous history request settles", async () => {
+      const loadMore = vi.fn();
+
+      await mountFlatList({
+        components: messageComponents,
+        history: { hasMore: true, isLoadingMore: false, loadMore },
+      });
+      getFlatListProps().onStartReached?.({ distanceFromStart: 0 });
+
+      await mountFlatList({
+        components: messageComponents,
+        history: { hasMore: true, isLoadingMore: true, loadMore },
+      });
+      await mountFlatList({
+        components: messageComponents,
+        history: { hasMore: true, isLoadingMore: false, loadMore },
+      });
+      getFlatListProps().onStartReached?.({ distanceFromStart: 0 });
+
+      expect(loadMore).toHaveBeenCalledTimes(2);
+    });
+
+    it("allows retrying when loadMore throws synchronously", async () => {
+      const loadError = new Error("load failed");
+      const loadMore = vi
+        .fn()
+        .mockImplementationOnce(() => {
+          throw loadError;
+        })
+        .mockImplementationOnce(() => undefined);
+
+      await mountFlatList({
+        components: messageComponents,
+        history: { hasMore: true, isLoadingMore: false, loadMore },
+      });
+      const onStartReached = getFlatListProps().onStartReached;
+
+      expect(() => onStartReached?.({ distanceFromStart: 0 })).toThrow(
+        loadError,
+      );
+      expect(() => onStartReached?.({ distanceFromStart: 0 })).not.toThrow();
+      expect(loadMore).toHaveBeenCalledTimes(2);
+    });
+
+    it("defaults the history threshold and preserves a caller override", async () => {
+      const history = {
+        hasMore: true,
+        isLoadingMore: false,
+        loadMore: vi.fn(),
+      };
+
+      await mountFlatList({ components: messageComponents, history });
+      expect(getFlatListProps().onStartReachedThreshold).toBe(1);
+
+      await mountFlatList({
+        components: messageComponents,
+        history,
+        onStartReachedThreshold: 0.5,
+      });
+      expect(getFlatListProps().onStartReachedThreshold).toBe(0.5);
+    });
+
+    it("runs a caller onStartReached before loading more history", async () => {
+      const calls: string[] = [];
+      const info = { distanceFromStart: 42 };
+      const onStartReached = vi.fn(() => calls.push("onStartReached"));
+
+      await mountFlatList({
+        components: messageComponents,
+        history: {
+          hasMore: true,
+          isLoadingMore: false,
+          loadMore: () => calls.push("loadMore"),
+        },
+        onStartReached,
+      });
+
+      getFlatListProps().onStartReached?.(info);
+
+      expect(onStartReached).toHaveBeenCalledWith(info);
+      expect(calls).toEqual(["onStartReached", "loadMore"]);
+    });
+
+    it("leaves start-reached props untouched without history", async () => {
+      const onStartReached = vi.fn();
+
+      await mountFlatList({ components: messageComponents, onStartReached });
+
+      const props = getFlatListProps();
+      expect(props.onStartReached).toBe(onStartReached);
+      expect(props).not.toHaveProperty("onStartReachedThreshold");
+    });
+  });
+
   describe("MessagesFlatList auto-scroll", () => {
     it("scrolls to the bottom when messages first appear", async () => {
       h.state.thread.messages = [{ id: "1", role: "user" }];

package/src/primitives/thread/ThreadMessages.tsx

@@ -17,7 +17,8 @@ import {
   type NativeScrollEvent,
   type NativeSyntheticEvent,
 } from "react-native";
-import type { MessageState, ThreadMessage } from "@assistant-ui/core";
+import type { ThreadMessage } from "@assistant-ui/core";
+import type { MessageState } from "@assistant-ui/core/store";
 import {
   RenderChildrenWithAccessor,
   useAuiEvent,
@@ -67,6 +68,13 @@ export type ThreadMessagesFlatListProps = Omit<
     scrollToBottomOnRunStart?: boolean | undefined;
     scrollToBottomOnInitialize?: boolean | undefined;
     scrollToBottomOnThreadSwitch?: boolean | undefined;
+    history?:
+      | {
+          hasMore: boolean;
+          isLoadingMore: boolean;
+          loadMore: () => void;
+        }
+      | undefined;
   };
 
 /** @deprecated Use ThreadMessagesFlatListProps instead. */
@@ -75,6 +83,42 @@ export type ThreadMessagesProps = ThreadMessagesFlatListProps;
 const DEFAULT_SYSTEM_MESSAGE = () => null;
 const AT_BOTTOM_THRESHOLD = 4;
 
+const useHistoryLoad = (
+  history: ThreadMessagesFlatListProps["history"],
+  onStartReached: FlatListProps<ThreadMessage>["onStartReached"],
+) => {
+  const loadRequestedRef = useRef(false);
+  const hasMore = history?.hasMore ?? false;
+  const isLoadingMore = history?.isLoadingMore ?? false;
+
+  // The latch is scoped to one commit so a no-op load cannot disable paging.
+  useEffect(() => {
+    loadRequestedRef.current = isLoadingMore;
+  });
+
+  const handleStartReached = useCallback<
+    NonNullable<FlatListProps<ThreadMessage>["onStartReached"]>
+  >(
+    (info) => {
+      onStartReached?.(info);
+      if (loadRequestedRef.current) return;
+      loadRequestedRef.current = true;
+      try {
+        history?.loadMore();
+      } catch (error) {
+        loadRequestedRef.current = false;
+        throw error;
+      }
+    },
+    [history, onStartReached],
+  );
+
+  return {
+    canLoadMore: hasMore && !isLoadingMore,
+    handleStartReached,
+  };
+};
+
 const getComponent = (
   components: MessageComponents,
   role: ThreadMessage["role"],
@@ -415,10 +459,13 @@ export const ThreadMessagesFlatList = forwardRef<
       onContentSizeChange,
       onLayout,
       onScroll,
+      onStartReached,
+      onStartReachedThreshold,
       scrollEventThrottle,
       scrollToBottomOnInitialize,
       scrollToBottomOnRunStart,
       scrollToBottomOnThreadSwitch,
+      history,
       ...flatListProps
     },
     forwardedRef,
@@ -485,6 +532,11 @@ export const ThreadMessagesFlatList = forwardRef<
       [handleAutoScrollContentSizeChange, onContentSizeChange],
     );
 
+    const { canLoadMore, handleStartReached } = useHistoryLoad(
+      history,
+      onStartReached,
+    );
+
     return (
       <FlatList
         ref={setFlatListRef}
@@ -505,6 +557,21 @@ export const ThreadMessagesFlatList = forwardRef<
               ...(onScroll && { onScroll }),
               ...(scrollEventThrottle !== undefined && { scrollEventThrottle }),
             })}
+        {...(history
+          ? {
+              ...(canLoadMore
+                ? { onStartReached: handleStartReached }
+                : onStartReached
+                  ? { onStartReached }
+                  : {}),
+              onStartReachedThreshold: onStartReachedThreshold ?? 1,
+            }
+          : {
+              ...(onStartReached && { onStartReached }),
+              ...(onStartReachedThreshold !== undefined && {
+                onStartReachedThreshold,
+              }),
+            })}
         {...flatListProps}
       />
     );

package/src/primitives/threadList/ThreadListNew.test.tsx

@@ -6,6 +6,7 @@ import { ThreadListNew } from "./ThreadListNew";
 const h = vi.hoisted(() => ({
   switchToNewThread: vi.fn<() => void>(),
   state: { threads: { newThreadId: "new", mainThreadId: "other" } },
+  platform: { os: "web" },
   pressableProps: null as Record<string, unknown> | null,
 }));
 
@@ -41,7 +42,16 @@ vi.mock("react-native", async (importOriginal) => {
     );
   });
 
-  return { ...actual, Pressable: PressableMock };
+  return {
+    ...actual,
+    Platform: {
+      ...actual.Platform,
+      get OS() {
+        return h.platform.os;
+      },
+    },
+    Pressable: PressableMock,
+  };
 });
 
 (globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
@@ -58,6 +68,7 @@ describe("ThreadListNew", () => {
   beforeEach(() => {
     h.switchToNewThread.mockReset();
     h.state.threads = { newThreadId: "new", mainThreadId: "other" };
+    h.platform.os = "web";
     h.pressableProps = null;
 
     container = document.createElement("div");
@@ -110,39 +121,55 @@ describe("ThreadListNew", () => {
     expect(h.switchToNewThread).not.toHaveBeenCalled();
   });
 
-  it("marks itself selected while the new thread is the current one", async () => {
+  it("marks itself current on the web while the new thread is current", async () => {
     h.state.threads = { newThreadId: "new", mainThreadId: "new" };
 
-    await mount();
+    const el = await mount();
 
+    expect(el.getAttribute("aria-current")).toBe("true");
+    expect(el.hasAttribute("aria-selected")).toBe(false);
     expect(accessibilityState()).toMatchObject({ selected: true });
   });
 
-  it("is not selected while another thread is current", async () => {
-    await mount();
+  it("is not current while another thread is current", async () => {
+    const el = await mount();
 
+    expect(el.hasAttribute("aria-current")).toBe(false);
     expect(accessibilityState()).toMatchObject({ selected: false });
   });
 
+  it("marks itself selected without aria-current on native", async () => {
+    h.platform.os = "ios";
+    h.state.threads = { newThreadId: "new", mainThreadId: "new" };
+
+    const el = await mount();
+
+    expect(el.hasAttribute("aria-current")).toBe(false);
+    expect(accessibilityState()).toMatchObject({ selected: true });
+  });
+
   it("keeps other accessibility state the caller passes", async () => {
     h.state.threads = { newThreadId: "new", mainThreadId: "new" };
 
-    await mount({ accessibilityState: { busy: true } });
+    const el = await mount({ accessibilityState: { busy: true } });
 
+    expect(el.getAttribute("aria-current")).toBe("true");
     expect(accessibilityState()).toMatchObject({ selected: true, busy: true });
   });
 
   it("lets the caller override the selected state", async () => {
     h.state.threads = { newThreadId: "new", mainThreadId: "new" };
 
-    await mount({ accessibilityState: { selected: false } });
+    const el = await mount({ accessibilityState: { selected: false } });
 
+    expect(el.hasAttribute("aria-current")).toBe(false);
     expect(accessibilityState()).toMatchObject({ selected: false });
   });
 
   it("lets the caller select a control the state reports inactive", async () => {
-    await mount({ accessibilityState: { selected: true } });
+    const el = await mount({ accessibilityState: { selected: true } });
 
+    expect(el.getAttribute("aria-current")).toBe("true");
     expect(accessibilityState()).toMatchObject({ selected: true });
   });
 

package/src/primitives/threadList/ThreadListNew.tsx

@@ -1,5 +1,6 @@
 import type { ReactNode } from "react";
 import {
+  Platform,
   Pressable,
   type PressableProps,
   type PressableStateCallbackType,
@@ -27,12 +28,14 @@ export const ThreadListNew = ({
     (s) => s.threads.newThreadId === s.threads.mainThreadId,
   );
   const { switchToNewThread } = useThreadListNew();
+  const selected = accessibilityState?.selected ?? isActive;
 
   return (
     <Pressable
       onPress={switchToNewThread}
       accessibilityRole="button"
-      accessibilityState={{ selected: isActive, ...accessibilityState }}
+      accessibilityState={{ ...accessibilityState, selected }}
+      aria-current={Platform.OS === "web" && selected ? "true" : undefined}
       {...pressableProps}
     >
       {typeof children === "function"

package/src/primitives/threadListItem/ThreadListItemTrigger.test.tsx

@@ -9,6 +9,7 @@ const h = vi.hoisted(() => ({
     threads: { mainThreadId: "thread-1" },
     threadListItem: { id: "thread-1" },
   },
+  platform: { os: "web" },
   pressableProps: null as Record<string, unknown> | null,
 }));
 
@@ -37,7 +38,16 @@ vi.mock("react-native", async (importOriginal) => {
       { ...props, ref },
     );
   });
-  return { ...actual, Pressable: PressableMock };
+  return {
+    ...actual,
+    Platform: {
+      ...actual.Platform,
+      get OS() {
+        return h.platform.os;
+      },
+    },
+    Pressable: PressableMock,
+  };
 });
 
 (globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
@@ -55,6 +65,7 @@ describe("ThreadListItemTrigger", () => {
     h.switchTo.mockReset();
     h.state.threads.mainThreadId = "thread-1";
     h.state.threadListItem.id = "thread-1";
+    h.platform.os = "web";
     h.pressableProps = null;
 
     container = document.createElement("div");
@@ -107,23 +118,38 @@ describe("ThreadListItemTrigger", () => {
     expect(h.switchTo).not.toHaveBeenCalled();
   });
 
-  it("marks the current thread selected", async () => {
-    await mount();
+  it("marks the current thread current on the web", async () => {
+    const el = await mount();
 
+    expect(el.getAttribute("aria-current")).toBe("true");
+    expect(el.hasAttribute("aria-selected")).toBe(false);
     expect(accessibilityState()).toMatchObject({ selected: true });
   });
 
-  it("does not mark another thread selected", async () => {
+  it("does not mark another thread current", async () => {
     h.state.threads.mainThreadId = "thread-2";
 
-    await mount();
+    const el = await mount();
 
+    expect(el.hasAttribute("aria-current")).toBe(false);
     expect(accessibilityState()).toMatchObject({ selected: false });
   });
 
+  it("marks the current thread selected without aria-current on native", async () => {
+    h.platform.os = "ios";
+
+    const el = await mount();
+
+    expect(el.hasAttribute("aria-current")).toBe(false);
+    expect(accessibilityState()).toMatchObject({ selected: true });
+  });
+
   it("keeps caller accessibility state overrides", async () => {
-    await mount({ accessibilityState: { busy: true, selected: false } });
+    const el = await mount({
+      accessibilityState: { busy: true, selected: false },
+    });
 
+    expect(el.hasAttribute("aria-current")).toBe(false);
     expect(accessibilityState()).toMatchObject({ busy: true, selected: false });
   });
 

package/src/primitives/threadListItem/ThreadListItemTrigger.tsx

@@ -1,5 +1,6 @@
 import type { ReactNode } from "react";
 import {
+  Platform,
   Pressable,
   type PressableProps,
   type PressableStateCallbackType,
@@ -27,12 +28,14 @@ export const ThreadListItemTrigger = ({
     (s) => s.threads.mainThreadId === s.threadListItem.id,
   );
   const { switchTo } = useThreadListItemTrigger();
+  const selected = accessibilityState?.selected ?? isActive;
 
   return (
     <Pressable
       onPress={switchTo}
       accessibilityRole="button"
-      accessibilityState={{ selected: isActive, ...accessibilityState }}
+      accessibilityState={{ ...accessibilityState, selected }}
+      aria-current={Platform.OS === "web" && selected ? "true" : undefined}
       {...pressableProps}
     >
       {typeof children === "function"