Apply white-space inline style when astGenerator missing

This fixes an SSR mismatch when using a non-async SyntaxHighlighter on the server and an async SyntaxHighlighter on the client - the whiteSpace style will be present regardless of which return statement we hit later in the function.
react-syntax-highlighter · Nov 15, 2021 · ddc6fbb · ddc6fbb
1 parent 76d7f11
commit ddc6fbb
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/highlight.js b/src/highlight.js
@@ -366,6 +366,12 @@ export default function(defaultAstGenerator, defaultStyle) {
           style: Object.assign({}, customStyle)
         });
 
+    if (wrapLongLines) {
+      codeTagProps.style = { ...codeTagProps.style, whiteSpace: 'pre-wrap' };
+    } else {
+      codeTagProps.style = { ...codeTagProps.style, whiteSpace: 'pre' };
+    }
+
     if (!astGenerator) {
       return (
         <PreTag {...preProps}>
@@ -409,12 +415,6 @@ export default function(defaultAstGenerator, defaultStyle) {
       wrapLongLines
     );
 
-    if (wrapLongLines) {
-      codeTagProps.style = { ...codeTagProps.style, whiteSpace: 'pre-wrap' };
-    } else {
-      codeTagProps.style = { ...codeTagProps.style, whiteSpace: 'pre' };
-    }
-
     return (
       <PreTag {...preProps}>
         <CodeTag {...codeTagProps}>