Skip to content

Fix scroll behaviour logs #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iskandervdh merged 1 commit into from
Feb 2, 2025
Merged

Fix scroll behaviour logs #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 4 additions & 18 deletions frontend/src/sections/logs-popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function LogsPopover() {

const scrollToBottom = useCallback(() => {
setTimeout(() => {
logsRef.current?.scrollTo(0, logsRef.current.scrollHeight);
logsRef.current?.scrollTo({ top: logsRef.current.scrollHeight });
}, 10);
}, [logsRef]);

Expand All @@ -35,13 +35,9 @@ export function LogsPopover() {

FollowProjectLogs(currentProject);

const logBuffer: string[] = [];
let bufferTimeout: NodeJS.Timeout | null = null;

const flushBuffer = () => {
const stopListeningForLogs = EventsOn('log', (newLogs: string) => {
setAnsiLogs((prevLogs) => {
const logs = prevLogs + logBuffer.join('');
logBuffer.length = 0;
const logs = prevLogs + newLogs;

// Limit logs to LOG_SIZE_LIMIT characters to prevent browser from freezing
if (logs.length > LOG_SIZE_LIMIT) {
Expand All @@ -50,16 +46,6 @@ export function LogsPopover() {

return logs;
});

bufferTimeout = null;
};

const stopListeningForLogs = EventsOn('log', (newLogs: string) => {
logBuffer.push(newLogs);

if (!bufferTimeout) {
bufferTimeout = setTimeout(flushBuffer, 100);
}
});

const scrollListener = (e: Event) => {
Expand All @@ -84,7 +70,7 @@ export function LogsPopover() {
if (followLogs) {
scrollToBottom();
}
}, [followLogs, scrollToBottom, logsRef.current?.scrollHeight]);
}, [followLogs, scrollToBottom, logsRef.current?.scrollHeight, ansiLogs]);

if (!currentProject) return null;

Expand Down