add-to-calendar-button 2.12.7 → 2.12.9

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

@@ -5,7 +5,7 @@
  *
  * Style: 3D
  *
- * Version: 2.12.7
+ * Version: 2.12.9
  * 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.7
+ * Version: 2.12.9
  * 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.7
+ * Version: 2.12.9
  * 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.7
+ * Version: 2.12.9
  * 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.7
+ * Version: 2.12.9
  * 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.7
+ * Version: 2.12.9
  * 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.7
+ * Version: 2.12.9
  * 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.7
+ * Version: 2.12.9
  * 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.7
+ *  Version: 2.12.9
  *  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.7';
+const atcbVersion = '2.12.9';
 const atcbCssTemplate = {};
 const atcbIsBrowser = () => {
   if (typeof window === 'undefined') {
@@ -620,7 +620,7 @@ function atcb_decorate_data_recurring_events(data) {
   }
   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 : '')) - new Date(startDate + (startTime && startTime !== '' ? 'T' + startTime : ''));
+  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()) +
@@ -2916,7 +2916,7 @@ function atcb_determine_ical_filename(data, subEvent) {
       return filenamePart + filenameSuffix;
     }
   }
-  return 'event-to-save-in-my-calendar' + filenameSuffix;
+  return 'event' + filenameSuffix;
 }
 function atcb_ical_copy_note(host, dataUrl, data, keyboardTrigger) {
   atcb_copy_to_clipboard(dataUrl);
@@ -3505,6 +3505,65 @@ function atcb_apply_transformation(value, transform) {
       return value;
   }
 }
+function atcb_parseByWeekdayTokens(rawByDay) {
+  const tokens = rawByDay ? rawByDay.toString().split(',') : [];
+  const mapWeekdayCode = (wd) => {
+    switch (wd) {
+      case 'SU':
+        return 0;
+      case 'MO':
+        return 1;
+      case 'TU':
+        return 2;
+      case 'WE':
+        return 3;
+      case 'TH':
+        return 4;
+      case 'FR':
+        return 5;
+      case 'SA':
+        return 6;
+      default:
+        return undefined;
+    }
+  };
+  const plainWeekdays = [];
+  const ordinals = [];
+  for (const tok of tokens) {
+    const t = tok.trim().toUpperCase();
+    if (t.length < 2) continue;
+    const wd = t.slice(-2);
+    const day = mapWeekdayCode(wd);
+    if (day === undefined) continue;
+    const prefix = t.slice(0, t.length - 2);
+    if (prefix) {
+      let sign = 1;
+      let digits = prefix;
+      if (digits[0] === '+') {
+        digits = digits.slice(1);
+      } else if (digits[0] === '-') {
+        sign = -1;
+        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;
+        }
+      }
+      if (!validDigits) continue;
+      const abs = parseInt(digits, 10);
+      if (abs < 1 || abs > 53) continue; 
+      ordinals.push({ n: sign * abs, day });
+    } else {
+      plainWeekdays.push(day);
+    }
+  }
+  return { plainWeekdays, ordinals };
+}
 function atcb_parseRRule(rruleStr, deep = true) {
   const parts = rruleStr
     .replace('RRULE:', '')
@@ -3516,40 +3575,66 @@ function atcb_parseRRule(rruleStr, deep = true) {
     }, {});
   if (!parts.FREQ) throw new Error('RRULE must have FREQ');
   parts.FREQ = parts.FREQ.toUpperCase();
-  parts.INTERVAL = parseInt(parts.INTERVAL || 1, 10);
-  parts.COUNT = parts.COUNT ? parseInt(parts.COUNT, 10) : null;
+  parts.INTERVAL = parts.INTERVAL ? parseInt(parts.INTERVAL.toString(), 10) : 1;
+  parts.COUNT = parts.COUNT ? parseInt(parts.COUNT.toString(), 10) : null;
   if (parts.UNTIL) {
-    const untilStr = parts.UNTIL;
-    parts.UNTIL = deep ? new Date(Date.UTC(parseInt(untilStr.slice(0, 4), 10), parseInt(untilStr.slice(4, 6), 10) - 1, parseInt(untilStr.slice(6, 8), 10), parseInt(untilStr.slice(9, 11) || 0, 10), parseInt(untilStr.slice(11, 13) || 0, 10))) : untilStr;
+    const untilStr = parts.UNTIL.toString();
+    parts.UNTIL = deep ? new Date(Date.UTC(parseInt(untilStr.slice(0, 4), 10), parseInt(untilStr.slice(4, 6), 10) - 1, parseInt(untilStr.slice(6, 8), 10), parseInt(untilStr.slice(9, 11) || '0', 10), parseInt(untilStr.slice(11, 13) || '0', 10))) : untilStr;
   }
   if (parts.BYWEEKDAY || parts.BYDAY) {
-    const dayMap = { SU: 0, MO: 1, TU: 2, WE: 3, TH: 4, FR: 5, SA: 6 };
-    parts.BYWEEKDAY = deep
-      ? (parts.BYWEEKDAY || parts.BYDAY)
+    const rawByDay = (parts.BYWEEKDAY || parts.BYDAY)?.toString();
+    if (deep) {
+      const { plainWeekdays, ordinals } = atcb_parseByWeekdayTokens(rawByDay);
+      parts.BYWEEKDAY = plainWeekdays.length ? plainWeekdays : null;
+      parts.BYDAY_ORDINALS = ordinals.length ? ordinals : null;
+    } else {
+      parts.BYWEEKDAY = parts.BYWEEKDAY || parts.BYDAY;
+    }
+  }
+  parts.BYMONTH =
+    deep && parts.BYMONTH
+      ? parts.BYMONTH.toString()
+          .split(',')
+          .map((n) => parseInt(n, 10))
+      : parts.BYMONTH;
+  parts.BYYEARDAY =
+    deep && parts.BYYEARDAY
+      ? parts.BYYEARDAY.toString()
+          .split(',')
+          .map((n) => parseInt(n, 10))
+      : parts.BYYEARDAY;
+  parts.BYMONTHDAY =
+    deep && parts.BYMONTHDAY
+      ? parts.BYMONTHDAY.toString()
+          .split(',')
+          .map((n) => parseInt(n, 10))
+      : parts.BYMONTHDAY;
+  parts.BYWEEKNO =
+    deep && parts.BYWEEKNO
+      ? parts.BYWEEKNO.toString()
           .split(',')
-          .map((day) => dayMap[day.trim().toUpperCase()])
-          .filter((n) => n !== undefined)
-      : parts.BYWEEKDAY || parts.BYDAY;
-  }
-  parts.BYMONTH = deep && parts.BYMONTH ? parts.BYMONTH.split(',').map((n) => parseInt(n, 10)) : parts.BYMONTH;
-  parts.BYYEARDAY = deep && parts.BYYEARDAY ? parts.BYYEARDAY.split(',').map((n) => parseInt(n, 10)) : parts.BYYEARDAY;
-  parts.BYMONTHDAY = deep && parts.BYMONTHDAY ? parts.BYMONTHDAY.split(',').map((n) => parseInt(n, 10)) : parts.BYMONTHDAY;
-  parts.BYWEEKNO = deep && parts.BYWEEKNO ? parts.BYWEEKNO.split(',').map((n) => parseInt(n, 10)) : parts.BYWEEKNO;
-  parts.BYHOUR = deep && parts.BYHOUR ? parts.BYHOUR.split(',').map((n) => parseInt(n, 10)) : parts.BYHOUR;
+          .map((n) => parseInt(n, 10))
+      : parts.BYWEEKNO;
+  parts.BYHOUR =
+    deep && parts.BYHOUR
+      ? parts.BYHOUR.toString()
+          .split(',')
+          .map((n) => parseInt(n, 10))
+      : parts.BYHOUR;
   return parts;
 }
 function getDayOfYear(date) {
   const start = new Date(Date.UTC(date.getUTCFullYear(), 0, 1));
-  return Math.floor((date - start) / (1000 * 60 * 60 * 24)) + 1;
+  return Math.floor((date.getTime() - start.getTime()) / (1000 * 60 * 60 * 24)) + 1;
 }
 function getWeekNumber(date) {
   const d = new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()));
   d.setUTCDate(d.getUTCDate() + 4 - (d.getUTCDay() || 7));
   const yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1));
-  return Math.ceil(((d - yearStart) / 86400000 + 1) / 7);
+  return Math.ceil(((d.getTime() - yearStart.getTime()) / 86400000 + 1) / 7);
 }
 function matchesFreq(date, rrule, startDate) {
-  const interval = rrule.INTERVAL;
+  const interval = parseInt(rrule.INTERVAL.toString(), 10) || 1;
   switch (rrule.FREQ) {
     case 'YEARLY':
       return (date.getUTCFullYear() - startDate.getUTCFullYear()) % interval === 0;
@@ -3558,12 +3643,12 @@ function matchesFreq(date, rrule, startDate) {
       return months % interval === 0;
     }
     case 'WEEKLY': {
-      const daysW = Math.floor((date - startDate) / 86400000);
+      const daysW = Math.floor((date.getTime() - startDate.getTime()) / 86400000);
       const weeks = Math.floor(daysW / 7);
       return weeks % interval === 0;
     }
     case 'DAILY': {
-      const days = Math.floor((date - startDate) / 86400000);
+      const days = Math.floor((date.getTime() - startDate.getTime()) / 86400000);
       return days % interval === 0;
     }
     default:
@@ -3580,16 +3665,73 @@ function matchesBYRules(date, rrule) {
   if (rrule.BYYEARDAY && !rrule.BYYEARDAY.includes(getDayOfYear(date))) return false;
   if (rrule.BYMONTHDAY && !rrule.BYMONTHDAY.includes(date.getUTCDate())) return false;
   if (rrule.BYWEEKNO && !rrule.BYWEEKNO.includes(getWeekNumber(date))) return false;
-  if (rrule.BYWEEKDAY && !rrule.BYWEEKDAY.includes(date.getUTCDay())) return false;
+  const hasPlainWeekday = !!(rrule.BYWEEKDAY && rrule.BYWEEKDAY.length);
+  const plainWeekdayOk = hasPlainWeekday ? rrule.BYWEEKDAY.includes(date.getUTCDay()) : null;
+  let ordinalOk = null;
+  if (rrule.BYDAY_ORDINALS && Array.isArray(rrule.BYDAY_ORDINALS) && rrule.BYDAY_ORDINALS.length > 0) {
+    const dow = date.getUTCDay(); 
+    const year = date.getUTCFullYear();
+    const month = date.getUTCMonth();
+    const dayOfYear = getDayOfYear(date);
+    const daysInMonth = new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
+    const daysInYear = getDayOfYear(new Date(Date.UTC(year, 11, 31)));
+    const isNthWeekdayOfMonth = (n, weekday) => {
+      if (n === 0) return false;
+      if (n > 0) {
+        const firstOfMonth = new Date(Date.UTC(year, month, 1));
+        const firstDow = firstOfMonth.getUTCDay();
+        const offset = (weekday - firstDow + 7) % 7;
+        const targetDay = 1 + offset + (n - 1) * 7;
+        return targetDay >= 1 && targetDay <= daysInMonth && date.getUTCDate() === targetDay;
+      } else {
+        const lastOfMonth = new Date(Date.UTC(year, month + 1, 0));
+        const lastDow = lastOfMonth.getUTCDay();
+        const backOffset = (lastDow - weekday + 7) % 7;
+        const targetDay = lastOfMonth.getUTCDate() - backOffset + (n + 1) * 7; 
+        return targetDay >= 1 && targetDay <= daysInMonth && date.getUTCDate() === targetDay;
+      }
+    };
+    const isNthWeekdayOfYear = (n, weekday) => {
+      if (n === 0) return false;
+      if (n > 0) {
+        const jan1 = new Date(Date.UTC(year, 0, 1));
+        const jan1Dow = jan1.getUTCDay();
+        const offset = (weekday - jan1Dow + 7) % 7;
+        const targetDoy = 1 + offset + (n - 1) * 7;
+        return targetDoy >= 1 && targetDoy <= daysInYear && dayOfYear === targetDoy;
+      } else {
+        const dec31 = new Date(Date.UTC(year, 11, 31));
+        const dec31Dow = dec31.getUTCDay();
+        const backOffset = (dec31Dow - weekday + 7) % 7;
+        const targetDoy = daysInYear - backOffset + (n + 1) * 7; 
+        return targetDoy >= 1 && targetDoy <= daysInYear && dayOfYear === targetDoy;
+      }
+    };
+    const anyOrdinalMatch = rrule.BYDAY_ORDINALS.some(({ n, day }) => {
+      if (day !== dow) return false;
+      if (rrule.FREQ === 'MONTHLY') return isNthWeekdayOfMonth(n, day);
+      if (rrule.FREQ === 'YEARLY') {
+        if (rrule.BYMONTH && rrule.BYMONTH.length > 0) return isNthWeekdayOfMonth(n, day);
+        if (!rrule.BYWEEKNO) return isNthWeekdayOfYear(n, day);
+        return false;
+      }
+      return false;
+    });
+    ordinalOk = anyOrdinalMatch;
+  }
+  if (plainWeekdayOk === false && ordinalOk === false) return false;
+  if (plainWeekdayOk === false && ordinalOk === null) return false;
+  if (ordinalOk === false && plainWeekdayOk === null) return false;
   if (rrule.BYHOUR && !rrule.BYHOUR.includes(date.getUTCHours())) return false;
   return true;
 }
 function matchesImplicitRules(date, rrule, startDate) {
   if (!rrule.BYHOUR && date.getUTCHours() !== startDate.getUTCHours()) return false;
-  if (rrule.FREQ === 'WEEKLY' && !rrule.BYWEEKDAY && date.getUTCDay() !== startDate.getUTCDay()) return false;
-  if (rrule.FREQ === 'MONTHLY' && !rrule.BYMONTHDAY && !rrule.BYWEEKDAY && date.getUTCDate() !== startDate.getUTCDate()) return false;
+  const hasByWeekdayAny = !!(rrule.BYWEEKDAY && rrule.BYWEEKDAY.length) || !!(rrule.BYDAY_ORDINALS && rrule.BYDAY_ORDINALS.length);
+  if (rrule.FREQ === 'WEEKLY' && !hasByWeekdayAny && date.getUTCDay() !== startDate.getUTCDay()) return false;
+  if (rrule.FREQ === 'MONTHLY' && !rrule.BYMONTHDAY && !hasByWeekdayAny && date.getUTCDate() !== startDate.getUTCDate()) return false;
   if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTH && date.getUTCMonth() !== startDate.getUTCMonth()) return false;
-  if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTHDAY && !rrule.BYWEEKDAY && !rrule.BYYEARDAY && !rrule.BYWEEKNO && date.getUTCDate() !== startDate.getUTCDate()) return false;
+  if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTHDAY && !hasByWeekdayAny && !rrule.BYYEARDAY && !rrule.BYWEEKNO && date.getUTCDate() !== startDate.getUTCDate()) return false;
   return true;
 }
 function atcb_getNextOccurrence(rruleStr, startDateTime, allday) {
@@ -3608,16 +3750,17 @@ function atcb_getNextOccurrence(rruleStr, startDateTime, allday) {
   let maxIterations = 10000;
   while (true) {
     if (rrule.UNTIL && currentDate > rrule.UNTIL) break;
-    if (matchesFreq(currentDate, rrule, startDateTime) && matchesRRule(currentDate, rrule, startDateTime)) {
+    const isMatch = matchesFreq(currentDate, rrule, startDateTime) && matchesRRule(currentDate, rrule, startDateTime);
+    if (isMatch) {
       occurrences.push(currentDate);
       count++;
       if (rrule.COUNT && count >= rrule.COUNT) break;
-      if (!rrule.COUNT && !rrule.UNTIL && occurrences.length > 0 && (allday ? currentDate >= now : currentDate > now)) break;
+      if (!rrule.COUNT && !rrule.UNTIL && (allday ? currentDate >= now : currentDate > now)) break;
     }
-    currentDate = new Date(currentDate.getTime() + stepMs);
     if (--maxIterations <= 0) {
       break;
     }
+    currentDate = new Date(currentDate.getTime() + stepMs);
   }
   let nextDate = null;
   let countDate = 0;
@@ -3629,8 +3772,15 @@ function atcb_getNextOccurrence(rruleStr, startDateTime, allday) {
     countDate++;
   }
   if (!nextDate) {
-    nextDate = occurrences.length > 1 ? occurrences[occurrences.length - 1] : null;
-    countDate = countDate - 1;
+    if (occurrences.length > 1) {
+      nextDate = occurrences[occurrences.length - 1];
+      countDate = countDate - 1;
+    } else if (occurrences.length === 1) {
+      nextDate = occurrences[0];
+    } else {
+      nextDate = startDateTime;
+      countDate = 1;
+    }
   }
   return {
     nextOccurrence: nextDate,