ti.sil/sourcebot
1
0
Fork 0
mirror of https://github.com/sourcebot-dev/sourcebot.git synced 2025-12-12 04:15:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

add back scroll restoration

Browse source
This commit is contained in:
bkellam 2025-11-27 16:38:14 -08:00
parent 4b7798a94e
commit 64e6350473
2 changed files with 44 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
packages/web/src/features/chat/components/chatThread/chatThread.tsx
View file

@ -189,47 +189,47 @@ export const ChatThread = ({
hasSubmittedInputMessage.current = true;
}, [inputMessage, sendMessage]);
// @todo: this need to be optimized to avoid excessive re-renders
// Track scroll position changes.
// useEffect(() => {
// const scrollElement = scrollAreaRef.current?.querySelector('[data-radix-scroll-area-viewport]') as HTMLElement;
// if (!scrollElement) return;
useEffect(() => {
const scrollElement = scrollAreaRef.current?.querySelector('[data-radix-scroll-area-viewport]') as HTMLElement;
if (!scrollElement) return;
// let timeout: NodeJS.Timeout | null = null;
let timeout: NodeJS.Timeout | null = null;
// const handleScroll = () => {
// const scrollOffset = scrollElement.scrollTop;
const handleScroll = () => {
const scrollOffset = scrollElement.scrollTop;
// const threshold = 50; // pixels from bottom to consider "at bottom"
// const { scrollHeight, clientHeight } = scrollElement;
// const isAtBottom = scrollHeight - scrollOffset - clientHeight <= threshold;
// setIsAutoScrollEnabled(isAtBottom);
const threshold = 50; // pixels from bottom to consider "at bottom"
const { scrollHeight, clientHeight } = scrollElement;
const isAtBottom = scrollHeight - scrollOffset - clientHeight <= threshold;
setIsAutoScrollEnabled(isAtBottom);
// // Debounce the history state update
// if (timeout) {
// clearTimeout(timeout);
// }
// Debounce the history state update
if (timeout) {
clearTimeout(timeout);
}
// timeout = setTimeout(() => {
// history.replaceState(
// {
// scrollOffset,
// } satisfies ChatHistoryState,
// '',
// window.location.href
// );
// }, 300);
// };
timeout = setTimeout(() => {
console.log(`scrollOffset: ${scrollOffset}`);
history.replaceState(
{
scrollOffset,
} satisfies ChatHistoryState,
'',
window.location.href
);
}, 500);
};
// scrollElement.addEventListener('scroll', handleScroll, { passive: true });
scrollElement.addEventListener('scroll', handleScroll, { passive: true });
// return () => {
// scrollElement.removeEventListener('scroll', handleScroll);
// if (timeout) {
// clearTimeout(timeout);
// }
// };
// }, []);
return () => {
scrollElement.removeEventListener('scroll', handleScroll);
if (timeout) {
clearTimeout(timeout);
}
};
}, []);
useEffect(() => {
const scrollElement = scrollAreaRef.current?.querySelector('[data-radix-scroll-area-viewport]') as HTMLElement;
@ -237,11 +237,17 @@ export const ChatThread = ({
return;
}
// @hack: without this setTimeout, the scroll position would not be restored
// at the correct position (it was slightly too high). The theory is that the
// content hasn't fully rendered yet, so restoring the scroll position too
// early results in weirdness. Waiting 10ms seems to fix the issue.
setTimeout(() => {
const { scrollOffset } = (history.state ?? {}) as ChatHistoryState;
scrollElement.scrollTo({
top: scrollOffset ?? 0,
behavior: 'instant',
});
}, 10);
}, []);
// When messages are being streamed, scroll to the latest message

2
packages/web/src/features/chat/components/chatThread/referencedFileSourceListItem.tsx
View file

@ -123,8 +123,6 @@ const ReferencedFileSourceListItem = ({
return createCodeFoldingExtension(references, 3);
}, [references]);
// console.log(`re-renderign for file ${fileName}`);
const extensions = useMemo(() => {
return [
languageExtension,