@docusaurus/theme-classic 3.9.2-canary-6448 → 3.9.2-canary-6450

package/lib/theme/CodeBlock/Line/index.js

@@ -8,8 +8,16 @@ import React from 'react';
 import clsx from 'clsx';
 import LineToken from '@theme/CodeBlock/Line/Token';
 import styles from './styles.module.css';
-// Replaces '\n' by ''
-// Historical code, not sure why we even need this :/
+// This <br/ seems useful when the line has no content to prevent collapsing.
+// For code blocks with "diff" languages, this makes the empty lines collapse to
+// zero height lines, which is undesirable.
+// See also https://github.com/facebook/docusaurus/pull/11565
+function LineBreak() {
+  return <br />;
+}
+// Replaces single lines with '\n' by '' so that we don't end up with
+// duplicate line breaks (the '\n' + the artificial <br/> above)
+// see also https://github.com/facebook/docusaurus/pull/11565
 function fixLineBreak(line) {
   const singleLineBreakToken =
     line.length === 1 && line[0].content === '\n' ? line[0] : undefined;
@@ -39,7 +47,7 @@ export default function CodeBlockLine({
     );
   });
   return (
-    <span {...lineProps}>
+    <div {...lineProps}>
       {showLineNumbers ? (
         <>
           <span className={styles.codeLineNumber} />
@@ -48,7 +56,7 @@ export default function CodeBlockLine({
       ) : (
         lineTokens
       )}
-      <br />
-    </span>
+      <LineBreak />
+    </div>
   );
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "3.9.2-canary-6448",
+  "version": "3.9.2-canary-6450",
   "description": "Classic theme for Docusaurus",
   "main": "lib/index.js",
   "types": "src/theme-classic.d.ts",
@@ -20,19 +20,19 @@
     "copy:watch": "node ../../admin/scripts/copyUntypedFiles.js --watch"
   },
   "dependencies": {
-    "@docusaurus/core": "3.9.2-canary-6448",
-    "@docusaurus/logger": "3.9.2-canary-6448",
-    "@docusaurus/mdx-loader": "3.9.2-canary-6448",
-    "@docusaurus/module-type-aliases": "3.9.2-canary-6448",
-    "@docusaurus/plugin-content-blog": "3.9.2-canary-6448",
-    "@docusaurus/plugin-content-docs": "3.9.2-canary-6448",
-    "@docusaurus/plugin-content-pages": "3.9.2-canary-6448",
-    "@docusaurus/theme-common": "3.9.2-canary-6448",
-    "@docusaurus/theme-translations": "3.9.2-canary-6448",
-    "@docusaurus/types": "3.9.2-canary-6448",
-    "@docusaurus/utils": "3.9.2-canary-6448",
-    "@docusaurus/utils-common": "3.9.2-canary-6448",
-    "@docusaurus/utils-validation": "3.9.2-canary-6448",
+    "@docusaurus/core": "3.9.2-canary-6450",
+    "@docusaurus/logger": "3.9.2-canary-6450",
+    "@docusaurus/mdx-loader": "3.9.2-canary-6450",
+    "@docusaurus/module-type-aliases": "3.9.2-canary-6450",
+    "@docusaurus/plugin-content-blog": "3.9.2-canary-6450",
+    "@docusaurus/plugin-content-docs": "3.9.2-canary-6450",
+    "@docusaurus/plugin-content-pages": "3.9.2-canary-6450",
+    "@docusaurus/theme-common": "3.9.2-canary-6450",
+    "@docusaurus/theme-translations": "3.9.2-canary-6450",
+    "@docusaurus/types": "3.9.2-canary-6450",
+    "@docusaurus/utils": "3.9.2-canary-6450",
+    "@docusaurus/utils-common": "3.9.2-canary-6450",
+    "@docusaurus/utils-validation": "3.9.2-canary-6450",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
     "infima": "0.2.0-alpha.45",
@@ -61,5 +61,5 @@
   "engines": {
     "node": ">=20.0"
   },
-  "gitHead": "ae30a9210d4e3dea606b00df6a7e04ee08af5195"
+  "gitHead": "ce94bc05c81f98b1f1b4022e919fe3b43dc22fc5"
 }

package/src/theme/CodeBlock/Line/index.tsx

@@ -14,16 +14,23 @@ import styles from './styles.module.css';
 
 type Token = Props['line'][number];
 
-// Replaces '\n' by ''
-// Historical code, not sure why we even need this :/
+// This <br/ seems useful when the line has no content to prevent collapsing.
+// For code blocks with "diff" languages, this makes the empty lines collapse to
+// zero height lines, which is undesirable.
+// See also https://github.com/facebook/docusaurus/pull/11565
+function LineBreak() {
+  return <br />;
+}
+
+// Replaces single lines with '\n' by '' so that we don't end up with
+// duplicate line breaks (the '\n' + the artificial <br/> above)
+// see also https://github.com/facebook/docusaurus/pull/11565
 function fixLineBreak(line: Token[]) {
   const singleLineBreakToken =
     line.length === 1 && line[0]!.content === '\n' ? line[0] : undefined;
-
   if (singleLineBreakToken) {
     return [{...singleLineBreakToken, content: ''}];
   }
-
   return line;
 }
 
@@ -35,7 +42,6 @@ export default function CodeBlockLine({
   getTokenProps,
 }: Props): ReactNode {
   const line = fixLineBreak(lineProp);
-
   const lineProps = getLineProps({
     line,
     className: clsx(classNames, showLineNumbers && styles.codeLine),
@@ -51,7 +57,7 @@ export default function CodeBlockLine({
   });
 
   return (
-    <span {...lineProps}>
+    <div {...lineProps}>
       {showLineNumbers ? (
         <>
           <span className={styles.codeLineNumber} />
@@ -60,7 +66,7 @@ export default function CodeBlockLine({
       ) : (
         lineTokens
       )}
-      <br />
-    </span>
+      <LineBreak />
+    </div>
   );
 }