From a2e348df06baae9afe600a4e764b629f43ffc4ec Mon Sep 17 00:00:00 2001 From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Date: Mon, 12 Jan 2026 11:22:44 +0530 Subject: [PATCH] fix: Backslash issue with `--` and improve autolink handling (#13208) --- app/javascript/dashboard/constants/editor.js | 5 +-- .../helper/specs/editorHelper.spec.js | 31 +++++++++++++++++++ package.json | 2 +- pnpm-lock.yaml | 10 +++--- 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/app/javascript/dashboard/constants/editor.js b/app/javascript/dashboard/constants/editor.js index 6b1a99f23..2aa98477e 100644 --- a/app/javascript/dashboard/constants/editor.js +++ b/app/javascript/dashboard/constants/editor.js @@ -237,10 +237,11 @@ export const MARKDOWN_PATTERNS = [ patterns: [{ pattern: /`([^`]+)`/g, replacement: '$1' }], }, { - type: 'link', // PM: link, eg: [text](url) or + type: 'link', // PM: link patterns: [ { pattern: /\[([^\]]+)\]\([^)]+\)/g, replacement: '$1' }, // [text](url) -> text - { pattern: /<(https?:\/\/[^>]+)>/g, replacement: '$1' }, // -> url (autolinks) + { pattern: /<([a-zA-Z][a-zA-Z0-9+.-]*:[^\s>]+)>/g, replacement: '$1' }, // , , , , etc + { pattern: /<([^\s@]+@[^\s@>]+)>/g, replacement: '$1' }, // -> user@example.com ], }, ]; diff --git a/app/javascript/dashboard/helper/specs/editorHelper.spec.js b/app/javascript/dashboard/helper/specs/editorHelper.spec.js index f928b1d28..abbef420f 100644 --- a/app/javascript/dashboard/helper/specs/editorHelper.spec.js +++ b/app/javascript/dashboard/helper/specs/editorHelper.spec.js @@ -901,6 +901,17 @@ describe('stripUnsupportedFormatting', () => { expect(stripUnsupportedFormatting(content, fullSchema)).toBe(content); }); + it('preserves various URI scheme autolinks', () => { + const content = + 'Email or call '; + expect(stripUnsupportedFormatting(content, fullSchema)).toBe(content); + }); + + it('preserves email autolinks', () => { + const content = 'Contact us at '; + expect(stripUnsupportedFormatting(content, fullSchema)).toBe(content); + }); + it('preserves lists when schema supports them', () => { const content = '- item 1\n- item 2\n1. first\n2. second'; expect(stripUnsupportedFormatting(content, fullSchema)).toBe(content); @@ -984,6 +995,26 @@ describe('stripUnsupportedFormatting', () => { expect(stripUnsupportedFormatting(content, emptySchema)).toBe(expected); }); + it('converts URI scheme autolinks to plain text', () => { + const content = + 'Email or call '; + const expected = + 'Email mailto:support@example.com or call tel:+1234567890'; + expect(stripUnsupportedFormatting(content, emptySchema)).toBe(expected); + }); + + it('converts email autolinks to plain text', () => { + const content = 'Reach us at for help'; + const expected = 'Reach us at admin@chatwoot.com for help'; + expect(stripUnsupportedFormatting(content, emptySchema)).toBe(expected); + }); + + it('handles mixed autolink types', () => { + const content = 'Visit or email '; + const expected = 'Visit https://example.com or email info@example.com'; + expect(stripUnsupportedFormatting(content, emptySchema)).toBe(expected); + }); + it('strips bullet list markers', () => { expect( stripUnsupportedFormatting('- item 1\n- item 2', emptySchema) diff --git a/package.json b/package.json index 6d5a37b5a..1d9b72be2 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "dependencies": { "@breezystack/lamejs": "^1.2.7", "@chatwoot/ninja-keys": "1.2.3", - "@chatwoot/prosemirror-schema": "1.3.4", + "@chatwoot/prosemirror-schema": "1.3.5", "@chatwoot/utils": "^0.0.51", "@formkit/core": "^1.6.7", "@formkit/vue": "^1.6.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 26bd3141e..f062848c5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,8 +23,8 @@ importers: specifier: 1.2.3 version: 1.2.3 '@chatwoot/prosemirror-schema': - specifier: 1.3.4 - version: 1.3.4 + specifier: 1.3.5 + version: 1.3.5 '@chatwoot/utils': specifier: ^0.0.51 version: 0.0.51 @@ -454,8 +454,8 @@ packages: '@chatwoot/ninja-keys@1.2.3': resolution: {integrity: sha512-xM8d9P5ikDMZm2WbaCTk/TW5HFauylrU3cJ75fq5je6ixKwyhl/0kZbVN/vbbZN4+AUX/OaSIn6IJbtCgIF67g==} - '@chatwoot/prosemirror-schema@1.3.4': - resolution: {integrity: sha512-XY1UyG9topVy7fNCt45YgiU/QzlJJRhrcrSWcvAIIcDYKomnEcGOyeAfM3WeFD6GgOuLzRUyIHrW+WQGpHaZvA==} + '@chatwoot/prosemirror-schema@1.3.5': + resolution: {integrity: sha512-3Koj3jwO1qOxJG84D4FqPOJ6o8k6ehZi1zedO3vKRERATm2Cy1p+ET6FEvVYWUpoBvDwR6hNVScXrcNNVobhsA==} '@chatwoot/utils@0.0.51': resolution: {integrity: sha512-WlEmWfOTzR7YZRUWzn5Wpm15/BRudpwqoNckph8TohyDbiim1CP4UZGa+qjajxTbNGLLhtKlm0Xl+X16+5Wceg==} @@ -4970,7 +4970,7 @@ snapshots: hotkeys-js: 3.8.7 lit: 2.2.6 - '@chatwoot/prosemirror-schema@1.3.4': + '@chatwoot/prosemirror-schema@1.3.5': dependencies: markdown-it-sup: 2.0.0 prosemirror-commands: 1.6.0