add-to-calendar-button 2.12.9 → 2.12.11

package/assets/css/atcb-3d.css

@@ -5,7 +5,7 @@
  *
  * Style: 3D
  *
- * Version: 2.12.9
+ * Version: 2.12.11
  * Creator: Jens Kuerschner (https://jekuer.com)
  * 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)

package/assets/css/atcb-date.css

@@ -5,7 +5,7 @@
  *
  * Style: Date
  *
- * Version: 2.12.9
+ * Version: 2.12.11
  * Creator: Jens Kuerschner (https://jekuer.com)
  * 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)

package/assets/css/atcb-flat.css

@@ -5,7 +5,7 @@
  *
  * Style: Flat
  *
- * Version: 2.12.9
+ * Version: 2.12.11
  * Creator: Jens Kuerschner (https://jekuer.com)
  * 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)

package/assets/css/atcb-neumorphism.css

@@ -5,7 +5,7 @@
  *
  * Style: Neumorphism
  *
- * Version: 2.12.9
+ * Version: 2.12.11
  * Creator: Jens Kuerschner (https://jekuer.com)
  * 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)

package/assets/css/atcb-round.css

@@ -5,7 +5,7 @@
  *
  * Style: Round
  *
- * Version: 2.12.9
+ * Version: 2.12.11
  * Creator: Jens Kuerschner (https://jekuer.com)
  * 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)

package/assets/css/atcb-simple.css

@@ -5,7 +5,7 @@
  *
  * Style: Simple
  *
- * Version: 2.12.9
+ * Version: 2.12.11
  * Creator: Jens Kuerschner (https://jekuer.com)
  * 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)

package/assets/css/atcb-text.css

@@ -5,7 +5,7 @@
  *
  * Style: Text
  *
- * Version: 2.12.9
+ * Version: 2.12.11
  * Creator: Jens Kuerschner (https://jekuer.com)
  * 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)

package/assets/css/atcb.css

@@ -5,7 +5,7 @@
  *
  * Style: Default
  *
- * Version: 2.12.9
+ * Version: 2.12.11
  * Creator: Jens Kuerschner (https://jekuer.com)
  * 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)

package/dist/atcb-no-pro-unstyle.js

@@ -223,14 +223,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.12.9
+ *  Version: 2.12.11
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  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.12.9';
+const atcbVersion = '2.12.11';
 const atcbCssTemplate = {};
 const atcbIsBrowser = () => {
   if (typeof window === 'undefined') {
@@ -595,43 +595,52 @@ function atcb_decorate_data_rrule(data) {
 function atcb_decorate_data_recurring_events(data) {
   const startDate = data.dates?.[0].startDate || data.startDate;
   const startTime = data.dates?.[0].startTime || data.startTime;
+  const tzid = data.dates?.[0].timeZone || data.timeZone || 'UTC';
+  const offset = startTime && startTime !== '' ? tzlib_get_offset(tzid, startDate, startTime) : '';
   const startDateTime = (function () {
     if (startTime && startTime !== '') {
-      const offset = tzlib_get_offset(data.dates?.[0].timeZone || data.timeZone, startDate, startTime);
       return new Date(startDate + ' ' + startTime + ':00 GMT' + offset);
     }
-    return new Date(startDate + 'T00:00:00Z');
+    const localMidnightOffset = tzlib_get_offset(tzid, startDate, '00:00');
+    return new Date(`${startDate} 00:00:00 GMT${localMidnightOffset}`);
   })();
   const isAllDay = !(startTime && startTime !== '');
   const occurenceData = atcb_getNextOccurrence(data.recurrence, startDateTime, isAllDay);
   if (!occurenceData || !occurenceData.nextOccurrence) {
     return data;
   }
-  const nextOccurrence =
-    String(occurenceData.nextOccurrence.getFullYear()) +
-    '-' +
-    String(occurenceData.nextOccurrence.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(occurenceData.nextOccurrence.getDate()).padStart(2, '0') +
-    (startTime && startTime !== '' ? 'T' + String(occurenceData.nextOccurrence.getHours()).padStart(2, '0') + ':' + String(occurenceData.nextOccurrence.getMinutes()).padStart(2, '0') : '');
-  data.startDate = nextOccurrence.slice(0, 10);
+  function formatInTz(dateObj, timeZone, includeTime) {
+    const opts = includeTime ? { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' } : { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit' };
+    const parts = new Intl.DateTimeFormat('en-CA', opts).formatToParts(dateObj);
+    const get = (t) => parts.find((p) => p.type === t)?.value || '';
+    return {
+      date: `${get('year')}-${get('month')}-${get('day')}`,
+      time: includeTime ? `${get('hour')}:${get('minute')}` : '',
+    };
+  }
+  const hasExplicitTimeRule = /;BYHOUR=/i.test(data.recurrence);
+  const nextLocalDate = formatInTz(occurenceData.nextOccurrence, tzid, false).date;
+  let nextStartTime = '';
   if (startTime && startTime !== '') {
-    data.startTime = nextOccurrence.slice(11, 16);
+    nextStartTime = hasExplicitTimeRule
+      ? formatInTz(occurenceData.nextOccurrence, tzid, true).time // RRULE drives time
+      : startTime; 
+  }
+  data.startDate = nextLocalDate;
+  if (nextStartTime) {
+    data.startTime = nextStartTime;
   }
   const endDate = data.dates?.[0].endDate || data.endDate || startDate;
   const endTime = data.dates?.[0].endTime || data.endTime || '';
-  const diff = new Date(endDate + (endTime && endTime !== '' ? 'T' + endTime : '')).getTime() - new Date(startDate + (startTime && startTime !== '' ? 'T' + startTime : '')).getTime();
-  const newEndDateTime = new Date(occurenceData.nextOccurrence.getTime() + diff);
-  const newEndDateTimeString =
-    String(newEndDateTime.getFullYear()) +
-    '-' +
-    String(newEndDateTime.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(newEndDateTime.getDate()).padStart(2, '0') +
-    (endTime && endTime !== '' ? 'T' + String(newEndDateTime.getHours()).padStart(2, '0') + ':' + String(newEndDateTime.getMinutes()).padStart(2, '0') : '');
-  data.endDate = newEndDateTimeString.slice(0, 10);
+  const origStart = startTime && startTime !== '' ? new Date(`${startDate} ${startTime}:00 GMT${tzlib_get_offset(tzid, startDate, startTime)}`) : new Date(`${startDate} 00:00:00 GMT${tzlib_get_offset(tzid, startDate, '00:00')}`);
+  const origEnd = endTime && endTime !== '' ? new Date(`${endDate} ${endTime}:00 GMT${tzlib_get_offset(tzid, endDate, endTime)}`) : new Date(`${endDate} 00:00:00 GMT${tzlib_get_offset(tzid, endDate, '00:00')}`);
+  const diff = origEnd.getTime() - origStart.getTime();
+  const newStartInstant = nextStartTime ? new Date(`${data.startDate} ${nextStartTime}:00 GMT${tzlib_get_offset(tzid, data.startDate, nextStartTime)}`) : new Date(`${data.startDate} 00:00:00 GMT${tzlib_get_offset(tzid, data.startDate, '00:00')}`);
+  const newEndDateTime = new Date(newStartInstant.getTime() + diff);
+  const nextEndLocal = formatInTz(newEndDateTime, tzid, !!(endTime && endTime !== ''));
+  data.endDate = nextEndLocal.date;
   if (endTime && endTime !== '') {
-    data.endTime = newEndDateTimeString.slice(11, 16);
+    data.endTime = nextEndLocal.time;
   }
   if ((data.recurrence_count && data.recurrence_count !== '') || (data.recurrence_until && data.recurrence_until !== '')) {
     if (occurenceData.adjustedCount < 2) {
@@ -3546,14 +3555,7 @@ function atcb_parseByWeekdayTokens(rawByDay) {
         digits = digits.slice(1);
       }
       if (!digits || digits.length > 2) continue;
-      let validDigits = true;
-      for (let i = 0; i < digits.length; i++) {
-        const code = digits.charCodeAt(i);
-        if (code < 48 || code > 57) {
-          validDigits = false;
-          break;
-        }
-      }
+      const validDigits = typeof digits === 'string' && /^\d+$/.test(digits);
       if (!validDigits) continue;
       const abs = parseInt(digits, 10);
       if (abs < 1 || abs > 53) continue; 

package/dist/atcb-no-pro.js

@@ -223,14 +223,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.12.9
+ *  Version: 2.12.11
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  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.12.9';
+const atcbVersion = '2.12.11';
 const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
@@ -594,43 +594,52 @@ function atcb_decorate_data_rrule(data) {
 function atcb_decorate_data_recurring_events(data) {
   const startDate = data.dates?.[0].startDate || data.startDate;
   const startTime = data.dates?.[0].startTime || data.startTime;
+  const tzid = data.dates?.[0].timeZone || data.timeZone || 'UTC';
+  const offset = startTime && startTime !== '' ? tzlib_get_offset(tzid, startDate, startTime) : '';
   const startDateTime = (function () {
     if (startTime && startTime !== '') {
-      const offset = tzlib_get_offset(data.dates?.[0].timeZone || data.timeZone, startDate, startTime);
       return new Date(startDate + ' ' + startTime + ':00 GMT' + offset);
     }
-    return new Date(startDate + 'T00:00:00Z');
+    const localMidnightOffset = tzlib_get_offset(tzid, startDate, '00:00');
+    return new Date(`${startDate} 00:00:00 GMT${localMidnightOffset}`);
   })();
   const isAllDay = !(startTime && startTime !== '');
   const occurenceData = atcb_getNextOccurrence(data.recurrence, startDateTime, isAllDay);
   if (!occurenceData || !occurenceData.nextOccurrence) {
     return data;
   }
-  const nextOccurrence =
-    String(occurenceData.nextOccurrence.getFullYear()) +
-    '-' +
-    String(occurenceData.nextOccurrence.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(occurenceData.nextOccurrence.getDate()).padStart(2, '0') +
-    (startTime && startTime !== '' ? 'T' + String(occurenceData.nextOccurrence.getHours()).padStart(2, '0') + ':' + String(occurenceData.nextOccurrence.getMinutes()).padStart(2, '0') : '');
-  data.startDate = nextOccurrence.slice(0, 10);
+  function formatInTz(dateObj, timeZone, includeTime) {
+    const opts = includeTime ? { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' } : { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit' };
+    const parts = new Intl.DateTimeFormat('en-CA', opts).formatToParts(dateObj);
+    const get = (t) => parts.find((p) => p.type === t)?.value || '';
+    return {
+      date: `${get('year')}-${get('month')}-${get('day')}`,
+      time: includeTime ? `${get('hour')}:${get('minute')}` : '',
+    };
+  }
+  const hasExplicitTimeRule = /;BYHOUR=/i.test(data.recurrence);
+  const nextLocalDate = formatInTz(occurenceData.nextOccurrence, tzid, false).date;
+  let nextStartTime = '';
   if (startTime && startTime !== '') {
-    data.startTime = nextOccurrence.slice(11, 16);
+    nextStartTime = hasExplicitTimeRule
+      ? formatInTz(occurenceData.nextOccurrence, tzid, true).time // RRULE drives time
+      : startTime; 
+  }
+  data.startDate = nextLocalDate;
+  if (nextStartTime) {
+    data.startTime = nextStartTime;
   }
   const endDate = data.dates?.[0].endDate || data.endDate || startDate;
   const endTime = data.dates?.[0].endTime || data.endTime || '';
-  const diff = new Date(endDate + (endTime && endTime !== '' ? 'T' + endTime : '')).getTime() - new Date(startDate + (startTime && startTime !== '' ? 'T' + startTime : '')).getTime();
-  const newEndDateTime = new Date(occurenceData.nextOccurrence.getTime() + diff);
-  const newEndDateTimeString =
-    String(newEndDateTime.getFullYear()) +
-    '-' +
-    String(newEndDateTime.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(newEndDateTime.getDate()).padStart(2, '0') +
-    (endTime && endTime !== '' ? 'T' + String(newEndDateTime.getHours()).padStart(2, '0') + ':' + String(newEndDateTime.getMinutes()).padStart(2, '0') : '');
-  data.endDate = newEndDateTimeString.slice(0, 10);
+  const origStart = startTime && startTime !== '' ? new Date(`${startDate} ${startTime}:00 GMT${tzlib_get_offset(tzid, startDate, startTime)}`) : new Date(`${startDate} 00:00:00 GMT${tzlib_get_offset(tzid, startDate, '00:00')}`);
+  const origEnd = endTime && endTime !== '' ? new Date(`${endDate} ${endTime}:00 GMT${tzlib_get_offset(tzid, endDate, endTime)}`) : new Date(`${endDate} 00:00:00 GMT${tzlib_get_offset(tzid, endDate, '00:00')}`);
+  const diff = origEnd.getTime() - origStart.getTime();
+  const newStartInstant = nextStartTime ? new Date(`${data.startDate} ${nextStartTime}:00 GMT${tzlib_get_offset(tzid, data.startDate, nextStartTime)}`) : new Date(`${data.startDate} 00:00:00 GMT${tzlib_get_offset(tzid, data.startDate, '00:00')}`);
+  const newEndDateTime = new Date(newStartInstant.getTime() + diff);
+  const nextEndLocal = formatInTz(newEndDateTime, tzid, !!(endTime && endTime !== ''));
+  data.endDate = nextEndLocal.date;
   if (endTime && endTime !== '') {
-    data.endTime = newEndDateTimeString.slice(11, 16);
+    data.endTime = nextEndLocal.time;
   }
   if ((data.recurrence_count && data.recurrence_count !== '') || (data.recurrence_until && data.recurrence_until !== '')) {
     if (occurenceData.adjustedCount < 2) {
@@ -3545,14 +3554,7 @@ function atcb_parseByWeekdayTokens(rawByDay) {
         digits = digits.slice(1);
       }
       if (!digits || digits.length > 2) continue;
-      let validDigits = true;
-      for (let i = 0; i < digits.length; i++) {
-        const code = digits.charCodeAt(i);
-        if (code < 48 || code > 57) {
-          validDigits = false;
-          break;
-        }
-      }
+      const validDigits = typeof digits === 'string' && /^\d+$/.test(digits);
       if (!validDigits) continue;
       const abs = parseInt(digits, 10);
       if (abs < 1 || abs > 53) continue; 

package/dist/atcb-unstyle.js

@@ -223,14 +223,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.12.9
+ *  Version: 2.12.11
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  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.12.9';
+const atcbVersion = '2.12.11';
 const atcbCssTemplate = {};
 const atcbIsBrowser = () => {
   if (typeof window === 'undefined') {
@@ -595,43 +595,52 @@ function atcb_decorate_data_rrule(data) {
 function atcb_decorate_data_recurring_events(data) {
   const startDate = data.dates?.[0].startDate || data.startDate;
   const startTime = data.dates?.[0].startTime || data.startTime;
+  const tzid = data.dates?.[0].timeZone || data.timeZone || 'UTC';
+  const offset = startTime && startTime !== '' ? tzlib_get_offset(tzid, startDate, startTime) : '';
   const startDateTime = (function () {
     if (startTime && startTime !== '') {
-      const offset = tzlib_get_offset(data.dates?.[0].timeZone || data.timeZone, startDate, startTime);
       return new Date(startDate + ' ' + startTime + ':00 GMT' + offset);
     }
-    return new Date(startDate + 'T00:00:00Z');
+    const localMidnightOffset = tzlib_get_offset(tzid, startDate, '00:00');
+    return new Date(`${startDate} 00:00:00 GMT${localMidnightOffset}`);
   })();
   const isAllDay = !(startTime && startTime !== '');
   const occurenceData = atcb_getNextOccurrence(data.recurrence, startDateTime, isAllDay);
   if (!occurenceData || !occurenceData.nextOccurrence) {
     return data;
   }
-  const nextOccurrence =
-    String(occurenceData.nextOccurrence.getFullYear()) +
-    '-' +
-    String(occurenceData.nextOccurrence.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(occurenceData.nextOccurrence.getDate()).padStart(2, '0') +
-    (startTime && startTime !== '' ? 'T' + String(occurenceData.nextOccurrence.getHours()).padStart(2, '0') + ':' + String(occurenceData.nextOccurrence.getMinutes()).padStart(2, '0') : '');
-  data.startDate = nextOccurrence.slice(0, 10);
+  function formatInTz(dateObj, timeZone, includeTime) {
+    const opts = includeTime ? { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' } : { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit' };
+    const parts = new Intl.DateTimeFormat('en-CA', opts).formatToParts(dateObj);
+    const get = (t) => parts.find((p) => p.type === t)?.value || '';
+    return {
+      date: `${get('year')}-${get('month')}-${get('day')}`,
+      time: includeTime ? `${get('hour')}:${get('minute')}` : '',
+    };
+  }
+  const hasExplicitTimeRule = /;BYHOUR=/i.test(data.recurrence);
+  const nextLocalDate = formatInTz(occurenceData.nextOccurrence, tzid, false).date;
+  let nextStartTime = '';
   if (startTime && startTime !== '') {
-    data.startTime = nextOccurrence.slice(11, 16);
+    nextStartTime = hasExplicitTimeRule
+      ? formatInTz(occurenceData.nextOccurrence, tzid, true).time // RRULE drives time
+      : startTime; 
+  }
+  data.startDate = nextLocalDate;
+  if (nextStartTime) {
+    data.startTime = nextStartTime;
   }
   const endDate = data.dates?.[0].endDate || data.endDate || startDate;
   const endTime = data.dates?.[0].endTime || data.endTime || '';
-  const diff = new Date(endDate + (endTime && endTime !== '' ? 'T' + endTime : '')).getTime() - new Date(startDate + (startTime && startTime !== '' ? 'T' + startTime : '')).getTime();
-  const newEndDateTime = new Date(occurenceData.nextOccurrence.getTime() + diff);
-  const newEndDateTimeString =
-    String(newEndDateTime.getFullYear()) +
-    '-' +
-    String(newEndDateTime.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(newEndDateTime.getDate()).padStart(2, '0') +
-    (endTime && endTime !== '' ? 'T' + String(newEndDateTime.getHours()).padStart(2, '0') + ':' + String(newEndDateTime.getMinutes()).padStart(2, '0') : '');
-  data.endDate = newEndDateTimeString.slice(0, 10);
+  const origStart = startTime && startTime !== '' ? new Date(`${startDate} ${startTime}:00 GMT${tzlib_get_offset(tzid, startDate, startTime)}`) : new Date(`${startDate} 00:00:00 GMT${tzlib_get_offset(tzid, startDate, '00:00')}`);
+  const origEnd = endTime && endTime !== '' ? new Date(`${endDate} ${endTime}:00 GMT${tzlib_get_offset(tzid, endDate, endTime)}`) : new Date(`${endDate} 00:00:00 GMT${tzlib_get_offset(tzid, endDate, '00:00')}`);
+  const diff = origEnd.getTime() - origStart.getTime();
+  const newStartInstant = nextStartTime ? new Date(`${data.startDate} ${nextStartTime}:00 GMT${tzlib_get_offset(tzid, data.startDate, nextStartTime)}`) : new Date(`${data.startDate} 00:00:00 GMT${tzlib_get_offset(tzid, data.startDate, '00:00')}`);
+  const newEndDateTime = new Date(newStartInstant.getTime() + diff);
+  const nextEndLocal = formatInTz(newEndDateTime, tzid, !!(endTime && endTime !== ''));
+  data.endDate = nextEndLocal.date;
   if (endTime && endTime !== '') {
-    data.endTime = newEndDateTimeString.slice(11, 16);
+    data.endTime = nextEndLocal.time;
   }
   if ((data.recurrence_count && data.recurrence_count !== '') || (data.recurrence_until && data.recurrence_until !== '')) {
     if (occurenceData.adjustedCount < 2) {
@@ -4266,14 +4275,7 @@ function atcb_parseByWeekdayTokens(rawByDay) {
         digits = digits.slice(1);
       }
       if (!digits || digits.length > 2) continue;
-      let validDigits = true;
-      for (let i = 0; i < digits.length; i++) {
-        const code = digits.charCodeAt(i);
-        if (code < 48 || code > 57) {
-          validDigits = false;
-          break;
-        }
-      }
+      const validDigits = typeof digits === 'string' && /^\d+$/.test(digits);
       if (!validDigits) continue;
       const abs = parseInt(digits, 10);
       if (abs < 1 || abs > 53) continue; 

package/dist/atcb.js

@@ -223,14 +223,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.12.9
+ *  Version: 2.12.11
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  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.12.9';
+const atcbVersion = '2.12.11';
 const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
@@ -594,43 +594,52 @@ function atcb_decorate_data_rrule(data) {
 function atcb_decorate_data_recurring_events(data) {
   const startDate = data.dates?.[0].startDate || data.startDate;
   const startTime = data.dates?.[0].startTime || data.startTime;
+  const tzid = data.dates?.[0].timeZone || data.timeZone || 'UTC';
+  const offset = startTime && startTime !== '' ? tzlib_get_offset(tzid, startDate, startTime) : '';
   const startDateTime = (function () {
     if (startTime && startTime !== '') {
-      const offset = tzlib_get_offset(data.dates?.[0].timeZone || data.timeZone, startDate, startTime);
       return new Date(startDate + ' ' + startTime + ':00 GMT' + offset);
     }
-    return new Date(startDate + 'T00:00:00Z');
+    const localMidnightOffset = tzlib_get_offset(tzid, startDate, '00:00');
+    return new Date(`${startDate} 00:00:00 GMT${localMidnightOffset}`);
   })();
   const isAllDay = !(startTime && startTime !== '');
   const occurenceData = atcb_getNextOccurrence(data.recurrence, startDateTime, isAllDay);
   if (!occurenceData || !occurenceData.nextOccurrence) {
     return data;
   }
-  const nextOccurrence =
-    String(occurenceData.nextOccurrence.getFullYear()) +
-    '-' +
-    String(occurenceData.nextOccurrence.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(occurenceData.nextOccurrence.getDate()).padStart(2, '0') +
-    (startTime && startTime !== '' ? 'T' + String(occurenceData.nextOccurrence.getHours()).padStart(2, '0') + ':' + String(occurenceData.nextOccurrence.getMinutes()).padStart(2, '0') : '');
-  data.startDate = nextOccurrence.slice(0, 10);
+  function formatInTz(dateObj, timeZone, includeTime) {
+    const opts = includeTime ? { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' } : { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit' };
+    const parts = new Intl.DateTimeFormat('en-CA', opts).formatToParts(dateObj);
+    const get = (t) => parts.find((p) => p.type === t)?.value || '';
+    return {
+      date: `${get('year')}-${get('month')}-${get('day')}`,
+      time: includeTime ? `${get('hour')}:${get('minute')}` : '',
+    };
+  }
+  const hasExplicitTimeRule = /;BYHOUR=/i.test(data.recurrence);
+  const nextLocalDate = formatInTz(occurenceData.nextOccurrence, tzid, false).date;
+  let nextStartTime = '';
   if (startTime && startTime !== '') {
-    data.startTime = nextOccurrence.slice(11, 16);
+    nextStartTime = hasExplicitTimeRule
+      ? formatInTz(occurenceData.nextOccurrence, tzid, true).time // RRULE drives time
+      : startTime; 
+  }
+  data.startDate = nextLocalDate;
+  if (nextStartTime) {
+    data.startTime = nextStartTime;
   }
   const endDate = data.dates?.[0].endDate || data.endDate || startDate;
   const endTime = data.dates?.[0].endTime || data.endTime || '';
-  const diff = new Date(endDate + (endTime && endTime !== '' ? 'T' + endTime : '')).getTime() - new Date(startDate + (startTime && startTime !== '' ? 'T' + startTime : '')).getTime();
-  const newEndDateTime = new Date(occurenceData.nextOccurrence.getTime() + diff);
-  const newEndDateTimeString =
-    String(newEndDateTime.getFullYear()) +
-    '-' +
-    String(newEndDateTime.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(newEndDateTime.getDate()).padStart(2, '0') +
-    (endTime && endTime !== '' ? 'T' + String(newEndDateTime.getHours()).padStart(2, '0') + ':' + String(newEndDateTime.getMinutes()).padStart(2, '0') : '');
-  data.endDate = newEndDateTimeString.slice(0, 10);
+  const origStart = startTime && startTime !== '' ? new Date(`${startDate} ${startTime}:00 GMT${tzlib_get_offset(tzid, startDate, startTime)}`) : new Date(`${startDate} 00:00:00 GMT${tzlib_get_offset(tzid, startDate, '00:00')}`);
+  const origEnd = endTime && endTime !== '' ? new Date(`${endDate} ${endTime}:00 GMT${tzlib_get_offset(tzid, endDate, endTime)}`) : new Date(`${endDate} 00:00:00 GMT${tzlib_get_offset(tzid, endDate, '00:00')}`);
+  const diff = origEnd.getTime() - origStart.getTime();
+  const newStartInstant = nextStartTime ? new Date(`${data.startDate} ${nextStartTime}:00 GMT${tzlib_get_offset(tzid, data.startDate, nextStartTime)}`) : new Date(`${data.startDate} 00:00:00 GMT${tzlib_get_offset(tzid, data.startDate, '00:00')}`);
+  const newEndDateTime = new Date(newStartInstant.getTime() + diff);
+  const nextEndLocal = formatInTz(newEndDateTime, tzid, !!(endTime && endTime !== ''));
+  data.endDate = nextEndLocal.date;
   if (endTime && endTime !== '') {
-    data.endTime = newEndDateTimeString.slice(11, 16);
+    data.endTime = nextEndLocal.time;
   }
   if ((data.recurrence_count && data.recurrence_count !== '') || (data.recurrence_until && data.recurrence_until !== '')) {
     if (occurenceData.adjustedCount < 2) {
@@ -4265,14 +4274,7 @@ function atcb_parseByWeekdayTokens(rawByDay) {
         digits = digits.slice(1);
       }
       if (!digits || digits.length > 2) continue;
-      let validDigits = true;
-      for (let i = 0; i < digits.length; i++) {
-        const code = digits.charCodeAt(i);
-        if (code < 48 || code > 57) {
-          validDigits = false;
-          break;
-        }
-      }
+      const validDigits = typeof digits === 'string' && /^\d+$/.test(digits);
       if (!validDigits) continue;
       const abs = parseInt(digits, 10);
       if (abs < 1 || abs > 53) continue;