@openui5/sap.m 1.93.3 → 1.96.2

package/src/sap/m/ComboBoxBase.js

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	'./ComboBoxTextField',
+	'./ComboBoxBaseRenderer',
 	'./SuggestionsPopover',
 	'sap/ui/base/ManagedObjectObserver',
 	'sap/ui/core/SeparatorItem',
@@ -25,6 +26,7 @@ sap.ui.define([
 ],
 	function(
 		ComboBoxTextField,
+		ComboBoxBaseRenderer,
 		SuggestionsPopover,
 		ManagedObjectObserver,
 		SeparatorItem,
@@ -62,7 +64,7 @@ sap.ui.define([
 		 * @abstract
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.2
 		 *
 		 * @constructor
 		 * @public
@@ -140,7 +142,8 @@ sap.ui.define([
 					loadItems: {}
 				},
 				dnd: { draggable: false, droppable: true }
-			}
+			},
+			renderer: ComboBoxBaseRenderer
 		});
 
 		/**

package/src/sap/m/ComboBoxRenderer.js

@@ -69,23 +69,39 @@ sap.ui.define(['./ComboBoxBaseRenderer', 'sap/ui/core/Renderer', 'sap/m/inputUti
 		 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
 		 */
 		ComboBoxRenderer.writeInnerAttributes = function(oRm, oControl) {
-			var oSelectedItem = oControl.getSelectedItem(),
-				oSelectedListItem = oSelectedItem && ListHelpers.getListItem(oSelectedItem),
-				bOpen = oControl.isOpen();
+			var bOpen = oControl.isOpen(), bIsGroupHeader, oSelectedItem, oListItem;
+			var oSuggestionPopover = oControl._getSuggestionsPopover();
 
 			ComboBoxBaseRenderer.writeInnerAttributes.apply(this, arguments);
 			oRm.attr("aria-expanded", bOpen);
 
-			if (!oControl.isOpen()) {
+			if (!oSuggestionPopover) {
 				return;
 			}
 
-			// Aria-activedescendant attributed must be added only if there is selected item
-			// and the visual focus is on it or the visual focus is on the formatted text value state header
-			if (oControl._getSuggestionsPopover().getValueStateActiveState()) {
+			var oFocusedItem = oSuggestionPopover.getFocusedListItem();
+			var bValueStateFocused = oSuggestionPopover.getValueStateActiveState();
+
+			// If the picker is not opened, no active descendant should be set
+			// If there is no focused element in the picker, no active descendant should be set
+			if (!bOpen || (!oFocusedItem && !bValueStateFocused)) {
+				return;
+			}
+
+			// If the value state is focused, set the active descendant in order to read out the value state header
+			if (bValueStateFocused) {
 				oRm.attr("aria-activedescendant", oControl._getFormattedValueStateText().getId());
-			} else if (oSelectedListItem && oSelectedListItem.hasStyleClass("sapMLIBFocused") && oControl.getFocusDomRef() === document.activeElement) {
-				oRm.attr("aria-activedescendant", oSelectedListItem.getId());
+				return;
+			}
+
+			// Active descendant should be set only when there is a selected item or a group header is set
+			bIsGroupHeader = (oFocusedItem.isA("sap.m.GroupHeaderListItem") || oFocusedItem.isA("sap.ui.core.SeparatorItem"));
+			oSelectedItem = oControl.getSelectedItem();
+			oListItem = oSelectedItem && ListHelpers.getListItem(oSelectedItem);
+			oFocusedItem = bIsGroupHeader ? oFocusedItem : oListItem;
+
+			if (oFocusedItem) {
+				oRm.attr("aria-activedescendant", oFocusedItem.getId());
 			}
 		};
 

package/src/sap/m/ComboBoxTextField.js

@@ -35,7 +35,7 @@ sap.ui.define([
 		 * @extends sap.m.InputBase
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.2
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/CustomDynamicDateOption.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/m/DynamicDateOption'],
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.2
 		 *
 		 * @public
 		 * @since 1.92
@@ -46,6 +46,10 @@ sap.ui.define(['sap/m/DynamicDateOption'],
 					 * getValueHelpUITypes is not enough to define the UI.
 					 */
 					createValueHelpUI: { type: "function" },
+					/**
+					 * Defines a method that can validate all controls from the value help UI related to a given option.
+					 */
+					validateValueHelpUI: { type: "function" },
 					/**
 					 * Defines a method that can collect the value from the value help UI.
 					 */
@@ -84,7 +88,7 @@ sap.ui.define(['sap/m/DynamicDateOption'],
 			return sString.charAt(0).toUpperCase() + sString.slice(1);
 		}
 
-		["getText", "getValueHelpUITypes", "createValueHelpUI", "getValueHelpOutput",
+		["getText", "getValueHelpUITypes", "createValueHelpUI", "getValueHelpOutput", "validateValueHelpUI",
 			"getGroup", "getGroupHeader", "format", "parse", "toDates", "enhanceFormattedValue"]
 			.forEach(function(sFnName) {
 				CustomDynamicDateOption.prototype[sFnName] = function() {
@@ -95,5 +99,13 @@ sap.ui.define(['sap/m/DynamicDateOption'],
 				};
 			});
 
+		CustomDynamicDateOption.prototype.getGroupHeader = function() {
+			if ((this.getGroup() < 7 && this.getGroup() > -1) || !this.getGetGroupHeader()) {
+				return DynamicDateOption.prototype.getGroupHeader.apply(this, arguments);
+			} else {
+				return this.getGetGroupHeader().apply(this, arguments);
+			}
+		};
+
 		return CustomDynamicDateOption;
 	});

package/src/sap/m/CustomListItem.js

@@ -24,7 +24,7 @@ sap.ui.define(['./ListItemBase', './library', './CustomListItemRenderer'],
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomTile.js

@@ -21,7 +21,7 @@ sap.ui.define(['./Tile', './library', './CustomTileRenderer'],
 	 * Use the CustomTile control to display application specific content in the Tile control.
 	 * The tile width is 8.5em and height is 10em.
 	 * @extends sap.m.Tile
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomTreeItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *        <code>Table, Form</code> etc, should not be aggregated as content.
 	 * @extends sap.m.TreeItemBase
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @public
 	 * @since 1.48.0

package/src/sap/m/DatePicker.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 // Provides control sap.m.DatePicker.
 sap.ui.define([
 	'sap/ui/thirdparty/jquery',
@@ -89,13 +84,15 @@ sap.ui.define([
 	 * mouse, or keyboard input. It consists of two parts: the date input field and the
 	 * date picker.
 	 *
-	 * <b>Note:</b> The {@link sap.ui.unified.Calendar} is used internally only if the
+	 * <b>Note:</b> The application developer should add dependency to <code>sap.ui.unified</code>
+	 * library on application level to ensure that the library is loaded before the module dependencies will be required.
+	 * The {@link sap.ui.unified.Calendar} is used internally only if the
 	 * <code>DatePicker</code> is opened (not used for the initial rendering). If the
 	 * <code>sap.ui.unified</code> library is not loaded before the
 	 * <code>DatePicker</code> is opened, it will be loaded upon opening. This could
-	 * lead to a waiting time when the <code>DatePicker</code> is opened for the
+	 * lead to CSP compliance issues and adds an additional waiting time when the <code>DatePicker</code> is opened for the
 	 * first time. To prevent this, apps using the <code>DatePicker</code> should also
-	 * load the <code>sap.ui.unified</code> library.
+	 * load the <code>sap.ui.unified</code> library in advance.
 	 *
 	 * <h3>Usage</h3>
 	 *
@@ -151,7 +148,7 @@ sap.ui.define([
 	 * the close event), or select Cancel.
 	 *
 	 * @extends sap.m.DateTimeField
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public
@@ -204,7 +201,17 @@ sap.ui.define([
 			 *
 			 * @since 1.70
 			 */
-			showFooter : {type : "boolean", group : "Misc", defaultValue : false}
+			showFooter : {type : "boolean", group : "Misc", defaultValue : false},
+
+			/**
+			 * Determines whether there is a shortcut navigation to Today. When used in Month, Year or
+			 * Year-range picker view, the calendar navigates to Day picker view.
+			 *
+			 * Note: The Current date button appears if the <code>displayFormat</code> property allows entering day.
+			 *
+			 * @since 1.95
+			 */
+			showCurrentDateButton : {type : "boolean", group : "Behavior", defaultValue : false}
 
 		},
 
@@ -654,6 +661,7 @@ sap.ui.define([
 			var oDateValue = this.getDateValue();
 			if (oDateValue && oDateValue.getTime() < oDate.getTime()) {
 				this._bValid = false;
+				this._bOutOfAllowedRange = true;
 				Log.warning("DateValue not in valid date range", this);
 			}
 		} else {
@@ -694,6 +702,7 @@ sap.ui.define([
 			var oDateValue = this.getDateValue();
 			if (oDateValue && oDateValue.getTime() > oDate.getTime()) {
 				this._bValid = false;
+				this._bOutOfAllowedRange = true;
 				Log.warning("DateValue not in valid date", this);
 			}
 		} else {
@@ -713,6 +722,12 @@ sap.ui.define([
 
 	};
 
+	DatePicker.prototype.setCurrentDateButton = function(bShow) {
+		var oCalendar = this._getCalendar();
+		oCalendar && oCalendar.setCurrentDateButton(bShow);
+		return this.setProperty("showCurrentDateButton", bShow);
+	};
+
 	DatePicker.prototype._checkMinMaxDate = function () {
 
 		if (this._oMinDate.getTime() > this._oMaxDate.getTime()) {
@@ -1101,6 +1116,7 @@ sap.ui.define([
 				showArrow: false,
 				showHeader: false,
 				placement: library.PlacementType.VerticalPreferedBottom,
+				contentWidth: this.$().closest(".sapUiSizeCompact").length > 0 ? "18rem" : "21rem",
 				beginButton: new Button({
 					type: library.ButtonType.Emphasized,
 					text: oResourceBundle.getText("DATEPICKER_SELECTION_CONFIRM"),
@@ -1192,6 +1208,7 @@ sap.ui.define([
 					}.bind(this)
 				});
 
+			this._oCalendar.setShowCurrentDateButton(this.getShowCurrentDateButton());
 			this._oDateRange = new DateRange();
 			this._getCalendar().addSelectedDate(this._oDateRange);
 			this._getCalendar()._setSpecialDatesControlOrigin(this);
@@ -1225,7 +1242,10 @@ sap.ui.define([
 				onAfterRendering: function() {
 					var oPopup = this._oPopup && this._oPopup._getPopup();
 					oPopup && oPopup._oLastPosition && oPopup._applyPosition(oPopup._oLastPosition);
-					this._oCalendar.focus();
+
+					if (this._oPopup.isOpen()) {
+						this._oCalendar.focus();
+					}
 				}.bind(this)
 			};
 			this._oCalendar.addDelegate(this._oCalendarAfterRenderDelegate);
@@ -1514,6 +1534,8 @@ sap.ui.define([
 		this.$("inner").attr("aria-expanded", true);
 
 		InstanceManager.addPopoverInstance(this._oPopup);
+
+		this._oCalendar.focus();
 	}
 
 	function _handleClose() {

package/src/sap/m/DatePickerRenderer.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Renderer', './InputBaseRenderer', 'sap/ui/core/libra
 	 * @param {sap.m.DatePicker} oDP An object representation of the control that should be rendered.
 	 */
 	DatePickerRenderer.writeInnerValue = function(oRm, oDP) {
-		if (oDP._bValid) {
+		if (oDP._bValid || oDP._bOutOfAllowedRange) {
 			oRm.attr("value", oDP._formatValue(oDP.getDateValue()));
 		} else {
 			oRm.attr("value", oDP.getValue());

package/src/sap/m/DateRangeSelection.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 // Provides control sap.m.DateRangeSelection.
 sap.ui.define([
 	'sap/ui/Device',
@@ -59,14 +54,16 @@ sap.ui.define([
 	 * <b>Note:</b>
 	 * The control is not UTC aware and the selected date range starts from 00:00:00:000 of the first date and ends in 23:59:59:999 on the second date.
 	 *
+	 * The application developer should add dependency to <code>sap.ui.unified</code> library
+	 * on application level to ensure that the library is loaded before the module dependencies will be required.
 	 * The {@link sap.ui.unified.Calendar} is used internally only if the
 	 * <code>DateRangeSelection</code> is opened (not used for the initial rendering).
 	 * If the <code>sap.ui.unified</code> library is not loaded before the
 	 * <code>DateRangeSelection</code> is opened, it will be loaded upon opening.
-	 * This could lead to a waiting time when the <code>DateRangeSelection</code> is
+	 * This could lead to CSP compliance issues and adds an additional waiting time when the <code>DateRangeSelection</code> is
 	 * opened for the first time. To prevent this, apps using the
 	 * <code>DateRangeSelection</code> should also load the <code>sap.ui.unified</code>
-	 * library.
+	 * library in advance.
 	 *
 	 * <h3>Usage</h3>
 	 *
@@ -129,8 +126,8 @@ sap.ui.define([
 	 * compact mode and provides a touch-friendly size in cozy mode.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.93.3
-	 * @version 1.93.3
+	 * @version 1.96.2
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimeField.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimeInput.js

@@ -62,7 +62,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimePicker.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 //Provides control sap.m.DateTimePicker.
 sap.ui.define([
 	"sap/ui/thirdparty/jquery",
@@ -71,13 +66,15 @@ sap.ui.define([
 	 * The <code>DateTimePicker</code> control consists of two parts: the input field and the
 	 * date/time picker.
 	 *
-	 * <b>Note:</b> The {@link sap.ui.unified.Calendar} is used internally only if the
+	 * <b>Note:</b> The application developer should add dependency to <code>sap.ui.unified</code> library
+	 * on application level to ensure that the library is loaded before the module dependencies will be required.
+	 * The {@link sap.ui.unified.Calendar} is used internally only if the
 	 * <code>DateTimePicker</code> is opened (not used for the initial rendering). If
 	 * the <code>sap.ui.unified</code> library is not loaded before the
 	 * <code>DateTimePicker</code> is opened, it will be loaded upon opening. This
-	 * could lead to a waiting time when the <code>DateTimePicker</code> is opened for
+	 * could lead to CSP compliance issues and adds an additional waiting time when the <code>DateTimePicker</code> is opened for
 	 * the first time. To prevent this, apps using the <code>DateTimePicker</code>
-	 * should also load the <code>sap.ui.unified</code> library.
+	 * should also load the <code>sap.ui.unified</code> library in advance.
 	 *
 	 * <h3>Usage</h3>
 	 *
@@ -139,7 +136,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public