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
38 changes: 38 additions & 0 deletions frontend/features/chat/components/sections/chat-area.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
MessageScrollerItem,
MessageScrollerProvider,
MessageScrollerViewport,
useMessageScroller,
} from "@/components/ui/message-scroller";
import {
ChatMessagePositionRail,
Expand All @@ -43,6 +44,38 @@ import { AppLogo, DeeixLogo } from "@/shared/components/app-logo";
import { useBranding } from "@/shared/config/branding-provider";
import { PoweredByDeeix } from "@/shared/components/powered-by-deeix";

function ScrollToPendingUser({ scrollKey }: { scrollKey: string }) {
const handledScrollKeyRef = React.useRef("");
const { scrollToEnd } = useMessageScroller();

React.useLayoutEffect(() => {
if (!scrollKey) {
handledScrollKeyRef.current = "";
return;
}
if (handledScrollKeyRef.current === scrollKey) {
return;
}

handledScrollKeyRef.current = scrollKey;
let secondFrameID: number | null = null;
const firstFrameID = window.requestAnimationFrame(() => {
secondFrameID = window.requestAnimationFrame(() => {
const reducedMotion = window.matchMedia?.("(prefers-reduced-motion: reduce)").matches ?? false;
scrollToEnd({ behavior: reducedMotion ? "auto" : "smooth" });
});
});
return () => {
window.cancelAnimationFrame(firstFrameID);
if (secondFrameID !== null) {
window.cancelAnimationFrame(secondFrameID);
}
};
}, [scrollKey, scrollToEnd]);

return null;
}

function CompactDivider({ summaryPreview }: { summaryPreview: string }) {
const t = useTranslations("chat.messages");
const [expanded, setExpanded] = React.useState(false);
Expand Down Expand Up @@ -511,6 +544,10 @@ export function ChatArea({
}
return "";
}, [hasLiveMessage, messages]);
const pendingUserScrollKey = React.useMemo(
() => [...messages].reverse().find((item) => item.role === "user" && item.isPending)?.key ?? "",
[messages],
);

return (
<>
Expand Down Expand Up @@ -570,6 +607,7 @@ export function ChatArea({
<div className="relative min-h-0 flex-1 overflow-hidden">
<MessageScrollerProvider autoScroll defaultScrollPosition="end" scrollEdgeThreshold={16}>
<MessageScroller>
<ScrollToPendingUser scrollKey={pendingUserScrollKey} />
<MessageScrollerViewport
ref={messageViewportBoundaryRef}
className="px-3 pb-8 pt-2 [overflow-anchor:none] md:px-6"
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"analyze:output": "next experimental-analyze --output",
"start": "next start",
"typecheck": "tsc --noEmit --pretty false",
"test": "node --no-warnings --test features/chat/components/sections/chat-model-picker-layout.test.mjs",
"check": "pnpm lint && pnpm typecheck",
"lint": "biome lint .",
"lint:fix": "biome lint --write .",
Expand Down
Loading