@assistant-ui/react-native 0.1.37 → 0.1.39

package/src/primitives/queueItem/QueueItem.test.tsx

@@ -0,0 +1,132 @@
+import { act, type ReactElement } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Text } from "react-native";
+import { QueueItemRemove } from "./QueueItemRemove";
+import { QueueItemSteer } from "./QueueItemSteer";
+import { QueueItemText } from "./QueueItemText";
+
+const h = vi.hoisted(() => ({
+  parts: [] as Array<{ type: "text" | "file"; text?: string }> | undefined,
+  remove: vi.fn<() => void>(),
+  steer: vi.fn<() => void>(),
+}));
+
+vi.mock("@assistant-ui/store", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@assistant-ui/store")>();
+  return {
+    ...actual,
+    useAui: () => ({ queueItem: { remove: h.remove, steer: h.steer } }),
+    useAuiState: <T,>(selector: (state: { queueItem: typeof h }) => T) =>
+      selector({ queueItem: h }),
+  };
+});
+
+(globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
+
+describe("Queue item primitives", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    h.parts = [];
+    h.remove.mockReset();
+    h.steer.mockReset();
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(async () => {
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+  });
+
+  const render = async (element: ReactElement) => {
+    await act(async () => {
+      root.render(element);
+    });
+  };
+
+  const press = async (testID: string) => {
+    const element = container.querySelector(`[data-testid="${testID}"]`);
+    expect(element).not.toBeNull();
+    await act(async () => {
+      element!.dispatchEvent(
+        new MouseEvent("click", { bubbles: true, cancelable: true }),
+      );
+    });
+  };
+
+  it("renders only text parts and supports child overrides", async () => {
+    h.parts = [
+      { type: "text", text: "hello" },
+      { type: "file", text: "not rendered" },
+      { type: "text", text: "world" },
+    ];
+    await render(<QueueItemText testID="text" />);
+    expect(container.querySelector('[data-testid="text"]')?.textContent).toBe(
+      "hello\n\nworld",
+    );
+
+    await render(
+      <QueueItemText testID="text">
+        <Text>override</Text>
+      </QueueItemText>,
+    );
+    expect(container.querySelector('[data-testid="text"]')?.textContent).toBe(
+      "override",
+    );
+  });
+
+  it("removes a queue item when pressed", async () => {
+    await render(<QueueItemRemove testID="remove">remove</QueueItemRemove>);
+    await press("remove");
+    expect(h.remove).toHaveBeenCalledTimes(1);
+  });
+
+  it("steers a queue item when pressed", async () => {
+    await render(<QueueItemSteer testID="steer">steer</QueueItemSteer>);
+    await press("steer");
+    expect(h.steer).toHaveBeenCalledTimes(1);
+  });
+
+  it("renders nothing extra when queue item parts are missing", async () => {
+    h.parts = undefined;
+    await render(<QueueItemText testID="text" />);
+    expect(container.querySelector('[data-testid="text"]')?.textContent).toBe(
+      "",
+    );
+  });
+
+  it("passes the Pressable press state to function children", async () => {
+    await render(
+      <QueueItemRemove testID="remove">
+        {({ pressed }) => (pressed ? "pressed" : "idle")}
+      </QueueItemRemove>,
+    );
+    expect(container.querySelector('[data-testid="remove"]')?.textContent).toBe(
+      "idle",
+    );
+
+    await render(
+      <QueueItemRemove testID="remove" testOnly_pressed>
+        {({ pressed }) => (pressed ? "pressed" : "idle")}
+      </QueueItemRemove>,
+    );
+    expect(container.querySelector('[data-testid="remove"]')?.textContent).toBe(
+      "pressed",
+    );
+
+    await render(
+      <QueueItemSteer testID="steer" testOnly_pressed>
+        {({ pressed }) => (pressed ? "pressed" : "idle")}
+      </QueueItemSteer>,
+    );
+    expect(container.querySelector('[data-testid="steer"]')?.textContent).toBe(
+      "pressed",
+    );
+  });
+});

package/src/primitives/queueItem/QueueItemRemove.tsx

@@ -0,0 +1,31 @@
+import { useCallback } from "react";
+import { Pressable, type PressableProps } from "react-native";
+import { useAui } from "@assistant-ui/store";
+
+export type QueueItemRemoveProps = Omit<
+  PressableProps,
+  "onPress" | "children"
+> & {
+  children: PressableProps["children"];
+};
+
+export const QueueItemRemove = ({
+  children,
+  ...pressableProps
+}: QueueItemRemoveProps) => {
+  const aui = useAui();
+
+  const handleRemove = useCallback(() => {
+    aui.queueItem.remove();
+  }, [aui]);
+
+  return (
+    <Pressable
+      onPress={handleRemove}
+      accessibilityRole="button"
+      {...pressableProps}
+    >
+      {children}
+    </Pressable>
+  );
+};

package/src/primitives/queueItem/QueueItemSteer.tsx

@@ -0,0 +1,31 @@
+import { useCallback } from "react";
+import { Pressable, type PressableProps } from "react-native";
+import { useAui } from "@assistant-ui/store";
+
+export type QueueItemSteerProps = Omit<
+  PressableProps,
+  "onPress" | "children"
+> & {
+  children: PressableProps["children"];
+};
+
+export const QueueItemSteer = ({
+  children,
+  ...pressableProps
+}: QueueItemSteerProps) => {
+  const aui = useAui();
+
+  const handleSteer = useCallback(() => {
+    aui.queueItem.steer();
+  }, [aui]);
+
+  return (
+    <Pressable
+      onPress={handleSteer}
+      accessibilityRole="button"
+      {...pressableProps}
+    >
+      {children}
+    </Pressable>
+  );
+};

package/src/primitives/queueItem/QueueItemText.tsx

@@ -0,0 +1,22 @@
+import type { ReactNode } from "react";
+import { Text, type TextProps } from "react-native";
+import { useAuiState } from "@assistant-ui/store";
+
+export type QueueItemTextProps = TextProps & {
+  children?: ReactNode;
+};
+
+export const QueueItemText = ({
+  children,
+  ...textProps
+}: QueueItemTextProps) => {
+  const text = useAuiState((s) =>
+    // hosts on the pre-parts adapter shape may omit the field at runtime
+    (s.queueItem.parts ?? [])
+      .filter((part) => part.type === "text")
+      .map((part) => part.text)
+      .join("\n\n"),
+  );
+
+  return <Text {...textProps}>{children ?? text}</Text>;
+};

package/src/primitives/queueItem.ts

@@ -0,0 +1,12 @@
+export {
+  QueueItemText as Text,
+  type QueueItemTextProps as TextProps,
+} from "./queueItem/QueueItemText";
+export {
+  QueueItemRemove as Remove,
+  type QueueItemRemoveProps as RemoveProps,
+} from "./queueItem/QueueItemRemove";
+export {
+  QueueItemSteer as Steer,
+  type QueueItemSteerProps as SteerProps,
+} from "./queueItem/QueueItemSteer";

package/src/primitives/suggestion/SuggestionTrigger.tsx

@@ -1,10 +1,12 @@
-import type { ReactNode } from "react";
 import { Pressable, type PressableProps } from "react-native";
 import { useAuiState } from "@assistant-ui/store";
 import { useSuggestionTrigger } from "@assistant-ui/core/react";
 
-export type SuggestionTriggerProps = Omit<PressableProps, "onPress"> & {
-  children: ReactNode;
+export type SuggestionTriggerProps = Omit<
+  PressableProps,
+  "onPress" | "children"
+> & {
+  children: PressableProps["children"];
   /**
    * When true, automatically sends the message.
    * When false, replaces or appends the composer text with the suggestion.
@@ -36,6 +38,7 @@ export const SuggestionTrigger = ({
     <Pressable
       onPress={trigger}
       disabled={disabledProp ?? disabled}
+      accessibilityRole="button"
       {...pressableProps}
     >
       {children}

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

@@ -1,16 +1,30 @@
+import type { ReactNode } from "react";
 import { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import { Text } from "react-native";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type * as Store from "@assistant-ui/store";
 import { ThreadEmpty } from "./ThreadEmpty";
 
 const h = vi.hoisted(() => ({
   isEmpty: true,
 }));
 
-vi.mock("@assistant-ui/core/react", () => ({
-  useThreadIsEmpty: () => h.isEmpty,
-}));
+type ThreadSlice = { thread: { isEmpty: boolean } };
+
+vi.mock("@assistant-ui/store", async (importOriginal) => {
+  const actual = await importOriginal<typeof Store>();
+  return {
+    ...actual,
+    AuiIf: ({
+      condition,
+      children,
+    }: {
+      condition: (s: ThreadSlice) => boolean;
+      children: ReactNode;
+    }) => (condition({ thread: { isEmpty: h.isEmpty } }) ? children : null),
+  };
+});
 
 (globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
 

package/src/primitives/thread/ThreadEmpty.tsx

@@ -1,12 +1,13 @@
 import type { ReactNode } from "react";
-import { useThreadIsEmpty } from "@assistant-ui/core/react";
+import { AuiIf } from "@assistant-ui/store";
 
 export type ThreadEmptyProps = {
   children: ReactNode;
 };
 
-export const ThreadEmpty = ({ children }: ThreadEmptyProps) => {
-  const isEmpty = useThreadIsEmpty();
-  if (!isEmpty) return null;
-  return <>{children}</>;
-};
+/**
+ * @deprecated Use `<AuiIf condition={(s) => s.thread.isEmpty} />` instead.
+ */
+export const ThreadEmpty = ({ children }: ThreadEmptyProps) => (
+  <AuiIf condition={(s) => s.thread.isEmpty}>{children}</AuiIf>
+);

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

@@ -2,25 +2,29 @@ import { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import { Text } from "react-native";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type * as Store from "@assistant-ui/store";
 import { ThreadIf } from "./ThreadIf";
 
 const h = vi.hoisted(() => ({
-  thread: { messages: [] as unknown[], isRunning: false },
+  thread: { isEmpty: true, isRunning: false },
 }));
 
-vi.mock("@assistant-ui/store", () => ({
-  useAuiState: <T,>(selector: (s: { thread: typeof h.thread }) => T) =>
-    selector({ thread: h.thread }),
-}));
+vi.mock("@assistant-ui/store", async (importOriginal) => {
+  const actual = await importOriginal<typeof Store>();
+  return {
+    ...actual,
+    useAuiState: <T,>(selector: (s: { thread: typeof h.thread }) => T) =>
+      selector({ thread: h.thread }),
+  };
+});
 
 (globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
 
 describe("ThreadIf", () => {
   let container: HTMLDivElement;
   let root: Root;
-
   beforeEach(() => {
-    h.thread.messages = [];
+    h.thread.isEmpty = true;
     h.thread.isRunning = false;
 
     container = document.createElement("div");
@@ -46,33 +50,29 @@ describe("ThreadIf", () => {
     return container.querySelector('[data-testid="child"]');
   };
 
-  const setMessages = (count: number) => {
-    h.thread.messages = Array.from({ length: count }, (_, i) => i);
-  };
-
   it("renders children when no guard is set", async () => {
-    setMessages(2);
+    h.thread.isEmpty = false;
     expect(await mount()).not.toBeNull();
   });
 
   describe("empty guard", () => {
     it("renders children when empty:true matches an empty thread", async () => {
-      setMessages(0);
+      h.thread.isEmpty = true;
       expect(await mount({ empty: true })).not.toBeNull();
     });
 
-    it("hides children when empty:true but the thread has messages", async () => {
-      setMessages(3);
+    it("hides children when empty:true but the thread is not empty", async () => {
+      h.thread.isEmpty = false;
       expect(await mount({ empty: true })).toBeNull();
     });
 
     it("renders children when empty:false matches a non-empty thread", async () => {
-      setMessages(3);
+      h.thread.isEmpty = false;
       expect(await mount({ empty: false })).not.toBeNull();
     });
 
     it("hides children when empty:false but the thread is empty", async () => {
-      setMessages(0);
+      h.thread.isEmpty = true;
       expect(await mount({ empty: false })).toBeNull();
     });
   });
@@ -101,19 +101,19 @@ describe("ThreadIf", () => {
 
   describe("combined guards", () => {
     it("renders children only when both empty and running match", async () => {
-      setMessages(0);
+      h.thread.isEmpty = true;
       h.thread.isRunning = true;
       expect(await mount({ empty: true, running: true })).not.toBeNull();
     });
 
     it("hides children when empty matches but running does not", async () => {
-      setMessages(0);
+      h.thread.isEmpty = true;
       h.thread.isRunning = false;
       expect(await mount({ empty: true, running: true })).toBeNull();
     });
 
     it("hides children when running matches but empty does not", async () => {
-      setMessages(2);
+      h.thread.isEmpty = false;
       h.thread.isRunning = true;
       expect(await mount({ empty: true, running: true })).toBeNull();
     });

package/src/primitives/thread/ThreadIf.tsx

@@ -7,17 +7,14 @@ export type ThreadIfProps = {
   running?: boolean | undefined;
 };
 
+/**
+ * @deprecated Use `<AuiIf condition={(s) => s.thread...} />` instead.
+ */
 export const ThreadIf = ({ children, empty, running }: ThreadIfProps) => {
   const thread = useAuiState((s) => s.thread);
 
-  if (empty !== undefined) {
-    const isEmpty = thread.messages.length === 0;
-    if (empty !== isEmpty) return null;
-  }
-
-  if (running !== undefined) {
-    if (running !== thread.isRunning) return null;
-  }
+  if (empty !== undefined && empty !== thread.isEmpty) return null;
+  if (running !== undefined && running !== thread.isRunning) return null;
 
   return <>{children}</>;
 };

package/src/primitives/thread/ThreadSuggestion.tsx

@@ -1,9 +1,11 @@
-import type { ReactNode } from "react";
 import { Pressable, type PressableProps } from "react-native";
 import { useSuggestionTrigger } from "@assistant-ui/core/react";
 
-export type ThreadSuggestionProps = Omit<PressableProps, "onPress"> & {
-  children: ReactNode;
+export type ThreadSuggestionProps = Omit<
+  PressableProps,
+  "onPress" | "children"
+> & {
+  children: PressableProps["children"];
   /** The suggestion prompt. */
   prompt: string;
   /**
@@ -37,6 +39,7 @@ export const ThreadSuggestion = ({
     <Pressable
       onPress={trigger}
       disabled={disabledProp ?? disabled}
+      accessibilityRole="button"
       {...pressableProps}
     >
       {children}

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

@@ -5,11 +5,44 @@ import { ThreadListNew } from "./ThreadListNew";
 
 const h = vi.hoisted(() => ({
   switchToNewThread: vi.fn<() => void>(),
+  state: { threads: { newThreadId: "new", mainThreadId: "other" } },
+  pressableProps: null as Record<string, unknown> | null,
 }));
 
-vi.mock("@assistant-ui/core/react", () => ({
-  useThreadListNew: () => ({ switchToNewThread: h.switchToNewThread }),
-}));
+vi.mock("@assistant-ui/core/react", async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import("@assistant-ui/core/react")>();
+  return {
+    ...actual,
+    useThreadListNew: () => ({ switchToNewThread: h.switchToNewThread }),
+  };
+});
+
+vi.mock("@assistant-ui/store", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@assistant-ui/store")>();
+  return {
+    ...actual,
+    useAuiState: <T,>(selector: (s: typeof h.state) => T) => selector(h.state),
+  };
+});
+
+vi.mock("react-native", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("react-native")>();
+  const React = await import("react");
+
+  const PressableMock = React.forwardRef(function PressableMock(
+    props: Record<string, unknown>,
+    ref: React.Ref<unknown>,
+  ) {
+    h.pressableProps = props;
+    return React.createElement(
+      actual.Pressable as unknown as React.ElementType,
+      { ...props, ref },
+    );
+  });
+
+  return { ...actual, Pressable: PressableMock };
+});
 
 (globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true;
 
@@ -24,6 +57,8 @@ describe("ThreadListNew", () => {
 
   beforeEach(() => {
     h.switchToNewThread.mockReset();
+    h.state.threads = { newThreadId: "new", mainThreadId: "other" };
+    h.pressableProps = null;
 
     container = document.createElement("div");
     document.body.appendChild(container);
@@ -50,6 +85,11 @@ describe("ThreadListNew", () => {
     return container.querySelector('[data-testid="t"]') as HTMLElement;
   };
 
+  const accessibilityState = () =>
+    h.pressableProps?.["accessibilityState"] as
+      | Record<string, unknown>
+      | undefined;
+
   it("fires switchToNewThread when pressed", async () => {
     const el = await mount();
 
@@ -69,4 +109,79 @@ describe("ThreadListNew", () => {
 
     expect(h.switchToNewThread).not.toHaveBeenCalled();
   });
+
+  it("marks itself selected while the new thread is the current one", async () => {
+    h.state.threads = { newThreadId: "new", mainThreadId: "new" };
+
+    await mount();
+
+    expect(accessibilityState()).toMatchObject({ selected: true });
+  });
+
+  it("is not selected while another thread is current", async () => {
+    await mount();
+
+    expect(accessibilityState()).toMatchObject({ selected: false });
+  });
+
+  it("keeps other accessibility state the caller passes", async () => {
+    h.state.threads = { newThreadId: "new", mainThreadId: "new" };
+
+    await mount({ accessibilityState: { busy: 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 } });
+
+    expect(accessibilityState()).toMatchObject({ selected: false });
+  });
+
+  it("lets the caller select a control the state reports inactive", async () => {
+    await mount({ accessibilityState: { selected: true } });
+
+    expect(accessibilityState()).toMatchObject({ selected: true });
+  });
+
+  it("passes isActive alongside press state to render children", async () => {
+    h.state.threads = { newThreadId: "new", mainThreadId: "new" };
+    let renderState: unknown = null;
+
+    await act(async () => {
+      root.render(
+        <ThreadListNew testID="t">
+          {(state) => {
+            renderState = state;
+            return state.isActive ? "current" : "not current";
+          }}
+        </ThreadListNew>,
+      );
+    });
+
+    const el = container.querySelector('[data-testid="t"]') as HTMLElement;
+    expect(el.textContent).toBe("current");
+    expect(renderState).toMatchObject({ pressed: false, isActive: true });
+  });
+
+  it("reports an inactive render state while another thread is current", async () => {
+    let renderState: unknown = null;
+
+    await act(async () => {
+      root.render(
+        <ThreadListNew testID="t">
+          {(state) => {
+            renderState = state;
+            return state.isActive ? "current" : "not current";
+          }}
+        </ThreadListNew>,
+      );
+    });
+
+    const el = container.querySelector('[data-testid="t"]') as HTMLElement;
+    expect(el.textContent).toBe("not current");
+    expect(renderState).toMatchObject({ pressed: false, isActive: false });
+  });
 });

package/src/primitives/threadList/ThreadListNew.tsx

@@ -1,20 +1,43 @@
 import type { ReactNode } from "react";
-import { Pressable, type PressableProps } from "react-native";
+import {
+  Pressable,
+  type PressableProps,
+  type PressableStateCallbackType,
+} from "react-native";
+import { useAuiState } from "@assistant-ui/store";
 import { useThreadListNew } from "@assistant-ui/core/react";
 
-export type ThreadListNewProps = Omit<PressableProps, "onPress"> & {
-  children: ReactNode;
+export type ThreadListNewProps = Omit<
+  PressableProps,
+  "onPress" | "children"
+> & {
+  children:
+    | ReactNode
+    | ((
+        state: PressableStateCallbackType & { isActive: boolean },
+      ) => ReactNode);
 };
 
 export const ThreadListNew = ({
   children,
+  accessibilityState,
   ...pressableProps
 }: ThreadListNewProps) => {
+  const isActive = useAuiState(
+    (s) => s.threads.newThreadId === s.threads.mainThreadId,
+  );
   const { switchToNewThread } = useThreadListNew();
 
   return (
-    <Pressable onPress={switchToNewThread} {...pressableProps}>
-      {children}
+    <Pressable
+      onPress={switchToNewThread}
+      accessibilityRole="button"
+      accessibilityState={{ selected: isActive, ...accessibilityState }}
+      {...pressableProps}
+    >
+      {typeof children === "function"
+        ? (state) => children({ ...state, isActive })
+        : children}
     </Pressable>
   );
 };

package/src/primitives/threadListItem/ThreadListItemArchive.tsx

@@ -1,9 +1,11 @@
-import type { ReactNode } from "react";
 import { Pressable, type PressableProps } from "react-native";
 import { useThreadListItemArchive } from "@assistant-ui/core/react";
 
-export type ThreadListItemArchiveProps = Omit<PressableProps, "onPress"> & {
-  children: ReactNode;
+export type ThreadListItemArchiveProps = Omit<
+  PressableProps,
+  "onPress" | "children"
+> & {
+  children: PressableProps["children"];
 };
 
 export const ThreadListItemArchive = ({
@@ -13,7 +15,7 @@ export const ThreadListItemArchive = ({
   const { archive } = useThreadListItemArchive();
 
   return (
-    <Pressable onPress={archive} {...pressableProps}>
+    <Pressable onPress={archive} accessibilityRole="button" {...pressableProps}>
       {children}
     </Pressable>
   );