@openui5/sap.ui.unified 1.128.0 → 1.129.0

package/THIRDPARTY.txt

@@ -468,7 +468,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.16.1
+Component: SAP Theming Base Content, version: 11.18.0
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.128.0",
+  "version": "1.129.0",
   "description": "OpenUI5 UI Library sap.ui.unified",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.128.0"
+    "@openui5/sap.ui.core": "1.129.0"
   }
 }

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

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.128.0</version>
+  <version>1.129.0</version>
 
   <documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
 

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

@@ -78,7 +78,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public
@@ -719,7 +719,7 @@ sap.ui.define([
 			this._sLocale = sLocale;
 			this._oLocaleData = undefined;
 			this.invalidate();
-			this._toggleTwoMonthsInTwoColumnsCSS();
+			this._toggleTwoMonthsInColumnsCSS();
 		}
 
 		return this;
@@ -860,7 +860,7 @@ sap.ui.define([
 				oMonth.setSecondaryCalendarType(this._getSecondaryCalendarType());
 				this.addAggregation("month", oMonth);
 			}
-			this._toggleTwoMonthsInTwoColumnsCSS();
+			this._toggleTwoMonthsInColumnsCSS();
 		} else if (aMonths.length > iMonths){
 			for (i = aMonths.length; i > iMonths; i--) {
 				oMonth = this.removeAggregation("month", i - 1);
@@ -870,7 +870,7 @@ sap.ui.define([
 				// back to standard case -> initialize month width
 				this._bInitMonth = true;
 			}
-			this._toggleTwoMonthsInTwoColumnsCSS();
+			this._toggleTwoMonthsInColumnsCSS();
 		}
 
 		if (iMonths > 1 && aMonths[0].getDate()) {
@@ -1331,7 +1331,7 @@ sap.ui.define([
 		}
 		this._setHeaderText(oCalDate);
 		this._setPrimaryHeaderMonthButtonText();
-		this._toggleTwoMonthsInTwoColumnsCSS();
+		this._toggleTwoMonthsInColumnsCSS();
 	};
 
 	Calendar.prototype._updateLegendParent = function(){
@@ -1836,7 +1836,7 @@ sap.ui.define([
 		// change month and year
 		this._updateHeader(oFirstDate);
 		this._setPrimaryHeaderMonthButtonText();
-		this._toggleTwoMonthsInTwoColumnsCSS();
+		this._toggleTwoMonthsInColumnsCSS();
 
 		if (bFireStartDateChange) {
 			this.fireStartDateChange();
@@ -2432,7 +2432,7 @@ sap.ui.define([
 	 * Toggle On or Off CSS class for indicating if calendar is in two columns with two calendars mode
 	 * @private
 	 */
-	Calendar.prototype._toggleTwoMonthsInTwoColumnsCSS = function () {
+	Calendar.prototype._toggleTwoMonthsInColumnsCSS = function () {
 		if (this._isTwoMonthsInTwoColumns()) {
 			if (new Locale(Localization.getLanguageTag()).getLanguage().toLowerCase() === "ja" ||
 				new Locale(Localization.getLanguageTag()).getLanguage().toLowerCase() === "zh") {
@@ -2446,6 +2446,12 @@ sap.ui.define([
 			this.removeStyleClass("sapUiCalTwoMonthsTwoColumnsJaZh");
 			this.removeStyleClass("sapUiCalTwoMonthsTwoColumns");
 		}
+
+		if (this._isTwoMonthsInOneColumn()) {
+			this.addStyleClass("sapUiCalTwoMonthsInOneColumn");
+		} else {
+			this.removeStyleClass("sapUiCalTwoMonthsInOneColumn");
+		}
 	};
 
 	/**
@@ -2694,7 +2700,7 @@ sap.ui.define([
 		}
 
 		this._setPrimaryHeaderMonthButtonText();
-		this._toggleTwoMonthsInTwoColumnsCSS();
+		this._toggleTwoMonthsInColumnsCSS();
 	}
 
 	/**
@@ -2748,7 +2754,7 @@ sap.ui.define([
 
 				this._setHeaderText(oDate);
 				this._setPrimaryHeaderMonthButtonText();
-				this._toggleTwoMonthsInTwoColumnsCSS();
+				this._toggleTwoMonthsInColumnsCSS();
 			}
 		}
 

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 *
 	 * Applications could inherit from this element to add own fields.
 	 * @extends sap.ui.unified.DateTypeRange
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @class
 	 * <code>CalendarDateInterval</code> only visualizes the dates in a one-line interval and allows the selection of a single day.
 	 * @extends sap.ui.unified.Calendar
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @class
 	 * Item to be displayed in a CalendarLegend.
 	 * @extends sap.ui.core.Element
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * <b>Note:</b> UI5Date or JavaScript Date objects are used to set and return the months, mark them as selected or as a special type.
 	 * But the date part of the Date object is not used. If a Date object is returned the date will be set to the 1st of the corresponding month.
 	 * @extends sap.ui.core.Control
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * Navigation via year picker switches to the corresponding year and the same month as before the navigation.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.128.0
+		 * @version 1.129.0
 		 *
 		 * @constructor
 		 * @private

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

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @class
 	 * A calendar row with a header and appointments. The Appointments will be placed in the defined interval.
 	 * @extends sap.ui.core.Control
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -267,10 +267,8 @@ sap.ui.define([
 
 	CalendarRowRenderer.renderInterval = function(oRm, oRow, iInterval, iWidth,  aIntervalHeaders, aNonWorkingItems, iStartOffset, iNonWorkingMax, aNonWorkingSubItems, iSubStartOffset, iNonWorkingSubMax, bFirstOfType, bLastOfType){
 		const oStartDateInterval = oRow.getStartDate();
-		const oEndDate = UI5Date.getInstance(oRow.getStartDate());
-		oEndDate.setDate(oEndDate.getDate() + 1);
 		const oCellStartDate = UI5Date.getInstance(oStartDateInterval);
-		oCellStartDate.setHours(iInterval + iStartOffset);
+		oCellStartDate.setHours(iInterval + iStartOffset, 0, 0, 0);
 
 		var sId = oRow.getId() + "-AppsInt" + iInterval;
 		var i;
@@ -281,6 +279,9 @@ sap.ui.define([
 		const aFilteredNonWorkingRange = oRow.getIntervalType() !== CalendarIntervalType.Hour ?
 			[] :
 			oRow.getNonWorkingPeriods().filter((oPeriod) => {
+				if (!oPeriod.isRecurring()) {
+					return oPeriod.hasNonWorkingAtDate(oStartDateInterval);
+				}
 				const hasOccurrenceOnDate = RecurrenceUtils.hasOccurrenceOnDate.bind(oPeriod);
 				return hasOccurrenceOnDate(oStartDateInterval);
 			});

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

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @class
 	 * Calendar with granularity of time items displayed in one line.
 	 * @extends sap.ui.core.Control
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -39,7 +39,7 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarUtils', 'sap/ui/unified/calendar
 		 * its start date to the first date of the same week as the date the user chose.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.128.0
+		 * @version 1.129.0
 		 *
 		 * @constructor
 		 * @private

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

@@ -69,7 +69,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -49,7 +49,7 @@ sap.ui.define([
 		 * A thin wrapper over {@link sap.ui.unified.ColorPicker} allowing the latter to be used in a popover.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.128.0
+		 * @version 1.129.0
 		 *
 		 * @constructor
 		 * @public

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

@@ -175,7 +175,23 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 		oRm.openEnd();
 		oRm.text("%");
 		oRm.close("div");
-		oControl.getMode() === "HSL" ?  this.renderLFirst(oRm, oControl) : this.renderVFirst(oRm, oControl);
+
+		const bHSL = oControl.getMode() === "HSL";
+		if (bHSL) {
+			oRm.renderControl(oControl.getAggregation("_oLitField"));
+		} else {
+			oRm.renderControl(oControl.getAggregation("_oValField"));
+		}
+		oRm.openStart("div");
+		oRm.class("sapUiCPPercentSymbol");
+		if (!bHSL) {
+			oRm.style("visibility", "hidden");
+		}
+		oRm.openEnd();
+		oRm.text("%");
+		oRm.close("div");
+
+		oRm.renderControl(oControl.getAggregation("_oAlphaField2"));
 		oRm.close("div");
 		this.renderHSLVLabel(oRm, oControl);
 	};
@@ -263,24 +279,6 @@ sap.ui.define(['./ColorPickerDisplayMode', "sap/ui/Device", "sap/ui/core/Lib"],
 		oRm.close("div");
 	};
 
-	//Renders Lit first and sets visibility hidden to Val because of flex rendering reasons.
-	ColorPickerRenderer.renderLFirst = function(oRm, oControl) {
-		oRm.renderControl(oControl.getAggregation("_oLitField"));
-		oRm.openStart("div");
-		oRm.class("sapUiCPPercentSymbol");
-		oRm.openEnd();
-		oRm.text("%");
-		oRm.close("div");
-		oRm.renderControl(oControl.getAggregation("_oValField"));
-	};
-
-	//Renders Val first and sets visibility hidden to Lit because of flex rendering reasons.
-	ColorPickerRenderer.renderVFirst = function(oRm, oControl) {
-		oRm.renderControl(oControl.getAggregation("_oValField"));
-		this.renderEmptyDiv(oRm);
-		oRm.renderControl(oControl.getAggregation("_oLitField"));
-	};
-
 	//Renders empty div because of display flex rendering reasons.
 	ColorPickerRenderer.renderEmptyDiv = function(oRm) {
 		oRm.openStart("div");

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.128.0
+		 * @version 1.129.0
 		 *
 		 * @constructor
 		 * @public

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

@@ -14,7 +14,7 @@ sap.ui.define(["sap/m/library", "sap/ui/core/Lib"],
 	/**
 	 * Currency renderer.
 	 *
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @namespace
 	 */
 	var CurrencyRenderer = {

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

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/calendar/Cale
 	 * @class
 	 * Date range for use in DatePicker
 	 * @extends sap.ui.core.Element
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -25,7 +25,7 @@ sap.ui.define(['./DateRange', './library'],
 	 * @class
 	 * Date range with calendar day type information. Used to visualize special days in the Calendar.
 	 * @extends sap.ui.unified.DateRange
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.unified.IProcessableBlobs
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.128.0
+		 * @version 1.129.0
 		 *
 		 * @constructor
 		 * @since 1.52

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

@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IContextMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @since 1.21.0
 	 *
 	 * @constructor
@@ -147,7 +147,13 @@ sap.ui.define([
 						 */
 						item : {type : "sap.ui.unified.MenuItemBase"}
 					}
-				}
+				},
+
+				/**
+				 * Fired when the menu is closed.
+				 * @since 1.129
+				 */
+				closed: {}
 
 			}
 		},
@@ -618,6 +624,9 @@ sap.ui.define([
 	 * @private
 	 */
 	Menu.prototype._menuClosed = function() {
+
+		this.fireClosed();
+
 		//TBD: standard popup autoclose: this.close(); //Ensure proper cleanup
 		if (this.oOpenerRef) {
 			if (!this.bIgnoreOpenerDOMRef) {

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @implements sap.ui.unified.IMenuItem
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

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

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/core/IconPool', 'sap/
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @implements sap.ui.unified.IMenuItem
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @since 1.127.0
 	 *
 	 * @constructor

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

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/core/ControlBehavior"],
 	 * Menu renderer.
 	 * @author SAP - TD Core UI&AM UI Infra
 	 *
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @namespace
 	 */
 	var MenuRenderer = {

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

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @implements sap.ui.unified.IMenuItem
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * NonWorkingPeriod
 	 * @extends sap.ui.core.Element
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public
@@ -106,5 +106,35 @@ sap.ui.define([
 		return false;
 	};
 
+	/**
+	 * Evaluates whether there is an non working period for a given date.
+	 * @param {Date|module:sap/ui/core/date/UI5Date} oDate A date instance
+	 * @return {boolean} True if there is an occurrence for this day
+	 */
+	NonWorkingPeriod.prototype.hasNonWorkingAtDate = function (oDate) {
+		const oStartDate = UI5Date.getInstance(this.getStartDate());
+		const oCurrentDate = UI5Date.getInstance(oDate);
+		oStartDate.setHours(0,0,0);
+		oCurrentDate.setHours(0,0,0);
+
+		const isDateInRange = oCurrentDate >= oStartDate && oCurrentDate <= this.getEndDate();
+
+		return  isDateInRange;
+	};
+
+	/**
+	 * Evaluates whether there is an occurrence for the given date and hours.
+	 * @param {Date|module:sap/ui/core/date/UI5Date} oDate A date instance
+	 * @return {boolean} True if there is an occurrence for these hours
+	 * @private
+	 */
+	NonWorkingPeriod.prototype.hasNonWorkingAtHour = function (oDate) {
+		const iStartHours = this.getStartDate().getHours();
+		const iTimeCalendarItem = iStartHours + (this.getStartDate().getMinutes() + this.getDurationInMinutes()) / 60;
+		const iTimeData = oDate.getHours() + oDate.getMinutes() / 60;
+
+		return oDate.getHours() === iStartHours || (iTimeCalendarItem >= iTimeData && iStartHours <= oDate.getHours());
+	};
+
 	return NonWorkingPeriod;
 });

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * Applications can inherit from this element to add own fields.
 	 * @extends sap.ui.unified.
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public
@@ -55,20 +55,6 @@ sap.ui.define([
 		}
 	}});
 
-	/**
-	 * Evaluates whether there is an occurrence for the given date and hours.
-	 * @param {Date|module:sap/ui/core/date/UI5Date} oDate A date instance
-	 * @return {boolean} True if there is an occurrence for these hours
-	 * @private
-	 */
-	RecurringNonWorkingPeriod.prototype.hasNonWorkingAtHour = function (oDate) {
-		const iStartHours = this.getStartDate().getHours();
-		const iTimeCalendarItem = iStartHours + (this.getStartDate().getMinutes() + this.getDurationInMinutes()) / 60;
-		const iTimeData = oDate.getHours() + oDate.getMinutes() / 60;
-
-		return oDate.getHours() === iStartHours || (iTimeCalendarItem >= iTimeData && iStartHours <= oDate.getHours());
-	};
-
 	/**
 	 * Determines whether the current instance has recurrence or not.
 	 * @return {boolean} The result is <code>true</code> when the instance has recurrence.

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

@@ -25,7 +25,7 @@ sap.ui.define(['./ShellHeader', './ShellLayout', './library', './ShellRenderer']
 	 * @extends sap.ui.unified.ShellLayout
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

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

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class
 	 * Time range for use in <code>NonWorkingPeriod</code>
 	 * @extends sap.ui.core.Element
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

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

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

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

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

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

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

@@ -83,7 +83,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.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -55,7 +55,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.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -66,7 +66,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.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @public

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.128.0
+	 * @version 1.129.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -46,14 +46,14 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.unified.RecurringNonWorkingPeriod
 		 */
 		RecurrenceUtils.hasOccurrenceOnDate = function (oDate) {
-			if (this?.getRecurrenceType() !== "Daily") {
+			if (this.getRecurrenceType() !== "Daily") {
 				return false;
 			}
 
 			const oStartDate = UI5Date.getInstance(this.getStartDate());
 			const oCurrentDate = UI5Date.getInstance(oDate);
-			oStartDate.setHours(0,0,0);
-			oCurrentDate.setHours(0,0,0);
+			oStartDate.setHours(0,0,0,0);
+			oCurrentDate.setHours(0,0,0,0);
 
 			const iDayInMilliseconds = 24 * 60 * 60 * 1000;
 			const isDateInRange = oCurrentDate >= oStartDate && oCurrentDate <= this.getRecurrenceEndDate();
@@ -72,7 +72,7 @@ sap.ui.define([
 				const iTimePart = oNonWorkingPartDate.getHours() * iMinutesInOneHours + oNonWorkingPartDate.getMinutes();
 				iDuration -= (iTimeCell - iTimePart);
 			} else if (oNonWorkingPartDate.getHours() === oCellStartDate.getHours() && oNonWorkingPartDate.getMinutes() > 0) {
-				iDuration = oNonWorkingPart.getDurationInMinutes() > 60 ? iMinutesInOneHours - iCurrentPointInMinutes : oNonWorkingPart.getDurationInMinutes();
+				iDuration = oNonWorkingPart.getDurationInMinutes() + iCurrentPointInMinutes > 60 ? iMinutesInOneHours - iCurrentPointInMinutes : oNonWorkingPart.getDurationInMinutes();
 			} else {
 				iDuration = iMinutesInOneHours - iCurrentPointInMinutes;
 			}

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

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

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

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

package/src/sap/ui/unified/themes/base/Calendar.less

@@ -567,6 +567,7 @@ html.sapUiMedia-Std-Phone .sapUiCalHeadB0{
 	width: 12.5rem;
 }
 
+.sapUiCalTwoMonthsInOneColumn .sapUiCalHeadB1,
 .sapUiCalTwoMonthsTwoColumnsJaZh .sapUiCalHeadB1,
 .sapUiCalTwoMonthsTwoColumnsJaZh .sapUiCalHeadB2,
 .sapUiCalTwoMonthsTwoColumnsJaZh .sapUiCalHeadB3,

package/src/sap/ui/unified/themes/base/ColorPicker.less

@@ -632,15 +632,14 @@ html[data-sap-ui-browser^="ie"] .sapMPopover .sapUiColorPicker-ColorPickerMatrix
 	}
 	.sapUiCPHSLV {
 		display: flex;
-		& > div:last-child {
-			visibility: hidden; //hide the not needed input (val or lit) for display flex reasons
+		& > div:last-child:not(.ColorPickerInputFieldsLeft) {
+			bottom: 2rem;
 		}
 	}
 	.sapUiCPRGBA {
 		display: flex;
-		& > div:last-child:not(.ColorPickerInputFieldsLeft) {
-			//move A field down
-			top: 2rem;
+		& > div:last-child {
+			visibility: hidden;
 		}
 	}
 	.sapUiCPHSLVText {