[pull] develop from docsifyjs:develop

src/core/render/compiler.js

@@ -25,6 +25,7 @@ export class Compiler {
     this.router = router;
     this.cacheTree = {};
     this.toc = [];
+    this.blockquoteDepth = 0;
     this.cacheTOC = {};
     this.linkTarget = config.externalLinkTarget || '_blank';
     this.linkRel =
@@ -113,9 +114,13 @@ export class Compiler {
       }
 
       let media;
-      if (config.type && (media = compileMedia[config.type])) {
+      const mediaType = Array.isArray(config.type)
+        ? config.type[0]
+        : config.type;
+
+      if (mediaType && (media = compileMedia[mediaType])) {
         embed = media.call(this, href, title);
-        embed.type = config.type;
+        embed.type = mediaType;
       } else {
         let type = 'code';
         if (/\.(md|markdown)/.test(href)) {
@@ -165,7 +170,10 @@ export class Compiler {
       router,
       compiler: this,
     });
-    origin.blockquoteCompiler = blockquoteCompiler({ renderer });
+    origin.blockquoteCompiler = blockquoteCompiler({
+      renderer,
+      compiler: this,
+    });
     origin.code = highlightCodeCompiler({ renderer });
     origin.link = linkCompiler({
       renderer,

src/core/render/compiler/blockquote.js

@@ -1,4 +1,4 @@
-export const blockquoteCompiler = ({ renderer }) =>
+export const blockquoteCompiler = ({ renderer, compiler }) =>
   (renderer.blockquote = function ({ tokens }) {
     let openTag = '<blockquote>';
     let closeTag = '</blockquote>';
@@ -40,6 +40,14 @@ export const blockquoteCompiler = ({ renderer }) =>
       }
     }
 
-    const body = this.parser.parse(tokens);
+    compiler.blockquoteDepth++;
+    let body = '';
+
+    try {
+      body = this.parser.parse(tokens);
+    } finally {
+      compiler.blockquoteDepth--;
+    }
+
     return `${openTag}${body}${closeTag}`;
   });

src/core/render/compiler/heading.js

@@ -22,7 +22,10 @@ export const headingCompiler = ({ renderer, router, compiler }) =>
     const slug = slugify(config.id || text);
     const url = router.toURL(router.getCurrentPath(), { id: slug });
     nextToc.slug = stripUrlExceptId(url);
-    compiler.toc.push(nextToc);
+
+    if (compiler.blockquoteDepth === 0) {
+      compiler.toc.push(nextToc);
+    }
 
     // Note: tabindex="-1" allows programmatically focusing on heading
     // elements after navigation. This is preferred over focusing on the link

test/integration/sidebar.test.js

@@ -63,11 +63,11 @@ describe('Test sidebar render toc structure', function () {
       },
       markdown: {
         homepage: `
-        # Getting started 
+        # Getting started
            some thing
-        ## Level1 
+        ## Level1
             foo
-        ### Level2 
+        ### Level2
             bar
         `,
       },
@@ -118,4 +118,28 @@ describe('Test sidebar render toc structure', function () {
     expect(level1_A_tag.textContent).toContain('Level1');
     expect(level2_A_tag.textContent).toContain('Level2');
   });
+
+  test('Render sidebar should ignore headings in blockquote by default', async () => {
+    await docsifyInit({
+      config: {
+        loadSidebar: false,
+      },
+      markdown: {
+        homepage: `
+        # Normal Title
+        > # Quoted Title
+        > #Quoted Title Without Space
+        ## Section Title
+        `,
+      },
+      waitForSelector: '.sidebar-nav > ul',
+    });
+
+    const sidebarText = document.querySelector('.sidebar-nav').textContent;
+
+    expect(sidebarText).toContain('Normal Title');
+    expect(sidebarText).toContain('Section Title');
+    expect(sidebarText).not.toContain('Quoted Title');
+    expect(sidebarText).not.toContain('Quoted Title Without Space');
+  });
 });