fix: customized markdown-it extensions have lower priority(#305)

imzbf · Jun 25, 2023 · 69f2234 · 69f2234
1 parent 9d5be64
commit 69f2234
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 33 deletions.
diff --git a/dev/Preview/image/TargetBlankExtension.js b/dev/Preview/image/TargetBlankExtension.js
@@ -0,0 +1,22 @@
+const TargetBlankExtension = (md) => {
+  const defaultRender =
+    md.renderer.rules.link_open ||
+    function (tokens, idx, options, env, self) {
+      return self.renderToken(tokens, idx, options);
+    };
+
+  md.renderer.rules.link_open = function (tokens, idx, options, env, self) {
+    const aIndex = tokens[idx].attrIndex('target');
+
+    if (aIndex < 0) {
+      tokens[idx].attrPush(['target', '_blank']);
+    } else {
+      tokens[idx].attrs[aIndex][1] = '_blank';
+    }
+
+    // pass token to default renderer.
+    return defaultRender(tokens, idx, options, env, self);
+  };
+};
+
+export default TargetBlankExtension;
diff --git a/dev/Preview/index.tsx b/dev/Preview/index.tsx
@@ -20,6 +20,7 @@ import type { ExposeParam } from '~~/index';
 import mdText from '../data.md';
 import { Theme } from '../App';
 import axios from 'axios';
+// import TargetBlankExtension from './image/TargetBlankExtension.js';
 // import 'katex/dist/katex.min.css';
 
 // import { Extension } from '@codemirror/state';
@@ -70,9 +71,11 @@ config({
     return [...extensions, lineNumbers()];
   },
   // markdownItConfig: (mdit) => {
-  //   mdit.use(ancher, {
-  //     permalink: true
-  //   });
+  // mdit.use(ancher, {
+  //   permalink: true
+  // });
+
+  // mdit.use(TargetBlankExtension);
   // },
   editorExtensions: {
     // prettier: {

diff --git a/packages/MdEditor/layouts/Content/composition/useMarkdownIt.ts b/packages/MdEditor/layouts/Content/composition/useMarkdownIt.ts
@@ -26,32 +26,34 @@ const initLineNumber = (md: mdit) => {
     'ordered_list_open',
     'bullet_list_open',
     'blockquote_open',
-    'hr'
+    'hr',
+    'html_block',
+    'fence'
   ].forEach((rule) => {
-    md.renderer.rules[rule] = (tokens, idx, options, _env, self) => {
-      let line;
-      if (tokens[idx].map && tokens[idx].level === 0) {
-        line = tokens[idx].map![0];
-        tokens[idx].attrSet('data-line', String(line));
-      }
-      return self.renderToken(tokens, idx, options);
-    };
-  });
-
-  ['html_block', 'fence'].forEach((rule) => {
     const backup = md.renderer.rules[rule];
 
-    md.renderer.rules[rule] = (tokens, idx, options, env, self) => {
-      let line;
-      const _htmlCode = backup!(tokens, idx, options, env, self);
-
-      if (tokens[idx].map && tokens[idx].level === 0) {
-        line = tokens[idx].map![0];
-        return _htmlCode.replace(/^(<[^>]*)/, `$1 data-line="${line}"`);
-      }
+    if (!backup) {
+      md.renderer.rules[rule] = (tokens, idx, options, _env, self) => {
+        let line;
+        if (tokens[idx].map && tokens[idx].level === 0) {
+          line = tokens[idx].map![0];
+          tokens[idx].attrSet('data-line', String(line));
+        }
+        return self.renderToken(tokens, idx, options);
+      };
+    } else {
+      md.renderer.rules[rule] = (tokens, idx, options, env, self) => {
+        let line;
+        const _htmlCode = backup(tokens, idx, options, env, self);
+
+        if (tokens[idx].map && tokens[idx].level === 0) {
+          line = tokens[idx].map![0];
+          return _htmlCode.replace(/^(<[^>]*)/, `$1 data-line="${line}"`);
+        }
 
-      return _htmlCode;
-    };
+        return _htmlCode;
+      };
+    }
   });
 };
 

diff --git a/packages/MdEditor/layouts/Content/markdownIt/heading/index.ts b/packages/MdEditor/layouts/Content/markdownIt/heading/index.ts
@@ -8,14 +8,6 @@ export interface HeadingPluginOps extends markdownit.Options {
 }
 
 const HeadingPlugin = (md: markdownit, options: HeadingPluginOps) => {
-  let Token: any;
-
-  md.core.ruler.push('headingLinks', (state) => {
-    if (!Token) {
-      Token = state.Token;
-    }
-  });
-
   md.renderer.rules.heading_open = (tokens, idx) => {
     const token = tokens[idx];