@openui5/sap.m 1.100.0 → 1.102.1

package/src/sap/m/DynamicDateFormat.js

@@ -170,10 +170,11 @@ sap.ui.define([
 		 * Formats a list according to the given format options.
 		 *
 		 * @param {object} oObj The value to format
+		 * @param {boolean} bSkipCustomFormatting If set to <code>true</code> the formatter does not format to the equivalent user-friendly string. Instead, the formatter uses the specified option key and parameters.
 		 * @return {string} The formatted output value.
 		 * @public
 		 */
-		DynamicDateFormat.prototype.format = function(oObj) {
+		DynamicDateFormat.prototype.format = function(oObj, bSkipCustomFormatting) {
 			var sKey = oObj.operator;
 			var aParams = oObj.values.slice(0);
 
@@ -189,10 +190,10 @@ sap.ui.define([
 
 				aParams[0] = this._monthFormatter.format(oDate);
 				aParams[1] = this._yearFormatter.format(oDate);
-			} else if (sKey === "LASTDAYS" && aParams[0] === 1) {
+			} else if (sKey === "LASTDAYS" && aParams[0] === 1 && !bSkipCustomFormatting) {
 				sKey = "YESTERDAY";
 				aParams = [];
-			} else if (sKey === "NEXTDAYS" && aParams[0] === 1) {
+			} else if (sKey === "NEXTDAYS" && aParams[0] === 1 && !bSkipCustomFormatting) {
 				sKey = "TOMORROW";
 				aParams = [];
 			} else if ((sKey === "LASTDAYS" || sKey === "NEXTDAYS") && aParams[0] === 0) {
@@ -278,7 +279,7 @@ sap.ui.define([
 							break;
 					}
 
-					if (!oVal) {
+					if (!oVal && oVal !== 0) {
 						aResult = null;
 						break;
 					}

package/src/sap/m/DynamicDateOption.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.100.0
+		 * @version 1.102.1
 		 *
 		 * @public
 		 * @since 1.92
@@ -100,7 +100,7 @@ sap.ui.define([
 		 * @public
 		 */
 		DynamicDateOption.prototype.createValueHelpUI = function(oControl, fnControlsUpdated) {
-			var oValue = oControl.getValue(),
+			var oValue = oControl.getValue() && Object.assign({}, oControl.getValue()),
 				aParams = this.getValueHelpUITypes(oControl),
 				valueHelpUiTypesCount = aParams.length,
 				aControls = [],
@@ -111,6 +111,16 @@ sap.ui.define([
 			}
 			oControl.aControlsByParameters[this.getKey()] = [];
 
+			if (oValue && oValue.values) {
+				oValue.values = oValue.values.map(function(val) {
+					if (val instanceof Date) {
+						return oControl._reverseConvertDate(val);
+					}
+
+					return val;
+				});
+			}
+
 			for (var i = 0; i < aParams.length; i++) {
 				if (aParams[i].getText()) {
 					aControls.push(

package/src/sap/m/DynamicDateRange.js

@@ -19,6 +19,7 @@ sap.ui.define([
 	'sap/ui/core/Icon',
 	"sap/ui/core/LabelEnablement",
 	'sap/ui/core/format/DateFormat',
+	'sap/ui/core/format/TimezoneUtil',
 	'sap/ui/base/ManagedObjectObserver',
 	'sap/ui/Device',
 	'./Label',
@@ -52,6 +53,7 @@ sap.ui.define([
 		Icon,
 		LabelEnablement,
 		DateFormat,
+		TimezoneUtil,
 		ManagedObjectObserver,
 		Device,
 		Label,
@@ -119,7 +121,7 @@ sap.ui.define([
 		 * is opened. The dialog is closed via a date time period value selection or by pressing the "Cancel" button.
 		 *
 		 * @author SAP SE
-		 * @version 1.100.0
+		 * @version 1.102.1
 		 *
 		 * @constructor
 		 * @public
@@ -381,6 +383,8 @@ sap.ui.define([
 			this._oInput.setPlaceholder(this.getPlaceholder());
 			this._oInput.setValueState(this.getValueState());
 			this._oInput.setValueStateText(this.getValueStateText());
+
+			this.setValue(this._substitudeMissingValue(this.getValue()));
 		};
 
 		DynamicDateRange.prototype.setValue = function(oValue) {
@@ -627,7 +631,9 @@ sap.ui.define([
 		 * @private
 		 */
 		DynamicDateRange.prototype._addSuggestionItem = function(oSuggestValue) {
-			var aResultingDates = DynamicDateUtil.toDates(oSuggestValue);
+			var aResultingDates = DynamicDateUtil.toDates(oSuggestValue).map(function(oDate) {
+				return this._convertDate(oDate);
+			}, this);
 
 			var oItem = new ListItem({
 				text: DynamicDateUtil.getOption(oSuggestValue.operator).format(oSuggestValue, this._getFormatter()),
@@ -696,7 +702,44 @@ sap.ui.define([
 		};
 
 		DynamicDateRange.prototype._toDatesString = function(oValue) {
-			return this._getDatesLabelFormatter().format(DynamicDateUtil.toDates(oValue));
+			var aDates = DynamicDateUtil.toDates(oValue).map(function(oDate) {
+				return this._convertDate(oDate);
+			}, this);
+
+			return this._getDatesLabelFormatter().format(aDates);
+		};
+
+		DynamicDateRange.prototype._convertDate = function(oDate) {
+			var sFormattedDate = this._getPickerParser().format(oDate, TimezoneUtil.getLocalTimezone());
+			var oParts = this._getPickerParser().parse(
+				sFormattedDate,
+				sap.ui.getCore().getConfiguration().getTimezone()
+			);
+			var oNewDate = oParts ? new Date(oParts[0].getTime()) : oParts;
+
+			return oNewDate;
+		};
+
+		DynamicDateRange.prototype._reverseConvertDate = function(oDate) {
+			var sFormattedDate = this._getPickerParser().format(
+				oDate,
+				sap.ui.getCore().getConfiguration().getTimezone()
+			);
+			var oParts = this._getPickerParser().parse(
+				sFormattedDate,
+				TimezoneUtil.getLocalTimezone()
+			);
+			var oNewDate = oParts ? new Date(oParts[0].getTime()) : oParts;
+
+			return oNewDate;
+		};
+
+		DynamicDateRange.prototype._getPickerParser = function() {
+			if (!this._calendarParser) {
+				this._calendarParser = DateFormat.getDateTimeWithTimezoneInstance({ showTimezone: false });
+			}
+
+			return this._calendarParser;
 		};
 
 		DynamicDateRange.prototype._createPopup = function() {
@@ -918,7 +961,10 @@ sap.ui.define([
 				return;
 			}
 
-			aResultDates = DynamicDateUtil.toDates(oOutputValue);
+			aResultDates = DynamicDateUtil.toDates(oOutputValue).map(function(oDate) {
+				return this._convertDate(oDate);
+			}, this);
+
 			if (aResultDates) {
 				if (this._oSelectedOption.getKey() === "FROMDATETIME" || this._oSelectedOption.getKey() === "TODATETIME"
 					|| this._oSelectedOption.getKey() === "FROM" || this._oSelectedOption.getKey() === "TO") {
@@ -1087,7 +1133,7 @@ sap.ui.define([
 			if (oToPage === oOptionDetailsPage) {
 				this.aInputControls.forEach(function(oControl) {
 					if (oControl.$().firstFocusableDomRef()) {
-						oControl.addAriaLabelledBy && oControl.addAriaLabelledBy(oToPage.getAggregation("_internalHeader"));
+						oControl.addAriaLabelledBy && oControl.addAriaLabelledBy(oToPage.getId() + "-title");
 
 						if (!this._isCalendarBasedControl(oControl) && oControl.addAriaDescribedBy) {
 							oControl.addAriaDescribedBy(oToPage.getFooter().getContent()[0]);
@@ -1125,13 +1171,21 @@ sap.ui.define([
 				return;
 			}
 
-			this._oPopup._getPopup().setAutoCloseAreas([this._oInput.getDomRef()]);
+			this._oPopup._getPopup().setExtraContent([this._oInput.getDomRef()]);
 			this._oPopup.openBy(this._oInput);
 		};
 
 		DynamicDateRange.prototype._applyValue = function() {
 			this._oOutput = this._oSelectedOption.getValueHelpOutput(this);
 
+			this._oOutput.values = this._oOutput.values.map(function(val) {
+				if (val instanceof Date) {
+					return this._convertDate(val);
+				}
+
+				return val;
+			}, this);
+
 			var prevValue = this.getValue();
 			this.setValue(this._oOutput);
 			this.fireChange({ prevValue: prevValue, value: this.getValue(), valid: true });
@@ -1190,6 +1244,7 @@ sap.ui.define([
 		/**
 		 * Some of the values are semantically equivalent to others.
 		 * So we substitute them everywhere, if needed. Example: Last 1 days === Yesterday
+		 * This substitution is performed only with options that are present in the options property.
 		 *
 		 * @param {object} oValue A valid control value
 		 * @private
@@ -1205,12 +1260,12 @@ sap.ui.define([
 			sKey = oValue.operator;
 			aParams = oValue.values;
 
-			if (sKey === "LASTDAYS" && aParams[0] === 1) {
+			if (sKey === "LASTDAYS" && aParams[0] === 1 && this.getOptions().includes("YESTERDAY")) {
 				oNewValue = {
 					operator: "YESTERDAY",
 					values: []
 				};
-			} else if (sKey === "NEXTDAYS" && aParams[0] === 1) {
+			} else if (sKey === "NEXTDAYS" && aParams[0] === 1  && this.getOptions().includes("TOMORROW")) {
 				oNewValue = {
 					operator: "TOMORROW",
 					values: []
@@ -1225,20 +1280,57 @@ sap.ui.define([
 			return oNewValue ? oNewValue : oValue;
 		};
 
-		var DynamicDateRangeInputRenderer = Renderer.extend(InputRenderer);
-		DynamicDateRangeInputRenderer.apiVersion = 2;
+		/**
+		 * Returns the DOMNode Id to be used for the "labelFor" attribute of the label.
+		 *
+		 * By default, this is the Id of the control itself.
+		 *
+		 * @return {string} Id to be used for the <code>labelFor</code>
+		 * @public
+		 */
+		DynamicDateRange.prototype.getIdForLabel = function () {
+			// The DynamicDateRangeInput inherits from the Input
+			return this.getAggregation("_input").getIdForLabel();
+		};
 
 		/**
-		 * Returns ARIA accessibility role for the control.
+		 * Some of the values are semantically equivalent to others.
+		 * Example: Last 1 days === Yesterday
+		 * When we receive value that is not present in the options property, we try to replace it with another existing equivalent option.
 		 *
-		 * @param {sap.ui.core.Control} oControl an object representation of the control
-		 * @returns {string}
+		 * @param {object} oValue A valid control value
+		 * @private
+		 * @returns {object} A substituted value if needed, or the same value if not
 		 */
-		DynamicDateRangeInputRenderer.getAriaRole = function(oControl) {
-			return "combobox";
+		DynamicDateRange.prototype._substitudeMissingValue = function(oValue) {
+			var oNewValue = oValue;
+
+			if (oValue  && oValue.operator === "YESTERDAY" && !this.getOptions().includes("YESTERDAY") && this.getOptions().includes("LASTDAYS")) {
+				oNewValue = {
+					operator: "LASTDAYS",
+					values: [1]
+				};
+			} else if (oValue && oValue.operator === "TOMORROW"  && !this.getOptions().includes("TOMORROW") && this.getOptions().includes("NEXTDAYS")) {
+				oNewValue = {
+					operator: "NEXTDAYS",
+					values: [1]
+				};
+			}
+
+			return oNewValue;
 		};
 
+		var DynamicDateRangeInputRenderer = Renderer.extend(InputRenderer);
+
+		DynamicDateRangeInputRenderer.apiVersion = 2;
+
 		DynamicDateRangeInputRenderer.writeInnerAttributes = function(oRm, oControl) {
+			var oDynamicDateRange = oControl._getControlOrigin ? oControl._getControlOrigin() : null,
+				mAccAttributes = this.getAccessibilityState(oControl);
+
+			if (oDynamicDateRange && oDynamicDateRange.isA("sap.m.DynamicDateRange")) {
+				oRm.accessibilityState(oDynamicDateRange, mAccAttributes);
+			}
 			oRm.attr("type", "text");
 		};
 
@@ -1272,7 +1364,6 @@ sap.ui.define([
 
 			mAccessibilityState.roledescription = oResourceBundle.getText("ACC_CTR_TYPE_DYNAMIC_DATE_RANGE");
 			mAccessibilityState.role = this.getAriaRole();
-			mAccessibilityState.expanded = oDynamicDateRange._oPopup ? oDynamicDateRange._oPopup.isOpen() : false;
 			mAccessibilityState.haspopup = coreLibrary.aria.HasPopup.ListBox.toLowerCase();
 			mAccessibilityState.autocomplete = "list";
 			mAccessibilityState.controls = oDynamicDateRange._oPopup && oDynamicDateRange._oPopup.getDomRef() ?

package/src/sap/m/DynamicDateValueHelpUIType.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.100.0
+		 * @version 1.102.1
 		 *
 		 * @public
 		 * @since 1.92

package/src/sap/m/ExpandableText.js

@@ -100,7 +100,7 @@ function(library,
 	 * @implements sap.ui.core.IFormContent, sap.m.IHyphenation
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilter.js

@@ -170,7 +170,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IShrinkable
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @constructor
 	 * @public
@@ -661,6 +661,13 @@ sap.ui.define([
 		//set the selected index
 		this.oItemNavigation.setPageSize(this._pageSize);
 
+		this.oItemNavigation.setDisabledModifiers({
+			sapnext: ["alt", "meta"],
+			sapprevious: ["alt", "meta"],
+			saphome : ["alt", "meta"],
+			sapend : ["meta"]
+		});
+
 	};
 
 	/**

package/src/sap/m/FacetFilterItem.js

@@ -20,7 +20,7 @@ sap.ui.define(['./ListItemBase', './library', './FacetFilterItemRenderer'],
 	 * @class
 	 * Represents a value for the {@link sap.m.FacetFilterList} control.
 	 * @extends sap.m.ListItemBase
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterList.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * be closed.
 	 *
 	 * @extends sap.m.List
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedContent.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/FeedInput.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @constructor
 	 * @public
@@ -243,7 +243,7 @@ sap.ui.define([
 			value,
 			addTarget = tagName === "a";
 		// add UI5 specific classes when appropriate
-		var cssClass = this._renderingRules.ELEMENTS[tagName].cssClass || "";
+		var cssClass = (this._renderingRules.ELEMENTS[tagName] && this._renderingRules.ELEMENTS[tagName].cssClass) ? this._renderingRules.ELEMENTS[tagName].cssClass : "";
 		for (var i = 0; i < attribs.length; i += 2) {
 			// attribs[i] is the name of the tag's attribute.
 			// attribs[i+1] is its corresponding value.

package/src/sap/m/FeedListItem.js

@@ -54,7 +54,7 @@ function(
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedListItemAction.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Element"],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Fiori20Adapter.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @class text
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 * @private
 	 * @since 1.38
 	 * @alias HeaderAdapter
@@ -227,7 +227,7 @@ sap.ui.define([
 	 * Constructor for an sap.m.Fiori20Adapter.
 	 *
 	 * @class text
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 * @private
 	 * @since 1.38
 	 * @alias sap.m.Fiori20Adapter

package/src/sap/m/FlexBox.js

@@ -62,7 +62,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @public
 	 * @alias sap.m.FlexBox

package/src/sap/m/FlexItemData.js

@@ -24,7 +24,7 @@ sap.ui.define(["./FlexBoxStylingHelper", "./library", "sap/ui/core/LayoutData"],
 	 * @class
 	 * Holds layout data for a FlexBox / HBox / VBox.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FormattedText.js

@@ -13,7 +13,8 @@ sap.ui.define([
 	'./FormattedTextRenderer',
 	"sap/base/Log",
 	"sap/base/security/URLListValidator",
-	"sap/base/security/sanitizeHTML"
+	"sap/base/security/sanitizeHTML",
+	"sap/ui/util/openWindow"
 ],
 function(
 	library,
@@ -23,7 +24,8 @@ function(
 	FormattedTextRenderer,
 	Log,
 	URLListValidator,
-	sanitizeHTML0
+	sanitizeHTML0,
+	openWindow
 	) {
 		"use strict";
 
@@ -42,7 +44,7 @@ function(
 		 * @class
 		 * The FormattedText control allows the usage of a limited set of tags for inline display of formatted text in HTML format.
 		 * @extends sap.ui.core.Control
-		 * @version 1.100.0
+		 * @version 1.102.1
 		 *
 		 * @constructor
 		 * @public
@@ -317,20 +319,18 @@ function(
 			});
 		}
 
-		// prohibit a new window from accessing window.opener.location
-		function openExternalLink (oEvent) {
-			var newWindow = window.open();
-			newWindow.opener = null;
-			newWindow.location = oEvent.currentTarget.href;
+		// open links href using safe API
+		function openLink (oEvent) {
 			oEvent.preventDefault();
+			openWindow(oEvent.currentTarget.href, oEvent.currentTarget.target);
 		}
 
 		FormattedText.prototype.onAfterRendering = function () {
-			this.$().find('a[target="_blank"]').on("click", openExternalLink);
+			this.$().find('a').on("click", openLink);
 		};
 
 		FormattedText.prototype.onBeforeRendering = function () {
-			this.$().find('a[target="_blank"]').off("click", openExternalLink);
+			this.$().find('a').off("click", openLink);
 		};
 
 		FormattedText.prototype._getDisplayHtml = function (){

package/src/sap/m/GenericTag.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/GenericTagRenderer.js

@@ -109,9 +109,11 @@ sap.ui.define([
 	GenericTagRenderer._getAriaLabelledBy = function(oControl) {
 		var aLabelledBy = oControl.getAriaLabelledBy().slice(),
 			sId = oControl.getId(),
-			sTagValueId = this._getTagValueId(oControl);
+			sTagValueId = this._getTagValueId(oControl),
+			sTagValueState = this._getTagValueState(oControl),
+			sStatus = oControl.getStatus();
 
-		if (oControl.getStatus() !== ValueState.None) {
+		if (sStatus !== ValueState.None && sStatus !== sTagValueState) {
 			aLabelledBy.push(sId + "-status");
 		}
 
@@ -154,6 +156,12 @@ sap.ui.define([
 		return oValue ? oValue.getId() : "";
 	};
 
+	GenericTagRenderer._getTagValueState = function(oControl) {
+		var oValue = oControl.getValue();
+
+		return oValue ? oValue.getState() : "";
+	};
+
 	return GenericTagRenderer;
 
 }, /* bExport= */true);