@openui5/sap.ui.unified 1.149.1 → 1.151.0

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.149.1
+	 * @version 1.151.0
 	 *
 	 * @constructor
 	 * @public
@@ -155,6 +155,15 @@ sap.ui.define([
 			 */
 			showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : true},
 
+			/**
+			 * Determines whether the header of the week numbers column is displayed.
+			 * The column header text is translated according to the active language.
+			 *
+			 * <b>Note:</b> Takes effect only when <code>showWeekNumbers</code> is set to <code>true</code>.
+			 * @since 1.151
+			 */
+			showWeekNumbersHeader : {type : "boolean", group : "Appearance", defaultValue : false},
+
 			/**
 			 * The value of this property is set trough the sap.ui.unified.Calendar control,
 			 * in order for the current sap.ui.unified.calendar.Month control to know which
@@ -326,6 +335,30 @@ sap.ui.define([
 		return "";
 	};
 
+	/**
+	 * Returns the text to display in the week numbers column header.
+	 * Returns an empty string when the header should not be shown.
+	 * @returns {string} The week numbers column header text, or empty string
+	 * @private
+	 */
+	Month.prototype._getWeekNumbersHeaderText = function() {
+		if (!this.getShowWeekNumbersHeader()) {
+			return "";
+		}
+
+		// Locales where the calendar week abbreviation (sap-calendarWeek narrow) is too long
+		// to fit in the week number column header cell — verified manually.
+		// These fall back to the "week" narrow display name from CLDR (week-narrow.displayName).
+		const _oLongCWLocales = new Set(["ar", "ar-EG", "ar-SA", "he", "vi", "zh-CN", "zh-HK", "zh-TW"]),
+			oLocaleData = this._getLocaleData();
+
+		if (_oLongCWLocales.has(this._getLocale())) {
+			return oLocaleData.getDisplayName("week", "narrow");
+		}
+
+		return oLocaleData.getCalendarWeek("narrow").replace("{0}", "").trim();
+	};
+
 	Month.prototype.exit = function(){
 
 		if (this._oItemNavigation) {
@@ -364,6 +397,14 @@ sap.ui.define([
 
 		// check if day names are too big -> use smaller ones
 		_checkNamesLength.call(this);
+
+		if (this._bFocusFromTouch) {
+			const iFocusedIndex = this._oItemNavigation.getFocusedIndex();
+			const oDomRef = this._oItemNavigation.getItemDomRefs()[iFocusedIndex];
+			if (oDomRef) {
+				oDomRef.classList.add("sapUiCalItemFocusFromTouch");
+			}
+		}
 	};
 
 	Month.prototype.onmouseover = function(oEvent) {
@@ -1084,6 +1125,10 @@ sap.ui.define([
 			clientY: oEvent.clientY
 		};
 
+		if (oEvent.target.closest(".sapUiCalItem")) {
+			this._bFocusFromTouch = true;
+		}
+
 		// handle only mouse down on a week number
 		if (oEvent.button
 			|| Device.support.touch
@@ -1102,6 +1147,12 @@ sap.ui.define([
 		this._handleWeekSelection(oFirstDayOfWeekCalendarDate, bFocusStartDate);
 	};
 
+	Month.prototype.ontouchstart = function(oEvent) {
+		if (oEvent.target.closest(".sapUiCalItem")) {
+			this._bFocusFromTouch = true;
+		}
+	};
+
 	Month.prototype.onmouseup = function(oEvent){
 		// BCP: 1980116734
 		// on a combi device right mouse button resulted in a selection (both a week or a single day)
@@ -1188,6 +1239,7 @@ sap.ui.define([
 		if (oEvent.which === KeyCodes.SPACE){
 			this.bSpaceButtonPressed = true;
 		}
+		this._bFocusFromTouch = false;
 	};
 	Month.prototype.onkeyup = function(oEvent){
 		if (oEvent.which === KeyCodes.SPACE){
@@ -1798,6 +1850,7 @@ sap.ui.define([
 			// when again clicked on a same week number - then remove the selections
 			oAggOwner.removeAllSelectedDates();
 			oAggOwner.addSelectedDate(oDateRange);
+			_fireSelect.call(this);
 		}
 
 		return this;
@@ -2163,6 +2216,12 @@ sap.ui.define([
 			this._selectedWithMouse = true;
 		}
 
+		if (this._bFocusFromTouch) {
+			oDomRef.classList.add("sapUiCalItemFocusFromTouch");
+		} else {
+			oDomRef.classList.remove("sapUiCalItemFocusFromTouch");
+		}
+
 		if (bFireFocus) {
 			this.fireFocus({date: oFocusedDate.toLocalJSDate(), otherMonth: bOtherMonth});
 		}

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.149.1
+	 * @version 1.151.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -197,10 +197,10 @@ sap.ui.define([
 
 	MonthRenderer.renderDayNames = function(oRm, oMonth, oLocaleData, iStartDay, iDays, bDayNumberAsId, sWidth){
 
-		var iFirstDayOfWeek = oMonth._getFirstDayOfWeek();
-		var sId = oMonth.getId();
-		var sDayId = "";
-		var sCalendarType = oMonth.getPrimaryCalendarType();
+		var iFirstDayOfWeek = oMonth._getFirstDayOfWeek(),
+			sId = oMonth.getId(),
+			sCalendarType = oMonth.getPrimaryCalendarType(),
+			sDayId = "";
 
 		var aWeekDays = [];
 		if (oMonth._bLongWeekDays || !oMonth._bNamesLengthChecked) {
@@ -211,7 +211,7 @@ sap.ui.define([
 		var aWeekDaysWide = oLocaleData.getDaysStandAlone("wide", sCalendarType);
 
 		if (oMonth.getShowWeekNumbers() && sCalendarType !== CalendarType.Islamic) { // on Islamic primary calendar week numbers are not shown, do not add dummy cell
-			this.renderDummyCell(oRm, "sapUiCalWH", true, "columnheader");
+			this.renderDummyCell(oRm, "sapUiCalWH", true, oMonth._getWeekNumbersHeaderText(), "columnheader");
 		}
 
 		for ( var i = 0; i < iDays; i++) {
@@ -308,7 +308,7 @@ sap.ui.define([
 
 		if (iLength === 28) {
 			// there are only 4 full weeks (28 days), add one hidden 'day' div in order to open space for 5-th week
-			this.renderDummyCell(oRm, "sapUiCalItem", false, "");
+			this.renderDummyCell(oRm, "sapUiCalItem", false, "", "");
 		}
 	};
 
@@ -316,22 +316,35 @@ sap.ui.define([
 	 * Generates empty 'day' div that adds space for one more week in the calendar, in case of 4 full weeks only (28 days)
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
 	 * @param {string} sClassName css class that will be added to the dummy element styles
-	 * @param {boolean} bVisible if set to true the dummy element will be visible
+	 * @param {boolean} bShowColumn if set to true the dummy element will be visible
+	 * @param {string} sCellText text to render inside the dummy element; if empty, no text span is rendered
 	 * @param {string} sRole aria role attribute
 	 * @private
 	 */
-	MonthRenderer.renderDummyCell = function(oRm, sClassName, bVisible, sRole) {
+	MonthRenderer.renderDummyCell = function(oRm, sClassName, bShowColumn, sCellText, sRole) {
+		var sFullText = Library.getResourceBundleFor("sap.ui.unified").getText("CALENDAR_WEEK");
 		oRm.openStart("div");
 		oRm.class(sClassName);
 		oRm.class("sapUiCalDummy");
-		oRm.style("visibility", bVisible ? "visible" : "hidden");
+		oRm.style("visibility", bShowColumn ? "visible" : "hidden");
 		oRm.attr("role", sRole);
+		if (sCellText) {
+			oRm.attr("title", sFullText);
+		}
 		oRm.openEnd();
 
+		if (sCellText) {
+			oRm.openStart("span");
+			oRm.attr("aria-hidden", "true");
+			oRm.openEnd();
+			oRm.text(sCellText);
+			oRm.close("span");
+		}
+
 		oRm.openStart("span");
 		oRm.class("sapUiPseudoInvisibleText");
 		oRm.openEnd();
-		oRm.text(Library.getResourceBundleFor("sap.ui.unified").getText("CALENDAR_WEEK"));
+		oRm.text(sFullText);
 		oRm.close("span");
 
 		oRm.close('div');

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

@@ -23,7 +23,8 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/unified/DateRange",
 	"sap/ui/core/date/UI5Date",
-	'sap/ui/core/InvisibleText'
+	'sap/ui/core/InvisibleText',
+	'sap/ui/Device'
 ], function(
 	Formatting,
 	_CalendarType, // type of `primaryCalendarType` and `secondaryCalendarType`
@@ -42,7 +43,8 @@ sap.ui.define([
 	jQuery,
 	DateRange,
 	UI5Date,
-	InvisibleText
+	InvisibleText,
+	Device
 ) {
 	"use strict";
 
@@ -68,7 +70,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.149.1
+	 * @version 1.151.0
 	 *
 	 * @constructor
 	 * @public
@@ -145,7 +147,13 @@ sap.ui.define([
 			 *
 			 * @since 1.145.0
 			 */
-			showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : false}
+			showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : false},
+
+			/**
+			 * The focused date for keyboard interval selection preview.
+			 * @private
+			 */
+			_focusedDate : {type : "object", group : "Data", visibility: "hidden", defaultValue: null}
 		},
 		aggregations : {
 
@@ -212,7 +220,7 @@ sap.ui.define([
 		this._oFormatYyyymm = DateFormat.getInstance({pattern: "yyyyMMdd", calendarType: sCalendarType});
 		this._oFormatOnlyYearLong = DateFormat.getInstance({pattern: "yyyy", calendarType: sCalendarType});
 		this._oFormatLong = DateFormat.getInstance({pattern: "MMMM y", calendarType: sCalendarType});
-		this._mouseMoveProxy = jQuery.proxy(this._handleMouseMove, this);
+		this._mouseMoveProxy = this._handleMouseMove.bind(this);
 		this._rb = Library.getResourceBundleFor("sap.ui.unified");
 	};
 
@@ -278,11 +286,15 @@ sap.ui.define([
 
 		if (!oEvent.relatedControlId || !containsOrEquals(this.getDomRef(), Element.getElementById(oEvent.relatedControlId).getFocusDomRef())) {
 			if (this._bMouseMove) {
-				_unbindMousemove.call(this, true);
+				this._unbindMousemove(true);
 
-				_selectMonth.call(this, this._getDate());
+				var bSelected = _selectMonth.call(this, this._getDate());
+				if (!bSelected && this._oMoveSelectedDate) {
+					_selectMonth.call(this, this._oMoveSelectedDate);
+				}
 				this._bMoveChange = false;
 				this._bMousedownChange = false;
+				this._oMoveSelectedDate = undefined;
 				_fireSelect.call(this);
 			}
 
@@ -671,7 +683,9 @@ sap.ui.define([
 			sCalendarType = this.getProperty("primaryCalendarType"),
 			i,
 			aSelectedDates,
-			oMyDate;
+			oMyDate,
+			oFocusedDate = this.getProperty("_focusedDate"),
+			bSelectionBetween = false;
 
 		CalendarUtils._checkCalendarDate(oDate);
 
@@ -698,6 +712,14 @@ sap.ui.define([
 				oEndTimeStamp = oEndDate.toUTCJSDate().getTime();
 			}
 
+			if (oFocusedDate) {
+				oFocusedDate = CalendarDate.fromLocalJSDate(oFocusedDate, sCalendarType);
+				oFocusedDate.setDate(1);
+			}
+
+			bSelectionBetween = this._isMarkingUnfinishedRangeAllowed() && oFocusedDate && !this._selectedWithMouse &&
+				(CalendarUtils._isBetween(oMyDate, oStartDate, oFocusedDate, true) || CalendarUtils._isBetween(oMyDate, oFocusedDate, oStartDate, true));
+
 			if (oTimeStamp == oStartTimeStamp && !oEndDate ) {
 				iSelected = 1; // single day selected
 				break;
@@ -711,7 +733,7 @@ sap.ui.define([
 			} else if (oEndDate && oTimeStamp == oEndTimeStamp) {
 				iSelected = 3; // interval end
 				break;
-			} else if (oEndDate && oTimeStamp > oStartTimeStamp && oTimeStamp < oEndTimeStamp) {
+			} else if ((oEndDate && oTimeStamp > oStartTimeStamp && oTimeStamp < oEndTimeStamp) || bSelectionBetween) {
 				iSelected = 4; // interval between
 				break;
 			}
@@ -798,11 +820,44 @@ sap.ui.define([
 
 	};
 
+	MonthsRow.prototype.onmousedown = function(oEvent) {
+		this._oMousedownPosition = {
+			clientX: oEvent.clientX,
+			clientY: oEvent.clientY
+		};
+	};
+
+	MonthsRow.prototype._isValueInThreshold = function(iReference, iValue, iThreshold) {
+		var iLowerThreshold = iReference - iThreshold,
+			iUpperThreshold = iReference + iThreshold;
+
+		return iValue >= iLowerThreshold && iValue <= iUpperThreshold;
+	};
+
+	MonthsRow.prototype._areMouseEventCoordinatesInThreshold = function(clientX, clientY, iThreshold) {
+		return this._oMousedownPosition
+			&& this._isValueInThreshold(this._oMousedownPosition.clientX, clientX, iThreshold)
+			&& this._isValueInThreshold(this._oMousedownPosition.clientY, clientY, iThreshold)
+			? true : false;
+	};
+
+	MonthsRow.prototype._getSelectedDateFromEvent = function(oEvent) {
+		var oTarget = oEvent.target,
+			sExtractedMonth, oParsedDate;
+
+		sExtractedMonth = oTarget.getAttribute("data-sap-month") || oTarget.parentNode.getAttribute("data-sap-month");
+
+		oParsedDate = sExtractedMonth ? this._oFormatYyyymm.parse(sExtractedMonth, this.getProperty("primaryCalendarType")) : null;
+
+		return oParsedDate ? CalendarDate.fromLocalJSDate(oParsedDate, this.getProperty("primaryCalendarType")) : null;
+	};
+
 	MonthsRow.prototype._handleMouseMove = function(oEvent){
 
 		if (!this.$().is(":visible")) {
 			// calendar was closed -> remove mousemove handler
-			_unbindMousemove.call(this, true);
+			this._unbindMousemove(true);
+			return;
 		}
 
 		var $Target = jQuery(oEvent.target);
@@ -811,26 +866,104 @@ sap.ui.define([
 			$Target = $Target.parent();
 		}
 
-		if ($Target.hasClass("sapUiCalItem")) {
-			var oOldFocusedDate = this._getDate();
-			var oFocusedDate = CalendarDate.fromLocalJSDate(this._oFormatYyyymm.parse($Target.attr("data-sap-month"), this.getProperty("primaryCalendarType")));
-			oFocusedDate.setDate(1);
+		if (this._sLastTargetId && this._sLastTargetId === $Target.attr("id")) {
+			// mouse move at same month -> do nothing
+			return;
+		}
+		this._sLastTargetId = $Target.attr("id");
+
+		if (!$Target.hasClass("sapUiCalItem") || !containsOrEquals(this.getDomRef(), oEvent.target)) {
+			return;
+		}
 
-			if (!oFocusedDate.isSame(oOldFocusedDate)) {
-				this.setDate(oFocusedDate.toLocalJSDate());
-				_selectMonth.call(this, oFocusedDate, true);
-				this._bMoveChange = true;
+		var oOldFocusedDate = this._getDate();
+		var oFocusedDate = CalendarDate.fromLocalJSDate(this._oFormatYyyymm.parse($Target.attr("data-sap-month"), this.getProperty("primaryCalendarType")));
+		oFocusedDate.setDate(1);
+
+		if (!oFocusedDate.isSame(oOldFocusedDate)) {
+			this.setDate(oFocusedDate.toLocalJSDate());
+			var bSelected = _selectMonth.call(this, oFocusedDate, true);
+			if (bSelected) {
+				this._oMoveSelectedDate = new CalendarDate(oFocusedDate, this.getProperty("primaryCalendarType"));
 			}
+			this._bMoveChange = true;
+		}
+	};
+
+	MonthsRow.prototype.onmouseover = function(oEvent) {
+		var $Target = jQuery(oEvent.target),
+			oSelectedDateRange = this.getSelectedDates()[0],
+			iMonth1,
+			iMonth2;
+
+		if (!this._isMarkingUnfinishedRangeAllowed()) {
+			return;
+		}
+
+		if (!$Target.hasClass("sapUiCalItemText") && !$Target.hasClass("sapUiCalItem")) {
+			return;
+		}
+
+		if ($Target.hasClass("sapUiCalItemText")) {
+			$Target = $Target.parent();
+		}
+
+		iMonth1 = parseInt(this._oFormatYyyymm.format(CalendarDate.fromLocalJSDate(oSelectedDateRange.getStartDate(), this.getProperty("primaryCalendarType")).toUTCJSDate(), true));
+		iMonth2 = parseInt($Target.attr("data-sap-month"));
+
+		if (this.hasListeners("datehovered")) {
+			this.fireEvent("datehovered", { date1: iMonth1, date2: iMonth2 });
+		} else {
+			this._markMonthsBetweenStartAndHoveredMonth(iMonth1, iMonth2);
+		}
+	};
+
+	MonthsRow.prototype._markMonthsBetweenStartAndHoveredMonth = function(iMonth1, iMonth2) {
+		const aDomRefs = this.$().find(".sapUiCalItem");
+
+		// swap if necessary
+		if (iMonth1 > iMonth2) {
+			[iMonth1, iMonth2] = [iMonth2, iMonth1];
 		}
 
+		[...aDomRefs].forEach((elem) => {
+			const $CheckRef = jQuery(elem);
+			const iCheckMonth = parseInt($CheckRef.attr("data-sap-month"));
+
+			if (iCheckMonth > iMonth1 && iCheckMonth < iMonth2 && this._isMonthInAllowedRange(iCheckMonth)) {
+				$CheckRef.addClass("sapUiCalItemSelBetween");
+			} else {
+				$CheckRef.removeClass("sapUiCalItemSelBetween");
+				if (iCheckMonth !== iMonth1 && iCheckMonth !== iMonth2) {
+					$CheckRef.removeClass("sapUiCalItemSel");
+				}
+			}
+		});
+	};
+
+	MonthsRow.prototype._isMonthInAllowedRange = function(iCheckMonth) {
+		const oCheckDate = this._oFormatYyyymm.parse(String(iCheckMonth));
+		const oCalDate = CalendarDate.fromLocalJSDate(oCheckDate, this.getProperty("primaryCalendarType"));
+
+		return this._checkMonthEnabled(oCalDate);
+	};
+
+	MonthsRow.prototype._isMarkingUnfinishedRangeAllowed = function() {
+		var oSelectedRange = this.getSelectedDates()[0],
+			bValidRangeForMarking = !!(oSelectedRange && oSelectedRange.getStartDate() && !oSelectedRange.getEndDate());
+
+		return this.getIntervalSelection() && bValidRangeForMarking;
 	};
 
 	MonthsRow.prototype.onmouseup = function(oEvent){
+		// BCP: 1980116734
+		// on a combi device right mouse button resulted in a selection
+		var bNotRightMouseButton = oEvent.button !== 2;
 
 		if (this._bMouseMove) {
-			_unbindMousemove.call(this, true);
+			this._unbindMousemove(true);
 
-			// focus now selected day
+			// focus now selected month
 			var oFocusedDate = this._getDate();
 			var aDomRefs = this._oItemNavigation.getItemDomRefs();
 
@@ -844,20 +977,13 @@ sap.ui.define([
 
 			if (this._bMoveChange) {
 				// selection was changed -> make it final
-				var $Target = jQuery(oEvent.target);
-
-				if ($Target.hasClass("sapUiCalItemText")) {
-					$Target = $Target.parent();
+				var bSelected = _selectMonth.call(this, oFocusedDate);
+				if (!bSelected && this._oMoveSelectedDate) {
+					_selectMonth.call(this, this._oMoveSelectedDate);
 				}
-
-				if ($Target.hasClass("sapUiCalItem")) {
-					oFocusedDate = CalendarDate.fromLocalJSDate(this._oFormatYyyymm.parse($Target.attr("data-sap-month")));
-					oFocusedDate.setDate(1);
-				}
-
-				_selectMonth.call(this, oFocusedDate);
 				this._bMoveChange = false;
 				this._bMousedownChange = false;
+				this._oMoveSelectedDate = undefined;
 				_fireSelect.call(this);
 			}
 		}
@@ -865,10 +991,25 @@ sap.ui.define([
 		if (this._bMousedownChange) {
 			this._bMousedownChange = false;
 			_fireSelect.call(this);
+		} else if (Device.support.touch && bNotRightMouseButton && this._areMouseEventCoordinatesInThreshold(oEvent.clientX, oEvent.clientY, 10)) {
+			var classList = oEvent.target.classList,
+				bIsMonthSelected = classList.contains("sapUiCalItemText") || classList.contains("sapUiCalItem"),
+				oSelectedDate = this._getSelectedDateFromEvent(oEvent);
+
+			if (bIsMonthSelected && oSelectedDate) {
+				_selectMonth.call(this, oSelectedDate, false);
+				_fireSelect.call(this);
+			}
 		}
 
 	};
 
+	MonthsRow.prototype.onkeydown = function(oEvent){
+		if (this.getIntervalSelection()) {
+			this._selectedWithMouse = false;
+		}
+	};
+
 	MonthsRow.prototype.onsapselect = function(oEvent){
 
 		// focused item must be selected
@@ -1065,7 +1206,14 @@ sap.ui.define([
 
 		if (oEvent.type == "mousedown") {
 			// as no click event is fired in some cases, e.g. if DOM changed select the month on mousedown
+			if (this.getIntervalSelection()) {
+				this._sLastTargetId = aDomRefs[iIndex].id;
+				this._selectedWithMouse = true;
+			}
 			_handleMousedown.call(this, oEvent, oFocusedDate, iIndex);
+		} else if (this.getIntervalSelection()) {
+			this.setProperty("_focusedDate", oFocusedDate.toLocalJSDate(), true);
+			this.invalidate();
 		}
 
 	}
@@ -1082,6 +1230,11 @@ sap.ui.define([
 		if (oEvent.type == "mousedown") {
 			// as no click event is fired in some cases, e.g. if DOM has changed select the day on mousedown
 			var oFocusedDate = this._getDate();
+			if (this.getIntervalSelection()) {
+				var aDomRefs = this._oItemNavigation.getItemDomRefs();
+				this._sLastTargetId = aDomRefs[iIndex].id;
+				this._selectedWithMouse = true;
+			}
 			_handleMousedown.call(this, oEvent, oFocusedDate, iIndex);
 		}
 
@@ -1137,8 +1290,8 @@ sap.ui.define([
 	*/
 	function _handleMousedown(oEvent, oFocusedDate, iIndex){
 
-		if (oEvent.button) {
-			// only use left mouse button
+		if (oEvent.button || Device.support.touch) {
+			// only use left mouse button; on touch devices avoid selection during scrolling
 			return;
 		}
 
@@ -1149,11 +1302,13 @@ sap.ui.define([
 
 		if (this._bMouseMove) {
 			// a mouseup must be happened outside of control -> just end move
-			_unbindMousemove.call(this, true);
+			this._unbindMousemove(true);
 			this._bMoveChange = false;
+			this._oMoveSelectedDate = undefined;
 		} else if (bSelected && this.getIntervalSelection() && this.$().is(":visible")) {
 			// if closed in select event, do not add mousemove handler
-			_bindMousemove.call(this, true);
+			this._bindMousemove(true);
+			this._oMoveSelectedDate = new CalendarDate(oFocusedDate, this.getProperty("primaryCalendarType"));
 		}
 
 		oEvent.preventDefault();
@@ -1319,7 +1474,7 @@ sap.ui.define([
 
 		if (this._bMouseMove) {
 			// detach mouse move handler because calendar might be losed in select event handler
-			_unbindMousemove.call(this, true);
+			this._unbindMousemove(true);
 		}
 
 		this.fireSelect();
@@ -1391,19 +1546,20 @@ sap.ui.define([
 		}
 	}
 
-	function _bindMousemove(){
+	MonthsRow.prototype._bindMousemove = function(){
 
 		jQuery(window.document).on('mousemove', this._mouseMoveProxy);
 		this._bMouseMove = true;
 
-	}
+	};
 
-	function _unbindMousemove(){
+	MonthsRow.prototype._unbindMousemove = function(){
 
 		jQuery(window.document).off('mousemove', this._mouseMoveProxy);
 		this._bMouseMove = undefined;
+		this._sLastTargetId = undefined;
 
-	}
+	};
 
 	return MonthsRow;
 

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.149.1
+	 * @version 1.151.0
 	 *
 	 * @constructor
 	 * @private

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.149.1
+	 * @version 1.151.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * 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.149.1
+	 * @version 1.151.0
 	 *
 	 * @constructor
 	 * @private

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.149.1
+	 * @version 1.151.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.149.1
+	 * @version 1.151.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.149.1
+	 * @version 1.151.0
 	 * @since 1.28
 	 * @public
 	 */
 	var thisLib = Library.init({
 		name : "sap.ui.unified",
 		apiVersion: 2,
-		version: "1.149.1",
+		version: "1.151.0",
 		dependencies : ["sap.ui.core"],
 		designtime: "sap/ui/unified/designtime/library.designtime",
 		types: [