layers-design-system 2.0.7 → 2.0.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "layers-design-system",
   "main": "src/main.js",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "scripts": {
     "start": "vue-cli-service serve ./src/main-docs.js",
     "build": "vue-cli-service build --target lib ./src/main.js",

package/src/components/LTextEditor/helpers/manageLinks.js

@@ -2,12 +2,12 @@ const urlRegex = require('url-regex-safe')
 
 const customUrlRegex = new RegExp(
   '((href=")?)' +
-    urlRegex({
-      localhost: false,
-      apostrophes: false,
-      returnString: true,
-    }) +
-    '((</a>)?)',
+  urlRegex({
+    localhost: false,
+    apostrophes: false,
+    returnString: true,
+  }) +
+  '((</a>)?)',
   'g'
 )
 
@@ -28,9 +28,29 @@ export function addProtocol(link) {
 }
 
 export function mountLink(text) {
-  return text.replace(customUrlRegex, (url) => {
-    return url.startsWith('href="') || url.endsWith('</a>')
-      ? url
-      : mountTagA(url)
-  })
-}
+  // Regular expression to match email addresses
+  const emailRegex = /(\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b)/g;
+
+  // Replace each email address in text with a mailto link
+  let finalText = text.replace(emailRegex, (email) => {
+    const href = `mailto:${email}`;
+    return getTagA(href, email);
+  });
+  let match;
+
+  // Loop through the text to find and replace URLs
+  while ((match = customUrlRegex.exec(finalText)) !== null) {
+    const url = match[0];
+
+    // Skip URLs that are parto of email addresses or already within anchor tags
+    if (finalText[match.index - 1] === '@' || url.startsWith('href="') || url.endsWith('</a>')) {
+      continue;
+    }
+    const finalIndex = match.index + url.length;
+    const finalUrl = mountTagA(url);
+
+    // Replace the URL with the formatted ancho tag
+    finalText = finalText.substring(0, match.index) + finalUrl + finalText.substring(finalIndex);
+  }
+  return finalText;
+}