@openui5/sap.ui.unified 1.144.0 → 1.146.0

package/src/sap/ui/unified/calendar/CalendarUtils.js

@@ -266,6 +266,23 @@ sap.ui.define([
 			return oNewDate;
 		};
 
+		/**
+		 * Gets the final day of a specified month.
+		 * This function processes date values in UTC to produce timezone agnostic results.
+		 *
+		 * @param {Date|module:sap/ui/core/date/UI5Date} oDate date instance
+		 * @returns {Date|module:sap/ui/core/date/UI5Date} date instance corresponding to the last date of the month
+		 * @public
+		 */
+		CalendarUtils.getLastDateOfMonth = function(oDate) {
+			const oNewDate = new UniversalDate(oDate.getTime());
+			oNewDate.setDate(1);
+			oNewDate.setMonth(oNewDate.getMonth() + 1);
+			oNewDate.setDate(oNewDate.getDate() - 1);
+
+			return oNewDate;
+		};
+
 		/**
 		 * Calculates the number of weeks for a given year using the current locale settings
 		 * @param {int} iYear The target year of interest in format (YYYY)

package/src/sap/ui/unified/calendar/DatesRow.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * If used inside the calendar the properties and aggregation are directly taken from the parent
 	 * (To not duplicate and sync DateRanges and so on...)
 	 * @extends sap.ui.unified.calendar.Month
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/DatesRowRenderer.js

@@ -52,7 +52,6 @@ sap.ui.define(["sap/base/i18n/date/CalendarType", "sap/ui/core/Lib", 'sap/ui/cor
 			DatesRowRenderer.renderCustomIntervals(oRm, oDatesRow);
 		} else {
 			MonthRenderer.renderMonth.apply(this, arguments);
-			this.renderWeekNumbers(oRm, oDatesRow);
 		}
 	};
 
@@ -91,43 +90,6 @@ sap.ui.define(["sap/base/i18n/date/CalendarType", "sap/ui/core/Lib", 'sap/ui/cor
 			oRm.close("div");
 	};
 
-	/**
-	 * Renders the week numbers in their own container.
-	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.unified.calendar.DatesRow} oDatesRow The row which will be rendered
-	 * @since 1.52
-	 */
-	DatesRowRenderer.renderWeekNumbers = function (oRm, oDatesRow) {
-		var oResourceBundle,
-			iDays,
-			iDaysWidth,
-			aWeekNumbers;
-
-		if (oDatesRow.getShowWeekNumbers() && oDatesRow._getPrimaryCalendarType() === CalendarType.Gregorian) {
-			oResourceBundle = Library.getResourceBundleFor("sap.ui.unified");
-
-			oRm.openStart("div", oDatesRow.getId() + "-weeks");
-			oRm.class("sapUiCalRowWeekNumbers");
-			oRm.openEnd();
-
-			iDays = oDatesRow.getDays();
-			iDaysWidth = 100 / iDays;
-			aWeekNumbers = oDatesRow.getWeekNumbers();
-
-			aWeekNumbers.forEach(function(oWeek) {
-				oRm.openStart("div", oDatesRow.getId() + "-week-" + oWeek.number + "-text");
-				oRm.class('sapUiCalRowWeekNumber');
-				oRm.style("width", oWeek.len * iDaysWidth + "%");
-				oRm.attr("data-sap-ui-week", oWeek.number);
-				oRm.openEnd();
-				oRm.text(oResourceBundle.getText('CALENDAR_DATES_ROW_WEEK_NUMBER', [oWeek.number]));
-				oRm.close("div");
-			});
-
-			oRm.close("div");
-		}
-	};
-
 	DatesRowRenderer.renderDummyCell = function() {};
 
 	/**

package/src/sap/ui/unified/calendar/Header.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * <b>Note:</b> This is used inside the calendar. Not for standalone usage
 	 * @extends sap.ui.core.Control
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/IndexPicker.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * This control serves for picking an item from a grid with items which are relative periods in Plannig Calendar.
 	 * This is used inside the sap.m.PlanningCalendar relative views. Not for stand alone usage.
 	 * @extends sap.ui.core.Control
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/unified/calendar/Month.js

@@ -78,7 +78,7 @@ sap.ui.define([
 	 * If used inside the calendar the properties and aggregation are directly taken from the parent
 	 * (To not duplicate and sync DateRanges and so on...)
 	 * @extends sap.ui.core.Control
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/MonthPicker.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * renders a MonthPicker with ItemNavigation
 	 * This is used inside the calendar. Not for stand alone usage
 	 * @extends sap.ui.core.Control
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/MonthPickerRenderer.js

@@ -169,7 +169,7 @@ sap.ui.define(["sap/ui/core/Lib", "sap/ui/unified/calendar/CalendarDate", 'sap/u
 
 			oRm.close("div");
 
-			if (iColumns > 0 && ((i + 1) % iColumns === 0)) {
+			if (iColumns > 0 && (((i + 1) % iColumns === 0) || (i + 1)  === iMonths)) {
 				// end of row
 				oRm.close("div");
 			}

package/src/sap/ui/unified/calendar/MonthRenderer.js

@@ -422,11 +422,13 @@ sap.ui.define([
 		CalendarUtils._checkCalendarDate(oDay);
 		var oSecondaryDay = new CalendarDate(oDay, oHelper.sSecondaryCalendarType),
 			bSelectable = oMonth._getAriaRole() === "gridcell" && oMonth._getSelectableAccessibilitySemantics(),
+			sDayDescription = bSelectable ? oMonth._getDayDescription() : "",
+			sDayNameId = (!bDayName && iNumber >= 0) ? oHelper.sId + "-WH" + iNumber : "",
 			mAccProps = {
 				role: oMonth._getAriaRole(),
 				selected: bSelectable ? false : null,
 				label: "",
-				describedby: bSelectable ? oMonth._getDayDescription() : null
+				describedby: `${sDayDescription} ${sDayNameId}`.trim() || ""
 			},
 			bBeforeFirstYear = oDay._bBeforeFirstYear,
 			sAriaType = "",
@@ -504,13 +506,31 @@ sap.ui.define([
 			mAccProps["describedby"] = `${mAccProps["describedby"]} ${sEndDateText}`.trim();
 		}
 
-		if (this.renderWeekNumbers && oMonth.getShowWeekNumbers() && oMonth._oDate) {
-			// TODO: We could replace the following lines with a sap.ui.unified.calendar.CalendarUtils.calculateWeekNumber usage
-			// once the same method starts to respect the sap/base/i18n/date/CalendarWeekNumbering types.
-			const oWeekConfig = CalendarDateUtils.getWeekConfigurationValues(oMonth.getCalendarWeekNumbering(), new Locale(oMonth._getLocale()));
-			oWeekConfig.firstDayOfWeek = oMonth._getFirstDayOfWeek();
-			const oFirstDateOfWeek = CalendarDate.fromUTCDate(CalendarUtils.getFirstDateOfWeek(oDay.toLocalJSDate(), oWeekConfig), oMonth.getPrimaryCalendarType());
-			mAccProps["describedby"] = mAccProps["describedby"] + " " + oMonth.getId() + "-week-" + oMonth._calculateWeekNumber(oFirstDateOfWeek) + "-text";
+		const oParent = oMonth.getParent();
+		const bShowWeekNumbers = oMonth.getShowWeekNumbers();
+		const bHasDate = !!oMonth._oDate;
+		const bSeparateWeekNumbers = bShowWeekNumbers && bHasDate && oParent &&
+			(oParent.isA("sap.m.PlanningCalendar") ||
+			 oParent.isA("sap.ui.unified.CalendarDateInterval") ||
+			 oParent.isA("sap.ui.unified.CalendarTimeInterval") ||
+			 oParent.isA("sap.m.Toolbar"));
+
+		if (bSeparateWeekNumbers) {
+			// This path is for controls that render week numbers separately (e.g., CalendarDateInterval with WeeksRow)
+			let sParentId = oParent.getId();
+
+			// For Toolbar, we need to find the PlanningCalendar (Toolbar -> Table -> PlanningCalendar hierarchy)
+			const bIsToolbar = oParent.isA("sap.m.Toolbar");
+			const oGrandParent = bIsToolbar ? oParent.getParent() : null;
+			const oGreatGrandParent = oGrandParent ? oGrandParent.getParent() : null;
+			const bHasPlanningCalendar = oGreatGrandParent && oGreatGrandParent.isA("sap.m.PlanningCalendar");
+
+			if (bIsToolbar) {
+				sParentId = bHasPlanningCalendar ? oGreatGrandParent.getId() : oMonth.getId();
+			}
+
+			const iWeekNumber = oMonth._calculateWeekNumber(oDay);
+			mAccProps["describedby"] = mAccProps["describedby"] + " " + sParentId + "-WeekNumbersRow-week-" + iWeekNumber + "-text";
 		}
 
 		if (bNonWorking) {

package/src/sap/ui/unified/calendar/MonthsRow.js

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * The MontsRow works with UI5Date or JavaScript Date objects, but only the month and the year are used to display and interact.
 	 * As representation for a month, the 1st of the month will always be returned in the API.
 	 * @extends sap.ui.core.Control
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 *
 	 * @constructor
 	 * @public
@@ -138,7 +138,14 @@ sap.ui.define([
 			 * @private
 			 * @since 1.139.0
 			 */
-			selectableAccessibilitySemantics : {type : "boolean", group : "Behavior", defaultValue : true, visibility: "hidden"}
+			selectableAccessibilitySemantics : {type : "boolean", group : "Behavior", defaultValue : true, visibility: "hidden"},
+
+			/**
+			 * Determines if the week numbers are displayed.
+			 *
+			 * @since 1.145.0
+			 */
+			showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : false}
 		},
 		aggregations : {
 

package/src/sap/ui/unified/calendar/MonthsRowRenderer.js

@@ -37,6 +37,10 @@ sap.ui.define(["sap/ui/core/Element", 'sap/ui/unified/calendar/CalendarUtils', '
 		oRm.class("sapUiCalMonthsRow");
 		oRm.class("sapUiCalRow");
 
+		if (oMonthsRow.getShowWeekNumbers()) {
+			oRm.class("sapUiCalRowWithWeekNumbers");
+		}
+
 		if (sTooltip) {
 			oRm.attr("title", sTooltip);
 		}
@@ -167,7 +171,6 @@ sap.ui.define(["sap/ui/core/Element", 'sap/ui/unified/calendar/CalendarUtils', '
 			this.renderMonth(oRm, oMonthsRow, oMonthDate, oHelper, sWidth);
 			oMonthDate.setMonth(oMonthDate.getMonth() + 1);
 		}
-
 	};
 
 	/**

package/src/sap/ui/unified/calendar/OneMonthDatesRow.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * Other usages are not supported.
 	 *
 	 * @extends sap.ui.unified.calendar.DatesRow
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/unified/calendar/RecurrenceUtils.js

@@ -44,12 +44,15 @@ sap.ui.define([
 
 			const oStartDate = UI5Date.getInstance(this.getStartDate());
 			const oCurrentDate = UI5Date.getInstance(oDate);
+			const oStartDateUTC = Date.UTC(oStartDate.getFullYear(), oStartDate.getMonth(), oStartDate.getDate());
+			const oCurrentDateUTC = Date.UTC(oCurrentDate.getFullYear(), oCurrentDate.getMonth(), oCurrentDate.getDate());
 			oStartDate.setHours(0,0,0,0);
 			oCurrentDate.setHours(0,0,0,0);
 
 			const iDayInMilliseconds = 24 * 60 * 60 * 1000;
 			const isDateInRange = oCurrentDate >= oStartDate && oCurrentDate <= this.getRecurrenceEndDate();
-			const isWithCorrectPattern = Math.floor((oCurrentDate.getTime() - oStartDate.getTime()) / iDayInMilliseconds) % this.getRecurrencePattern() === 0;
+
+			const isWithCorrectPattern = Math.floor((oCurrentDateUTC - oStartDateUTC) / iDayInMilliseconds) % this.getRecurrencePattern() === 0;
 
 			return  isDateInRange && isWithCorrectPattern;
 		};

package/src/sap/ui/unified/calendar/TimesRow.js

@@ -69,7 +69,7 @@ sap.ui.define([
 	 *
 	 * The TimesRow works with UI5Date or JavaScript Date objects.
 	 * @extends sap.ui.core.Control
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/WeeksRow.js

@@ -0,0 +1,219 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/base/i18n/date/CalendarType",
+	"sap/ui/unified/library",
+	"sap/ui/core/Control",
+	"./WeeksRowRenderer",
+	"sap/ui/core/date/UI5Date",
+	"sap/ui/unified/calendar/CalendarUtils",
+	"sap/ui/unified/calendar/CalendarDate",
+	"sap/ui/core/Locale",
+	"sap/base/i18n/Formatting"
+], function (
+	CalendarType,
+	unifiedLibrary,
+	Control,
+	WeeksRowRenderer,
+	UI5Date,
+	CalendarUtils,
+	CalendarDate,
+	Locale,
+	Formatting
+) {
+	"use strict";
+	const CalendarIntervalType = unifiedLibrary.CalendarIntervalType;
+
+	/**
+	 * Constructor for a new sap.ui.unified.calendar.WeeksRow.
+	 *
+	 * @param {string} [sId] ID for the new control, generated automatically if no ID is provided.
+	 * @param {object} [mSettings] Initial settings for the new control.
+	 *
+	 * @class
+	 * Renders a row of weeks, each consisting of days, for use in calendar-based controls such as the PlanningCalendar.
+	 * The WeeksRow control is not intended for standalone usage, but as an internal part of higher-level calendar components.
+	 *
+	 * The WeeksRow works with UI5Date or JavaScript Date objects for its API, but internally uses CalendarDate objects for calculations.
+	 *
+	 * @extends sap.ui.core.Control
+	 * @version 1.146.0
+	 *
+	 * @constructor
+	 * @private
+	 * @since 1.145.0
+	 * @alias sap.ui.unified.calendar.WeeksRow
+	 */
+	const WeeksRow = Control.extend("sap.ui.unified.calendar.WeeksRow", /** @lends sap.ui.unified.calendar.WeeksRow.prototype */ {
+		metadata : {
+			library : "sap.ui.unified",
+			properties : {
+
+				/**
+				 * Determines the start date of the row, as a UI5Date or JavaScript Date object. The current date is used as default.
+				 */
+				startDate : { type : "object", group : "Data" },
+
+				/**
+				 * If set, the calendar type is used for display.
+				 * If not set, the calendar type of the global configuration is used.
+				 */
+				primaryCalendarType : { type : "sap.base.i18n.date.CalendarType", group : "Appearance", defaultValue : CalendarType.Gregorian },
+
+				/**
+			 	 * number weeks displayed
+			 	 */
+				interval : { type : "int", group : "Appearance" },
+
+				/**
+				 * Defines the key of the <code>PlanningCalendarView</code> used for the output.
+				 *
+				 * <b>Note:</b> The default value is set <code>Hour</code>. If you are using your own views, the keys of these
+				 * views should be used instead.
+				 */
+				viewKey : {type : "string", group : "Appearance", defaultValue : CalendarIntervalType.Hour},
+
+				/**
+				 * Determines if the week numbers are displayed.
+				 */
+				showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : false},
+
+				/**
+				 * If set, the calendar week numbering is used for display.
+				 * If not set, the calendar week numbering of the global configuration is used.
+				 */
+				calendarWeekNumbering : { type : "sap.base.i18n.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null}
+			}
+		},
+		renderer: WeeksRowRenderer
+	});
+
+	/**
+	 * Sets the ARIA role for the row container.
+	 * @param {string} sRole The ARIA role to be assigned.
+	 * @returns {sap.ui.unified.calendar.WeeksRow} The current instance for method chaining.
+	 * @private
+	 */
+	WeeksRow.prototype._setAriaRole = function(sRole){
+		this._ariaRole = sRole;
+
+		return this;
+	};
+
+	/**
+	 * Retrieves the locale used by this control.
+	 * If the parent control specifies a locale it will be used; otherwise the
+	 * control falls back to the runtime language tag.
+	 *
+	 * @returns {string} The locale identifier.
+	 * @private
+	 */
+	WeeksRow.prototype._getLocale = function(){
+		const oParent = this.getParent();
+
+		if (oParent && oParent.getLocale) {
+			return oParent.getLocale();
+		} else if (!this._sLocale) {
+			this._sLocale = new Locale(Formatting.getLanguageTag()).toString();
+		}
+
+		return this._sLocale;
+
+	};
+
+	/**
+	 * Returns the weekday index of the start date (0 = Sunday, 6 = Saturday).
+	 * @returns {int} The index of the weekday corresponding to the start date.
+	 * @private
+	 */
+	WeeksRow.prototype._getFirstWeekDay = function(){
+		return this.getStartDate().getDay();
+	};
+
+	/**
+	 * Calculates and returns the week numbers for the currently displayed
+	 * interval. The result is an array of objects, where each object contains
+	 * a `number` (the week number) and `len` (how many days of that week are
+	 * displayed in the interval).
+	 *
+	 * @returns {Array<{len: int, number: int}>} Week numbers and lengths.
+	 * @private
+	 */
+	WeeksRow.prototype._getWeekNumbers = function() {
+		const iDays = this.getInterval(),
+			sLocale = this._getLocale(),
+			oCalType = this.getPrimaryCalendarType(),
+			oStartDate = CalendarDate.fromLocalJSDate(this.getStartDate(), oCalType),
+			oDate = new CalendarDate(oStartDate, oCalType),
+			oEndDate = new CalendarDate(oStartDate, oCalType).setDate(oDate.getDate() + iDays),
+			aDisplayedDates = [],
+			sCalendarWeekNumbering = this.getCalendarWeekNumbering() || "Default";
+
+		while (oDate.isBefore(oEndDate)) {
+			aDisplayedDates.push(new CalendarDate(oDate, oCalType));
+			oDate.setDate(oDate.getDate() + 1);
+		}
+
+		const weekNumbers = aDisplayedDates.reduce(function (aWeekNumbers, oDay) {
+			const iWeekNumber = CalendarUtils.calculateWeekNumber(oDay, oCalType, sLocale, sCalendarWeekNumbering, this._getFirstWeekDay());
+
+			if (!aWeekNumbers.length || aWeekNumbers[aWeekNumbers.length - 1].number !== iWeekNumber) {
+				aWeekNumbers.push({
+					len: 0,
+					number: iWeekNumber
+				});
+			}
+
+			aWeekNumbers[aWeekNumbers.length - 1].len++;
+
+			return aWeekNumbers;
+		}.bind(this), []);
+
+		return weekNumbers;
+	};
+
+	/**
+	 * Helper that returns the first and last week numbers for each month
+	 * in the current interval. The returned object maps the month index
+	 * (0..n-1) to an object with `first` and `last` week numbers.
+	 *
+	 * @returns {Object<number, {first: number, last: number}>} Mapping of month index to week numbers.
+	 * @private
+	 */
+	WeeksRow.prototype._getMonthsFirstAndLastWeekNumbers = function() {
+		const oStartDate = this.getStartDate();
+		const iInterval = this.getInterval();
+		const iCurrentYear = oStartDate.getFullYear();
+		let iCurrentDateMonth = oStartDate.getMonth();
+		const oWeeks = {};
+		const sPrimaryCalendarType = this.getPrimaryCalendarType();
+		const sCalendarWeekNumbering = this.getCalendarWeekNumbering() || "Default";
+
+		for (let i = 0; i < iInterval; i++) {
+			const oFirstDateOfMonth = UI5Date.getInstance(iCurrentYear, iCurrentDateMonth, 1);
+			const oLastDateOfMonth = CalendarUtils.getLastDateOfMonth(oFirstDateOfMonth);
+			const oFirstDateOfStartWeek = CalendarUtils.getFirstDateOfWeek(oFirstDateOfMonth);
+			const oFirstDateOfEndWeek = CalendarUtils.getFirstDateOfWeek(oLastDateOfMonth);
+
+			// Calculate week numbers for the first and last week of the month
+			const iFirstWeekNumber = iCurrentDateMonth === 0 ? 1 : CalendarUtils.calculateWeekNumber(new CalendarDate(CalendarDate.fromLocalJSDate(oFirstDateOfMonth), sPrimaryCalendarType), sPrimaryCalendarType, this._getLocale(), sCalendarWeekNumbering, oFirstDateOfStartWeek.getDay());
+			const iLastWeekNumber = CalendarUtils.calculateWeekNumber(new CalendarDate(CalendarDate.fromLocalJSDate(oLastDateOfMonth.oDate), sPrimaryCalendarType), sPrimaryCalendarType, this._getLocale(), sCalendarWeekNumbering, oFirstDateOfEndWeek.getDay());
+
+			oWeeks[i] = {
+				first: iFirstWeekNumber,
+				last: iLastWeekNumber
+			};
+
+			iCurrentDateMonth++;
+		}
+
+		return oWeeks;
+	};
+
+	return WeeksRow;
+
+});

package/src/sap/ui/unified/calendar/WeeksRowRenderer.js

@@ -0,0 +1,114 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/ui/unified/library",
+	"sap/ui/core/Lib",
+	"sap/base/i18n/date/CalendarType"
+],
+	function(
+		library,
+		coreLibrary,
+		CalendarType
+	) {
+	"use strict";
+
+	const CalendarIntervalType = library.CalendarIntervalType;
+
+	/**
+	 * WeeksRow renderer.
+	 * @namespace
+	 */
+	const WeeksRowRenderer = {
+		apiVersion: 2
+	};
+
+	WeeksRowRenderer.render = function (oRm, oWeeksRow) {
+		const bShowWeekNumbers = oWeeksRow.getShowWeekNumbers();
+		const sPrimaryCalendarType = oWeeksRow.getPrimaryCalendarType();
+		const sViewKey = oWeeksRow.getViewKey();
+		if (!bShowWeekNumbers || sPrimaryCalendarType !== CalendarType.Gregorian) {
+			return;
+		}
+
+		oRm.openStart("div", oWeeksRow);
+		oRm.class("sapUiCalWeeksRow");
+		oRm.class(`sapMPlanWeeksRow${sViewKey.split(" ").join("")}View`);
+		oRm.openEnd();
+		oRm.openStart("div");
+		oRm.class("sapMPlanWeeksLabelRow");
+		oRm.openEnd();
+		if (sViewKey === CalendarIntervalType.Month) {
+			const oResourceBundle = coreLibrary.getResourceBundleFor("sap.ui.unified");
+			oRm.openStart("div");
+			oRm.class("sapUiCalRowWeekLabel");
+			oRm.openEnd();
+			oRm.text(oResourceBundle.getText("CALENDAR_WEEK_NUMBERS"));
+			oRm.close("div");
+		}
+		oRm.close("div");
+		oRm.openStart("div");
+		oRm.class("sapMPlanWeeksDataRow");
+		oRm.openEnd();
+		if (sViewKey === CalendarIntervalType.Day || sViewKey === CalendarIntervalType.Week ||
+				sViewKey === CalendarIntervalType.OneMonth || sViewKey === CalendarIntervalType.OneWeek ||
+				sViewKey === "OneMonth") {
+			this.renderDaysWeeks(oRm, oWeeksRow);
+		} else if (sViewKey === CalendarIntervalType.Month) {
+			this.renderMonthsWeeks(oRm, oWeeksRow);
+		}
+		oRm.close("div");
+		oRm.close("div");
+	};
+
+	WeeksRowRenderer.renderMonthsWeeks = function(oRm, oWeeksRow) {
+		const iInterval = oWeeksRow.getInterval();
+		const aWeeks = oWeeksRow._getMonthsFirstAndLastWeekNumbers();
+		const sWidth = ( 100 / iInterval ) + "%";
+
+		oRm.openStart("div");
+		oRm.class("sapUiCalRowWeekNumbers");
+		oRm.openEnd();
+		for (var i = 0; i < iInterval; i++) {
+			const oWeekInfo = aWeeks[i];
+			oRm.openStart("div",   `${oWeeksRow.getId()}-week-interval-${oWeekInfo.first}-${oWeekInfo.last}-text`);
+			oRm.class("sapUiCalRowWeekNumber");
+			if (sWidth) {
+				oRm.style("width", sWidth);
+			}
+			oRm.openEnd();
+			oRm.text(`${oWeekInfo.first} - ${oWeekInfo.last}`);
+			oRm.close("div");
+		}
+
+		oRm.close("div");
+	};
+
+	WeeksRowRenderer.renderDaysWeeks = function(oRm, oWeeksRow) {
+		const iDays = oWeeksRow.getInterval();
+		const iDaysWidth = 100 / iDays;
+		const aWeekNumbers = oWeeksRow._getWeekNumbers();
+		const oResourceBundle = coreLibrary.getResourceBundleFor("sap.ui.unified");
+
+		oRm.openStart("div");
+		oRm.class("sapUiCalRowWeekNumbers");
+		oRm.openEnd();
+
+		aWeekNumbers.forEach(function(oWeek) {
+			oRm.openStart("div", oWeeksRow.getId() + "-week-" + oWeek.number + "-text");
+			oRm.class('sapUiCalRowWeekNumber');
+			oRm.style("width", oWeek.len * iDaysWidth + "%");
+			oRm.attr("data-sap-ui-week", oWeek.number);
+			oRm.openEnd();
+			oRm.text(oResourceBundle.getText('CALENDAR_DATES_ROW_WEEK_NUMBER', [oWeek.number]));
+			oRm.close("div");
+		});
+
+		oRm.close("div");
+	};
+
+	return WeeksRowRenderer;
+});

package/src/sap/ui/unified/calendar/YearPicker.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * As in all date-time controls, all pubic JS Date objects that are given (e.g. <code>setDate()</code>) or read
 	 * (e.g. <code>getFirstRenderedDate</code>) with values which are considered as date objects in browser(local) timezone.
 	 * @extends sap.ui.core.Control
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/YearRangePicker.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.unified.calendar.YearPicker
 	 *
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/unified/library.js

@@ -32,14 +32,14 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.unified
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.146.0
 	 * @since 1.28
 	 * @public
 	 */
 	var thisLib = Library.init({
 		name : "sap.ui.unified",
 		apiVersion: 2,
-		version: "1.144.0",
+		version: "1.146.0",
 		dependencies : ["sap.ui.core"],
 		designtime: "sap/ui/unified/designtime/library.designtime",
 		types: [

package/src/sap/ui/unified/messagebundle.properties

@@ -94,6 +94,9 @@ CALENDAR_BTN_TODAY=Today
 #XFLD: Text for a week in week numbers row
 CALENDAR_DATES_ROW_WEEK_NUMBER=Week {0}
 
+#XACT: Text for calendar weeks label
+CALENDAR_WEEK_NUMBERS=Calendar Weeks
+
 #XACT: Aria description of the Month picker
 MONTH_PICKER=Month Picker