Merge branch 'develop' into develop

Author: Koooooo-7

src/core/event/index.js

@@ -548,9 +548,11 @@ export function Events(Base) {
 
       // Set aria-expanded attribute
       ariaElms.forEach(toggleElm => {
+        const expanded = force ?? sidebarElm.classList.contains('show');
+        toggleElm.setAttribute('aria-expanded', expanded);
         toggleElm.setAttribute(
-          'aria-expanded',
-          force ?? sidebarElm.classList.contains('show'),
+          'aria-label',
+          expanded ? 'Hide primary navigation' : 'Show primary navigation',
         );
       });
 

src/core/render/compiler.js

@@ -15,6 +15,7 @@ import { taskListCompiler } from './compiler/taskList.js';
 import { taskListItemCompiler } from './compiler/taskListItem.js';
 import { linkCompiler } from './compiler/link.js';
 import { compileMedia } from './compiler/media.js';
+import { tableCellCompiler } from './compiler/tableCell.js';
 
 const cachedLinks = {};
 
@@ -176,6 +177,7 @@ export class Compiler {
     origin.image = imageCompiler({ renderer, contentBase, router });
     origin.list = taskListCompiler({ renderer });
     origin.listitem = taskListItemCompiler({ renderer });
+    origin.tablecell = tableCellCompiler({ renderer, compiler: this });
 
     renderer.origin = origin;
 

src/core/render/compiler/tableCell.js

@@ -0,0 +1,15 @@
+export const tableCellCompiler = ({ renderer }) =>
+  (renderer.tablecell = function (token) {
+    let content;
+
+    if (token.embedTokens && token.embedTokens.length > 0) {
+      content = this.parser.parse(token.embedTokens);
+    } else {
+      content = this.parser.parseInline(token.tokens);
+    }
+
+    const type = token.header ? 'th' : 'td';
+    const tag = token.align ? `<${type} align="${token.align}">` : `<${type}>`;
+
+    return tag + content + `</${type}>\n`;
+  });

src/core/render/embed.js

@@ -98,7 +98,14 @@ function walkFetchEmbed({ embedTokens, compile, fetch }, cb) {
         }
       }
 
-      cb({ token: currentToken, embedToken });
+      cb({
+        token: currentToken,
+        embedToken,
+        rowIndex: currentToken.rowIndex,
+        cellIndex: currentToken.cellIndex,
+        tokenRef: currentToken.tokenRef,
+      });
+
       if (++count >= embedTokens.length) {
         cb({});
       }
@@ -126,51 +133,82 @@ export function prerenderEmbed({ compiler, raw = '', fetch }, done) {
   const linkRE = compile.Lexer.rules.inline.normal.link;
   const links = tokens.links;
 
+  const linkMatcher = new RegExp(linkRE.source, 'g');
+
   tokens.forEach((token, index) => {
     if (token.type === 'paragraph') {
       token.text = token.text.replace(
-        new RegExp(linkRE.source, 'g'),
+        linkMatcher,
         (src, filename, href, title) => {
           const embed = compiler.compileEmbed(href, title);
-
           if (embed) {
             embedTokens.push({
               index,
+              tokenRef: token,
               embed,
             });
           }
-
           return src;
         },
       );
+    } else if (token.type === 'table') {
+      token.rows.forEach((row, rowIndex) => {
+        row.forEach((cell, cellIndex) => {
+          cell.text = cell.text.replace(
+            linkMatcher,
+            (src, filename, href, title) => {
+              const embed = compiler.compileEmbed(href, title);
+              if (embed) {
+                embedTokens.push({
+                  index,
+                  tokenRef: token,
+                  rowIndex,
+                  cellIndex,
+                  embed,
+                });
+              }
+              return src;
+            },
+          );
+        });
+      });
     }
   });
 
   // keep track of which tokens have been embedded so far
   // so that we know where to insert the embedded tokens as they
   // are returned
   const moves = [];
-  walkFetchEmbed({ compile, embedTokens, fetch }, ({ embedToken, token }) => {
-    if (token) {
-      // iterate through the array of previously inserted tokens
-      // to determine where the current embedded tokens should be inserted
-      let index = token.index;
-      moves.forEach(pos => {
-        if (index > pos.start) {
-          index += pos.length;
-        }
-      });
+  walkFetchEmbed(
+    { compile, embedTokens, fetch },
+    ({ embedToken, token, rowIndex, cellIndex, tokenRef }) => {
+      if (token) {
+        if (typeof rowIndex === 'number' && typeof cellIndex === 'number') {
+          const cell = tokenRef.rows[rowIndex][cellIndex];
+
+          cell.embedTokens = embedToken;
+        } else {
+          // iterate through the array of previously inserted tokens
+          // to determine where the current embedded tokens should be inserted
+          let index = token.index;
+          moves.forEach(pos => {
+            if (index > pos.start) {
+              index += pos.length;
+            }
+          });
 
-      Object.assign(links, embedToken.links);
+          Object.assign(links, embedToken.links);
 
-      tokens = tokens
-        .slice(0, index)
-        .concat(embedToken, tokens.slice(index + 1));
-      moves.push({ start: index, length: embedToken.length - 1 });
-    } else {
-      cached[raw] = tokens.concat();
-      tokens.links = cached[raw].links = links;
-      done(tokens);
-    }
-  });
+          tokens = tokens
+            .slice(0, index)
+            .concat(embedToken, tokens.slice(index + 1));
+          moves.push({ start: index, length: embedToken.length - 1 });
+        }
+      } else {
+        cached[raw] = tokens.concat();
+        tokens.links = cached[raw].links = links;
+        done(tokens);
+      }
+    },
+  );
 }

src/core/render/tpl.js

@@ -43,7 +43,7 @@ export function main(config) {
     ? ''
     : `
     <button class="sidebar-toggle" tabindex="-1" title="Press \\ to toggle">
-      <div class="sidebar-toggle-button" tabindex="0" aria-label="Toggle primary navigation" aria-keyshortcuts="\\" aria-controls="__sidebar">
+      <div class="sidebar-toggle-button" tabindex="0" aria-label="Hide primary navigation" aria-keyshortcuts="Use shortcut key \\" aria-controls="__sidebar" role="button">
         <span></span><span></span><span></span>
       </div>
     </button>