From 655d647d40a9d75343368f50958a36524a667140 Mon Sep 17 00:00:00 2001 From: Jake Howell Date: Wed, 8 Apr 2026 03:54:16 +1000 Subject: [PATCH] fix: resolve style not passing in `` (#24111) This pull-request resolves an regression where the spread was overriding the required styles from the `react-window` virtualised rows. This was causing the scroll to act a little crazy. --- site/src/components/Logs/LogLine.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/site/src/components/Logs/LogLine.tsx b/site/src/components/Logs/LogLine.tsx index 6d49f6ed3e..fc5813c563 100644 --- a/site/src/components/Logs/LogLine.tsx +++ b/site/src/components/Logs/LogLine.tsx @@ -16,7 +16,12 @@ type LogLineProps = { level: LogLevel; } & HTMLAttributes; -export const LogLine: FC = ({ level, className, ...props }) => { +export const LogLine: FC = ({ + level, + className, + style, + ...props +}) => { return (
 = ({ level, className, ...props }) => {
 				className,
 			)}
 			style={{
-				padding: `0 var(--log-line-side-padding, ${DEFAULT_LOG_LINE_SIDE_PADDING}px)`,
+				...style,
+				padding:
+					style?.padding ??
+					`0 var(--log-line-side-padding, ${DEFAULT_LOG_LINE_SIDE_PADDING}px)`,
 			}}
 		/>
 	);