From d8a3f6b2d9932dcaef621c328380b12489ca4e7d Mon Sep 17 00:00:00 2001 From: mwritter Date: Tue, 19 Jul 2022 13:53:51 -0400 Subject: [PATCH 1/2] Replaced 'lineNumberProps' with 'lineNumberStyle' --- packages/spectacle/src/components/code-pane.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/spectacle/src/components/code-pane.tsx b/packages/spectacle/src/components/code-pane.tsx index c8b98ad26..8c2a283cf 100644 --- a/packages/spectacle/src/components/code-pane.tsx +++ b/packages/spectacle/src/components/code-pane.tsx @@ -112,12 +112,12 @@ const CodePane = forwardRef( const scrollTarget = useRef(null); - const getLineNumberProps = useCallback( + const getLineNumberStyle = useCallback( (lineNumber: number) => { - if (!isActive) return; + if (!isActive) return {}; const range = getRangeFormat(numberOfSteps, highlightRanges, step); return { - style: getStyleForLineNumber(lineNumber, range) + ...getStyleForLineNumber(lineNumber, range) }; }, [isActive, highlightRanges, numberOfSteps, step] @@ -174,7 +174,7 @@ const CodePane = forwardRef( wrapLines showLineNumbers={showLineNumbers} lineProps={getLineProps} - lineNumberProps={getLineNumberProps} + lineNumberStyle={getLineNumberStyle} style={syntaxTheme} > {children} From 79ebee6d9f3659a03f462fadc2d106060927656b Mon Sep 17 00:00:00 2001 From: mwritter Date: Tue, 19 Jul 2022 14:10:00 -0400 Subject: [PATCH 2/2] No need to spread --- packages/spectacle/src/components/code-pane.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/spectacle/src/components/code-pane.tsx b/packages/spectacle/src/components/code-pane.tsx index 8c2a283cf..fa1650bbc 100644 --- a/packages/spectacle/src/components/code-pane.tsx +++ b/packages/spectacle/src/components/code-pane.tsx @@ -116,9 +116,7 @@ const CodePane = forwardRef( (lineNumber: number) => { if (!isActive) return {}; const range = getRangeFormat(numberOfSteps, highlightRanges, step); - return { - ...getStyleForLineNumber(lineNumber, range) - }; + return getStyleForLineNumber(lineNumber, range); }, [isActive, highlightRanges, numberOfSteps, step] );