@siemens/element-ng 47.12.1 → 47.12.2

package/datepicker/date-time-helper.d.ts

@@ -33,8 +33,9 @@ export declare const getDayStrings: (locale: string, weekStart?: WeekStart, form
  */
 export declare const getFirstDayInMonth: (year: number, month: number) => Date;
 /**
- * Gets the week number of the specified date.
- * Week number according to the ISO-8601 standard, weeks starting on Monday.
+ * Returns the ISO-8601 week number for the user's week containing the specified date.
+ * ISO-8601 weeks always start on Monday. When the user's week starts on Sunday or Saturday,
+ * the date is adjusted to find the corresponding ISO week (based on the Thursday rule).
  * The first week of a year is the week that contains the first Thursday of the year (='First 4-day week').
  * The highest week number in a year is either 52 or 53.
  *

package/fesm2022/siemens-element-ng-datepicker.mjs

@@ -91,8 +91,9 @@ const getDayStrings = (locale, weekStart = 'monday', format = 'short') => {
  */
 const getFirstDayInMonth = (year, month) => new Date(year, month - 1, 1);
 /**
- * Gets the week number of the specified date.
- * Week number according to the ISO-8601 standard, weeks starting on Monday.
+ * Returns the ISO-8601 week number for the user's week containing the specified date.
+ * ISO-8601 weeks always start on Monday. When the user's week starts on Sunday or Saturday,
+ * the date is adjusted to find the corresponding ISO week (based on the Thursday rule).
  * The first week of a year is the week that contains the first Thursday of the year (='First 4-day week').
  * The highest week number in a year is either 52 or 53.
  *
@@ -101,16 +102,21 @@ const getFirstDayInMonth = (year, month) => new Date(year, month - 1, 1);
  * @returns The number of the Week
  */
 const getWeekOfYear = (date, weekStart) => {
-    // Algorithm rewritten from C# example given at http://en.wikipedia.org/wiki/Talk:ISO_week_date
-    const dayOfWeek = getWeekDayOffset(date, weekStart) + 1;
     const nearestThu = new Date(date);
-    nearestThu.setDate(date.getDate() + (UNITS.thursday - dayOfWeek)); // get nearest Thursday (-3..+3 days)
+    nearestThu.setHours(0, 0, 0, 0);
+    const offset = weekStart === 'monday' ? 0 : weekStart === 'sunday' ? 1 : 2;
+    nearestThu.setDate(nearestThu.getDate() + offset);
+    adjustToThursday(nearestThu);
     const year = nearestThu.getFullYear();
-    const janfirst = getFirstDayInMonth(year, 1);
-    const days = Math.floor((nearestThu - janfirst) / UNITS.millisecondsPerDay);
+    const weekOne = new Date(year, 0, 4);
+    adjustToThursday(weekOne);
+    const days = Math.round((nearestThu.getTime() - weekOne.getTime()) / UNITS.millisecondsPerDay);
     const week = 1 + Math.floor(days / UNITS.daysPerWeek); // Count of Thursdays
     return week;
 };
+const adjustToThursday = (date) => {
+    date.setDate(date.getDate() + 3 - ((date.getDay() + 6) % 7));
+};
 const getWeekDayOffset = (date, weekStart) => {
     const offset = WEEK_START_OFFSET[weekStart ?? 'monday'];
     return (date.getDay() + 6 - offset) % 7;