add-to-calendar-button 2.2.3 → 2.2.4

package/dist/commonjs/index.js

@@ -7,15 +7,15 @@ const tzlibActions = require('timezones-ical-library');
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.2.3
+ *  Version: 2.2.4
  *  Creator: Jens Kuerschner (https://jenskuerschner.de)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.2.3';
-const atcbCssTemplate = {
+const atcbVersion = '2.2.4';
+const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
   } else {
@@ -440,11 +440,15 @@ function atcb_decorate_data_meta(data) {
 }
 function atcb_decorate_data_description(data, i) {
   if (data.dates[`${i}`].description != null && data.dates[`${i}`].description != '') {
+    data.dates[`${i}`].description = data.dates[`${i}`].description.replace(/(\\r\\n|\\n|\\r|<br(\s|\s\/|\/|)>)/g, '');
     data.dates[`${i}`].descriptionHtmlFree = atcb_rewrite_html_elements(data.dates[`${i}`].description, true);
+    data.dates[`${i}`].descriptionHtmlFreeICal = atcb_rewrite_html_elements(data.dates[`${i}`].description, true, true);
     data.dates[`${i}`].description = atcb_rewrite_html_elements(data.dates[`${i}`].description);
   } else {
     if (data.dates[`${i}`].description == null && data.description != null && data.description != '') {
+      data.description = data.description.replace(/(\\r\\n|\\n|\\r|<br(\s|\s\/|\/|)>)/g, '');
       data.dates[`${i}`].descriptionHtmlFree = atcb_rewrite_html_elements(data.description, true);
+      data.dates[`${i}`].descriptionHtmlFreeICal = atcb_rewrite_html_elements(data.description, true, true);
       data.dates[`${i}`].description = atcb_rewrite_html_elements(data.description);
     } else {
       data.dates[`${i}`].descriptionHtmlFree = data.dates[`${i}`].description = '';
@@ -1886,25 +1890,28 @@ function atcb_generate_rich_data_recurrence(data, formattedDate) {
 
 
 function atcb_generate_links(host, type, data, subEvent = 'all', keyboardTrigger = false, multiDateModal = false) {
+  let linkType = type;
+  if (type == 'apple') {
+    linkType = 'ical';
+  }
+  if (isMobile() && (type == 'msteams' || type == 'ms365' || type == 'outlookcom')) {
+    linkType = 'ical';
+  }
   if (subEvent != 'all') {
     subEvent = parseInt(subEvent) - 1;
   } else if (data.dates.length == 1) {
     subEvent = 0;
   }
   if (data.subscribe) {
-    atcb_generate_subscribe_links(host, type, data, keyboardTrigger);
+    atcb_generate_subscribe_links(host, linkType, data, keyboardTrigger);
     return;
   }
-  if (isMobile() && (type == 'msteams' || type == 'ms365' || type == 'outlookcom')) {
-    type = 'ical';
-  }
   if (subEvent != 'all') {
-    if (data.dates[`${subEvent}`].status == 'CANCELLED' && type != 'apple' && type != 'ical') {
+    if (data.dates[`${subEvent}`].status == 'CANCELLED' && linkType != 'ical') {
       atcb_create_modal(host, data, 'warning', atcb_translate_hook('date.status.cancelled', data), atcb_translate_hook('date.status.cancelled.cta', data), [], [], keyboardTrigger);
     } else {
-      switch (type) {
-        case 'apple':
-        case 'ical':
+      switch (linkType) {
+        case 'ical': // also for apple (see above)
           atcb_generate_ical(host, data, subEvent, keyboardTrigger);
           break;
         case 'google':
@@ -1940,12 +1947,11 @@ function atcb_generate_links(host, type, data, subEvent = 'all', keyboardTrigger
     }
     return;
   }
-  atcb_generate_multidate_links(host, type, data, keyboardTrigger, multiDateModal);
+  atcb_generate_multidate_links(host, type, linkType, data, keyboardTrigger, multiDateModal);
 }
-function atcb_generate_multidate_links(host, type, data, keyboardTrigger, multiDateModal) {
+function atcb_generate_multidate_links(host, type, linkType, data, keyboardTrigger, multiDateModal) {
   if (
-    (type == 'ical' || type == 'apple') &&
-    data.dates.every(function (theSubEvent) {
+    (linkType == 'ical') && data.dates.every(function (theSubEvent) {
       if (theSubEvent.status == 'CANCELLED' || (theSubEvent.organizer != null && theSubEvent.organizer != '')) {
         return false;
       }
@@ -1967,11 +1973,10 @@ function atcb_generate_multidate_links(host, type, data, keyboardTrigger, multiD
     atcb_create_modal(host, data, type, atcb_translate_hook('modal.multidate.h', data), atcb_translate_hook('modal.multidate.text', data), [], individualButtons, keyboardTrigger);
   }
 }
-function atcb_generate_subscribe_links(host, type, data, keyboardTrigger) {
+function atcb_generate_subscribe_links(host, linkType, data, keyboardTrigger) {
   const adjustedFileUrl = data.icsFile.replace('https://', 'webcal://');
-  switch (type) {
-    case 'apple':
-    case 'ical':
+  switch (linkType) {
+    case 'ical': // also for apple (see above)
       atcb_subscribe_ical(adjustedFileUrl);
       break;
     case 'google':
@@ -2148,7 +2153,7 @@ function atcb_generate_microsoft(data, type = '365') {
     urlParts.push('location=' + encodeURIComponent(data.location));
   }
   if (data.description != null && data.description != '') {
-    urlParts.push('body=' + encodeURIComponent(data.description.replace(/\n/g, '<br>')));
+    urlParts.push('body=' + encodeURIComponent(data.description));
   }
   urlParts.push('uid=' + encodeURIComponent(data.uid));
   atcb_open_cal_url(urlParts.join('&'));
@@ -2251,25 +2256,25 @@ function atcb_generate_ical(host, data, subEvent = 'all', keyboardTrigger = fals
     ics_lines.push('DTSTAMP:' + atcb_format_datetime(now, 'clean', true));
     ics_lines.push('DTSTART' + timeAddon + ':' + formattedDate.start);
     ics_lines.push('DTEND' + timeAddon + ':' + formattedDate.end);
-    ics_lines.push('SUMMARY:' + data.dates[`${i}`].name.replace(/.{65}/g, '$&' + '\r\n ')); 
-    if (data.dates[`${i}`].descriptionHtmlFree != null && data.dates[`${i}`].descriptionHtmlFree != '') {
+    ics_lines.push('SUMMARY:' + atcb_rewrite_ical_text(data.dates[`${i}`].name, true));
+    if (data.dates[`${i}`].descriptionHtmlFreeICal != null && data.dates[`${i}`].descriptionHtmlFreeICal != '') {
       ics_lines.push(
-        'DESCRIPTION:' + data.dates[`${i}`].descriptionHtmlFree.replace(/\n/g, '\\n').replace(/.{60}/g, '$&' + '\r\n ') // adjusting for intended line breaks + making sure it does not exceed 75 characters per line
+        'DESCRIPTION:' + atcb_rewrite_ical_text(data.dates[`${i}`].descriptionHtmlFreeICal, true)
       );
     }
     if (data.dates[`${i}`].description != null && data.dates[`${i}`].description != '') {
-      ics_lines.push('X-ALT-DESC;FMTTYPE=text/html:\r\n <!DOCTYPE HTML PUBLIC ""-//W3C//DTD HTML 3.2//EN"">\r\n <HTML><BODY>\r\n ' + data.dates[`${i}`].description.replace(/\n/g, '<br>').replace(/.{60}/g, '$&' + '\r\n ') + '\r\n </BODY></HTML>');
+      ics_lines.push('X-ALT-DESC;FMTTYPE=text/html:\r\n <!DOCTYPE HTML PUBLIC ""-//W3C//DTD HTML 3.2//EN"">\r\n <HTML><BODY>\r\n ' + atcb_rewrite_ical_text(data.dates[`${i}`].description, true) + '\r\n </BODY></HTML>');
     }
     if (data.dates[`${i}`].location != null && data.dates[`${i}`].location != '') {
-      ics_lines.push('LOCATION:' + data.dates[`${i}`].location);
+      ics_lines.push('LOCATION:' + atcb_rewrite_ical_text(data.dates[`${i}`].location, true));
     }
     if (data.dates[`${i}`].organizer != null && data.dates[`${i}`].organizer != '') {
       const organizerParts = data.dates[`${i}`].organizer.split('|');
-      ics_lines.push('ORGANIZER;CN=' + organizerParts[0] + ':MAILTO:' + organizerParts[1]);
+      ics_lines.push('ORGANIZER;CN="' + atcb_rewrite_ical_text(organizerParts[0], false, true) + '":MAILTO:' + organizerParts[1]);
     }
     if (data.dates[`${i}`].attendee != null && data.dates[`${i}`].attendee != '') {
       const attendeeParts = data.dates[`${i}`].attendee.split('|');
-      ics_lines.push('ATTENDEE;ROLE=REQ-PARTICIPANT;CN=' + attendeeParts[0] + ':MAILTO:' + attendeeParts[1]);
+      ics_lines.push('ATTENDEE;ROLE=REQ-PARTICIPANT;CN="' + atcb_rewrite_ical_text(attendeeParts[0], false, true) + '":MAILTO:' + attendeeParts[1]);
     }
     if (data.recurrence != null && data.recurrence != '') {
       ics_lines.push(data.recurrence);
@@ -2471,11 +2476,16 @@ function atcb_validEmail(email, mx = false) {
   }
   return true;
 }
-function atcb_rewrite_html_elements(content, clear = false) {
-  content = content.replace(/<br\s*\/?>/gi, '\n');
+function atcb_rewrite_html_elements(content, clear = false, iCalBreaks = false) {
   if (clear) {
-    content = content.replace(/\[(|\/)(url|br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\]|((\|.*)\[\/url\])/gi, '');
-    content = content.replace(/\{(|\/)(url|br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\}|((\|.*)\{\/url\})/gi, '');
+    content = content.replace(/\[(|\/)(url|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\]|((\|.*)\[\/url\])/gi, '');
+    content = content.replace(/\{(|\/)(url|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\}|((\|.*)\{\/url\})/gi, '');
+    if (iCalBreaks) {
+      content = content.replace(/(\[br\]|\{br\})/gi, '\\n');
+    } else {
+      content = content.replace(/(\[br\]|\{br\})/gi, ' ');
+    }
+    content = content.replace(/&[#a-zA-Z0-9]{1,9};/gi, '');
   } else {
     content = content.replace(/\[(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\]/gi, '<$1$2>');
     content = content.replace(/\{(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\}/gi, '<$1$2>');
@@ -2499,6 +2509,17 @@ function atcb_parse_url_code(input) {
   })();
   return '<a href="' + urlText[0] + '" target="' + atcbDefaultTarget + '" rel="noopener">' + text + '</a>';
 }
+function atcb_rewrite_ical_text(content, truncate = true, inQuotes = false) {
+  if (inQuotes) {
+    content = content.replace(/"/g, '');
+  } else {
+    content = content.replace(/\\/g, '\\\\').replace(/(,|;)/g, '\\$1');
+  }
+  if (truncate) {
+    content = content.replace(/.{60}/g, '$&' + '\r\n ');
+  }
+  return content;
+}
 function atcb_position_list(host, trigger, list, blockUpwards = false, resize = false) {
   let anchorSet = false;
   const originalTrigger = trigger;
@@ -3279,7 +3300,7 @@ function atcb_read_attributes(el) {
   for (let i = 0; i < atcbWcParams.length; i++) {
     let attr = atcbWcParams[`${i}`];
     if (el.hasAttribute(`${attr}`)) {
-      let inputVal = atcb_secure_content(el.getAttribute(`${attr}`).replace(/(\r\n|\n|\r)/g, ''), false);
+      let inputVal = atcb_secure_content(el.getAttribute(`${attr}`).replace(/(\\r\\n|\\n|\\r)/g, ''), false);
       let val;
       if (atcbWcBooleanParams.includes(attr)) {
         if (inputVal == '') {
@@ -3324,7 +3345,7 @@ function atcb_read_attributes(el) {
     }
     const identifierAttr = el.getAttribute('identifier');
     if (identifierAttr != null && identifierAttr != '') {
-      data['identifier'] = atcb_secure_content(identifierAttr.replace(/(\r\n|\n|\r)/g, ''), false);
+      data['identifier'] = atcb_secure_content(identifierAttr.replace(/(\\r\\n|\\n|\\r)/g, ''), false);
     }
   }
   if (!atcb_check_required(data)) {
@@ -3332,7 +3353,7 @@ function atcb_read_attributes(el) {
     const atcbJsonInput = (function () {
       if (slotInput != '') {
         try {
-          return JSON.parse(atcb_secure_content(slotInput.replace(/(\r\n|\n|\r)/g, ''), false));
+          return JSON.parse(atcb_secure_content(slotInput.replace(/(\\r\\n|\\n|\\r)/g, ''), false));
         } catch (e) {
           throw new Error('Add to Calendar Button generation failed: JSON content provided, but badly formatted (in doubt, try some tool like https://jsonformatter.org/ to validate).\r\nError message: ' + e);
         }
@@ -3424,14 +3445,14 @@ function atcb_load_css(host, rootObj = null, style = '', inline = false, buttons
     const cssContent = document.createElement('style');
     const overrideDefaultCss = (function () {
       if (host.host.hasAttribute('styleLight')) {
-        const output = ':host { ' + atcb_secure_content(host.host.getAttribute('styleLight').replace(/(\r\n|\n|\r)/g, ''), false) + ' }';
+        const output = ':host { ' + atcb_secure_content(host.host.getAttribute('styleLight').replace(/(\\r\\n|\\n|\\r)/g, ''), false) + ' }';
         return output;
       }
       return '';
     })();
     const overrideDarkCss = (function () {
       if (host.host.hasAttribute('styleDark')) {
-        const output = ':host(.atcb-dark), :host-context(html.atcb-dark):host(.atcb-bodyScheme), :host-context(body.atcb-dark):host(.atcb-bodyScheme) { ' + atcb_secure_content(host.host.getAttribute('styleDark').replace(/(\r\n|\n|\r)/g, ''), false) + ' }';
+        const output = ':host(.atcb-dark), :host-context(html.atcb-dark):host(.atcb-bodyScheme), :host-context(body.atcb-dark):host(.atcb-bodyScheme) { ' + atcb_secure_content(host.host.getAttribute('styleDark').replace(/(\\r\\n|\\n|\\r)/g, ''), false) + ' }';
         return output;
       }
       return '';

package/dist/module/index.js

@@ -6,15 +6,15 @@ import { tzlib_get_ical_block, tzlib_get_offset, tzlib_get_timezones } from 'tim
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.2.3
+ *  Version: 2.2.4
  *  Creator: Jens Kuerschner (https://jenskuerschner.de)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.2.3';
-const atcbCssTemplate = {
+const atcbVersion = '2.2.4';
+const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
   } else {
@@ -439,11 +439,15 @@ function atcb_decorate_data_meta(data) {
 }
 function atcb_decorate_data_description(data, i) {
   if (data.dates[`${i}`].description != null && data.dates[`${i}`].description != '') {
+    data.dates[`${i}`].description = data.dates[`${i}`].description.replace(/(\\r\\n|\\n|\\r|<br(\s|\s\/|\/|)>)/g, '');
     data.dates[`${i}`].descriptionHtmlFree = atcb_rewrite_html_elements(data.dates[`${i}`].description, true);
+    data.dates[`${i}`].descriptionHtmlFreeICal = atcb_rewrite_html_elements(data.dates[`${i}`].description, true, true);
     data.dates[`${i}`].description = atcb_rewrite_html_elements(data.dates[`${i}`].description);
   } else {
     if (data.dates[`${i}`].description == null && data.description != null && data.description != '') {
+      data.description = data.description.replace(/(\\r\\n|\\n|\\r|<br(\s|\s\/|\/|)>)/g, '');
       data.dates[`${i}`].descriptionHtmlFree = atcb_rewrite_html_elements(data.description, true);
+      data.dates[`${i}`].descriptionHtmlFreeICal = atcb_rewrite_html_elements(data.description, true, true);
       data.dates[`${i}`].description = atcb_rewrite_html_elements(data.description);
     } else {
       data.dates[`${i}`].descriptionHtmlFree = data.dates[`${i}`].description = '';
@@ -1885,25 +1889,28 @@ function atcb_generate_rich_data_recurrence(data, formattedDate) {
 
 
 function atcb_generate_links(host, type, data, subEvent = 'all', keyboardTrigger = false, multiDateModal = false) {
+  let linkType = type;
+  if (type == 'apple') {
+    linkType = 'ical';
+  }
+  if (isMobile() && (type == 'msteams' || type == 'ms365' || type == 'outlookcom')) {
+    linkType = 'ical';
+  }
   if (subEvent != 'all') {
     subEvent = parseInt(subEvent) - 1;
   } else if (data.dates.length == 1) {
     subEvent = 0;
   }
   if (data.subscribe) {
-    atcb_generate_subscribe_links(host, type, data, keyboardTrigger);
+    atcb_generate_subscribe_links(host, linkType, data, keyboardTrigger);
     return;
   }
-  if (isMobile() && (type == 'msteams' || type == 'ms365' || type == 'outlookcom')) {
-    type = 'ical';
-  }
   if (subEvent != 'all') {
-    if (data.dates[`${subEvent}`].status == 'CANCELLED' && type != 'apple' && type != 'ical') {
+    if (data.dates[`${subEvent}`].status == 'CANCELLED' && linkType != 'ical') {
       atcb_create_modal(host, data, 'warning', atcb_translate_hook('date.status.cancelled', data), atcb_translate_hook('date.status.cancelled.cta', data), [], [], keyboardTrigger);
     } else {
-      switch (type) {
-        case 'apple':
-        case 'ical':
+      switch (linkType) {
+        case 'ical': // also for apple (see above)
           atcb_generate_ical(host, data, subEvent, keyboardTrigger);
           break;
         case 'google':
@@ -1939,12 +1946,11 @@ function atcb_generate_links(host, type, data, subEvent = 'all', keyboardTrigger
     }
     return;
   }
-  atcb_generate_multidate_links(host, type, data, keyboardTrigger, multiDateModal);
+  atcb_generate_multidate_links(host, type, linkType, data, keyboardTrigger, multiDateModal);
 }
-function atcb_generate_multidate_links(host, type, data, keyboardTrigger, multiDateModal) {
+function atcb_generate_multidate_links(host, type, linkType, data, keyboardTrigger, multiDateModal) {
   if (
-    (type == 'ical' || type == 'apple') &&
-    data.dates.every(function (theSubEvent) {
+    (linkType == 'ical') && data.dates.every(function (theSubEvent) {
       if (theSubEvent.status == 'CANCELLED' || (theSubEvent.organizer != null && theSubEvent.organizer != '')) {
         return false;
       }
@@ -1966,11 +1972,10 @@ function atcb_generate_multidate_links(host, type, data, keyboardTrigger, multiD
     atcb_create_modal(host, data, type, atcb_translate_hook('modal.multidate.h', data), atcb_translate_hook('modal.multidate.text', data), [], individualButtons, keyboardTrigger);
   }
 }
-function atcb_generate_subscribe_links(host, type, data, keyboardTrigger) {
+function atcb_generate_subscribe_links(host, linkType, data, keyboardTrigger) {
   const adjustedFileUrl = data.icsFile.replace('https://', 'webcal://');
-  switch (type) {
-    case 'apple':
-    case 'ical':
+  switch (linkType) {
+    case 'ical': // also for apple (see above)
       atcb_subscribe_ical(adjustedFileUrl);
       break;
     case 'google':
@@ -2147,7 +2152,7 @@ function atcb_generate_microsoft(data, type = '365') {
     urlParts.push('location=' + encodeURIComponent(data.location));
   }
   if (data.description != null && data.description != '') {
-    urlParts.push('body=' + encodeURIComponent(data.description.replace(/\n/g, '<br>')));
+    urlParts.push('body=' + encodeURIComponent(data.description));
   }
   urlParts.push('uid=' + encodeURIComponent(data.uid));
   atcb_open_cal_url(urlParts.join('&'));
@@ -2250,25 +2255,25 @@ function atcb_generate_ical(host, data, subEvent = 'all', keyboardTrigger = fals
     ics_lines.push('DTSTAMP:' + atcb_format_datetime(now, 'clean', true));
     ics_lines.push('DTSTART' + timeAddon + ':' + formattedDate.start);
     ics_lines.push('DTEND' + timeAddon + ':' + formattedDate.end);
-    ics_lines.push('SUMMARY:' + data.dates[`${i}`].name.replace(/.{65}/g, '$&' + '\r\n ')); 
-    if (data.dates[`${i}`].descriptionHtmlFree != null && data.dates[`${i}`].descriptionHtmlFree != '') {
+    ics_lines.push('SUMMARY:' + atcb_rewrite_ical_text(data.dates[`${i}`].name, true));
+    if (data.dates[`${i}`].descriptionHtmlFreeICal != null && data.dates[`${i}`].descriptionHtmlFreeICal != '') {
       ics_lines.push(
-        'DESCRIPTION:' + data.dates[`${i}`].descriptionHtmlFree.replace(/\n/g, '\\n').replace(/.{60}/g, '$&' + '\r\n ') // adjusting for intended line breaks + making sure it does not exceed 75 characters per line
+        'DESCRIPTION:' + atcb_rewrite_ical_text(data.dates[`${i}`].descriptionHtmlFreeICal, true)
       );
     }
     if (data.dates[`${i}`].description != null && data.dates[`${i}`].description != '') {
-      ics_lines.push('X-ALT-DESC;FMTTYPE=text/html:\r\n <!DOCTYPE HTML PUBLIC ""-//W3C//DTD HTML 3.2//EN"">\r\n <HTML><BODY>\r\n ' + data.dates[`${i}`].description.replace(/\n/g, '<br>').replace(/.{60}/g, '$&' + '\r\n ') + '\r\n </BODY></HTML>');
+      ics_lines.push('X-ALT-DESC;FMTTYPE=text/html:\r\n <!DOCTYPE HTML PUBLIC ""-//W3C//DTD HTML 3.2//EN"">\r\n <HTML><BODY>\r\n ' + atcb_rewrite_ical_text(data.dates[`${i}`].description, true) + '\r\n </BODY></HTML>');
     }
     if (data.dates[`${i}`].location != null && data.dates[`${i}`].location != '') {
-      ics_lines.push('LOCATION:' + data.dates[`${i}`].location);
+      ics_lines.push('LOCATION:' + atcb_rewrite_ical_text(data.dates[`${i}`].location, true));
     }
     if (data.dates[`${i}`].organizer != null && data.dates[`${i}`].organizer != '') {
       const organizerParts = data.dates[`${i}`].organizer.split('|');
-      ics_lines.push('ORGANIZER;CN=' + organizerParts[0] + ':MAILTO:' + organizerParts[1]);
+      ics_lines.push('ORGANIZER;CN="' + atcb_rewrite_ical_text(organizerParts[0], false, true) + '":MAILTO:' + organizerParts[1]);
     }
     if (data.dates[`${i}`].attendee != null && data.dates[`${i}`].attendee != '') {
       const attendeeParts = data.dates[`${i}`].attendee.split('|');
-      ics_lines.push('ATTENDEE;ROLE=REQ-PARTICIPANT;CN=' + attendeeParts[0] + ':MAILTO:' + attendeeParts[1]);
+      ics_lines.push('ATTENDEE;ROLE=REQ-PARTICIPANT;CN="' + atcb_rewrite_ical_text(attendeeParts[0], false, true) + '":MAILTO:' + attendeeParts[1]);
     }
     if (data.recurrence != null && data.recurrence != '') {
       ics_lines.push(data.recurrence);
@@ -2470,11 +2475,16 @@ function atcb_validEmail(email, mx = false) {
   }
   return true;
 }
-function atcb_rewrite_html_elements(content, clear = false) {
-  content = content.replace(/<br\s*\/?>/gi, '\n');
+function atcb_rewrite_html_elements(content, clear = false, iCalBreaks = false) {
   if (clear) {
-    content = content.replace(/\[(|\/)(url|br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\]|((\|.*)\[\/url\])/gi, '');
-    content = content.replace(/\{(|\/)(url|br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\}|((\|.*)\{\/url\})/gi, '');
+    content = content.replace(/\[(|\/)(url|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\]|((\|.*)\[\/url\])/gi, '');
+    content = content.replace(/\{(|\/)(url|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\}|((\|.*)\{\/url\})/gi, '');
+    if (iCalBreaks) {
+      content = content.replace(/(\[br\]|\{br\})/gi, '\\n');
+    } else {
+      content = content.replace(/(\[br\]|\{br\})/gi, ' ');
+    }
+    content = content.replace(/&[#a-zA-Z0-9]{1,9};/gi, '');
   } else {
     content = content.replace(/\[(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\]/gi, '<$1$2>');
     content = content.replace(/\{(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\}/gi, '<$1$2>');
@@ -2498,6 +2508,17 @@ function atcb_parse_url_code(input) {
   })();
   return '<a href="' + urlText[0] + '" target="' + atcbDefaultTarget + '" rel="noopener">' + text + '</a>';
 }
+function atcb_rewrite_ical_text(content, truncate = true, inQuotes = false) {
+  if (inQuotes) {
+    content = content.replace(/"/g, '');
+  } else {
+    content = content.replace(/\\/g, '\\\\').replace(/(,|;)/g, '\\$1');
+  }
+  if (truncate) {
+    content = content.replace(/.{60}/g, '$&' + '\r\n ');
+  }
+  return content;
+}
 function atcb_position_list(host, trigger, list, blockUpwards = false, resize = false) {
   let anchorSet = false;
   const originalTrigger = trigger;
@@ -3278,7 +3299,7 @@ function atcb_read_attributes(el) {
   for (let i = 0; i < atcbWcParams.length; i++) {
     let attr = atcbWcParams[`${i}`];
     if (el.hasAttribute(`${attr}`)) {
-      let inputVal = atcb_secure_content(el.getAttribute(`${attr}`).replace(/(\r\n|\n|\r)/g, ''), false);
+      let inputVal = atcb_secure_content(el.getAttribute(`${attr}`).replace(/(\\r\\n|\\n|\\r)/g, ''), false);
       let val;
       if (atcbWcBooleanParams.includes(attr)) {
         if (inputVal == '') {
@@ -3323,7 +3344,7 @@ function atcb_read_attributes(el) {
     }
     const identifierAttr = el.getAttribute('identifier');
     if (identifierAttr != null && identifierAttr != '') {
-      data['identifier'] = atcb_secure_content(identifierAttr.replace(/(\r\n|\n|\r)/g, ''), false);
+      data['identifier'] = atcb_secure_content(identifierAttr.replace(/(\\r\\n|\\n|\\r)/g, ''), false);
     }
   }
   if (!atcb_check_required(data)) {
@@ -3331,7 +3352,7 @@ function atcb_read_attributes(el) {
     const atcbJsonInput = (function () {
       if (slotInput != '') {
         try {
-          return JSON.parse(atcb_secure_content(slotInput.replace(/(\r\n|\n|\r)/g, ''), false));
+          return JSON.parse(atcb_secure_content(slotInput.replace(/(\\r\\n|\\n|\\r)/g, ''), false));
         } catch (e) {
           throw new Error('Add to Calendar Button generation failed: JSON content provided, but badly formatted (in doubt, try some tool like https://jsonformatter.org/ to validate).\r\nError message: ' + e);
         }
@@ -3423,14 +3444,14 @@ function atcb_load_css(host, rootObj = null, style = '', inline = false, buttons
     const cssContent = document.createElement('style');
     const overrideDefaultCss = (function () {
       if (host.host.hasAttribute('styleLight')) {
-        const output = ':host { ' + atcb_secure_content(host.host.getAttribute('styleLight').replace(/(\r\n|\n|\r)/g, ''), false) + ' }';
+        const output = ':host { ' + atcb_secure_content(host.host.getAttribute('styleLight').replace(/(\\r\\n|\\n|\\r)/g, ''), false) + ' }';
         return output;
       }
       return '';
     })();
     const overrideDarkCss = (function () {
       if (host.host.hasAttribute('styleDark')) {
-        const output = ':host(.atcb-dark), :host-context(html.atcb-dark):host(.atcb-bodyScheme), :host-context(body.atcb-dark):host(.atcb-bodyScheme) { ' + atcb_secure_content(host.host.getAttribute('styleDark').replace(/(\r\n|\n|\r)/g, ''), false) + ' }';
+        const output = ':host(.atcb-dark), :host-context(html.atcb-dark):host(.atcb-bodyScheme), :host-context(body.atcb-dark):host(.atcb-bodyScheme) { ' + atcb_secure_content(host.host.getAttribute('styleDark').replace(/(\\r\\n|\\n|\\r)/g, ''), false) + ' }';
         return output;
       }
       return '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "add-to-calendar-button",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "engines": {
     "node": ">=16.18.1",
     "npm": ">=8.19.2"
@@ -79,11 +79,11 @@
   },
   "devDependencies": {
     "@open-wc/testing": "^3.1.7",
-    "@typescript-eslint/eslint-plugin": "^5.53.0",
-    "@typescript-eslint/parser": "^5.53.0",
-    "@web/test-runner": "^0.15.0",
-    "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.6.0",
+    "@typescript-eslint/eslint-plugin": "^5.55.0",
+    "@typescript-eslint/parser": "^5.55.0",
+    "@web/test-runner": "^0.15.1",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-commonjs": "^1.0.2",
     "eslint-plugin-security": "^1.7.1",
     "grunt": ">=1.6.1",
@@ -94,9 +94,8 @@
     "grunt-file-creator": "^0.1.3",
     "grunt-version": "^3.0.0",
     "prettier": "2.8.4",
-    "prettier-plugin-tailwindcss": "^0.2.3",
-    "stylelint": "^14.16.1",
-    "stylelint-config-prettier": "^9.0.5",
-    "stylelint-config-standard": "^29.0.0"
+    "prettier-plugin-tailwindcss": "^0.2.4",
+    "stylelint": "^15.2.0",
+    "stylelint-config-standard": "^30.0.1"
   }
 }