Fixed usage in mdx code blocks and added a test page

facebook · Dec 30, 2023 · a5535b3 · a5535b3
1 parent 1ebd01d
commit a5535b3
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/index.ts b/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
@@ -72,6 +72,7 @@ const removeTags = (input: string) =>
 
 export default function plugin(): Transformer {
   return (root) => {
+    let importsCount = 0;
     const headings: (TOCItem | string)[] = [];
 
     const PartialComponentToHeadingsName = Object.create(null);
@@ -100,17 +101,19 @@ export default function plugin(): Transformer {
         const imports = importNode.value
           .split('\n')
           .filter((statement) => markdownExtensionRegex.test(statement));
-        for (let i = 0; i < imports.length; i += 1) {
-          const localName = `${name}${i}`;
 
-          const importWords = imports[i]!.split(' ');
+        for (const importStatement of imports) {
+          const localName = `${name}${importsCount}`;
+
+          const importWords = importStatement!.split(' ');
           const partialPath = importWords[importWords.length - 1];
           const partialName = importWords[1] as string;
           const tocImport = `import {${name} as ${localName}} from ${partialPath}`;
 
           PartialComponentToHeadingsName[partialName] = localName;
 
           importNode.value = `${importNode.value}\n${tocImport}`;
+          importsCount += 1;
         }
       }
 

diff --git a/website/_dogfooding/_pages tests/_anotherPagePartial.md b/website/_dogfooding/_pages tests/_anotherPagePartial.md
@@ -0,0 +1,7 @@
+### Another page partial content
+
+This is text coming from another page partial
+
+#### Foo
+
+Level 4 headings don't belong in ToC
diff --git a/website/_dogfooding/_pages tests/index.mdx → website/_dogfooding/_pages tests/index.md b/website/_dogfooding/_pages tests/index.mdx → website/_dogfooding/_pages tests/index.md
@@ -1,17 +1,22 @@
-import PagePartial from './_pagePartial.md';
-import Readme from '../README.md';
-
 ## Page
 
 Let's import a MDX partial at `./_pagePartial.md`:
 
+```mdx-code-block
+import PagePartial from "./_pagePartial.md"
+
 <PagePartial />
+```
 
 ---
 
 Now let's import `../README.md`:
 
+```mdx-code-block
+import Readme from "../README.md"
+
 <Readme />
+```
 
 ### Other tests
 
@@ -26,4 +31,5 @@ Now let's import `../README.md`:
 - [Tabs tests](/tests/pages/tabs-tests)
 - [z-index tests](/tests/pages/z-index-tests)
 - [Head metadata tests](/tests/pages/head-metadata)
+- [Partials tests](/tests/pages/partials-tests)
 - [Embeds](/tests/pages/embeds)
diff --git a/website/_dogfooding/_pages tests/partials-tests.mdx b/website/_dogfooding/_pages tests/partials-tests.mdx
@@ -0,0 +1,12 @@
+import PagePartial from './_pagePartial.md';
+import AnotherPagePartial from './_anotherPagePartial.md';
+
+# Partials tests
+
+This page consists of multiple files imported into one. Notice how the table of contents works even for imported headings.
+
+## Imported content
+
+<PagePartial />
+
+<AnotherPagePartial />