@openui5/sap.m 1.93.1 → 1.96.0

package/src/sap/m/PlanningCalendar.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 //Provides control sap.m.PlanningCalendar.
 sap.ui.define([
 	'sap/m/delegate/DateNavigation',
@@ -166,11 +161,13 @@ sap.ui.define([
 	 * a whole week/month. The available navigation allows the user to select a specific interval using a picker, or
 	 * move to the previous/next interval using arrows.
 	 *
-	 * <b>Note:</b> The <code>PlanningCalendar</code> uses parts of the <code>sap.ui.unified</code> library.
+	 * <b>Note:</b> The application developer should add dependency to <code>sap.ui.unified</code> library
+	 * on application level to ensure that the library is loaded before the module dependencies will be required.
+	 * The <code>PlanningCalendar</code> uses parts of the <code>sap.ui.unified</code> library.
 	 * This library will be loaded after the <code>PlanningCalendar</code>, if it wasn't loaded first.
-	 * This could lead to a waiting time when a <code>PlanningCalendar</code> is used for the first time.
+	 * This could lead to CSP compliance issues and adds an additional waiting time when a <code>PlanningCalendar</code> is used for the first time.
 	 * To prevent this, apps that use the <code>PlanningCalendar</code> should also load the
-	 * <code>sap.ui.unified</code> library.
+	 * <code>sap.ui.unified</code> library in advance.
 	 *
 	 * <h3>Usage</h3>
 	 *
@@ -201,7 +198,7 @@ sap.ui.define([
 	 * {@link sap.m.PlanningCalendarView PlanningCalendarView}'s properties.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.93.1
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public
@@ -301,7 +298,7 @@ sap.ui.define([
 				appointmentHeight: { type: "sap.ui.unified.CalendarAppointmentHeight", group: "Appearance", defaultValue: CalendarAppointmentHeight.Regular },
 
 				/**
-				 * Defines rounding of the width <code>CalendarAppoinment<code>
+				 * Defines rounding of the width <code>CalendarAppoinment</code>
 				 * <b>Note:</b> This property is applied, when the calendar interval type is day and the view shows more than 20 days
 				 * @experimental Since 1.81.0
 				 * @since 1.81.0
@@ -381,7 +378,18 @@ sap.ui.define([
 				 * Therefore, all features and restrictions of the property in <code>sap.m.Table</code> apply to the <code>PlanningCalendar</code> as well.
 				 * @since 1.54
 				 */
-				stickyHeader : {type : "boolean", group : "Appearance", defaultValue : false}
+				stickyHeader : {type : "boolean", group : "Appearance", defaultValue : false},
+
+				/**
+				 * If set, the first day of the displayed week is this day. Valid values are 0 to 6 starting on Sunday.
+				 * If there is no valid value set, the default of the used locale is used.
+				 *
+				 * Note: this property will only have effect in the weekly – based views of the PlanningCalendar – Week view,
+				 * and OneMonth view (on small devices).
+				 *
+				 * @since 1.94
+				 */
+				firstDayOfWeek : {type : "int", group : "Appearance", defaultValue : -1}
 			},
 			aggregations : {
 
@@ -755,7 +763,7 @@ sap.ui.define([
 				this._adjustColumnHeadersTopOffset();
 			}
 		}, false, this);
-
+		oTable.getStickyFocusOffset = getStickyFocusOffset.bind(this);
 		this.setAggregation("table", oTable, true);
 
 		this.setStartDate(new Date());
@@ -929,7 +937,7 @@ sap.ui.define([
 		var oRow = this._getRowInstanceByViewKey(this.getViewKey());
 
 		this.setStartDate(this._dateNav.getStart());
-		oRow.setDate(this._dateNav.getCurrent());
+		oRow.displayDate(this._dateNav.getCurrent());
 		this._updatePickerSelection();
 		this.fireStartDateChange();
 	};
@@ -980,6 +988,7 @@ sap.ui.define([
 				break;
 
 			case CalendarIntervalType.OneMonth:
+			case "OneMonth":
 				oDateFormat = DateFormat.getDateInstance({format: "yMMMM"});
 				sBeginningResult = oDateFormat.format(oStartDate);
 				break;
@@ -1094,7 +1103,7 @@ sap.ui.define([
 	 */
 	PlanningCalendar.prototype.getVisibleIntervalsCount = function () {
 		var sViewKey = this.getViewKey();
-		if (sViewKey === CalendarIntervalType.OneMonth && this._iSize < 2) {
+		if ((sViewKey === CalendarIntervalType.OneMonth || sViewKey === "OneMonth") && this._iSize < 2) {
 			var oFirstVisibleDate = CalendarUtils.getFirstDateOfWeek(this.getStartDate()),
 				oFirstDateInLastWeek = CalendarUtils.getFirstDateOfWeek(this._dateNav.getEnd()),
 				oLastVisibleDate = new Date(oFirstDateInLastWeek.getTime());
@@ -1364,13 +1373,13 @@ sap.ui.define([
 
 		// in OneMonth view there is selection,
 		// start date of the rows should match the selected date
-		if (this.getViewKey() === PlanningCalendarBuiltInView.OneMonth && this._oOneMonthsRow.getMode() < 2 && this._oOneMonthsRow.getSelectedDates().length) {
+		if ((this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === "OneMonth") && this._oOneMonthsRow.getMode() < 2 && this._oOneMonthsRow.getSelectedDates().length) {
 			this._setRowsStartDate(this._oOneMonthsRow.getSelectedDates()[0].getStartDate());
 		} else {
 			this._setRowsStartDate(new Date(oStartDate.getTime()));
 		}
 
-		if (this.getViewKey() === PlanningCalendarBuiltInView.Week || this.getViewKey() === PlanningCalendarBuiltInView.OneMonth) {
+		if (this.getViewKey() === PlanningCalendarBuiltInView.Week || this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === "OneMonth") {
 			this._updateTodayButtonState();
 		}
 
@@ -1592,6 +1601,7 @@ sap.ui.define([
 				case CalendarIntervalType.Day:
 				case CalendarIntervalType.Week:
 				case CalendarIntervalType.OneMonth:
+				case "OneMonth":
 					//Date, Week and OneMonth intervals share the same object artifacts
 					oIntervalMetadata = INTERVAL_METADATA[sIntervalType];
 					oInterval = this[oIntervalMetadata.sInstanceName];
@@ -1610,7 +1620,7 @@ sap.ui.define([
 						oInterval.attachEvent("select", this._handleCalendarSelect, this);
 						oInterval.attachEvent("focus", this._handleFocus, this);
 
-						if (sKey === PlanningCalendarBuiltInView.OneMonth) {
+						if (sKey === PlanningCalendarBuiltInView.OneMonth || sKey === "OneMonth") {
 							oInterval._setRowsStartDate = this._setRowsStartDate.bind(this);
 						}
 
@@ -1627,7 +1637,7 @@ sap.ui.define([
 					}
 					this._insertInterval(oInterval);
 					this[oIntervalMetadata.sInstanceName] = oInterval;
-					if (sIntervalType === CalendarIntervalType.OneMonth) {
+					if ((sIntervalType === CalendarIntervalType.OneMonth || sIntervalType === "OneMonth")) {
 						oAssociation = oHeader.getAggregation("_monthPicker") ? oHeader.getAggregation("_monthPicker") : oHeader._oPopup.getContent()[0];
 						oHeader.setAssociation("currentPicker", oAssociation);
 						oAssociation.addDelegate(MONTH_PICKER_DELEGATE, oAssociation);
@@ -1688,6 +1698,11 @@ sap.ui.define([
 					throw new Error("Unknown IntervalType: " + sIntervalType + "; " + this);
 			}
 
+			var oContent = this.getAggregation("table").getInfoToolbar().getContent()[1];
+			if (oContent.setFirstDayOfWeek) {
+				oContent.setFirstDayOfWeek(this.getFirstDayOfWeek());
+			}
+
 			var aRows = this.getRows();
 			for (var i = 0; i < aRows.length; i++) {
 				var oRow = aRows[i];
@@ -1707,7 +1722,7 @@ sap.ui.define([
 			this._updatePickerSelection();
 		}
 
-		if (sKey === PlanningCalendarBuiltInView.Week || sKey === PlanningCalendarBuiltInView.OneMonth || sKey === PlanningCalendarBuiltInView.Month) {
+		if (sKey === PlanningCalendarBuiltInView.Week || sKey === PlanningCalendarBuiltInView.OneMonth || sKey === PlanningCalendarBuiltInView.Month || sKey === "OneMonth") {
 			oOldStartDate = this.getStartDate();
 			this.setStartDate(new Date(oOldStartDate.getTime())); //make sure the start date is aligned according to the week/month rules
 			if (oOldStartDate.getTime() !== this.getStartDate().getTime()) {
@@ -1715,7 +1730,7 @@ sap.ui.define([
 			}
 		}
 
-		if (this._oOneMonthsRow && sKey === PlanningCalendarBuiltInView.OneMonth) {
+		if (this._oOneMonthsRow && (sKey === PlanningCalendarBuiltInView.OneMonth || sKey === "OneMonth")) {
 			this._oOneMonthsRow.setMode(this._iSize);
 			this._oOldStartDate = new Date(this.getStartDate().getTime());
 			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oOldStartDate));
@@ -1723,7 +1738,7 @@ sap.ui.define([
 				this._setRowsStartDate(oOldStartDate);
 			}
 		} else if (this._oOneMonthsRow
-			&& sOldViewKey === PlanningCalendarBuiltInView.OneMonth
+			&& (sOldViewKey === PlanningCalendarBuiltInView.OneMonth || sOldViewKey === "OneMonth")
 			&& this._oOneMonthsRow.getSelectedDates().length) {
 			oSelectedDate = this._oOneMonthsRow.getSelectedDates()[0].getStartDate();
 			if (oSelectedDate) {
@@ -1752,6 +1767,45 @@ sap.ui.define([
 
 	};
 
+	PlanningCalendar.prototype.setFirstDayOfWeek = function (iFirstDayOfWeek) {
+		if (iFirstDayOfWeek < -1 || iFirstDayOfWeek > 6) {
+			Log.error("" + iFirstDayOfWeek + " is not a valid value to the property firstDayOfWeek. Valid values are from -1 to 6.");
+			return;
+		}
+		var sCurrentPickerId = this._getHeader().getAssociation("currentPicker"),
+			oPicker = Core.byId(sCurrentPickerId),
+			sViewKey = this.getViewKey(),
+			oDateNav = this._dateNav,
+			oPCStart = oDateNav.getStart(),
+			iOldFirstDayOfWeek = this.getStartDate().getDay(),
+			bOneMonthViewOnSmallScreen = sViewKey === PlanningCalendarBuiltInView.OneMonth && this._iSize < 2,
+			iResultFirstDayOfWeek = iFirstDayOfWeek,
+			oRow, oFirstUTCDateOfWeek, oFirstLocalDateOfWeek;
+
+		oPicker.setFirstDayOfWeek(iFirstDayOfWeek);
+
+		if (sViewKey === PlanningCalendarBuiltInView.Week || bOneMonthViewOnSmallScreen) {
+			oRow = this.getAggregation("table").getInfoToolbar().getContent()[1];
+
+			if (iFirstDayOfWeek === -1) { // -1 is the default value of firstDayOfWeek property. It means that the Locale information should be used.
+				oFirstUTCDateOfWeek = CalendarUtils.getFirstDateOfWeek(CalendarUtils._createUniversalUTCDate(oPCStart, undefined, true));
+				oFirstLocalDateOfWeek = CalendarUtils._createLocalDate(oFirstUTCDateOfWeek, true);
+				iResultFirstDayOfWeek = oFirstLocalDateOfWeek.getDay();
+			}
+
+			oRow.setFirstDayOfWeek(iFirstDayOfWeek);
+			if (!bOneMonthViewOnSmallScreen) {
+				oPCStart.setDate(oPCStart.getDate() - iOldFirstDayOfWeek + iResultFirstDayOfWeek);
+				oRow.setStartDate(oPCStart);
+			}
+			this.getRows().forEach(function (oRow) {
+				this._updateRowTimeline(oRow);
+			}.bind(this));
+		}
+
+		return this.setProperty("firstDayOfWeek", iFirstDayOfWeek);
+	};
+
 	PlanningCalendar.prototype._handleFocus = function (oEvent) {
 		var oDate = oEvent.getParameter("date"),
 			bRestoreOldDate = oEvent.getParameter("restoreOldDate");
@@ -1825,12 +1879,19 @@ sap.ui.define([
 			 * is because the dates are timezone irrelevant), it should be called with the local datetime values presented
 			 * as UTC ones(e.g. if oStartDate is 21 Dec 1981, 13:00 GMT+02:00, it will be converted to 21 Dec 1981, 13:00 GMT+00:00)
 			 */
-			var oFirstDateOfWeek = CalendarUtils.getFirstDateOfWeek(CalendarUtils._createUniversalUTCDate(oStartDate, undefined, true));
-			//CalendarUtils.getFirstDateOfWeek works with UTC based date values, restore the result back in local timezone.
-			oStartDate.setTime(CalendarUtils._createLocalDate(oFirstDateOfWeek, true).getTime());
+			var oFirstDateOfWeek = CalendarUtils.getFirstDateOfWeek(CalendarUtils._createUniversalUTCDate(oStartDate, undefined, true)),
+				//CalendarUtils.getFirstDateOfWeek works with UTC based date values, restore the result back in local timezone.
+				oLocalDate = CalendarUtils._createLocalDate(oFirstDateOfWeek, true);
+			if (this.getFirstDayOfWeek() > -1) {
+				oLocalDate.setDate(oLocalDate.getDate() - oLocalDate.getDay() + this.getFirstDayOfWeek());
+			}
+			if (oLocalDate.getTime() > oStartDate.getTime()) {
+				oLocalDate.setDate(oLocalDate.getDate() - 7);
+			}
+			oStartDate.setTime(oLocalDate.getTime());
 		}
 
-		if ((this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === PlanningCalendarBuiltInView.Month)) {
+		if ((this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === PlanningCalendarBuiltInView.Month || this.getViewKey() === "OneMonth")) {
 			/*
 			 * Have in mind that the oStartDate is the date that the user sees in the UI, thus - local one. As
 			 * CalendarUtils.getFirstDateOfMonth works with UTC dates (this is because the dates are timezone irrelevant),
@@ -2138,7 +2199,7 @@ sap.ui.define([
 	PlanningCalendar.prototype._updateStickyHeader = function() {
 		var aStickyParts = [],
 			bStick = this.getStickyHeader(),
-			bMobile1MonthView = this.getViewKey() === PlanningCalendarBuiltInView.OneMonth && this._iSize < 2,
+			bMobile1MonthView = (this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === "OneMonth") && this._iSize < 2,
 			bStickyToolbar = bStick && !Device.system.phone && !bMobile1MonthView,
 			bStickyInfoToolbar = bStick && !(Device.system.phone && Device.orientation.landscape) && !bMobile1MonthView;
 
@@ -2377,6 +2438,7 @@ sap.ui.define([
 						}
 						break;
 					case CalendarIntervalType.OneMonth:
+					case "OneMonth":
 						if (this._oOneMonthsRow) {
 							this._oOneMonthsRow.invalidate(arguments);
 						}
@@ -2662,6 +2724,7 @@ sap.ui.define([
 			case CalendarIntervalType.Day:
 			case CalendarIntervalType.Week:
 			case CalendarIntervalType.OneMonth:
+			case "OneMonth":
 				iTime = 1800000;
 				iStartTime = oStartDate.getTime() - 3600000;
 				iEndTime = oStartDate.getTime() + iIntervals * 86400000;
@@ -2694,11 +2757,17 @@ sap.ui.define([
 	PlanningCalendar.prototype._handleTodayPress = function (oEvent) {
 		var oDate = new Date(),
 			oStartDate,
-			sViewKey = this.getViewKey();
+			sViewKey = this.getViewKey(),
+			oFocusMonthDelegate = {
+				onAfterRendering: function() {
+					this._focusDate(CalendarDate.fromLocalJSDate(new Date()));
+					this.removeDelegate(oFocusMonthDelegate);
+				}
+			};
 
 		// if the OneMonth view is selected and Today btn is pressed,
 		// the calendar should start from the 1st date of the current month
-		if (sViewKey === PlanningCalendarBuiltInView.OneMonth) {
+		if (sViewKey === PlanningCalendarBuiltInView.OneMonth || sViewKey === "OneMonth") {
 			oStartDate = CalendarUtils.getFirstDateOfMonth(CalendarUtils._createUniversalUTCDate(oDate, undefined, true));
 			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oDate));
 
@@ -2715,6 +2784,11 @@ sap.ui.define([
 
 		this.setStartDate(oDate);
 		this._dateNav.setCurrent(oDate);
+		if (sViewKey === PlanningCalendarBuiltInView.Week) {
+			this._oWeeksRow.addDelegate(oFocusMonthDelegate, this._oWeeksRow);
+		} else if (sViewKey === PlanningCalendarBuiltInView.OneMonth || sViewKey === "OneMonth") {
+			this._oOneMonthsRow.addDelegate(oFocusMonthDelegate, this._oOneMonthsRow);
+		}
 		this._updatePickerSelection();
 		this.fireStartDateChange();
 
@@ -2784,7 +2858,7 @@ sap.ui.define([
 			sControlRef = "_o" + sCurrentViewIntervalType + "sRow";
 
 			if (this[sControlRef]) {
-				this[sControlRef].setDate(oStartDate);
+				this[sControlRef].displayDate(oStartDate);
 			}
 		}
 	};
@@ -2807,7 +2881,7 @@ sap.ui.define([
 		// remove old selection
 		// unless the select acts as a picker, then the selection stays
 		// in OneMonth view smaller sizes
-		if (sIntervalType !== CalendarIntervalType.OneMonth
+		if ((sIntervalType !== CalendarIntervalType.OneMonth && sIntervalType !== "OneMonth")
 			|| this._iSize > 1) {
 			aSelectedDates[0].setStartDate();
 		}
@@ -2822,6 +2896,7 @@ sap.ui.define([
 				oEndDate.setUTCDate(oEndDate.getUTCDate() + 1);
 				break;
 			case CalendarIntervalType.OneMonth:
+			case "OneMonth":
 				if (this._iSize < 2) { // change rows' startDate on S and M sizes
 					var oFocusedDate = new Date(oEvtSelectedStartDate.getTime());
 					if (CalendarUtils.monthsDiffer(this.getStartDate(), oEvtSelectedStartDate)) {
@@ -2861,7 +2936,7 @@ sap.ui.define([
 		var oView = this._getView(sKey);
 		var sIntervalType = oView.getIntervalType();
 
-		if (sIntervalType === CalendarIntervalType.OneMonth
+		if ((sIntervalType === CalendarIntervalType.OneMonth || sIntervalType === "OneMonth")
 			&& CalendarUtils._isNextMonth(oStartDate, this.getStartDate())) {
 			this.shiftToDate(oStartDate);
 			this._addMonthFocusDelegate(this._getRowInstanceByViewKey(this.getViewKey()));
@@ -2961,6 +3036,7 @@ sap.ui.define([
 					break;
 
 				case CalendarIntervalType.OneMonth:
+				case "OneMonth":
 					if (this._oOneMonthsRow && this._oOneMonthsRow.getDays() != iIntervals) {
 						this._oOneMonthsRow.setDays(iIntervals);
 						this._dateNav.setStep(iIntervals * iIntervalSize);
@@ -2984,7 +3060,7 @@ sap.ui.define([
 			}
 		}
 
-		if (this._oOneMonthsRow && this.getViewKey() === CalendarIntervalType.OneMonth) {
+		if (this._oOneMonthsRow && (this.getViewKey() === CalendarIntervalType.OneMonth || this.getViewKey() === "OneMonth")) {
 			oSelectedDate = (this._getSelectedDates().length && this._getSelectedDates()[0].getStartDate()) ?
 				this._getSelectedDates()[0].getStartDate() : this.getStartDate();
 			this._oOneMonthsRow.setMode(this._iSize);
@@ -3132,6 +3208,7 @@ sap.ui.define([
 					}
 					return this._oViews[oViewType.Week];
 				case oViewType.OneMonth:
+				case "OneMonth":
 					if (!this._oViews[oViewType.OneMonth]) {
 						this._oViews[oViewType.OneMonth] = new PlanningCalendarView(this.getId() + "-OneMonthView", {
 							key: oViewType.OneMonth,
@@ -3277,7 +3354,7 @@ sap.ui.define([
 	PlanningCalendar.prototype._updateRowTimeline = function (oRow) {
 		var oRowTimeline = getRowTimeline(oRow),
 			sKey, oView, sIntervalType, iIntervals, iIntervalSize,
-			bMobile1MonthView = this.getViewKey() === PlanningCalendarBuiltInView.OneMonth && this._iSize < 2,
+			bMobile1MonthView = (this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === "OneMonth") && this._iSize < 2,
 			oStartDate = this.getStartDate();
 
 		oRowTimeline.setNonWorkingDays(oRow.getNonWorkingDays());
@@ -3349,8 +3426,12 @@ sap.ui.define([
 				title: function (oChanges) {
 					oRowHeader.setProperty(oChanges.name, oChanges.current);
 				},
-				icon: function (oChanges) {
-					oRowHeader.setProperty(oChanges.name, oChanges.current);
+				icon: function(oChanges) {
+					if (oRowHeader.setIcon) {
+						oRowHeader.setIcon(oChanges.current);
+					} else {
+						oRowHeader.setProperty(oChanges.name, oChanges.current);
+					}
 				},
 				text: function (oChanges) {
 					// Large row style class
@@ -3599,7 +3680,7 @@ sap.ui.define([
 			var aEmptyNonWorkDay = [];
 		return CalendarRowRenderer.renderInterval(oRm, oTimeline, iInterval, iWidth,  aIntervalHeaders, aEmptyNonWorkDay, iStartOffset, iNonWorkingMax, aNonWorkingSubItems, iSubStartOffset, iNonWorkingSubMax, bFirstOfType, bLastOfType, sAdditionalNonWorkingClass);
 		}
-		if (sIntervalType === CalendarIntervalType.Day || sIntervalType === CalendarIntervalType.Week || sIntervalType === CalendarIntervalType.OneMonth) {
+		if (sIntervalType === CalendarIntervalType.Day || sIntervalType === CalendarIntervalType.Week || sIntervalType === CalendarIntervalType.OneMonth || sIntervalType === "OneMonth") {
 			var oRow = getRow(oTimeline.getParent()),
 				oPC = oRow.getParent(),
 				fnNonWorkingFilter = function (oSpecialDate) {
@@ -3883,7 +3964,7 @@ sap.ui.define([
 						newPos = this._calcNewHoursAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 					} else if (sIntervalType === CalendarIntervalType.Day
 						|| sIntervalType === CalendarIntervalType.Week
-						|| (sIntervalType === CalendarIntervalType.OneMonth && !oTargetTimeline._isOneMonthsRowOnSmallSizes())) {
+						|| ((sIntervalType === CalendarIntervalType.OneMonth || sIntervalType === "OneMonth") && !oTargetTimeline._isOneMonthsRowOnSmallSizes())) {
 
 						newPos = this._calcNewDaysAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 					} else if (sIntervalType === CalendarIntervalType.Month) {
@@ -3936,7 +4017,7 @@ sap.ui.define([
 					newPos = this._calcNewHoursAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 				} else if (sIntervalType === CalendarIntervalType.Day
 					|| sIntervalType === CalendarIntervalType.Week
-					|| (sIntervalType === CalendarIntervalType.OneMonth && !oTargetTimeline._isOneMonthsRowOnSmallSizes())) {
+					|| ((sIntervalType === CalendarIntervalType.OneMonth || sIntervalType === "OneMonth") && !oTargetTimeline._isOneMonthsRowOnSmallSizes())) {
 
 					newPos = this._calcNewDaysAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 				} else if (sIntervalType === CalendarIntervalType.Month) {
@@ -4099,7 +4180,7 @@ sap.ui.define([
 						newPos = this._calcResizeNewHoursAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 					} else if (sIntervalType === CalendarIntervalType.Day
 						|| sIntervalType === CalendarIntervalType.Week
-						|| (sIntervalType === CalendarIntervalType.OneMonth && !oTimeline._isOneMonthsRowOnSmallSizes())) {
+						|| ((sIntervalType === CalendarIntervalType.OneMonth || sIntervalType === "OneMonth") && !oTimeline._isOneMonthsRowOnSmallSizes())) {
 
 						newPos = this._calcResizeNewDaysAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 					} else if (sIntervalType === CalendarIntervalType.Month) {
@@ -4310,7 +4391,7 @@ sap.ui.define([
 						oNewPos = this._calcCreateNewAppHours(oRowStartDate, iStartIndex, iEndIndex);
 					} else if (sIntervalType === CalendarIntervalType.Day
 						|| sIntervalType === CalendarIntervalType.Week
-						|| (sIntervalType === CalendarIntervalType.OneMonth && !oTimeline._isOneMonthsRowOnSmallSizes())) {
+						|| ((sIntervalType === CalendarIntervalType.OneMonth || sIntervalType === "OneMonth") && !oTimeline._isOneMonthsRowOnSmallSizes())) {
 						oNewPos = this._calcCreateNewAppDays(oRowStartDate, iStartIndex, iEndIndex);
 					} else if (sIntervalType === CalendarIntervalType.Month) {
 						oNewPos = this._calcCreateNewAppMonths(oRowStartDate, iStartIndex, iEndIndex);
@@ -4708,5 +4789,22 @@ sap.ui.define([
 		return this._oTimesRow || this._oDatesRow || this._oMonthsRow || this._oWeeksRow || this._oOneMonthsRow;
 	}
 
+	function getStickyFocusOffset() {
+		if (!this._getHeader()) {
+			return 0;
+		}
+
+		var oPCHeaderContainer = this._getHeader().getDomRef(),
+			iPCHeaderContainerRectHeight = 0,
+			oPCHeaderContainerRect;
+
+		if (oPCHeaderContainer) {
+				oPCHeaderContainerRect = oPCHeaderContainer.getBoundingClientRect();
+				iPCHeaderContainerRectHeight = parseInt(oPCHeaderContainerRect.height);
+		}
+
+		return iPCHeaderContainerRectHeight;
+	}
+
 	return PlanningCalendar;
-});
+});

package/src/sap/m/PlanningCalendarHeader.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 // Provides control sap.m.PlanningCalendarHeader.
 sap.ui.define([
 	'sap/ui/core/Element',
@@ -97,7 +92,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/PlanningCalendarLegend.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 // Provides control sap.m.PlanningCalendarLegend.
 sap.ui.define(['sap/ui/unified/CalendarLegend', 'sap/ui/unified/CalendarAppointment', './PlanningCalendarLegendRenderer'],
 	function(CalendarLegend, CalendarAppointment, PlanningCalendarLegendRenderer) {
@@ -28,7 +23,7 @@ sap.ui.define(['sap/ui/unified/CalendarLegend', 'sap/ui/unified/CalendarAppointm
 		 * @extends sap.ui.unified.CalendarLegend
 		 *
 		 * @author SAP SE
-		 * @version 1.93.1
+		 * @version 1.96.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/PlanningCalendarLegendRenderer.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 sap.ui.define(['sap/ui/unified/CalendarLegendRenderer', 'sap/ui/core/Renderer'],
 	function(CalendarLegendRenderer, Renderer) {
 		"use strict";
@@ -61,6 +56,8 @@ sap.ui.define(['sap/ui/unified/CalendarLegendRenderer', 'sap/ui/core/Renderer'],
 		PlanningCalendarLegendRenderer._renderItemsHeader = function(oRm, sHeaderText) {
 			oRm.openStart("div");
 			oRm.class("sapMPlanCalLegendHeader");
+			oRm.attr("role", "heading");
+			oRm.attr("aria-level", "3");
 			oRm.openEnd();
 			oRm.text(sHeaderText);
 			oRm.close("div");

package/src/sap/m/PlanningCalendarRow.js

@@ -32,7 +32,7 @@ sap.ui.define(['sap/ui/core/Element',
 	 * The <code>sap.m.PlanningCalendarRow</code> allows you to modify appointments at row level.
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.93.1
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/PlanningCalendarView.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 //Provides control sap.m.PlanningCalendarView.
 sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/library'],
 		function(Element, library, unifiedLibrary) {
@@ -30,7 +25,7 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/library'],
 	 * The <code>PlanningCalendarView</code> defines the type of the intervals (hours, days, months)
 	 * and how many intervals are displayed.
 	 * @extends sap.ui.core.Element
-	 * @version 1.93.1
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Popover.js

@@ -113,7 +113,7 @@ sap.ui.define([
 		* @extends sap.ui.core.Control
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.93.1
+		* @version 1.96.0
 		*
 		* @public
 		* @alias sap.m.Popover
@@ -734,8 +734,6 @@ sap.ui.define([
 					this._marginTopInit = true;
 				}
 			}
-
-			this._repositionOffset();
 		};
 
 		/**
@@ -1103,6 +1101,8 @@ sap.ui.define([
 			var that = this;
 			this.oPopup.detachOpened(this._handleOpened, this);
 
+			this._repositionOffset();
+
 			//	recalculate the arrow position when the size of the popover changes.
 			if (!Device.support.touch) {
 				setTimeout(function () {
@@ -2294,9 +2294,9 @@ sap.ui.define([
 				oEndButton = this.getEndButton(),
 				sButtonId = "";
 
-			if (oBeginButton && oBeginButton.getVisible()) {
+			if (oBeginButton && oBeginButton.getVisible() && oBeginButton.getEnabled()) {
 				sButtonId = oBeginButton.getId();
-			} else if (oEndButton && oEndButton.getVisible()) {
+			} else if (oEndButton && oEndButton.getVisible() && oEndButton.getEnabled()) {
 				sButtonId = oEndButton.getId();
 			}
 

package/src/sap/m/PopoverRenderer.js

@@ -6,9 +6,10 @@
 sap.ui.define([
 	'sap/ui/Device',
 	'sap/m/library',
-	"sap/ui/dom/getScrollbarSize"
+	"sap/ui/dom/getScrollbarSize",
+	"sap/ui/core/IconPool"
 ],
-	function(Device, library, getScrollbarSize) {
+	function(Device, library, getScrollbarSize, IconPool) {
 		"use strict";
 
 		// shortcut for sap.m.PlacementType

package/src/sap/m/ProgressIndicator.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/PullToRefresh.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickView.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.m.QuickViewBase
 	 *
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickViewBase.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickViewCard.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.m.QuickViewBase
 	 *
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickViewGroup.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	* @extends sap.ui.core.Element
 	*
 	* @author SAP SE
-	* @version 1.93.1
+	* @version 1.96.0
 	*
 	* @constructor
 	* @public