@openui5/sap.m 1.121.1 → 1.122.1

package/src/sap/m/PlanningCalendar.js

@@ -206,7 +206,7 @@ sap.ui.define([
 	 * {@link sap.m.PlanningCalendarView PlanningCalendarView}'s properties.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @constructor
 	 * @public
@@ -870,6 +870,7 @@ sap.ui.define([
 				}.bind(this));
 				this._rowHeaderPressEventKeyboard = oRowHeader.on("keydown", function (oEvent) {
 					if (oEvent.which === KeyCodes.SPACE || oEvent.which === KeyCodes.ENTER) {
+						oEvent.preventDefault();
 						var oRowListItem = Element.closestTo(oEvent.currentTarget),
 							oRow = getRow(oRowListItem),
 							sRowHeaderId = oRowListItem.getAggregation("cells")[0].getId();
@@ -1224,7 +1225,7 @@ sap.ui.define([
 		return { primaryType: sResult, secondaryType: sResultInSecType };
 	};
 
-	PlanningCalendar.prototype._getPrimaryCalendarType = function(){
+	PlanningCalendar.prototype._getPrimaryCalendarType = function() {
 		return this.getProperty("primaryCalendarType") || Formatting.getCalendarType();
 	};
 
@@ -1235,8 +1236,18 @@ sap.ui.define([
 	 * @private
 	 */
 	PlanningCalendar.prototype._getFirstAndLastRangeDate = function () {
-		var oUniStartDate = CalendarUtils._createUniversalUTCDate(this.getStartDate(), this._getPrimaryCalendarType(), true),
-			oUniEndDate = CalendarUtils._createUniversalUTCDate(this._dateNav.getEnd(), this._getPrimaryCalendarType(), true);
+		var oStartDate = this.getStartDate(),
+			oMinDate = this.getMinDate(),
+			oStartRange = oStartDate,
+			oUniStartDate,
+			oUniEndDate;
+
+		if (oMinDate && oMinDate.getTime() > oStartDate.getTime() && this._isWeekOrOneMonthView(this.getViewKey())) {
+			oStartRange = oMinDate;
+		}
+
+		oUniStartDate = CalendarUtils._createUniversalUTCDate(oStartRange, this._getPrimaryCalendarType(), true);
+		oUniEndDate = CalendarUtils._createUniversalUTCDate(this._dateNav.getEnd(), this._getPrimaryCalendarType(), true);
 
 		return {
 			oStartDate: oUniStartDate,
@@ -1310,15 +1321,9 @@ sap.ui.define([
 	 * @public
 	 */
 	PlanningCalendar.prototype.getVisibleIntervalsCount = function () {
-		var sViewKey = this.getViewKey();
-		if ((sViewKey === CalendarIntervalType.OneMonth || sViewKey === "OneMonth") && this._iSize < 2) {
-			var oFirstVisibleDate = CalendarUtils.getFirstDateOfWeek(CalendarUtils._createUniversalUTCDate(this.getStartDate(), this._getPrimaryCalendarType(), false)),
-				oFirstDateInLastWeek = CalendarUtils.getFirstDateOfWeek(CalendarUtils._createUniversalUTCDate(this._dateNav.getEnd(), this._getPrimaryCalendarType(), false)),
-				oLastVisibleDate = UI5Date.getInstance(oFirstDateInLastWeek.getTime());
-
-			oLastVisibleDate.setDate(oLastVisibleDate.getDate() + 6);
-
-			return ((oLastVisibleDate.getTime() - oFirstVisibleDate.getTime()) / 86400000) + 1;
+		if (this._isOneMonthView(this.getViewKey()) && this._iSize < 2) {
+			const aVisibleDays = this._oOneMonthsRow._getVisibleDays();
+			return aVisibleDays.length;
 		} else {
 			return this._getIntervals(this._getView(this.getViewKey()));
 		}
@@ -1528,7 +1533,9 @@ sap.ui.define([
 	 * @public
 	 */
 	PlanningCalendar.prototype.setStartDate = function(oDate) {
-		var oStartDate;
+		var oStartDate,
+			oMinDate = this.getMinDate(),
+			sViewKey = this.getViewKey();
 
 		if (!oDate) {
 			//set default value
@@ -1552,10 +1559,11 @@ sap.ui.define([
 		var iYear = oStartDate.getFullYear();
 		CalendarUtils._checkYearInValidRange(iYear);
 
-		var oMinDate = this.getMinDate();
 		if (oMinDate && oMinDate.getTime() > oStartDate.getTime()) {
-			Log.warning("StartDate < minDate -> StartDate set to minDate", this);
-			oStartDate = UI5Date.getInstance(oMinDate.getTime());
+			if (!this._isWeekOrOneMonthView(sViewKey))  {
+				Log.warning("StartDate < minDate -> StartDate set to minDate", this);
+				oStartDate = UI5Date.getInstance(oMinDate.getTime());
+			}
 		} else {
 			var oMaxDate = this.getMaxDate();
 			if (oMaxDate && oMaxDate.getTime() < oStartDate.getTime()) {
@@ -1582,13 +1590,16 @@ 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.getViewKey() === "OneMonth") && this._oOneMonthsRow.getMode() < 2 && this._oOneMonthsRow.getSelectedDates().length) {
+		if (this._isOneMonthView(sViewKey)
+			&& this._oOneMonthsRow
+			&& this._oOneMonthsRow.getMode() < 2
+			&& this._oOneMonthsRow.getSelectedDates().length) {
 			this._setRowsStartDate(this._oOneMonthsRow.getSelectedDates()[0].getStartDate());
 		} else {
 			this._setRowsStartDate(UI5Date.getInstance(oStartDate.getTime()));
 		}
 
-		if (this.getViewKey() === PlanningCalendarBuiltInView.Week || this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === "OneMonth") {
+		if (this._isWeekOrOneMonthView(sViewKey)) {
 			this._updateTodayButtonState();
 		}
 
@@ -1682,14 +1693,15 @@ sap.ui.define([
 	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @public
 	 */
-	PlanningCalendar.prototype.setMinDate = function(oDate){
+	PlanningCalendar.prototype.setMinDate = function(oDate) {
 
 		if (deepEqual(oDate, this.getMinDate())) {
 			return this;
 		}
 
 		var oMaxDate = this.getMaxDate(),
-			oHeader = this._getHeader();
+			oHeader = this._getHeader(),
+			oMinDate;
 
 		if (oDate) {
 			CalendarUtils._checkJSDateObject(oDate);
@@ -1697,16 +1709,33 @@ sap.ui.define([
 			var iYear = oDate.getFullYear();
 			CalendarUtils._checkYearInValidRange(iYear);
 
-			this.setProperty("minDate", oDate, true);
+			oMinDate = UI5Date.getInstance(oDate.getTime());
+
+			this.setProperty("minDate", oMinDate, true);
 			this._bNoStartDateChange = true; // set the start date after all calendars are updated
 
-			oHeader.getAggregation("_calendarPicker").setMinDate(UI5Date.getInstance(oDate.getTime()));
-			oHeader.getAggregation("_monthPicker").setMinDate(UI5Date.getInstance(oDate.getTime()));
-			oHeader.getAggregation("_yearPicker").setMinDate(UI5Date.getInstance(oDate.getTime()));
+			oHeader.getAggregation("_calendarPicker").setMinDate(oMinDate);
+			oHeader.getAggregation("_monthPicker").setMinDate(oMinDate);
+			oHeader.getAggregation("_yearPicker").setMinDate(oMinDate);
+
+			if (this._oDatesRow) {
+				this._oDatesRow._oMinDate = oMinDate;
+				this._oDatesRow.invalidate();
+			}
+
+			if (this._oWeeksRow) {
+				this._oWeeksRow._oMinDate = oMinDate;
+				this._oWeeksRow.invalidate();
+			}
+
+			if (this._oOneMonthsRow) {
+				this._oOneMonthsRow._oMinDate = oMinDate;
+				this._oOneMonthsRow.invalidate();
+			}
 
 			if (oMaxDate && oMaxDate.getTime() < oDate.getTime()) {
 				Log.warning("minDate > maxDate -> maxDate set to end of the month", this);
-				oMaxDate = UI5Date.getInstance(oDate.getTime());
+				oMaxDate = oMinDate;
 				oMaxDate.setMonth(oMaxDate.getMonth() + 1, 0);
 				oMaxDate.setHours(23);
 				oMaxDate.setMinutes(59);
@@ -1717,9 +1746,9 @@ sap.ui.define([
 
 			this._bNoStartDateChange = undefined;
 			var oStartDate = this.getStartDate();
-			if (oStartDate && oStartDate.getTime() < oDate.getTime()) {
+			if (oStartDate && oStartDate.getTime() < oMinDate.getTime()) {
 				Log.warning("StartDate < minDate -> StartDate set to minDate", this);
-				oStartDate = UI5Date.getInstance(oDate.getTime());
+				oStartDate = oMinDate;
 				this.setStartDate(oStartDate);
 				oHeader.updatePickerText(this._formatPickerText());
 			}
@@ -1731,12 +1760,17 @@ sap.ui.define([
 		}
 
 		var oToday = UI5Date.getInstance();
-		if (oDate && oToday.getTime() < oDate.getTime()) {
+		if (oDate && oToday.getTime() < oMinDate.getTime()) {
 			this._oTodayButton.setVisible(false);
 		} else if (!oMaxDate || oToday.getTime() < oMaxDate.getTime()) {
 			this._oTodayButton.setVisible(true);
 		}
 
+		if (this.getDomRef()) {
+			this._updatePickerSelection();
+			this._updateHeaderButtons();
+		}
+
 		return this;
 
 	};
@@ -1747,14 +1781,15 @@ sap.ui.define([
 	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @public
 	 */
-	PlanningCalendar.prototype.setMaxDate = function(oDate){
+	PlanningCalendar.prototype.setMaxDate = function(oDate) {
 
 		if (deepEqual(oDate, this.getMaxDate())) {
 			return this;
 		}
 
 		var oMinDate = this.getMinDate(),
-			oHeader = this._getHeader();
+			oHeader = this._getHeader(),
+			oMaxDate;
 
 		if (oDate) {
 			CalendarUtils._checkJSDateObject(oDate);
@@ -1762,16 +1797,33 @@ sap.ui.define([
 			var iYear = oDate.getFullYear();
 			CalendarUtils._checkYearInValidRange(iYear);
 
-			this.setProperty("maxDate", oDate, true);
+			oMaxDate = UI5Date.getInstance(oDate.getTime());
+
+			this.setProperty("maxDate", oMaxDate, true);
 			this._bNoStartDateChange = true; // set the start date after all calendars are updated
 
-			oHeader.getAggregation("_calendarPicker").setMaxDate(UI5Date.getInstance(oDate.getTime()));
-			oHeader.getAggregation("_monthPicker").setMaxDate(UI5Date.getInstance(oDate.getTime()));
-			oHeader.getAggregation("_yearPicker").setMaxDate(UI5Date.getInstance(oDate.getTime()));
+			oHeader.getAggregation("_calendarPicker").setMaxDate(oMaxDate);
+			oHeader.getAggregation("_monthPicker").setMaxDate(oMaxDate);
+			oHeader.getAggregation("_yearPicker").setMaxDate(oMaxDate);
+
+			if (this._oDatesRow) {
+				this._oDatesRow._oMaxDate = oMaxDate;
+				this._oDatesRow.invalidate();
+			}
+
+			if (this._oWeeksRow) {
+				this._oWeeksRow._oMaxDate = oMaxDate;
+				this._oWeeksRow.invalidate();
+			}
 
-			if (oMinDate && oMinDate.getTime() > oDate.getTime()) {
+			if (this._oOneMonthsRow) {
+				this._oOneMonthsRow._oMaxDate = oMaxDate;
+				this._oOneMonthsRow.invalidate();
+			}
+
+			if (oMinDate && oMinDate.getTime() > oMaxDate.getTime()) {
 				Log.warning("maxDate < minDate -> maxDate set to begin of the month", this);
-				oMinDate = UI5Date.getInstance(oDate.getTime());
+				oMinDate = oMaxDate;
 				oMinDate.setDate(1);
 				oMinDate.setHours(0);
 				oMinDate.setMinutes(0);
@@ -1782,7 +1834,7 @@ sap.ui.define([
 
 			this._bNoStartDateChange = undefined;
 			var oStartDate = this.getStartDate();
-			if (oStartDate && oStartDate.getTime() > oDate.getTime()) {
+			if (oStartDate && oStartDate.getTime() > oMaxDate.getTime()) {
 				Log.warning("StartDate > maxDate -> StartDate set to minDate", this);
 				if (oMinDate) {
 					oStartDate = UI5Date.getInstance(oMinDate.getTime());
@@ -1802,12 +1854,17 @@ sap.ui.define([
 		}
 
 		var oToday = UI5Date.getInstance();
-		if (oDate && oToday.getTime() > oDate.getTime()) {
+		if (oDate && oToday.getTime() > oMaxDate.getTime()) {
 			this._oTodayButton.setVisible(false);
 		} else if (!oMinDate || oToday.getTime() > oMinDate.getTime()) {
 			this._oTodayButton.setVisible(true);
 		}
 
+		if (this.getDomRef()) {
+			this._updatePickerSelection();
+			this._updateHeaderButtons();
+		}
+
 		return this;
 
 	};
@@ -1852,7 +1909,9 @@ sap.ui.define([
 		var oInterval, oOldStartDate, oIntervalMetadata,
 			sOldViewKey = this.getViewKey(),
 			oHeader = this._getHeader(),
-			oSelectedDate;
+			oSelectedDate,
+			oFirstDateOfMonth,
+			oJSDate;
 
 		this.setProperty("viewKey", sKey, true);
 
@@ -1914,6 +1973,23 @@ sap.ui.define([
 				case CalendarIntervalType.Week:
 				case CalendarIntervalType.OneMonth:
 				case "OneMonth":
+					if (oStartDate && oMinDate && oStartDate.getTime() <= oMinDate.getTime()) {
+						if (sKey === CalendarIntervalType.Week) {
+							var oWeekConfigurationValues = this._getWeekConfigurationValues(),
+								oFirstWeekDay = CalendarUtils.getFirstDateOfWeek(CalendarUtils._createUniversalUTCDate(oMinDate, undefined, true), oWeekConfigurationValues),
+								oLocalDate = CalendarUtils._createLocalDate(oFirstWeekDay, true);
+
+							oStartDate = UI5Date.getInstance(oLocalDate.getTime());
+						} else if (this._isOneMonthView(sKey) && this._iSize && this._iSize === 2) {
+							oFirstDateOfMonth = CalendarUtils._getFirstDateOfMonth(CalendarDate.fromLocalJSDate(oMinDate, this._getPrimaryCalendarType()));
+							oJSDate = oFirstDateOfMonth.toLocalJSDate();
+							oStartDate = UI5Date.getInstance(oJSDate.getTime());
+						} else {
+							oStartDate = UI5Date.getInstance(oMinDate.getTime());
+						}
+						this.setStartDate(oStartDate);
+					}
+
 					//Date, Week and OneMonth intervals share the same object artifacts
 					oIntervalMetadata = INTERVAL_METADATA[sIntervalType];
 					oInterval = this[oIntervalMetadata.sInstanceName];
@@ -1933,10 +2009,13 @@ sap.ui.define([
 						oInterval.attachEvent("select", this._handleCalendarSelect, this);
 						oInterval.attachEvent("focus", this._handleFocus, this);
 
-						if (sKey === PlanningCalendarBuiltInView.OneMonth || sKey === "OneMonth") {
+						if (this._isOneMonthView(sKey)) {
 							oInterval._setRowsStartDate = this._setRowsStartDate.bind(this);
 						}
 
+						oInterval._oMinDate = oMinDate;
+						oInterval._oMaxDate = oMaxDate;
+
 						oInterval._oPlanningCalendar = this;
 						oInterval._getSpecialDates = function(){
 							return this._oPlanningCalendar._getSpecialDates();
@@ -2056,7 +2135,7 @@ sap.ui.define([
 			this._updatePickerSelection();
 		}
 
-		if (sKey === PlanningCalendarBuiltInView.Week || sKey === PlanningCalendarBuiltInView.OneMonth || sKey === PlanningCalendarBuiltInView.Month || sKey === "OneMonth") {
+		if (this._isWeekOrOneMonthView(sKey) || sKey === PlanningCalendarBuiltInView.Month) {
 			oOldStartDate = this.getStartDate();
 
 			this.setStartDate(UI5Date.getInstance(oOldStartDate.getTime())); //make sure the start date is aligned according to the week/month rules
@@ -2065,23 +2144,22 @@ sap.ui.define([
 			}
 		}
 
-		if (this._oOneMonthsRow && (sKey === PlanningCalendarBuiltInView.OneMonth || sKey === "OneMonth")) {
+		if (this._oOneMonthsRow && this._isOneMonthView(sKey)) {
 			this._oOneMonthsRow.setMode(this._iSize);
-			this._oOldStartDate = UI5Date.getInstance(this.getStartDate().getTime());
-			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oOldStartDate, this._getPrimaryCalendarType()));
+			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oStartDate, this._getPrimaryCalendarType()));
 
 			if (this._iSize < 2) {
-				this._setRowsStartDate(oOldStartDate);
+				this._setRowsStartDate(oStartDate);
 			}
 		} else if (this._oOneMonthsRow
-			&& (sOldViewKey === PlanningCalendarBuiltInView.OneMonth || sOldViewKey === "OneMonth")
+			&& this._isOneMonthView(sOldViewKey)
 			&& this._oOneMonthsRow.getSelectedDates().length) {
 			oSelectedDate = this._oOneMonthsRow.getSelectedDates()[0].getStartDate();
 			if (oSelectedDate) {
-				oSelectedDate.setHours(this._oOldStartDate.getHours());
-				oSelectedDate.setMinutes(this._oOldStartDate.getMinutes());
-				oSelectedDate.setSeconds(this._oOldStartDate.getSeconds());
-				oSelectedDate.setMilliseconds(this._oOldStartDate.getMilliseconds());
+				oSelectedDate.setHours(oSelectedDate.getHours());
+				oSelectedDate.setMinutes(oSelectedDate.getMinutes());
+				oSelectedDate.setSeconds(oSelectedDate.getSeconds());
+				oSelectedDate.setMilliseconds(oSelectedDate.getMilliseconds());
 				this.setStartDate(oSelectedDate);
 			}
 		}
@@ -2146,6 +2224,13 @@ sap.ui.define([
 	};
 
 	PlanningCalendar.prototype._updateWeekConfiguration = function() {
+		var oWeekConfiguration = this._getWeekConfigurationValues();
+
+		this._dateNav.setWeekConfiguration(oWeekConfiguration);
+		this.setStartDate(this._dateNav.getStart());
+	};
+
+	PlanningCalendar.prototype._getWeekConfigurationValues = function() {
 		var sLocale = new Locale(Formatting.getLanguageTag()).toString(),
 			sCalendarWeekNumbering = this.getCalendarWeekNumbering(),
 			iFirstDayOfWeek = this.getFirstDayOfWeek(),
@@ -2154,9 +2239,7 @@ sap.ui.define([
 		if (iFirstDayOfWeek > -1 ) {
 			oWeekConfiguration.firstDayOfWeek = iFirstDayOfWeek;
 		}
-
-		this._dateNav.setWeekConfiguration(oWeekConfiguration);
-		this.setStartDate(this._dateNav.getStart());
+		return oWeekConfiguration;
 	};
 
 	PlanningCalendar.prototype._handleFocus = function (oEvent) {
@@ -2232,16 +2315,9 @@ 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 sLocale = new Locale(Formatting.getLanguageTag()).toString(),
-				oWeekConfigurationValues = CalendarDateUtils.getWeekConfigurationValues(this.getCalendarWeekNumbering(), new Locale(sLocale)),
-				oFirstDateOfWeek,
-				oLocalDate;
-
-			if (this.getFirstDayOfWeek() > -1) {
-				oWeekConfigurationValues.firstDayOfWeek = this.getFirstDayOfWeek();
-			}
-			oFirstDateOfWeek = CalendarUtils.getFirstDateOfWeek(CalendarUtils._createUniversalUTCDate(oStartDate, undefined, true), oWeekConfigurationValues);
-			oLocalDate = CalendarUtils._createLocalDate(oFirstDateOfWeek, true);
+			var oWeekConfigurationValues = this._getWeekConfigurationValues(),
+				oFirstDateOfWeek = CalendarUtils.getFirstDateOfWeek(CalendarUtils._createUniversalUTCDate(oStartDate, undefined, true), oWeekConfigurationValues),
+				oLocalDate = CalendarUtils._createLocalDate(oFirstDateOfWeek, true);
 			if (this.getFirstDayOfWeek() > -1) {
 				oLocalDate.setDate(oLocalDate.getDate() - oLocalDate.getDay() + this.getFirstDayOfWeek());
 			}
@@ -2299,7 +2375,13 @@ sap.ui.define([
 	 * @private
 	 */
 	PlanningCalendar.prototype._adjustSelectedDate = function(oSelectDate) {
-		var oLocaleDate = oSelectDate.toLocalJSDate();
+		var oLocaleDate = oSelectDate.toLocalJSDate(),
+			oMinDate = this.getMinDate();
+
+		if (oMinDate && oLocaleDate.getTime() < oMinDate.getTime()) {
+			oLocaleDate = UI5Date.getInstance(oMinDate.getTime());
+		}
+
 
 		if (this._oOneMonthsRow.getMode && this._oOneMonthsRow.getMode() < 2) {
 			this._oOneMonthsRow.removeAllSelectedDates();
@@ -2579,7 +2661,7 @@ sap.ui.define([
 	PlanningCalendar.prototype._updateStickyHeader = function() {
 		var aStickyParts = [],
 			bStick = this.getStickyHeader(),
-			bMobile1MonthView = (this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === "OneMonth") && this._iSize < 2,
+			bMobile1MonthView = this._isOneMonthView(this.getViewKey()) && this._iSize < 2,
 			bStickyToolbar = bStick && !Device.system.phone && !bMobile1MonthView,
 			bStickyInfoToolbar = bStick && !(Device.system.phone && Device.orientation.landscape) && !bMobile1MonthView;
 
@@ -2995,6 +3077,14 @@ sap.ui.define([
 		return oResult;
 	};
 
+	PlanningCalendar.prototype._isOneMonthView = function(sViewKey) {
+		return sViewKey === PlanningCalendarBuiltInView.OneMonth || sViewKey === "OneMonth";
+	};
+
+	PlanningCalendar.prototype._isWeekOrOneMonthView = function(sViewKey) {
+		return sViewKey === PlanningCalendarBuiltInView.Week || this._isOneMonthView(sViewKey);
+	};
+
 	/**
 	 * Gets the correct <code>PlanningCalendarView</code> interval depending on the screen size.
 	 * @param {PlanningCalendarView} oView Target view
@@ -3145,7 +3235,7 @@ sap.ui.define([
 
 		// 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 || sViewKey === "OneMonth") {
+		if (this._isOneMonthView(sViewKey)) {
 			oStartDate = CalendarUtils._getFirstDateOfMonth(CalendarDate.fromLocalJSDate(oDate, this._getPrimaryCalendarType()));
 			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oDate, this._getPrimaryCalendarType()));
 
@@ -3164,7 +3254,7 @@ sap.ui.define([
 		this._dateNav.setCurrent(oDate);
 		if (sViewKey === PlanningCalendarBuiltInView.Week) {
 			this._oWeeksRow.addDelegate(oFocusMonthDelegate, this._oWeeksRow);
-		} else if (sViewKey === PlanningCalendarBuiltInView.OneMonth || sViewKey === "OneMonth") {
+		} else if (this._isOneMonthView(sViewKey)) {
 			this._oOneMonthsRow.addDelegate(oFocusMonthDelegate, this._oOneMonthsRow);
 		}
 		this._updatePickerSelection();
@@ -3282,17 +3372,18 @@ sap.ui.define([
 					if (CalendarUtils.monthsDiffer(this.getStartDate(), oEvtSelectedStartCalendarDate.toLocalJSDate())) {
 						this.setStartDate(oEvtSelectedStartCalendarDate.toLocalJSDate());
 						this._getHeader().updatePickerText(this._formatPickerText());
+						this.fireStartDateChange();
 					}
 					this._setRowsStartDate(oFocusedDate);
 					this._oOneMonthsRow._focusDate(CalendarDate.fromLocalJSDate(oFocusedDate, this._getPrimaryCalendarType()), true);
 				} else if (CalendarUtils._isNextMonth(oEvtSelectedStartCalendarDate.toLocalJSDate(), this.getStartDate())) {
-					this.shiftToDate(oEvtSelectedStartCalendarDate.toLocalJSDate());
+					this.shiftToDate(oEvtSelectedStartCalendarDate.toLocalJSDate(), true);
 					this._addMonthFocusDelegate(this._getRowInstanceByViewKey(this.getViewKey()));
 					oEndDate.setUTCDate(oEndDate.getUTCDate() + 1);
 					oEndDate.setUTCMilliseconds(oEndDate.getUTCMilliseconds() - 1);
 					oEndDate = CalendarUtils._createLocalDate(oEndDate, true);
-
-					return this.fireIntervalSelect({startDate: oEvtSelectedStartDate, endDate: oEndDate, subInterval: false, row: undefined});
+					this.fireIntervalSelect({startDate: oEvtSelectedStartDate, endDate: oEndDate, subInterval: false, row: undefined});
+					return;
 				}
 				oEndDate.setUTCDate(oEndDate.getUTCDate() + 1);
 				break;
@@ -3744,8 +3835,9 @@ sap.ui.define([
 	 */
 	PlanningCalendar.prototype._updateRowTimeline = function (oRow) {
 		var oRowTimeline = getRowTimeline(oRow),
-			sKey, oView, sIntervalType, iIntervals, iIntervalSize,
-			bMobile1MonthView = (this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === "OneMonth") && this._iSize < 2,
+			sKey = this.getViewKey(),
+			oView, sIntervalType, iIntervals, iIntervalSize,
+			bMobile1MonthView = this._isOneMonthView(sKey) && this._iSize < 2,
 			oStartDate = this.getStartDate();
 
 		oRowTimeline.setNonWorkingDays(oRow.getNonWorkingDays());

package/src/sap/m/PlanningCalendarHeader.js

@@ -100,7 +100,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @constructor
 	 * @private
@@ -370,8 +370,15 @@ function(
 			press: function () {
 				if (this.fireEvent("_pickerButtonPress", {}, true)) {
 					var oDate = this.getStartDate() || UI5Date.getInstance(),
-						sCurrentPickerId = this.getAssociation("currentPicker");
+						sCurrentPickerId = this.getAssociation("currentPicker"),
+						oMinDate;
 					oPicker = Element.getElementById(sCurrentPickerId);
+					if (oPicker instanceof Calendar) {
+						oMinDate = oPicker.getMinDate();
+						if (oMinDate && oMinDate.getTime() > oDate.getTime()) {
+							oDate = oMinDate;
+						}
+					}
 					if (oPicker.displayDate) {
 						oPicker.displayDate(oDate);
 					}

package/src/sap/m/PlanningCalendarLegend.js

@@ -23,7 +23,7 @@ sap.ui.define(["sap/ui/core/Lib", 'sap/ui/unified/CalendarLegend', 'sap/ui/unifi
 		 * @extends sap.ui.unified.CalendarLegend
 		 *
 		 * @author SAP SE
-		 * @version 1.121.1
+		 * @version 1.122.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/PlanningCalendarRow.js

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

package/src/sap/m/PlanningCalendarView.js

@@ -25,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.121.1
+	 * @version 1.122.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Popover.js

@@ -122,7 +122,7 @@ sap.ui.define([
 		* @extends sap.ui.core.Control
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.121.1
+		* @version 1.122.1
 		*
 		* @public
 		* @alias sap.m.Popover

package/src/sap/m/ProgressIndicator.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/PullToRefresh.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickView.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.m.QuickViewBase
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @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.121.1
+	 * @version 1.122.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickViewCard.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.m.QuickViewBase
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @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.121.1
+	* @version 1.122.1
 	*
 	* @constructor
 	* @public

package/src/sap/m/QuickViewGroupElement.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	* @extends sap.ui.core.Element
 	*
 	* @author SAP SE
-	* @version 1.121.1
+	* @version 1.122.1
 	*
 	* @constructor
 	* @public

package/src/sap/m/QuickViewPage.js

@@ -103,7 +103,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/RadioButton.js

@@ -91,7 +91,7 @@ function(
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @constructor
 	 * @public