Merge branch 'next'

readmeio · Sep 30, 2024 · 4a2b322 · 4a2b322
2 parents a960433 + c929bd0
commit 4a2b322
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 6 deletions.
diff --git a/__tests__/compilers/compatability.test.tsx b/__tests__/compilers/compatability.test.tsx
@@ -409,4 +409,59 @@ ${JSON.stringify(
       "
     `);
   });
+
+  it('compiles tables with inline code with newlines', () => {
+    const md = `
+[block:parameters]
+${JSON.stringify(
+  {
+    data: {
+      'h-0': 'Field',
+      'h-1': 'Description',
+      '0-0': 'orderby',
+      '0-1': '`{\n "field": "ID",\n "type": "ASC"\n }`',
+    },
+    cols: 2,
+    rows: 1,
+    align: ['left', 'left'],
+  },
+  null,
+  2,
+)}
+[/block]
+    `;
+
+    const rmdx = mdx(rdmd.mdast(md));
+    expect(rmdx).toMatchInlineSnapshot(`
+      "<Table align={["left","left"]}>
+        <thead>
+          <tr>
+            <th style={{ textAlign: "left" }}>
+              Field
+            </th>
+
+            <th style={{ textAlign: "left" }}>
+              Description
+            </th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr>
+            <td style={{ textAlign: "left" }}>
+              orderby
+            </td>
+
+            <td style={{ textAlign: "left" }}>
+              \`{
+               "field": "ID",
+               "type": "ASC"
+               }\`
+            </td>
+          </tr>
+        </tbody>
+      </Table>
+      "
+    `);
+  });
 });
diff --git a/__tests__/plugins/toc.test.tsx b/__tests__/plugins/toc.test.tsx
@@ -46,4 +46,16 @@ describe('toc transformer', () => {
     expect(screen.findByText('Common Heading')).toBeDefined();
     expect(screen.findByText('Subheading')).toBeDefined();
   });
+
+  it('parses out a toc and only uses plain text', async () => {
+    const md = `
+# [Title](http://example.com)
+`;
+    const { Toc } = await run(compile(md));
+
+    render(<Toc />);
+
+    expect(screen.findByText('Title')).toBeDefined();
+    expect(screen.queryByText('[', { exact: false })).toBeNull();
+  });
 });
diff --git a/processor/plugin/toc.ts b/processor/plugin/toc.ts
@@ -5,7 +5,7 @@ import { h } from 'hastscript';
 
 import { CustomComponents, HastHeading, IndexableElements, TocList, TocListItem } from '../../types';
 import { visit } from 'unist-util-visit';
-import { mdx } from '../../lib';
+import { mdx, plain } from '../../lib';
 
 interface Options {
   components?: Record<string, any>;
@@ -74,10 +74,13 @@ const tocToHast = (headings: HastHeading[] = []): TocList => {
       stack.pop();
     }
 
-    if (heading.properties)
+    if (heading.properties) {
+      const content = plain({ type: 'root', children: heading.children }) as string;
+
       stack[stack.length - 1].children.push(
-        h('li', null, h('a', { href: `#${heading.properties.id}` }, heading.children)) as TocListItem,
+        h('li', null, h('a', { href: `#${heading.properties.id}` }, content)) as TocListItem,
       );
+    }
   });
 
   return ast;

diff --git a/processor/transform/tables-to-jsx.ts b/processor/transform/tables-to-jsx.ts
@@ -1,4 +1,4 @@
-import { Node, Paragraph, Parents, Table, TableCell, Text } from 'mdast';
+import { Literal, Node, Paragraph, Parents, Table, TableCell, Text } from 'mdast';
 import { visit, EXIT } from 'unist-util-visit';
 import { Transform } from 'mdast-util-from-markdown';
 
@@ -19,6 +19,8 @@ const alignToStyle = (align: 'left' | 'center' | 'right' | null) => {
 
 const isTableCell = (node: Node) => ['tableHead', 'tableCell'].includes(node.type);
 
+const isLiteral = (node: Node): node is Literal => 'value' in node;
+
 const visitor = (table: Table, index: number, parent: Parents) => {
   let hasFlowContent = false;
 
@@ -39,8 +41,8 @@ const visitor = (table: Table, index: number, parent: Parents) => {
       return EXIT;
     }
 
-    visit(cell, 'text', (text: Text) => {
-      if (text.value.match(/\n/)) {
+    visit(cell, isLiteral, (node: Literal) => {
+      if (node.value.match(/\n/)) {
         hasFlowContent = true;
         return EXIT;
       }