From 65eddf0e789c620a53d9bec9509b515211fb9b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Sun, 10 Oct 2021 21:27:37 +0200 Subject: [PATCH] fix: fix regex modifier for input rules and paste rules, fix #2003 --- packages/extension-blockquote/src/blockquote.ts | 2 +- packages/extension-bold/src/bold.ts | 8 ++++---- packages/extension-code/src/code.ts | 4 ++-- packages/extension-highlight/src/highlight.ts | 4 ++-- packages/extension-italic/src/italic.ts | 8 ++++---- packages/extension-strike/src/strike.ts | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/extension-blockquote/src/blockquote.ts b/packages/extension-blockquote/src/blockquote.ts index e4c339b3..13a23333 100644 --- a/packages/extension-blockquote/src/blockquote.ts +++ b/packages/extension-blockquote/src/blockquote.ts @@ -23,7 +23,7 @@ declare module '@tiptap/core' { } } -export const inputRegex = /^\s*>\s$/gm +export const inputRegex = /^\s*>\s$/ export const Blockquote = Node.create({ diff --git a/packages/extension-bold/src/bold.ts b/packages/extension-bold/src/bold.ts index 50c0098e..728ba00e 100644 --- a/packages/extension-bold/src/bold.ts +++ b/packages/extension-bold/src/bold.ts @@ -28,10 +28,10 @@ declare module '@tiptap/core' { } } -export const starInputRegex = /(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))$/gm -export const starPasteRegex = /(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))/gm -export const underscoreInputRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))$/gm -export const underscorePasteRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))/gm +export const starInputRegex = /(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))$/ +export const starPasteRegex = /(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))/g +export const underscoreInputRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))$/ +export const underscorePasteRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))/g export const Bold = Mark.create({ name: 'bold', diff --git a/packages/extension-code/src/code.ts b/packages/extension-code/src/code.ts index 12b84b75..25581a72 100644 --- a/packages/extension-code/src/code.ts +++ b/packages/extension-code/src/code.ts @@ -28,8 +28,8 @@ declare module '@tiptap/core' { } } -export const inputRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))$/gm -export const pasteRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))/gm +export const inputRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))$/ +export const pasteRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))/g export const Code = Mark.create({ name: 'code', diff --git a/packages/extension-highlight/src/highlight.ts b/packages/extension-highlight/src/highlight.ts index b37e5fc0..06d8febb 100644 --- a/packages/extension-highlight/src/highlight.ts +++ b/packages/extension-highlight/src/highlight.ts @@ -29,8 +29,8 @@ declare module '@tiptap/core' { } } -export const inputRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))$/gm -export const pasteRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))/gm +export const inputRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))$/ +export const pasteRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))/g export const Highlight = Mark.create({ name: 'highlight', diff --git a/packages/extension-italic/src/italic.ts b/packages/extension-italic/src/italic.ts index 0bb1260f..cb6d3f61 100644 --- a/packages/extension-italic/src/italic.ts +++ b/packages/extension-italic/src/italic.ts @@ -28,10 +28,10 @@ declare module '@tiptap/core' { } } -export const starInputRegex = /(?:^|\s)((?:\*)((?:[^*]+))(?:\*))$/gm -export const starPasteRegex = /(?:^|\s)((?:\*)((?:[^*]+))(?:\*))/gm -export const underscoreInputRegex = /(?:^|\s)((?:_)((?:[^_]+))(?:_))$/gm -export const underscorePasteRegex = /(?:^|\s)((?:_)((?:[^_]+))(?:_))/gm +export const starInputRegex = /(?:^|\s)((?:\*)((?:[^*]+))(?:\*))$/ +export const starPasteRegex = /(?:^|\s)((?:\*)((?:[^*]+))(?:\*))/g +export const underscoreInputRegex = /(?:^|\s)((?:_)((?:[^_]+))(?:_))$/ +export const underscorePasteRegex = /(?:^|\s)((?:_)((?:[^_]+))(?:_))/g export const Italic = Mark.create({ name: 'italic', diff --git a/packages/extension-strike/src/strike.ts b/packages/extension-strike/src/strike.ts index cd09ef86..c0fcbf46 100644 --- a/packages/extension-strike/src/strike.ts +++ b/packages/extension-strike/src/strike.ts @@ -28,8 +28,8 @@ declare module '@tiptap/core' { } } -export const inputRegex = /(?:^|\s)((?:~~)((?:[^~]+))(?:~~))$/gm -export const pasteRegex = /(?:^|\s)((?:~~)((?:[^~]+))(?:~~))/gm +export const inputRegex = /(?:^|\s)((?:~~)((?:[^~]+))(?:~~))$/ +export const pasteRegex = /(?:^|\s)((?:~~)((?:[^~]+))(?:~~))/g export const Strike = Mark.create({ name: 'strike',