@openui5/sap.m 1.92.0 → 1.93.3

package/src/sap/m/PlanningCalendar.js

@@ -201,7 +201,7 @@ sap.ui.define([
 	 * {@link sap.m.PlanningCalendarView PlanningCalendarView}'s properties.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @constructor
 	 * @public
@@ -709,6 +709,9 @@ sap.ui.define([
 
 		this._oCalendarHeader = new CalendarHeader(sId + "-CalHead", {});
 
+		this._oCalendarHeader.isRelative = this.isRelative.bind(this);
+		this._oCalendarHeader._getRelativeInfo = this._getRelativeInfo.bind(this);
+
 		this._oInfoToolbar = new Toolbar(sId + "-InfoToolbar", {
 			height: "auto",
 			design: ToolbarDesign.Transparent,
@@ -864,6 +867,8 @@ sap.ui.define([
 	PlanningCalendar.prototype._createHeader = function () {
 		var oHeader = new PlanningCalendarHeader(this.getId() + "-Header");
 
+		oHeader._getRelativeInfo = this._getRelativeInfo.bind(this);
+
 		oHeader.getAggregation("_actionsToolbar")
 			.addAriaLabelledBy(InvisibleText.getStaticId("sap.m", "PC_FUNCTIONS_TOOLBAR"));
 
@@ -959,9 +964,19 @@ sap.ui.define([
 
 			case CalendarIntervalType.Day:
 			case CalendarIntervalType.Week:
-				oDateFormat = DateFormat.getDateInstance({format: "yMMMMd"});
-				sBeginningResult = oDateFormat.format(oStartDate);
-				sEndResult = oDateFormat.format(oEndDate);
+				var fnIntervalLabelFormatter = this._getView(sViewKey).getIntervalLabelFormatter();
+
+				if (this.isRelative()) {
+					var iBeginning = this.calcIntervalOffset(this.getStartDate());
+					var iEnding = this.calcIntervalOffset(this.getEndDate()) - this.calcIntervalOffset(this.getStartDate());
+					sBeginningResult = fnIntervalLabelFormatter ? fnIntervalLabelFormatter(iBeginning) : iBeginning;
+					sEndResult = fnIntervalLabelFormatter ? fnIntervalLabelFormatter(iBeginning + iEnding - 1) : iBeginning + iEnding;
+				} else {
+					oDateFormat = DateFormat.getDateInstance({ format: "yMMMMd" });
+					sBeginningResult = oDateFormat.format(oStartDate);
+					sEndResult = oDateFormat.format(oEndDate);
+				}
+
 				break;
 
 			case CalendarIntervalType.OneMonth:
@@ -1106,9 +1121,15 @@ sap.ui.define([
 	 * @private
 	 */
 	PlanningCalendar.prototype._updateTodayButtonState = function() {
-		if (this._oTodayButton) {
-			this._oTodayButton.setEnabled(!this._dateMatchesVisibleRange(new Date(), this.getViewKey()));
+		if (!this._oTodayButton) {
+			return;
 		}
+		if (this.isRelative()) {
+			this._oTodayButton.setEnabled(false);
+			return;
+		}
+
+		this._oTodayButton.setEnabled(!this._dateMatchesVisibleRange(new Date(), this.getViewKey()));
 	};
 
 	/**
@@ -1498,6 +1519,15 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	PlanningCalendar.prototype.isRelative = function() {
+		var oView = this._getView(this.getViewKey(), true);
+		if (!oView) {
+			return false;
+		}
+
+		return oView.getRelative();
+	};
+
 	PlanningCalendar.prototype.setViewKey = function(sKey){
 		var oInterval, oOldStartDate, oIntervalMetadata,
 			sOldViewKey = this.getViewKey(),
@@ -1521,12 +1551,13 @@ sap.ui.define([
 			this.invalidate(); // view not exist now, maybe added later, so rerender
 		} else {
 			var sIntervalType = oView.getIntervalType();
+			var iIntervalSize = oView.getIntervalSize();
 			var iIntervals = this._getIntervals(oView);
 
 			this._bCheckView = false; // no additional check needed
 
 			this._dateNav.setUnit(sIntervalType);
-			this._dateNav.setStep(iIntervals);
+			this._dateNav.setStep(iIntervals * iIntervalSize);
 			this._dateNav.setCurrent(undefined);
 			switch (sIntervalType) {
 				case CalendarIntervalType.Hour:
@@ -1550,7 +1581,7 @@ sap.ui.define([
 						};
 					} else if (this._oTimesRow.getItems() !== iIntervals) {
 						this._oTimesRow.setItems(iIntervals);
-						this._dateNav.setStep(iIntervals);
+						this._dateNav.setStep(iIntervals * iIntervalSize);
 					}
 					this._insertInterval(this._oTimesRow);
 					oAssociation = oHeader.getAggregation("_calendarPicker") ? oHeader.getAggregation("_calendarPicker") : oHeader._oPopup.getContent()[0];
@@ -1564,7 +1595,6 @@ sap.ui.define([
 					//Date, Week and OneMonth intervals share the same object artifacts
 					oIntervalMetadata = INTERVAL_METADATA[sIntervalType];
 					oInterval = this[oIntervalMetadata.sInstanceName];
-
 					if (!oInterval) {
 						oInterval = new oIntervalMetadata.oClass(this.getId() + oIntervalMetadata.sIdSuffix, {
 							startDate: new Date(oStartDate.getTime()), // use new date object
@@ -1573,8 +1603,10 @@ sap.ui.define([
 							legend: this.getLegend(),
 							showWeekNumbers: this.getShowWeekNumbers()
 						});
-						this._setAriaRole(oInterval);
 
+						oInterval.isRelative = this.isRelative.bind(this);
+						oInterval._getRelativeInfo = this._getRelativeInfo.bind(this);
+						this._setAriaRole(oInterval);
 						oInterval.attachEvent("select", this._handleCalendarSelect, this);
 						oInterval.attachEvent("focus", this._handleFocus, this);
 
@@ -1591,7 +1623,7 @@ sap.ui.define([
 						};
 					} else if (oInterval.getDays() !== iIntervals) {
 						oInterval.setDays(iIntervals);
-						this._dateNav.setStep(iIntervals);
+						this._dateNav.setStep(iIntervals * iIntervalSize);
 					}
 					this._insertInterval(oInterval);
 					this[oIntervalMetadata.sInstanceName] = oInterval;
@@ -1599,6 +1631,23 @@ sap.ui.define([
 						oAssociation = oHeader.getAggregation("_monthPicker") ? oHeader.getAggregation("_monthPicker") : oHeader._oPopup.getContent()[0];
 						oHeader.setAssociation("currentPicker", oAssociation);
 						oAssociation.addDelegate(MONTH_PICKER_DELEGATE, oAssociation);
+					} else if (this.isRelative()) {
+						var oIndexPicker = oHeader.getAggregation("_indexPicker");
+						oAssociation = oIndexPicker ? oIndexPicker : oHeader._oPopup.getContent()[0];
+						if (oIndexPicker ) {
+							var oView = this._getView(sKey);
+							var iIndexesFromStart = Math.round(this.calcIntervalOffset(oStartDate));
+							oIndexPicker.setFormatter(this._getRelativeInfo().intervalLabelFormatter);
+							oIndexPicker.setPeriodSize(oInterval.getDays());
+							oIndexPicker.setSelectedIndex(iIndexesFromStart);
+						} else {
+							var oView = this._getView(sKey);
+							oAssociation.setFormatter(oView.getIntervalLabelFormatter());
+							oAssociation.setPeriodSize(oInterval.getDays());
+							var iIndexesFromStart = Math.round(this.calcIntervalOffset(oStartDate));
+							oAssociation.setSelectedIndex(iIndexesFromStart);
+						}
+						oHeader.setAssociation("currentPicker", oAssociation);
 					} else {
 						oAssociation = oHeader.getAggregation("_calendarPicker") ? oHeader.getAggregation("_calendarPicker") : oHeader._oPopup.getContent()[0];
 						oHeader.setAssociation("currentPicker", oAssociation);
@@ -1627,7 +1676,7 @@ sap.ui.define([
 						};
 					} else if (this._oMonthsRow.setMonths() !== iIntervals) {
 						this._oMonthsRow.setMonths(iIntervals);
-						this._dateNav.setStep(iIntervals);
+						this._dateNav.setStep(iIntervals * iIntervalSize);
 					}
 					this._insertInterval(this._oMonthsRow);
 					oAssociation = oHeader.getAggregation("_yearPicker") ? oHeader.getAggregation("_yearPicker") : oHeader._oPopup.getContent()[0];
@@ -1645,6 +1694,7 @@ sap.ui.define([
 				var oTimeline = getRowTimeline(oRow);
 				oTimeline.setIntervalType(sIntervalType);
 				oTimeline.setIntervals(iIntervals);
+				oTimeline.setIntervalSize(iIntervalSize);
 				oTimeline.setShowSubIntervals(oView.getShowSubIntervals());
 			}
 
@@ -1686,15 +1736,16 @@ sap.ui.define([
 		}
 
 		if (oMinDate) {
-			oHeader.getAggregation("_calendarPicker").setMinDate(new Date(oMinDate.getTime()));
-			oHeader.getAggregation("_yearPicker").setMinDate(new Date(oMinDate.getTime()));
-			oHeader.getAggregation("_monthPicker").setMinDate(new Date(oMinDate.getTime()));
+			oHeader.getAggregation("_calendarPicker") && oHeader.getAggregation("_calendarPicker").setMinDate(new Date(oMinDate.getTime()));
+			oHeader.getAggregation("_yearPicker") && oHeader.getAggregation("_yearPicker").setMinDate(new Date(oMinDate.getTime()));
+			oHeader.getAggregation("_monthPicker") && oHeader.getAggregation("_monthPicker").setMinDate(new Date(oMinDate.getTime()));
 		}
 		if (oMaxDate) {
-			oHeader.getAggregation("_calendarPicker").setMaxDate(new Date(oMaxDate.getTime()));
-			oHeader.getAggregation("_yearPicker").setMaxDate(new Date(oMaxDate.getTime()));
-			oHeader.getAggregation("_monthPicker").setMaxDate(new Date(oMaxDate.getTime()));
+			oHeader.getAggregation("_calendarPicker") && oHeader.getAggregation("_calendarPicker").setMaxDate(new Date(oMaxDate.getTime()));
+			oHeader.getAggregation("_yearPicker") && oHeader.getAggregation("_yearPicker").setMaxDate(new Date(oMaxDate.getTime()));
+			oHeader.getAggregation("_monthPicker") && oHeader.getAggregation("_monthPicker").setMaxDate(new Date(oMaxDate.getTime()));
 		}
+
 		this._updateTodayButtonState();
 
 		return this;
@@ -1807,8 +1858,12 @@ sap.ui.define([
 			endDate: CalendarUtils._createLocalDate(oRangeDates.oEndDate, true)
 		});
 
-		oPicker.destroySelectedDates();
-		oPicker.addSelectedDate(oSelectedRange);
+		if (this.isRelative()) {
+			oPicker.setStartIndex(this.calcIntervalOffset(oRangeDates.oStartDate));
+		} else {
+			oPicker.destroySelectedDates();
+			oPicker.addSelectedDate(oSelectedRange);
+		}
 
 		this._getHeader().setPickerText(this._formatPickerText());
 		this._updateTodayButtonState();
@@ -2690,10 +2745,19 @@ sap.ui.define([
 	 * @param {jQuery.Event} oEvent the triggered event
 	 * @private
 	 */
-	PlanningCalendar.prototype._handleDateSelect = function(oEvent){
-		var oStartDate = oEvent.oSource.getStartDate(),
+	PlanningCalendar.prototype._handleDateSelect = function(oEvent) {
+		var oStartDate,
 			oCurrentStartDate = this.getStartDate();
 
+		if (this.isRelative()) {
+			oStartDate = new Date(this.getMinDate().getTime());
+			oStartDate.setDate(
+				oStartDate.getDate() + oEvent.getSource()._oIndexPicker.getSelectedIndex() * this._getView(this.getViewKey()).getIntervalSize()
+			);
+		} else {
+			oStartDate = oEvent.getSource().getStartDate();
+		}
+
 		// Checking if the current view (custom or not) is of type Hour
 		if (this._getView(this.getViewKey()).getIntervalType() === CalendarIntervalType.Hour) {
 			oStartDate.setHours(oCurrentStartDate.getHours());
@@ -2855,6 +2919,7 @@ sap.ui.define([
 			var sKey = this.getViewKey();
 			var oView = this._getView(sKey);
 			var sIntervalType = oView.getIntervalType();
+			var iIntervalSize = oView.getIntervalSize();
 			var iIntervals = this._getIntervals(oView);
 			for (i = 0; i < aRows.length; i++) {
 				oRow = aRows[i];
@@ -2870,35 +2935,35 @@ sap.ui.define([
 				case CalendarIntervalType.Hour:
 					if (this._oTimesRow && this._oTimesRow.getItems() != iIntervals) {
 						this._oTimesRow.setItems(iIntervals);
-						this._dateNav.setStep(iIntervals);
+						this._dateNav.setStep(iIntervals * iIntervalSize);
 					}
 					break;
 
 				case CalendarIntervalType.Day:
 					if (this._oDatesRow && this._oDatesRow.getDays() != iIntervals) {
 						this._oDatesRow.setDays(iIntervals);
-						this._dateNav.setStep(iIntervals);
+						this._dateNav.setStep(iIntervals * iIntervalSize);
 					}
 					break;
 
 				case CalendarIntervalType.Month:
 					if (this._oMonthsRow && this._oMonthsRow.getMonths() != iIntervals) {
 						this._oMonthsRow.setMonths(iIntervals);
-						this._dateNav.setStep(iIntervals);
+						this._dateNav.setStep(iIntervals * iIntervalSize);
 					}
 					break;
 
 				case CalendarIntervalType.Week:
 					if (this._oWeeksRow && this._oWeeksRow.getDays() != iIntervals) {
 						this._oWeeksRow.setDays(iIntervals);
-						this._dateNav.setStep(iIntervals);
+						this._dateNav.setStep(iIntervals * iIntervalSize);
 					}
 					break;
 
 				case CalendarIntervalType.OneMonth:
 					if (this._oOneMonthsRow && this._oOneMonthsRow.getDays() != iIntervals) {
 						this._oOneMonthsRow.setDays(iIntervals);
-						this._dateNav.setStep(iIntervals);
+						this._dateNav.setStep(iIntervals * iIntervalSize);
 						if (this._iSize > 1) {
 							//set start date to 1st of the month
 							this._setRowsStartDate(new Date(this.getStartDate().getTime()));
@@ -3019,55 +3084,65 @@ sap.ui.define([
 		aResultViews = aKeysForBuiltInViews.map(function (sViewKey) {
 			switch (sViewKey) {
 				case oViewType.Hour:
-					return this._oViews[oViewType.Hour] ||
-						(this._oViews[oViewType.Hour] = new PlanningCalendarView(this.getId() + "-HourView", {
+					if (!this._oViews[oViewType.Hour]) {
+						this._oViews[oViewType.Hour] = new PlanningCalendarView(this.getId() + "-HourView", {
 							key: oViewType.Hour,
 							intervalType: oIntervalType.Hour,
 							description: this._oRB && this._oRB.getText("PLANNINGCALENDAR_HOURS"),
 							intervalsS: 6,
 							intervalsM: 6,
 							intervalsL: 12
-						}));
+						});
+					}
+					return this._oViews[oViewType.Hour];
 				case oViewType.Day:
-					return this._oViews[oViewType.Day] ||
-						(this._oViews[oViewType.Day] = new PlanningCalendarView(this.getId() + "-DayView", {
+					if (!this._oViews[oViewType.Day]) {
+						this._oViews[oViewType.Day] = new PlanningCalendarView(this.getId() + "-DayView", {
 							key: oViewType.Day,
 							intervalType: oIntervalType.Day,
 							description: this._oRB && this._oRB.getText("PLANNINGCALENDAR_DAYS"),
 							intervalsS: 7,
 							intervalsM: 7,
 							intervalsL: 14
-						}));
+						});
+					}
+					return this._oViews[oViewType.Day];
 				case oViewType.Month:
-					return  this._oViews[oViewType.Month] ||
-						(this._oViews[oViewType.Month] = new PlanningCalendarView(this.getId() + "-MonthView", {
+					if (!this._oViews[oViewType.Month]) {
+						this._oViews[oViewType.Month] = new PlanningCalendarView(this.getId() + "-MonthView", {
 							key: oViewType.Month,
 							intervalType: oIntervalType.Month,
 							description: this._oRB && this._oRB.getText("PLANNINGCALENDAR_MONTHS"),
 							intervalsS: 3,
 							intervalsM: 6,
 							intervalsL: 12
-						}));
+						});
+					}
+					return this._oViews[oViewType.Month];
 				case oViewType.Week:
-					return this._oViews[oViewType.Week] ||
-						(this._oViews[oViewType.Week] = new PlanningCalendarView(this.getId() + "-WeekView", {
+					if (!this._oViews[oViewType.Week]) {
+						this._oViews[oViewType.Week] = new PlanningCalendarView(this.getId() + "-WeekView", {
 							key: oViewType.Week,
 							intervalType: oIntervalType.Week,
 							description: this._oRB && this._oRB.getText("PLANNINGCALENDAR_WEEK"),
 							intervalsS: 7,
 							intervalsM: 7,
 							intervalsL: 7
-						}));
+						});
+					}
+					return this._oViews[oViewType.Week];
 				case oViewType.OneMonth:
-					return this._oViews[oViewType.OneMonth] ||
-						( this._oViews[oViewType.OneMonth] = new PlanningCalendarView(this.getId() + "-OneMonthView", {
+					if (!this._oViews[oViewType.OneMonth]) {
+						this._oViews[oViewType.OneMonth] = new PlanningCalendarView(this.getId() + "-OneMonthView", {
 							key: oViewType.OneMonth,
 							intervalType: oIntervalType.OneMonth,
 							description: this._oRB && this._oRB.getText("PLANNINGCALENDAR_ONE_MONTH"),
 							intervalsS: 1,
 							intervalsM: 1,
 							intervalsL: 31
-						}));
+						});
+					}
+					return this._oViews[oViewType.OneMonth];
 				default:
 					Log.error("Cannot get PlanningCalendar views. Invalid view key " + sViewKey);
 					break;
@@ -3201,7 +3276,7 @@ sap.ui.define([
 	 */
 	PlanningCalendar.prototype._updateRowTimeline = function (oRow) {
 		var oRowTimeline = getRowTimeline(oRow),
-			sKey, oView, sIntervalType, iIntervals,
+			sKey, oView, sIntervalType, iIntervals, iIntervalSize,
 			bMobile1MonthView = this.getViewKey() === PlanningCalendarBuiltInView.OneMonth && this._iSize < 2,
 			oStartDate = this.getStartDate();
 
@@ -3237,10 +3312,12 @@ sap.ui.define([
 			sKey = this.getViewKey();
 			oView = this._getView(sKey);
 			sIntervalType = oView.getIntervalType();
+			iIntervalSize = oView.getIntervalSize();
 			iIntervals = this._getIntervals(oView);
 
 			oRowTimeline.setIntervalType(sIntervalType);
 			oRowTimeline.setIntervals(iIntervals);
+			oRowTimeline.setIntervalSize(iIntervalSize);
 			oRowTimeline.setShowSubIntervals(oView.getShowSubIntervals());
 		}
 
@@ -3378,6 +3455,8 @@ sap.ui.define([
 			ariaLabelledBy: oRowHeader.getId()
 		});
 
+		oRowTimeline._getRelativeInfo = this._getRelativeInfo.bind(this);
+
 		oRowTimeline.getAppointments = function() {
 			return oRow.getAppointments();
 		};
@@ -3516,7 +3595,10 @@ sap.ui.define([
 	PlanningCalendarRowTimelineRenderer.renderInterval = function (oRm, oTimeline, iInterval, iWidth,  aIntervalHeaders, aNonWorkingItems, iStartOffset, iNonWorkingMax, aNonWorkingSubItems, iSubStartOffset, iNonWorkingSubMax, bFirstOfType, bLastOfType) {
 		var sIntervalType = oTimeline.getIntervalType(),
 			sAdditionalNonWorkingClass;
-
+		if (oTimeline._getRelativeInfo().bIsRelative){
+			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) {
 			var oRow = getRow(oTimeline.getParent()),
 				oPC = oRow.getParent(),
@@ -3594,6 +3676,8 @@ sap.ui.define([
 		}
 	};
 
+	PlanningCalendarRowTimeline.prototype._getRelativeInfo = function () {};
+
 	PlanningCalendarRowTimeline.prototype.onBeforeRendering = function() {
 		CalendarRow.prototype.onBeforeRendering.call(this);
 		this._updatePlaceholders();
@@ -4581,6 +4665,45 @@ sap.ui.define([
 
 	};
 
+	/** calculates the number of intervals after the interval starting at min date */
+	PlanningCalendar.prototype.calcIntervalOffset = function(oDate) {
+		var oUTCDate = Date.UTC(
+			oDate.getFullYear(),
+			oDate.getMonth(),
+			oDate.getDate()
+		);
+		var oYearStart = this.getMinDate() || oDate;
+		var oUTCYearStart = Date.UTC(
+			oYearStart.getFullYear(),
+			oYearStart.getMonth(),
+			oYearStart.getDate()
+		);
+
+		return Math.round((oUTCDate - oUTCYearStart) / 1000 / 60 / 60 / 24 / this._getView(this.getViewKey()).getIntervalSize());
+	};
+
+	PlanningCalendar.prototype._getDateFromIndex = function(iIndex) {
+		var oDate = new Date(this.getMinDate());
+
+		oDate.setDate(oDate.getDate() + iIndex * this._getView(this.getViewKey()).getIntervalSize());
+
+		return oDate;
+	};
+
+	PlanningCalendar.prototype._getRelativeInfo = function() {
+		var oRelativeInfo = {},
+			oView = this._getView(this.getViewKey(), true);
+
+		oRelativeInfo.iIntervalSize = oView.getIntervalSize();
+		oRelativeInfo.bIsRelative = oView.getRelative();
+		oRelativeInfo.oMinDate = this.getMinDate();
+		oRelativeInfo._getDateFromIndex = this._getDateFromIndex.bind(this);
+		oRelativeInfo.intervalLabelFormatter = oView.getIntervalLabelFormatter() ? oView.getIntervalLabelFormatter() : function (x) { return x; };
+		oRelativeInfo._getIndexFromDate = this.calcIntervalOffset.bind(this);
+
+		return oRelativeInfo;
+	};
+
 	function isThereAnIntervalInstance() {
 		return this._oTimesRow || this._oDatesRow || this._oMonthsRow || this._oWeeksRow || this._oOneMonthsRow;
 	}

package/src/sap/m/PlanningCalendarHeader.js

@@ -25,6 +25,7 @@ sap.ui.define([
 	'sap/ui/unified/calendar/CalendarDate',
 	'sap/ui/unified/calendar/CustomMonthPicker',
 	'sap/ui/unified/calendar/CustomYearPicker',
+	'sap/ui/unified/calendar/IndexPicker',
 	'sap/ui/core/format/DateFormat',
 	'sap/ui/core/IconPool',
 	'sap/ui/core/InvisibleText',
@@ -46,6 +47,7 @@ function(
 	CalendarDate,
 	CustomMonthPicker,
 	CustomYearPicker,
+	IndexPicker,
 	DateFormat,
 	IconPool,
 	InvisibleText,
@@ -95,7 +97,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @constructor
 	 * @private
@@ -172,7 +174,15 @@ function(
 			 *
 			 * @private
 			 */
-			_yearPicker : { type : "sap.ui.unified.internal.CustomYearPicker", multiple : false, visibility : "hidden" }
+			_yearPicker : { type : "sap.ui.unified.internal.CustomYearPicker", multiple : false, visibility : "hidden" },
+
+			/**
+			 * Hidden, for internal use only.
+			 * The popup which contains the index picker for navigation.
+			 *
+			 * @private
+			 */
+			_indexPicker : { type : "sap.ui.unified.calendar.IndexPicker", multiple : false, visibility : "hidden" }
 
 		},
 
@@ -308,16 +318,23 @@ function(
 		this.setAggregation("_yearPicker", oYearPicker);
 		this._oYearPicker = oYearPicker;
 
+		var oIndexPicker = new IndexPicker(sOPHId + "-IndexPicker");
+		oIndexPicker.attachEvent("select", this._handleIndexPickerSelect, this);
+		this.setAggregation("_indexPicker", oIndexPicker);
+		this._oIndexPicker = oIndexPicker;
+
 		this._oPickerBtn = new Button(sNavToolbarId + "-PickerBtn", {
 			text: this.getPickerText(),
-			ariaHasPopup: coreLibrary.aria.HasPopup.Grid,
+			ariaHasPopup: coreLibrary.aria.HasPopup.Dialog,
 			ariaLabelledBy: InvisibleText.getStaticId("sap.m", "PCH_SELECT_RANGE"),
 			press: function () {
 				if (this.fireEvent("_pickerButtonPress", {}, true)) {
 					var oDate = this.getStartDate() || new Date(),
 						sCurrentPickerId = this.getAssociation("currentPicker");
 					oPicker = Element.registry.get(sCurrentPickerId);
-					oPicker.displayDate(oDate);
+					if (oPicker.displayDate) {
+						oPicker.displayDate(oDate);
+					}
 					this._openCalendarPickerPopup(oPicker);
 				}
 			}.bind(this)
@@ -528,6 +545,18 @@ function(
 		//oPickerBtnDomRef && oPickerBtnDomRef.focus();
 	};
 
+	PlanningCalendarHeader.prototype._handleIndexPickerSelect = function (oEvent) {
+		var iSelectedIndex = this._oIndexPicker.getSelectedIndex();
+		var oSelectedDate = new Date(this._oCalendar.getMinDate());
+		var oRelativeInfo = this._getRelativeInfo();
+
+		oSelectedDate.setDate(oSelectedDate.getDate() + iSelectedIndex * oRelativeInfo.iIntervalSize);
+
+		this.setStartDate(oSelectedDate);
+		this._closeCalendarPickerPopup();
+		this.fireDateSelect();
+	};
+
 	/**
 	 * Handler for the change event of the view switch.
 	 * @private
@@ -556,6 +585,8 @@ function(
 				this.setAggregation("_yearPicker", this._oPopup.removeAllContent()[0]);
 			} else if (oContent.isA("sap.ui.unified.internal.CustomMonthPicker")) {
 				this.setAggregation("_monthPicker", this._oPopup.removeAllContent()[0]);
+			} else if (oContent.isA("sap.ui.unified.calendar.IndexPicker")) {
+				this.setAggregation("_indexPicker", this._oPopup.removeAllContent()[0]);
 			} else if (oPicker !== oContent) {
 				this.setAggregation("_calendarPicker", this._oPopup.removeAllContent()[0]);
 			}
@@ -571,8 +602,8 @@ function(
 			var iOffsetY = this._oPickerBtn.$().height();
 
 			this._oPopup.setOffsetY(this._oPopup._getCalculatedPlacement() === "Top" ? iOffsetY : -iOffsetY);
+			this._oPopup.getContent()[0].focus();
 		}, this);
-
 		this._oPopup.openBy(this._oPickerBtn.getDomRef());
 	};
 

package/src/sap/m/PlanningCalendarLegend.js

@@ -28,7 +28,7 @@ sap.ui.define(['sap/ui/unified/CalendarLegend', 'sap/ui/unified/CalendarAppointm
 		 * @extends sap.ui.unified.CalendarLegend
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
 		 *
 		 * @constructor
 		 * @public

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.92.0
+	 * @version 1.93.3
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/PlanningCalendarView.js

@@ -30,7 +30,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.92.0
+	 * @version 1.93.3
 	 *
 	 * @constructor
 	 * @public
@@ -57,6 +57,31 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/library'],
 			 */
 			intervalType : {type : "sap.ui.unified.CalendarIntervalType", group : "Appearance", defaultValue : CalendarIntervalType.Hour},
 
+			/**
+			 *  An integer that defines the period size.
+			 *
+			 * @experimental Since 1.93. This class is experimental and provides only limited functionality. Also the API might be changed in future.
+	 		 * @since 1.93
+			 * */
+			intervalSize: {type: "int", group: "Appearance", defaultValue: 1},
+
+			/**
+			 * A function that formats the interval.
+			 *
+			 * @experimental Since 1.93. This class is experimental and provides only limited functionality. Also the API might be changed in future.
+	 		 * @since 1.93
+			 *
+			 */
+			intervalLabelFormatter: {type: "object", group: "Appearance"},
+
+			/**
+			 *  Defines if the view will be relative.
+			 *  NOTE: Relative views, can be only used with intervalType - Day and when used they need intervalSize and intervalLabelFormatter defined.
+			 * @experimental Since 1.93. This class is experimental and provides only limited functionality. Also the API might be changed in future.
+	 		 * @since 1.93
+			 */
+			relative: {type: "boolean", group: "Appearance", defaultValue: false},
+
 			/**
 			 * Defines the description of the <code>PlanningCalendarView</code>.
 			 */
@@ -98,7 +123,6 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/library'],
 
 		}
 	}});
-
 	return PlanningCalendarView;
 
 });

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.92.0
+		* @version 1.93.3
 		*
 		* @public
 		* @alias sap.m.Popover
@@ -806,7 +806,12 @@ sap.ui.define([
 
 			// A theme can force the usage of compact arrow offset in all content density modes, by setting sapMPopoverForceCompactArrowOffset variable.
 			// This is needed when a theme defines only a compact arrow for all modes.
-			bForceCompactArrowOffset = Parameters.get("_sap_m_Popover_ForceCompactArrowOffset") === "true";
+			bForceCompactArrowOffset = Parameters.get({
+					name: "_sap_m_Popover_ForceCompactArrowOffset"
+			}) || "true"; // ensure a default value is added in case the parameter is not loaded
+
+			// cast the string value to boolean
+			bForceCompactArrowOffset = bForceCompactArrowOffset === "true";
 
 			// Determines if the Popover will be rendered in a compact mode
 			this._bSizeCompact = library._bSizeCompact || !!aCompactParents.length || this.hasStyleClass("sapUiSizeCompact");
@@ -825,6 +830,10 @@ sap.ui.define([
 						this.openBy(oControl);
 					};
 					oPopup.attachClosed(afterClosed, this);
+
+					// the focus should not be restored to the control that previously opened the popover,
+					// because the focus info of the new control opening it is getting lost: BCP2170040819
+					this._oPreviousFocus = null;
 					this.close();
 					return this;
 				}

package/src/sap/m/ProgressIndicator.js

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