Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/ui/app/chat/chat-preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ export function ChatPreview({ direct = false }: { direct?: boolean }) {
initial={false}
onExitComplete={() => {
setReplyFocus(null);
scroll.updatePosition();
if (dismissalRef.current === "cancel") scroll.updatePosition();
}}
>
{replyTo !== null && replyFocus && replyMessage && (
Expand Down
2 changes: 1 addition & 1 deletion apps/ui/public/r/chat-demo.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/ui/public/r/composer.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/ui/public/r/drawer.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/ui/public/r/use-composer-editor.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion apps/ui/registry/default/chat-demo/chat-demo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,8 @@ export function ChatDemo({
initial={false}
onExitComplete={() => {
setReplyFocus(null);
finishNestedDrawerClose();
if (replyDismissalRef.current === "cancel")
finishNestedDrawerClose();
}}
>
{replyMessage && replyFocus && (
Expand Down
14 changes: 14 additions & 0 deletions apps/ui/registry/default/hooks/use-composer-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,20 @@ export function useComposerEditor({
setQuery(null);
}, [disabled, readOnly, query, triggers]);

useLayoutEffect(() => {
const input = inputElement;
if (!input || input instanceof HTMLTextAreaElement || disabled || readOnly)
return;
const initializeCaret = (): void => {
if (composing.current || readValue(input).length > 0) return;
input.ownerDocument.getSelection()?.setBaseAndExtent(input, 0, input, 0);
};
// Initialize before focusin, while the drawer's temporary focus geometry is
// still applied, so Safari doesn't pan to reveal the empty editor's caret.
input.addEventListener("focus", initializeCaret);
return () => input.removeEventListener("focus", initializeCaret);
}, [inputElement, disabled, readOnly]);

useEffect(() => {
const input = inputElement;
if (!input || input instanceof HTMLTextAreaElement) return;
Expand Down
26 changes: 14 additions & 12 deletions apps/ui/registry/default/ui/composer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { useRender } from "@base-ui/react/use-render";
import type {
ComponentProps,
MouseEvent,
PointerEvent,
ReactElement,
ReactNode,
} from "react";
Expand Down Expand Up @@ -467,21 +466,24 @@ export function ComposerSubmit({
...props
}: Omit<ComponentProps<typeof ButtonPrimitive>, "type">): ReactElement {
const editor = useComposerEditorContext();
const preserveInputFocus = (event: MouseEvent<HTMLButtonElement>): void => {
const input = editor?.rootRef.current?.querySelector(
'[data-slot="composer-input"]',
);
if (
event.button === 0 &&
input === event.currentTarget.ownerDocument.activeElement
) {
event.preventDefault();
}
};
const defaultProps = {
"data-slot": "composer-submit",
type: "button" as const,
disabled: disabled ?? !editor?.canSubmit,
onPointerDown: (event: PointerEvent<HTMLButtonElement>): void => {
const input = editor?.rootRef.current?.querySelector(
'[data-slot="composer-input"]',
);
if (
event.button === 0 &&
input === event.currentTarget.ownerDocument.activeElement
) {
event.preventDefault();
}
},
onPointerDown: preserveInputFocus,
// iOS can still move focus on compatibility mousedown after pointerdown is canceled.
onMouseDown: preserveInputFocus,
onClick: (event: MouseEvent<HTMLButtonElement>): void => {
if (event.defaultPrevented || disabled) return;
event.preventDefault();
Expand Down
5 changes: 3 additions & 2 deletions apps/ui/registry/default/ui/drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,14 @@ export function DrawerViewport({
"fixed inset-0 z-50 [--bleed:--spacing(12)] [--inset:0px]",
"touch-none",
position === "bottom" &&
"grid grid-rows-[1fr_auto] pt-[max(--spacing(2),env(safe-area-inset-top,0px))]",
"grid grid-rows-[1fr_auto] pt-[max(--spacing(2),env(safe-area-inset-top,0px))] after:pointer-events-none after:fixed after:inset-x-0 after:bottom-0 after:h-(--bleed) after:bg-popover data-closed:after:opacity-0 has-[[data-swiping]]:after:opacity-0",
position === "top" && "grid grid-rows-[auto_1fr] pb-12",
position === "left" && "flex justify-start",
position === "right" && "flex justify-end",
variant === "inset" && "px-(--inset) sm:[--inset:--spacing(4)]",
variant === "inset" && position !== "bottom" && "pt-(--inset)",
variant === "inset" && position !== "top" && "pb-(--inset)",
variant === "inset" && position === "bottom" && "sm:after:hidden",
className,
)}
data-slot="drawer-viewport"
Expand Down Expand Up @@ -165,7 +166,7 @@ export function DrawerPopup({
"relative flex max-h-full min-h-0 w-full min-w-0 flex-col bg-popover not-dark:bg-clip-padding text-popover-foreground shadow-lg/5 outline-none transition-[transform,box-shadow,height,background-color] duration-450 ease-[cubic-bezier(0.32,0.72,0,1)] will-change-transform [--peek:calc(--spacing(6)-1px)] [--scale-base:calc(max(0,1-(var(--nested-drawers)*var(--stack-step))))] [--scale:clamp(0,calc(var(--scale-base)+(var(--stack-step)*var(--stack-progress))),1)] [--shrink:calc(1-var(--scale))] [--stack-peek-offset:max(0px,calc((var(--nested-drawers)-var(--stack-progress))*var(--peek)))] [--stack-progress:clamp(0,var(--drawer-swipe-progress),1)] [--stack-step:0.05] before:pointer-events-none before:absolute before:inset-0 before:shadow-[0_1px_--theme(--color-black/4%)] after:pointer-events-none after:absolute after:bg-popover data-swiping:select-none data-nested-drawer-open:overflow-hidden data-nested-drawer-open:bg-[color-mix(in_srgb,var(--popover),var(--color-black)_calc(2%*(var(--nested-drawers)-var(--stack-progress))))] data-ending-style:shadow-transparent data-starting-style:shadow-transparent data-ending-style:duration-[calc(var(--drawer-swipe-strength)*400ms)] dark:data-nested-drawer-open:bg-[color-mix(in_srgb,var(--popover),var(--color-black)_calc(6%*(var(--nested-drawers)-var(--stack-progress))))] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
"touch-none",
position === "bottom" &&
"transform-[translateY(calc(var(--keyboard-snap-offset)+var(--drawer-swipe-movement-y)))] data-ending-style:transform-[translateY(calc(100%+env(safe-area-inset-bottom,0px)+var(--inset)))] data-starting-style:transform-[translateY(calc(100%+env(safe-area-inset-bottom,0px)+var(--inset)))] row-start-2 -mb-[max(0px,calc(var(--keyboard-snap-offset)+clamp(0,1,var(--keyboard-snap-offset)/1px)*var(--drawer-swipe-movement-y,0px)))] border-t pb-[max(0px,calc(max(env(safe-area-inset-bottom,0px),var(--drawer-keyboard-inset,0px))+var(--keyboard-snap-offset)+clamp(0,1,var(--keyboard-snap-offset)/1px)*var(--drawer-swipe-movement-y,0px)))] not-data-starting-style:not-data-ending-style:transition-[transform,box-shadow,height,background-color,margin,padding] [--keyboard-snap-offset:max(0px,calc(var(--drawer-snap-point-offset,0px)-var(--drawer-keyboard-inset,0px)))] after:inset-x-0 after:top-full after:h-(--bleed) has-data-[slot=drawer-bar]:pt-2 data-ending-style:mb-0 data-starting-style:mb-0 data-ending-style:pb-0 data-starting-style:pb-0",
"z-1 transform-[translateY(calc(var(--keyboard-snap-offset)+var(--drawer-swipe-movement-y)))] data-ending-style:transform-[translateY(calc(100%+env(safe-area-inset-bottom,0px)+var(--inset)))] data-starting-style:transform-[translateY(calc(100%+env(safe-area-inset-bottom,0px)+var(--inset)))] row-start-2 -mb-[max(0px,calc(var(--keyboard-snap-offset)+clamp(0,1,var(--keyboard-snap-offset)/1px)*var(--drawer-swipe-movement-y,0px)))] border-t pb-[max(0px,calc(max(env(safe-area-inset-bottom,0px),var(--drawer-keyboard-inset,0px))+var(--keyboard-snap-offset)+clamp(0,1,var(--keyboard-snap-offset)/1px)*var(--drawer-swipe-movement-y,0px)))] not-data-starting-style:not-data-ending-style:transition-[transform,box-shadow,height,background-color,margin,padding] [--keyboard-snap-offset:max(0px,calc(var(--drawer-snap-point-offset,0px)-var(--drawer-keyboard-inset,0px)))] after:inset-x-0 after:top-full after:h-(--bleed) has-data-[slot=drawer-bar]:pt-2 data-ending-style:mb-0 data-starting-style:mb-0 data-ending-style:pb-0 data-starting-style:pb-0",
position === "top" &&
"data-starting-style:transform-[translateY(calc(-100%-var(--inset)))] data-ending-style:transform-[translateY(calc(-100%-var(--inset)))] transform-[translateY(var(--drawer-swipe-movement-y))] border-b after:inset-x-0 after:bottom-full after:h-(--bleed) has-data-[slot=drawer-bar]:pb-2",
position === "left" &&
Expand Down
26 changes: 14 additions & 12 deletions packages/ui/src/components/composer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import { cn } from "@coss/ui/lib/utils";
import type {
ComponentProps,
MouseEvent,
PointerEvent,
ReactElement,
ReactNode,
} from "react";
Expand Down Expand Up @@ -467,21 +466,24 @@ export function ComposerSubmit({
...props
}: Omit<ComponentProps<typeof ButtonPrimitive>, "type">): ReactElement {
const editor = useComposerEditorContext();
const preserveInputFocus = (event: MouseEvent<HTMLButtonElement>): void => {
const input = editor?.rootRef.current?.querySelector(
'[data-slot="composer-input"]',
);
if (
event.button === 0 &&
input === event.currentTarget.ownerDocument.activeElement
) {
event.preventDefault();
}
};
const defaultProps = {
"data-slot": "composer-submit",
type: "button" as const,
disabled: disabled ?? !editor?.canSubmit,
onPointerDown: (event: PointerEvent<HTMLButtonElement>): void => {
const input = editor?.rootRef.current?.querySelector(
'[data-slot="composer-input"]',
);
if (
event.button === 0 &&
input === event.currentTarget.ownerDocument.activeElement
) {
event.preventDefault();
}
},
onPointerDown: preserveInputFocus,
// iOS can still move focus on compatibility mousedown after pointerdown is canceled.
onMouseDown: preserveInputFocus,
onClick: (event: MouseEvent<HTMLButtonElement>): void => {
if (event.defaultPrevented || disabled) return;
event.preventDefault();
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/src/components/drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,14 @@ export function DrawerViewport({
"fixed inset-0 z-50 [--bleed:--spacing(12)] [--inset:0px]",
"touch-none",
position === "bottom" &&
"grid grid-rows-[1fr_auto] pt-[max(--spacing(2),env(safe-area-inset-top,0px))]",
"grid grid-rows-[1fr_auto] pt-[max(--spacing(2),env(safe-area-inset-top,0px))] after:pointer-events-none after:fixed after:inset-x-0 after:bottom-0 after:h-(--bleed) after:bg-popover data-closed:after:opacity-0 has-[[data-swiping]]:after:opacity-0",
position === "top" && "grid grid-rows-[auto_1fr] pb-12",
position === "left" && "flex justify-start",
position === "right" && "flex justify-end",
variant === "inset" && "px-(--inset) sm:[--inset:--spacing(4)]",
variant === "inset" && position !== "bottom" && "pt-(--inset)",
variant === "inset" && position !== "top" && "pb-(--inset)",
variant === "inset" && position === "bottom" && "sm:after:hidden",
className,
)}
data-slot="drawer-viewport"
Expand Down Expand Up @@ -165,7 +166,7 @@ export function DrawerPopup({
"relative flex max-h-full min-h-0 w-full min-w-0 flex-col bg-popover not-dark:bg-clip-padding text-popover-foreground shadow-lg/5 outline-none transition-[transform,box-shadow,height,background-color] duration-450 ease-[cubic-bezier(0.32,0.72,0,1)] will-change-transform [--peek:calc(--spacing(6)-1px)] [--scale-base:calc(max(0,1-(var(--nested-drawers)*var(--stack-step))))] [--scale:clamp(0,calc(var(--scale-base)+(var(--stack-step)*var(--stack-progress))),1)] [--shrink:calc(1-var(--scale))] [--stack-peek-offset:max(0px,calc((var(--nested-drawers)-var(--stack-progress))*var(--peek)))] [--stack-progress:clamp(0,var(--drawer-swipe-progress),1)] [--stack-step:0.05] before:pointer-events-none before:absolute before:inset-0 before:shadow-[0_1px_--theme(--color-black/4%)] after:pointer-events-none after:absolute after:bg-popover data-swiping:select-none data-nested-drawer-open:overflow-hidden data-nested-drawer-open:bg-[color-mix(in_srgb,var(--popover),var(--color-black)_calc(2%*(var(--nested-drawers)-var(--stack-progress))))] data-ending-style:shadow-transparent data-starting-style:shadow-transparent data-ending-style:duration-[calc(var(--drawer-swipe-strength)*400ms)] dark:data-nested-drawer-open:bg-[color-mix(in_srgb,var(--popover),var(--color-black)_calc(6%*(var(--nested-drawers)-var(--stack-progress))))] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
"touch-none",
position === "bottom" &&
"transform-[translateY(calc(var(--keyboard-snap-offset)+var(--drawer-swipe-movement-y)))] data-ending-style:transform-[translateY(calc(100%+env(safe-area-inset-bottom,0px)+var(--inset)))] data-starting-style:transform-[translateY(calc(100%+env(safe-area-inset-bottom,0px)+var(--inset)))] row-start-2 -mb-[max(0px,calc(var(--keyboard-snap-offset)+clamp(0,1,var(--keyboard-snap-offset)/1px)*var(--drawer-swipe-movement-y,0px)))] border-t pb-[max(0px,calc(max(env(safe-area-inset-bottom,0px),var(--drawer-keyboard-inset,0px))+var(--keyboard-snap-offset)+clamp(0,1,var(--keyboard-snap-offset)/1px)*var(--drawer-swipe-movement-y,0px)))] not-data-starting-style:not-data-ending-style:transition-[transform,box-shadow,height,background-color,margin,padding] [--keyboard-snap-offset:max(0px,calc(var(--drawer-snap-point-offset,0px)-var(--drawer-keyboard-inset,0px)))] after:inset-x-0 after:top-full after:h-(--bleed) has-data-[slot=drawer-bar]:pt-2 data-ending-style:mb-0 data-starting-style:mb-0 data-ending-style:pb-0 data-starting-style:pb-0",
"z-1 transform-[translateY(calc(var(--keyboard-snap-offset)+var(--drawer-swipe-movement-y)))] data-ending-style:transform-[translateY(calc(100%+env(safe-area-inset-bottom,0px)+var(--inset)))] data-starting-style:transform-[translateY(calc(100%+env(safe-area-inset-bottom,0px)+var(--inset)))] row-start-2 -mb-[max(0px,calc(var(--keyboard-snap-offset)+clamp(0,1,var(--keyboard-snap-offset)/1px)*var(--drawer-swipe-movement-y,0px)))] border-t pb-[max(0px,calc(max(env(safe-area-inset-bottom,0px),var(--drawer-keyboard-inset,0px))+var(--keyboard-snap-offset)+clamp(0,1,var(--keyboard-snap-offset)/1px)*var(--drawer-swipe-movement-y,0px)))] not-data-starting-style:not-data-ending-style:transition-[transform,box-shadow,height,background-color,margin,padding] [--keyboard-snap-offset:max(0px,calc(var(--drawer-snap-point-offset,0px)-var(--drawer-keyboard-inset,0px)))] after:inset-x-0 after:top-full after:h-(--bleed) has-data-[slot=drawer-bar]:pt-2 data-ending-style:mb-0 data-starting-style:mb-0 data-ending-style:pb-0 data-starting-style:pb-0",
position === "top" &&
"data-starting-style:transform-[translateY(calc(-100%-var(--inset)))] data-ending-style:transform-[translateY(calc(-100%-var(--inset)))] transform-[translateY(var(--drawer-swipe-movement-y))] border-b after:inset-x-0 after:bottom-full after:h-(--bleed) has-data-[slot=drawer-bar]:pb-2",
position === "left" &&
Expand Down
14 changes: 14 additions & 0 deletions packages/ui/src/hooks/use-composer-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,20 @@ export function useComposerEditor({
setQuery(null);
}, [disabled, readOnly, query, triggers]);

useLayoutEffect(() => {
const input = inputElement;
if (!input || input instanceof HTMLTextAreaElement || disabled || readOnly)
return;
const initializeCaret = (): void => {
if (composing.current || readValue(input).length > 0) return;
input.ownerDocument.getSelection()?.setBaseAndExtent(input, 0, input, 0);
};
// Initialize before focusin, while the drawer's temporary focus geometry is
// still applied, so Safari doesn't pan to reveal the empty editor's caret.
input.addEventListener("focus", initializeCaret);
return () => input.removeEventListener("focus", initializeCaret);
}, [inputElement, disabled, readOnly]);

useEffect(() => {
const input = inputElement;
if (!input || input instanceof HTMLTextAreaElement) return;
Expand Down
109 changes: 109 additions & 0 deletions packages/ui/test/components/composer.dom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const {
ComposerItem,
ComposerList,
ComposerPopup,
ComposerSubmit,
getComposerText,
} = await import("../../src/components/composer");
type ComposerItemValue =
Expand Down Expand Up @@ -112,6 +113,114 @@ afterAll(async () => {
await GlobalRegistrator.unregister();
});

describe("Composer focus", () => {
afterEach(async () => {
await act(async () => root.unmount());
container.remove();
window.getSelection()?.removeAllRanges();
});

async function mount(defaultValue: ComposerValue = []): Promise<void> {
function TestComposer(): ReactElement {
const [value, setValue] = useState(defaultValue);
return (
<Composer
value={value}
onValueChange={setValue}
onSubmit={() => setValue([])}
>
<ComposerInput aria-label="Message" />
<ComposerSubmit aria-label="Send message">Send</ComposerSubmit>
</Composer>
);
}
container = document.createElement("div");
document.body.append(container);
root = createRoot(container);
await act(async () => root.render(<TestComposer />));
const element = container.querySelector<HTMLDivElement>(
'[data-slot="composer-input"]',
);
if (!element) throw new Error("Composer input not rendered");
input = element;
}

test("initializes an empty caret during native focus, before focusin", async () => {
await mount();
window.getSelection()?.removeAllRanges();
let caretReady = false;
input.addEventListener(
"focusin",
() => {
const selection = window.getSelection();
caretReady =
selection?.anchorNode === input &&
selection.anchorOffset === 0 &&
selection.isCollapsed;
},
{ once: true },
);
await act(async () => input.focus());
expect(caretReady).toBe(true);
expect(input.textContent).toBe("");
});

test("preserves the caret in an existing draft when refocused", async () => {
await mount([{ type: "text", text: "existing draft" }]);
await act(async () => input.focus());
const text = input.firstChild;
if (!text) throw new Error("Draft not rendered");
window.getSelection()?.setBaseAndExtent(text, 3, text, 3);
await act(async () => {
input.blur();
input.focus();
});
expect(window.getSelection()?.anchorNode).toBe(text);
expect(window.getSelection()?.anchorOffset).toBe(3);
expect(input.textContent).toBe("existing draft");
});

test("preserves the caret in a blank-line draft when refocused", async () => {
await mount([{ type: "text", text: "\n" }]);
await act(async () => input.focus());
input.innerHTML = "<div><br></div><div><br></div>";
const secondLine = input.lastChild;
if (!secondLine) throw new Error("Blank line not rendered");
window.getSelection()?.setBaseAndExtent(secondLine, 0, secondLine, 0);
await act(async () => {
input.blur();
input.focus();
});
expect(window.getSelection()?.anchorNode).toBe(secondLine);
expect(window.getSelection()?.anchorOffset).toBe(0);
});

test("prevents compatibility mousedown from stealing focus across sends", async () => {
await mount();
const button = container.querySelector<HTMLButtonElement>(
'[aria-label="Send message"]',
);
if (!button) throw new Error("Send button not rendered");
for (const message of ["first", "second"]) {
await type(message);
const down = new MouseEvent("mousedown", {
bubbles: true,
cancelable: true,
button: 0,
});
await act(async () => {
button.dispatchEvent(down);
if (!down.defaultPrevented) button.focus();
button.click();
});
expect(down.defaultPrevented).toBe(true);
expect(document.activeElement).toBe(input);
expect(input.textContent).toBe("");
await act(async () => input.blur());
}
});
});

describe("Composer text items", () => {
afterEach(async () => {
await act(async () => root.unmount());
Expand Down
Loading