markdown auto import fixes

ibastawisi · Jun 16, 2024 · 11c5b55 · 11c5b55
1 parent cd0ea2a
commit 11c5b55
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/editor/plugins/MarkdownPlugin/MarkdownAutoImportPlugin.tsx b/src/editor/plugins/MarkdownPlugin/MarkdownAutoImportPlugin.tsx
@@ -56,6 +56,7 @@ function runTextMatchTransformers(
 
     const startIndex = match.index || 0;
     const endIndex = startIndex + match[0].length;
+    if (!match.slice(1).map(Boolean).includes(true)) continue;
     let replaceNode;
 
     if (startIndex === 0) {
@@ -84,6 +85,7 @@ function $runTextFormatTransformers(
     const matches = textContent.matchAll(regex);
     for (const match of matches) {
       const startIndex = match.index || 0;
+      if (textContent[startIndex - 1] === matcher.tag[0]) continue;
       const endIndex = startIndex + match[0].length;
       let targetNode;
       if (startIndex === 0) {

diff --git a/src/editor/plugins/MarkdownPlugin/MarkdownTransformers.tsx b/src/editor/plugins/MarkdownPlugin/MarkdownTransformers.tsx
@@ -437,9 +437,9 @@ export const LINK: TextMatchTransformer = {
 export const HR: ElementTransformer = {
   dependencies: [HorizontalRuleNode],
   export: (node: LexicalNode) => {
-    return $isHorizontalRuleNode(node) ? '***' : null;
+    return $isHorizontalRuleNode(node) ? '---' : null;
   },
-  regExp: /^(---|\*\*\*|___)\s?/,
+  regExp: /^(---)\s?/,
   replace: (parentNode, _1, _2, isImport) => {
     const line = $createHorizontalRuleNode();
 

diff --git a/src/editor/plugins/index.tsx b/src/editor/plugins/index.tsx
@@ -10,7 +10,7 @@ import { LinkPlugin } from "@lexical/react/LexicalLinkPlugin";
 import { ListPlugin } from "./ListPlugin";
 import { CheckListPlugin } from '@lexical/react/LexicalCheckListPlugin';
 import { TabIndentationPlugin } from '@lexical/react/LexicalTabIndentationPlugin';
-import MarkdownPlugin from "./MarkdownPlugin/MarkdownShortcutPlugin";
+import MarkdownShortcutPlugin from "./MarkdownPlugin/MarkdownShortcutPlugin";
 import MarkdownAutoImportPlugin from "./MarkdownPlugin/MarkdownAutoImportPlugin";
 import ListMaxIndentLevelPlugin from "./ListPlugin/ListMaxIndentLevelPlugin";
 import CodeHighlightPlugin from "./CodePlugin/CodeHighlightPlugin";
@@ -64,7 +64,7 @@ export const EditorPlugins: React.FC<{
       <TabFocusPlugin />
       <TabIndentationPlugin />
       <ListMaxIndentLevelPlugin maxDepth={7} />
-      <MarkdownPlugin />
+      <MarkdownShortcutPlugin />
       <MarkdownAutoImportPlugin />
       <FloatingToolbarPlugin />
       <HorizontalRulePlugin />