fixing link can handle more than one mail

plone · Jan 16, 2025 · 4d2360b · 4d2360b
1 parent 1c88feb
commit 4d2360b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/packages/volto/src/helpers/Url/Url.test.js b/packages/volto/src/helpers/Url/Url.test.js
@@ -19,6 +19,7 @@ import {
   normaliseMail,
   normalizeTelephone,
   flattenScales,
+  isMail,
 } from './Url';
 
 beforeEach(() => {
@@ -533,4 +534,18 @@ describe('Url', () => {
       });
     });
   });
+
+  describe('isMail', () => {
+    it('isMale test', () => {
+      const mailExamples = [
+        'mailto:[email protected]',
+        'mailto:[email protected],[email protected]',
+        'mailto:[email protected][email protected]',
+        'mailto:[email protected]?subject=Hello&body=World',
+      ];
+      for (let mail of mailExamples) {
+        expect(isMail(mail)).toBe(true);
+      }
+    });
+  });
 });
diff --git a/packages/volto/src/helpers/Url/urlRegex.js b/packages/volto/src/helpers/Url/urlRegex.js
@@ -3,7 +3,7 @@
 import tlds from 'tlds';
 
 export const mailRegex = () =>
-  /^((mailto:[^<>()/[\].,;:\s@"]+(\.[^<>()[\].,;:\s@"]+)*)|(".+"))@(([^<>()[\].,;:\s@"]+\.)+[^<>()[\].,;:\s@"]{2,})$/i;
+  /^mailto:([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})(,[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})*(\?[^<>()[\]\s]*)?$/i;
 
 export const telRegex = () =>
   /^[tel:]*[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s./0-9]*$/g;