fix: allow to re-apply current mark for input rules and paste rules, fix

#2003
ueberdosis · Oct 10, 2021 · 3958bf1 · 3958bf1
1 parent 3a7e202
commit 3958bf1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/packages/core/src/inputRules/markInputRule.ts b/packages/core/src/inputRules/markInputRule.ts
@@ -39,11 +39,10 @@ export default function markInputRule(config: {
 
         const excludedMarks = getMarksBetween(range.from, range.to, state)
           .filter(item => {
-            // TODO: PR to add excluded to MarkType
             // @ts-ignore
-            const { excluded } = item.mark.type
+            const excluded = item.mark.type.excluded as MarkType[]
 
-            return excluded.find((type: MarkType) => type.name === config.type.name)
+            return excluded.find(type => type === config.type && type !== item.mark.type)
           })
           .filter(item => item.to > textStart)
 

diff --git a/packages/core/src/pasteRules/markPasteRule.ts b/packages/core/src/pasteRules/markPasteRule.ts
@@ -39,11 +39,10 @@ export default function markPasteRule(config: {
 
         const excludedMarks = getMarksBetween(range.from, range.to, state)
           .filter(item => {
-            // TODO: PR to add excluded to MarkType
             // @ts-ignore
-            const { excluded } = item.mark.type
+            const excluded = item.mark.type.excluded as MarkType[]
 
-            return excluded.find((type: MarkType) => type.name === config.type.name)
+            return excluded.find(type => type === config.type && type !== item.mark.type)
           })
           .filter(item => item.to > textStart)