@openui5/sap.m 1.92.0 → 1.95.0

package/src/sap/m/ColumnPopoverActionItem.js

@@ -16,7 +16,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/Button'], function(ColumnPopoverIte
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverCustomItem.js

@@ -17,7 +17,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/ToggleButton'], function(ColumnPopo
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverItem.js

@@ -16,7 +16,7 @@ sap.ui.define(['sap/ui/core/Element'], function(Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverSelectListItem.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @since 1.86

package/src/sap/m/ColumnPopoverSortItem.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @since 1.66

package/src/sap/m/ComboBox.js

@@ -108,7 +108,7 @@ sap.ui.define([
 		 * </ul>
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.95.0
 		 *
 		 * @constructor
 		 * @extends sap.m.ComboBoxBase

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.92.0
+		 * @version 1.95.0
 		 *
 		 * @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.92.0
+		 * @version 1.95.0
 		 *
 		 * @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.92.0
+		 * @version 1.95.0
 		 *
 		 * @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() {

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

package/src/sap/m/DatePicker.js

@@ -18,6 +18,7 @@ sap.ui.define([
 	'./DateTimeField',
 	'./Button',
 	'./ResponsivePopover',
+	"./ValueStateHeader",
 	'sap/ui/core/date/UniversalDate',
 	'./library',
 	'sap/ui/core/Control',
@@ -46,6 +47,7 @@ sap.ui.define([
 		DateTimeField,
 		Button,
 		ResponsivePopover,
+		ValueStateHeader,
 		UniversalDate,
 		library,
 		Control,
@@ -149,7 +151,7 @@ sap.ui.define([
 	 * the close event), or select Cancel.
 	 *
 	 * @extends sap.m.DateTimeField
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -202,7 +204,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}
 
 		},
 
@@ -485,7 +497,7 @@ sap.ui.define([
 	DatePicker.prototype.onfocusin = function(oEvent) {
 
 		if (!jQuery(oEvent.target).hasClass("sapUiIcon")) {
-			InputBase.prototype.onfocusin.apply(this, arguments);
+			DateTimeField.prototype.onfocusin.apply(this, arguments);
 		}
 
 		this._bFocusNoPopup = undefined;
@@ -652,6 +664,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 {
@@ -692,6 +705,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 {
@@ -711,6 +725,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()) {
@@ -1099,6 +1119,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"),
@@ -1190,6 +1211,7 @@ sap.ui.define([
 					}.bind(this)
 				});
 
+			this._oCalendar.setShowCurrentDateButton(this.getShowCurrentDateButton());
 			this._oDateRange = new DateRange();
 			this._getCalendar().addSelectedDate(this._oDateRange);
 			this._getCalendar()._setSpecialDatesControlOrigin(this);
@@ -1208,6 +1230,11 @@ sap.ui.define([
 
 				this._oPopup._getButtonFooter().setVisible(this.getShowFooter());
 				this._getCalendar()._bSkipCancelButtonRendering = true;
+				if (!this._oPopup.getContent().length) {
+					var oHeader = this._getValueStateHeader();
+					this._oPopup.addContent(this._getValueStateHeader());
+					oHeader.setPopup(this._oPopup._oControl);
+				}
 				this._oPopup.addContent(this._getCalendar());
 
 				if (!this.getDateValue()) {

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

@@ -129,8 +129,8 @@ sap.ui.define([
 	 * compact mode and provides a touch-friendly size in cozy mode.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.92.0
-	 * @version 1.92.0
+	 * @version 1.95.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimeField.js

@@ -10,6 +10,8 @@ sap.ui.define([
 	'sap/ui/model/odata/type/ODataType',
 	'sap/ui/model/odata/type/DateTimeBase',
 	'./InputBase',
+	'./ValueStateHeader',
+	'sap/ui/core/Core',
 	'sap/ui/core/LocaleData',
 	'sap/ui/core/library',
 	'sap/ui/core/format/DateFormat',
@@ -24,6 +26,8 @@ sap.ui.define([
 	ODataType,
 	DateTimeBase,
 	InputBase,
+	ValueStateHeader,
+	Core,
 	LocaleData,
 	coreLibrary,
 	DateFormat,
@@ -37,6 +41,9 @@ sap.ui.define([
 	// shortcut for sap.ui.core.CalendarType
 	var CalendarType = coreLibrary.CalendarType;
 
+	// shortcut for sap.ui.core.ValueState
+	var ValueState = coreLibrary.ValueState;
+
 	/**
 	 * Constructor for a new <code>sap.m.DateTimeField</code>.
 	 *
@@ -52,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -213,6 +220,37 @@ sap.ui.define([
 		return null;
 	};
 
+	DateTimeField.prototype.onfocusin = function(oEvent) {
+
+		if (!jQuery(oEvent.target).hasClass("sapUiIcon")) {
+			this.addStyleClass("sapMFocus");
+		}
+
+		if (!jQuery(oEvent.target).hasClass("sapMInputBaseIconContainer") && !(this._oPopup && this._oPopup.isOpen())) {
+			// open value state message popup when focus is in the input
+			this.openValueStateMessage();
+		} else if (this._oValueStateHeader) {
+			this._oValueStateHeader.setVisible(this.getValueState() !== ValueState.None);
+		}
+
+	};
+
+	DateTimeField.prototype._getValueStateHeader = function () {
+		var sValueState;
+
+		if (!this._oValueStateHeader) {
+			sValueState = this.getValueState();
+
+			this._oValueStateHeader = new ValueStateHeader({
+				text: this._getTextForPickerValueStateContent(),
+				valueState: sValueState,
+				visible: sValueState !== ValueState.None
+			});
+		}
+
+		return this._oValueStateHeader;
+	};
+
 	DateTimeField.prototype._dateValidation = function (oDate) {
 		this._bValid = true;
 		this.setProperty("dateValue", oDate);
@@ -463,6 +501,36 @@ sap.ui.define([
 		return !oDate || Object.prototype.toString.call(oDate) === "[object Date]";
 	};
 
+	/**
+	 * Gets the text for the picker's subheader title.
+	 * In case <code>valueStateText</code> is not set, a default value is returned.
+	 * @returns {string}
+	 * @private
+	 */
+	DateTimeField.prototype._getTextForPickerValueStateContent = function() {
+		return this.getValueStateText() || this._getDefaultTextForPickerValueStateContent();
+	};
+
+	/**
+	 * Gets the default text for the picker's subheader title.
+	 * @returns {string}
+	 * @private
+	 */
+	DateTimeField.prototype._getDefaultTextForPickerValueStateContent = function() {
+		var sValueState = this.getValueState(),
+			oResourceBundle,
+			sText;
+
+		if (sValueState === ValueState.None) {
+			sText = "";
+		} else {
+			oResourceBundle = Core.getLibraryResourceBundle("sap.ui.core");
+			sText = oResourceBundle.getText("VALUE_STATE_" + sValueState.toUpperCase());
+		}
+
+		return sText;
+	};
+
 	return DateTimeField;
 
 });

package/src/sap/m/DateTimeInput.js

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

package/src/sap/m/DateTimePicker.js

@@ -139,7 +139,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -262,7 +262,9 @@ sap.ui.define([
 		},
 
 		onAfterRendering: function() {
-			this.getAggregation('timeSliders').getAggregation("_columns")[0].setIsExpanded(false);
+			if (this.getAggregation('timeSliders') && this.getAggregation('timeSliders').getAggregation("_columns")) {
+				this.getAggregation('timeSliders').getAggregation("_columns")[0].setIsExpanded(false);
+			}
 			if (Device.system.phone || jQuery('html').hasClass("sapUiMedia-Std-Phone")) {
 				var oSwitcher = this.getAggregation("_switcher");
 				var sKey = oSwitcher.getSelectedKey();
@@ -525,15 +527,20 @@ sap.ui.define([
 				type: ButtonType.Emphasized,
 				press: _handleOkPress.bind(this)
 			});
+			var oHeader = this._getValueStateHeader();
 			this._oPopup = new ResponsivePopover(this.getId() + "-RP", {
 				showCloseButton: false,
 				showHeader: false,
 				placement: PlacementType.VerticalPreferedBottom,
 				beginButton: this._oOKButton,
-				content: this._oPopupContent,
+				content: [
+					oHeader,
+					this._oPopupContent
+				],
 				afterOpen: _handleAfterOpen.bind(this),
 				afterClose: _handleAfterClose.bind(this)
 			});
+			oHeader.setPopup(this._oPopup._oControl);
 
 
 			if (Device.system.phone) {
@@ -579,7 +586,7 @@ sap.ui.define([
 
 		this._oPopup.openBy(this);
 
-		var oSliders = this._oPopup.getContent()[0] && this._oPopup.getContent()[0].getTimeSliders();
+		var oSliders = this._oPopup.getContent()[1] && this._oPopup.getContent()[1].getTimeSliders();
 		if (oSliders) {//Sliders values need to be updated after a popup is (especially sliders) is really visible
 			setTimeout(oSliders._updateSlidersValues.bind(oSliders), 0);
 		}
@@ -712,14 +719,14 @@ sap.ui.define([
 	 * @private
 	 */
 	DateTimePicker.prototype._handleWindowResize = function(mParams) {
-		var oSwitcher = this.getAggregation("_popup").getContent()[0].getAggregation("_switcher"),
-			oCalendar = this.getAggregation("_popup").getContent()[0].getCalendar(),
-			oSliders = this.getAggregation("_popup").getContent()[0].getTimeSliders();
+		var oSwitcher = this.getAggregation("_popup").getContent()[1].getAggregation("_switcher"),
+			oCalendar = this.getAggregation("_popup").getContent()[1].getCalendar(),
+			oSliders = this.getAggregation("_popup").getContent()[1].getTimeSliders();
 
 		if (mParams.name === STANDART_PHONE_RANGESET) {
 			oSwitcher.setVisible(true);
 			// Getting "sap.m.internal.DateTimePickerPopup" instance in order to call "_switchVisibility(sKey)" method
-			this.getAggregation("_popup").getContent()[0]._switchVisibility(oSwitcher.getSelectedKey());
+			this.getAggregation("_popup").getContent()[1]._switchVisibility(oSwitcher.getSelectedKey());
 		} else {
 			oSwitcher.setVisible(false);
 			oSliders.$().css("display", "");