Update mark input/paste rules to tiptap v2 regular expressions

The most important change is that a mark is added only if you are at the beginning of a block or there is a space before it. This especially fixes accidently formatting parts of a string as italic when it contains two underscores (often true in URLs or emoji names). This change can be reverted when we migrated to tiptap v2, but it's a low hanging fix for an annoying bug, and the tiptap v2 migration might take a bit longer. See Philipp Kuehns comment at https://discuss.prosemirror.net/t/4230/3. Signed-off-by: Jonas Meurer <[email protected]>
nextcloud · Nov 27, 2021 · a2338f9 · a2338f9
1 parent 5da5d63
commit a2338f9
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 15 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/marks/index.js b/src/marks/index.js
@@ -23,6 +23,7 @@
 import { Bold, Italic as TipTapItalic, Strike as TipTapStrike, Link as TipTapLink } from 'tiptap-extensions'
 import { Plugin } from 'tiptap'
 import { getMarkAttrs } from 'tiptap-utils'
+import { markInputRule, markPasteRule } from 'tiptap-commands'
 import { domHref, parseHref } from './../helpers/links'
 import { markdownit } from './../EditorFactory'
 
@@ -37,6 +38,22 @@ class Strong extends Bold {
 		return 'strong'
 	}
 
+	// TODO: remove once we upgraded to tiptap v2
+	inputRules({ type }) {
+		return [
+			markInputRule(/(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))$/, type),
+			markInputRule(/(?:^|\s)((?:__)((?:[^__]+))(?:__))$/, type),
+		]
+	}
+
+	// TODO: remove once we upgraded to tiptap v2
+	pasteRules({ type }) {
+		return [
+			markPasteRule(/(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))/g, type),
+			markPasteRule(/(?:^|\s)((?:__)((?:[^__]+))(?:__))/g, type),
+		]
+	}
+
 }
 
 class Italic extends TipTapItalic {
@@ -45,6 +62,22 @@ class Italic extends TipTapItalic {
 		return 'em'
 	}
 
+	// TODO: remove once we upgraded to tiptap v2
+	inputRules({ type }) {
+		return [
+			markInputRule(/(?:^|\s)((?:\*)((?:[^*]+))(?:\*))$/, type),
+			markInputRule(/(?:^|\s)((?:_)((?:[^_]+))(?:_))$/, type),
+		]
+	}
+
+	// TODO: remove once we upgraded to tiptap v2
+	pasteRules({ type }) {
+		return [
+			markPasteRule(/(?:^|\s)((?:\*)((?:[^*]+))(?:\*))/g, type),
+			markPasteRule(/(?:^|\s)((?:_)((?:[^_]+))(?:_))/g, type),
+		]
+	}
+
 }
 
 class Strike extends TipTapStrike {
@@ -76,6 +109,20 @@ class Strike extends TipTapStrike {
 		}
 	}
 
+	// TODO: remove once we upgraded to tiptap v2
+	inputRules({ type }) {
+		return [
+			markInputRule(/(?:^|\s)((?:~~)((?:[^~]+))(?:~~))$/, type),
+		]
+	}
+
+	// TODO: remove once we upgraded to tiptap v2
+	pasteRules({ type }) {
+		return [
+			markPasteRule(/(?:^|\s)((?:~~)((?:[^~]+))(?:~~))/g, type),
+		]
+	}
+
 }
 
 class Link extends TipTapLink {