@openui5/sap.m 1.98.0 → 1.101.0

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',
@@ -35,8 +36,9 @@ sap.ui.define([
 	'./NavContainer',
 	'./DynamicDateRangeRenderer',
 	'./StandardDynamicDateOption',
-	'sap/ui/dom/jquery/Focusable',
-	'./library'],
+	'./library',
+	'sap/ui/thirdparty/jquery',
+	'sap/ui/dom/jquery/Focusable'], // provides jQuery.fn.firstFocusableDomRef
 	function(
 		InvisibleText,
 		Element,
@@ -51,6 +53,7 @@ sap.ui.define([
 		Icon,
 		LabelEnablement,
 		DateFormat,
+		TimezoneUtil,
 		ManagedObjectObserver,
 		Device,
 		Label,
@@ -67,8 +70,8 @@ sap.ui.define([
 		NavContainer,
 		DynamicDateRangeRenderer,
 		StandardDynamicDateOption,
-		Focusable,
-		library
+		library,
+		jQuery
 	) {
 		"use strict";
 
@@ -118,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.98.0
+		 * @version 1.101.0
 		 *
 		 * @constructor
 		 * @public
@@ -239,8 +242,11 @@ sap.ui.define([
 							"FIRSTDAYYEAR",
 							"LASTDAYYEAR",
 							"DATERANGE",
+							"DATETIMERANGE",
 							"FROM",
 							"TO",
+							"FROMDATETIME",
+							"TODATETIME",
 							"YEARTODATE",
 							"DATETOYEAR",
 							"LASTDAYS",
@@ -258,6 +264,7 @@ sap.ui.define([
 							"LASTWEEK",
 							"NEXTWEEK",
 							"SPECIFICMONTH",
+							"SPECIFICMONTHINYEAR",
 							"THISMONTH",
 							"LASTMONTH",
 							"NEXTMONTH",
@@ -270,7 +277,8 @@ sap.ui.define([
 							"QUARTER4",
 							"THISYEAR",
 							"LASTYEAR",
-							"NEXTYEAR"
+							"NEXTYEAR",
+							"DATETIME"
 						]
 					}
 				},
@@ -378,10 +386,13 @@ sap.ui.define([
 		};
 
 		DynamicDateRange.prototype.setValue = function(oValue) {
+			var sOptionKey = oValue && oValue.operator;
+
 			// substutude the semantically equivalent values
 			oValue = this._substitudeValue(oValue);
 
 			this.setProperty("value", oValue);
+			this._oSelectedOption = DynamicDateUtil.getOption(sOptionKey);
 
 			// Forward Dynamic Date Range control property values to inner sap.m.Input instance.
 			this._updateInputValue(oValue);
@@ -427,6 +438,13 @@ sap.ui.define([
 					if (typeof (vOption) === "string") {
 						return this._createHeaderListItem(vOption);
 					}
+					if (vOption.getKey() === "FROMDATETIME") {
+						vOption._bAdditionalTimeText = !!this._findOption("FROM");
+					} else if (vOption.getKey() === "TODATETIME") {
+						vOption._bAdditionalTimeText = !!this._findOption("TO");
+					} else if (vOption.getKey() === "DATETIMERANGE") {
+						vOption._bAdditionalTimeText = !!this._findOption("DATERANGE");
+					}
 					return this._createListItem(vOption);
 				}, this).forEach(function(oItem) {
 					oItem.addDelegate(this._oListItemDelegate, this);
@@ -440,6 +458,19 @@ sap.ui.define([
 			}
 		};
 
+		/**
+		 * Searches if there is an option with the given key included.
+		 *
+		 * @param {string} sKey option key to be searched against
+		 * @returns  {object|undefined} object if the object exists
+		 * @private
+		 */
+		DynamicDateRange.prototype._findOption = function(sKey) {
+			return this._getOptions().find(function(oOption) {
+				return oOption.getKey() === sKey;
+			});
+		};
+
 		/**
 		 * Appends an option key, identifying an additional option to be used by the control.
 		 *
@@ -468,6 +499,8 @@ sap.ui.define([
 			if (oValue && oValue.operator !== "PARSEERROR") {
 				sInputValue = this._enhanceInputValue(this._formatValue(oValue), oValue);
 				this._oInput.setValue(sInputValue);
+			} else if (oValue === undefined) {
+				this._oInput.setValue("");
 			}
 		};
 
@@ -555,11 +588,24 @@ sap.ui.define([
 		};
 
 		DynamicDateRange.prototype._getDatesLabelFormatter = function() {
-			if (!this._oDatesLabelFormatter) {
-				var oFormatOptions = Object.create(this._getFormatter()._dateFormatter.oFormatOptions);
-				oFormatOptions.interval = true;
+			var oFormatOptions,
+				aValueHelpTypes = this._oSelectedOption ? this._oSelectedOption.getValueHelpUITypes() : [],
+				sType = aValueHelpTypes && aValueHelpTypes.length ? aValueHelpTypes[0].getType() : "";
 
-				this._oDatesLabelFormatter = DateFormat.getInstance(oFormatOptions);
+			if (!this._oDatesLabelFormatter) {
+				switch (sType) {
+					case "datetime":
+						oFormatOptions = Object.create(this._getFormatter()._dateTimeFormatter.oFormatOptions);
+						oFormatOptions.singleIntervalValue = true;
+						oFormatOptions.interval = true;
+						this._oDatesLabelFormatter = DateFormat.getDateTimeInstance(oFormatOptions);
+						break;
+					default:
+						oFormatOptions = Object.create(this._getFormatter()._dateFormatter.oFormatOptions);
+						oFormatOptions.singleIntervalValue = true;
+						oFormatOptions.interval = true;
+						this._oDatesLabelFormatter = DateFormat.getInstance(oFormatOptions);
+				}
 			}
 
 			return this._oDatesLabelFormatter;
@@ -583,7 +629,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()),
@@ -652,15 +700,52 @@ 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() {
 			if (!this._oPopup) {
 				this._oPopup = new ResponsivePopover(this.getId() + "-RP", {
 					//read the documentation about those two - the page addapts its size to its container...
-					contentHeight: '470px',
-					contentWidth: _isCompact(this.getDomRef()) ? '272px' : '320px',
+					contentHeight: '512px',
+					contentWidth: '320px',
 					showCloseButton: false,
 					showArrow: false,
 					showHeader: false,
@@ -688,6 +773,7 @@ sap.ui.define([
 				}, this);
 
 				this._oPopup.attachAfterClose(function() {
+					this._oPreviousSelectedOption = this._oSelectedOption;
 					this._setFooterVisibility(false);
 					this.invalidate();
 				}, this);
@@ -700,7 +786,11 @@ sap.ui.define([
 
 				this._oPopup.setEndButton(new Button({
 					text: oResourceBundle.getText("DYNAMIC_DATE_RANGE_CANCEL"),
-					press: this._closePopup.bind(this)
+					press: function() {
+						this._oSelectedOption = this._oPreviousSelectedOption;
+						this._oDatesLabelFormatter = null;
+						this._closePopup();
+					}.bind(this)
 				}));
 
 				this._setFooterVisibility(false);
@@ -785,7 +875,7 @@ sap.ui.define([
 		DynamicDateRange.prototype._createListItem = function(oOption) {
 			var bIsFixedOption = this._isFixedOption(oOption);
 
-			return new DynamicDateRangeListItem(this.getId() + "-option-" + oOption.getKey(),  {
+			return new DynamicDateRangeListItem(this.getId() + "-option-" + oOption.getKey().replaceAll(" ", ""),  {
 				type: bIsFixedOption ? ListType.Active : ListType.Navigation,
 				title: oOption.getText(this),
 				wrapping: true,
@@ -806,6 +896,11 @@ sap.ui.define([
 			var sOptionKey = oEvent.getSource().getOptionKey(),
 				oOption = DynamicDateUtil.getOption(sOptionKey);
 
+			if (this._oPreviousSelectedOption && this._oPreviousSelectedOption.getKey() !== sOptionKey)	{
+				this._oDatesLabelFormatter = null;
+			}
+			this._oPreviousSelectedOption = this._oSelectedOption;
+
 			this._oSelectedOption = oOption;
 			if (this._isFixedOption(oOption)) {
 				this._applyValue();
@@ -864,8 +959,15 @@ 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") {
+					aResultDates.push(null);
+				}
 				sFormattedDates = this._getDatesLabelFormatter().format(aResultDates);
 				this._getDatesLabel().setText(oResourceBundle.getText("DDR_INFO_DATES", [sFormattedDates]));
 			}
@@ -1028,8 +1130,8 @@ sap.ui.define([
 
 			if (oToPage === oOptionDetailsPage) {
 				this.aInputControls.forEach(function(oControl) {
-					if (jQuery(oControl.getDomRef()).firstFocusableDomRef()) {
-						oControl.addAriaLabelledBy(oToPage.getAggregation("_internalHeader"));
+					if (oControl.$().firstFocusableDomRef()) {
+						oControl.addAriaLabelledBy && oControl.addAriaLabelledBy(oToPage.getAggregation("_internalHeader"));
 
 						if (!this._isCalendarBasedControl(oControl) && oControl.addAriaDescribedBy) {
 							oControl.addAriaDescribedBy(oToPage.getFooter().getContent()[0]);
@@ -1074,6 +1176,14 @@ sap.ui.define([
 		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 });
@@ -1170,16 +1280,6 @@ sap.ui.define([
 		var DynamicDateRangeInputRenderer = Renderer.extend(InputRenderer);
 		DynamicDateRangeInputRenderer.apiVersion = 2;
 
-		/**
-		 * Returns ARIA accessibility role for the control.
-		 *
-		 * @param {sap.ui.core.Control} oControl an object representation of the control
-		 * @returns {String}
-		 */
-		DynamicDateRangeInputRenderer.getAriaRole = function(oControl) {
-			return "combobox";
-		};
-
 		DynamicDateRangeInputRenderer.writeInnerAttributes = function(oRm, oControl) {
 			oRm.attr("type", "text");
 		};
@@ -1214,7 +1314,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() ?
@@ -1244,7 +1343,6 @@ sap.ui.define([
 		/**
 		 * Getter for the originating control.
 		 *
-		 * @param {void}
 		 * @returns {sap.ui.core.Control}
 		 */
 		DynamicDateRangeInput.prototype._getControlOrigin = function() {
@@ -1265,6 +1363,13 @@ sap.ui.define([
 				&& (!this._bClearButtonPressed);
 		};
 
+		DynamicDateRangeInput.prototype.onfocusin = function (oEvent) {
+			Input.prototype.onfocusin.apply(this, arguments);
+			if (this._getControlOrigin()._oPopup && this._getControlOrigin()._oPopup.isOpen()) {
+				this._getControlOrigin()._closePopup();
+			}
+		};
+
 		var DynamicDateRangeListItem = StandardListItem.extend("sap.m.DynamicDateRangeListItem", {
 			metadata: {
 				library: "sap.m",
@@ -1278,13 +1383,17 @@ sap.ui.define([
 		// Overwrite the sap.m.StandardListItem.getNavigationControl method, in order to change the navigation icon URI
 		DynamicDateRangeListItem.prototype.getNavigationControl = function() {
 			var oNavControl = StandardListItem.prototype.getNavigationControl.apply(this, arguments),
-				bDateOption = ["SPECIFICMONTH", "DATE", "DATERANGE", "FROM", "TO"].includes(this.getOptionKey()),
-				sNavgationIconURI = bDateOption
-					? IconPool.getIconURI("appointment-2")
-					: IconPool.getIconURI("slim-arrow-right");
+				sOptionKey = this.getOptionKey(),
+				aValueTypes = DynamicDateUtil.getOption(sOptionKey).getValueTypes(),
+				bDateOption = ["SPECIFICMONTH", "DATE", "DATERANGE", "FROM", "TO"].includes(sOptionKey),
+				bDateTimeOption = aValueTypes && aValueTypes.length && aValueTypes[0] === "datetime",
+				sNavgationIconURI;
 
-			if (bDateOption) {
+			if (bDateOption || bDateTimeOption) {
 				oNavControl.addStyleClass("sapMDDRDateOption");
+				sNavgationIconURI = bDateOption ? IconPool.getIconURI("appointment-2") : IconPool.getIconURI("date-time");
+			} else {
+				sNavgationIconURI = IconPool.getIconURI("slim-arrow-right");
 			}
 
 			oNavControl.setSrc(sNavgationIconURI);
@@ -1292,18 +1401,5 @@ sap.ui.define([
 			return oNavControl;
 		};
 
-		function _isCompact(oRef) {
-			var oDomRef = oRef;
-
-			while (oDomRef && oDomRef.classList) {
-				if (oDomRef.classList.contains("sapUiSizeCompact")) {
-					return true;
-				}
-				oDomRef = oDomRef.parentNode;
-			}
-
-			return false;
-		}
-
 		return DynamicDateRange;
 	});

package/src/sap/m/DynamicDateRangeRenderer.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/m/InputBaseRenderer", 'sap/ui/core/Renderer'],
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.DynamicDateRange} oControl an object representation of the control that should be rendered
 	 */
 	DynamicDateRangeRenderer.render = function(oRm, oControl) {
 

package/src/sap/m/DynamicDateUtil.js

@@ -27,6 +27,9 @@ sap.ui.define([
 		"LASTDAYQUARTER",
 		"FIRSTDAYYEAR",
 		"LASTDAYYEAR",
+		"DATETIMERANGE",
+		"FROMDATETIME",
+		"TODATETIME",
 		"DATERANGE",
 		"FROM",
 		"TO",
@@ -67,11 +70,10 @@ sap.ui.define([
 	];
 
 	/**
-	 * @class
 	 * The DynamicDateUtil is a utility class for working with the DynamicDateOption instances.
 	 *
+	 * @namespace
 	 * @alias sap.m.DynamicDateUtil
-	 * @static
 	 * @public
 	 * @experimental Since 1.92. This class is experimental and provides only limited functionality. Also the API might be changed in future.
 	 */
@@ -112,6 +114,8 @@ sap.ui.define([
 			"NEXTYEARS": new StandardDynamicDateOption({ key: "NEXTYEARS", valueTypes: ["int"] }),
 			"FROM": new StandardDynamicDateOption({ key: "FROM", valueTypes: ["date"] }),
 			"TO": new StandardDynamicDateOption({ key: "TO", valueTypes: ["date"] }),
+			"FROMDATETIME": new StandardDynamicDateOption({ key: "FROMDATETIME", valueTypes: ["datetime"] }),
+			"TODATETIME": new StandardDynamicDateOption({ key: "TODATETIME", valueTypes: ["datetime"] }),
 			"YEARTODATE": new StandardDynamicDateOption({ key: "YEARTODATE", valueTypes: [] }),
 			"DATETOYEAR": new StandardDynamicDateOption({ key: "DATETOYEAR", valueTypes: [] }),
 			"TODAYFROMTO": new StandardDynamicDateOption({ key: "TODAYFROMTO", valueTypes: ["int", "int"] }),
@@ -120,8 +124,11 @@ sap.ui.define([
 			"QUARTER3": new StandardDynamicDateOption({ key: "QUARTER3", valueTypes: [] }),
 			"QUARTER4": new StandardDynamicDateOption({ key: "QUARTER4", valueTypes: [] }),
 			"SPECIFICMONTH": new StandardDynamicDateOption({ key: "SPECIFICMONTH", valueTypes: ["int"] }),
+			"SPECIFICMONTHINYEAR": new StandardDynamicDateOption({ key: "SPECIFICMONTHINYEAR", valueTypes: ["int", "int"] }),
 			"DATERANGE": new StandardDynamicDateOption({ key: "DATERANGE", valueTypes: ["date", "date"] }),
-			"DATE": new StandardDynamicDateOption({ key: "DATE", valueTypes: ["date"] })
+			"DATE": new StandardDynamicDateOption({ key: "DATE", valueTypes: ["date"] }),
+			"DATETIME": new StandardDynamicDateOption({ key: "DATETIME", valueTypes: ["datetime"] }),
+			"DATETIMERANGE": new StandardDynamicDateOption({ key: "DATETIMERANGE", valueTypes: ["datetime", "datetime"] })
 		},
 		_allKeys: STANDARD_KEYS_ARRAY.slice(0)
 	};

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.98.0
+		 * @version 1.101.0
 		 *
 		 * @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.98.0
+	 * @version 1.101.0
 	 *
 	 * @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.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

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.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterItemRenderer.js

@@ -16,7 +16,7 @@ sap.ui.define(['./ListItemBaseRenderer', 'sap/ui/core/Renderer'],
 	 *
 	 * @param {sap.ui.core.RenderManager}
 	 *          oRm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control}
+	 * @param {sap.m.FacetFilterItem}
 	 *          oControl An object representation of the control that should be rendered
 	 */
 	FacetFilterItemRenderer.renderLIContent = function(oRm, oControl) {

package/src/sap/m/FacetFilterList.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * be closed.
 	 *
 	 * @extends sap.m.List
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -613,9 +613,11 @@ sap.ui.define([
 
 		// Checks whether given model is one of the OData Models
 		function isODataModel(oModel) {
-			return oModel instanceof sap.ui.model.odata.ODataModel ||
-				oModel instanceof sap.ui.model.odata.v2.ODataModel ||
-				oModel instanceof sap.ui.model.odata.v4.ODataModel;
+			return oModel && (
+				oModel.isA("sap.ui.model.odata.ODataModel") ||
+				oModel.isA("sap.ui.model.odata.v2.ODataModel") ||
+				oModel.isA("sap.ui.model.odata.v4.ODataModel")
+			);
 		}
 
 		if (force || (sSearchVal !== this._searchValue)) {
@@ -876,7 +878,7 @@ sap.ui.define([
 	 * This method overrides runs when the list updates its items.
 	 * The reason for the update is given by sReason, which for example, can be when the
 	 * list is filtered or when it grows.
-	 * @param {String} sReason reason for update
+	 * @param {string} sReason reason for update
 	 */
 	FacetFilterList.prototype.updateItems = function(sReason) {
 		var oPrevActiveElement = document.activeElement;

package/src/sap/m/FacetFilterRenderer.js

@@ -26,7 +26,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText"],
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.FacetFilter} oControl An object representation of the control that should be rendered
 	 */
 	FacetFilterRenderer.render = function(oRm, oControl){
 		if (oControl.getType() === FacetFilterType.Light || oControl.getShowSummaryBar()) {
@@ -42,7 +42,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText"],
 	 *
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.FacetFilter} oControl An object representation of the control that should be rendered
 	 */
 	FacetFilterRenderer.renderSimpleFlow = function(oRm, oControl) {
 
@@ -102,7 +102,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText"],
 	 *
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.FacetFilter} oControl An object representation of the control that should be rendered
 	 */
 	FacetFilterRenderer.renderSummaryBar = function(oRm, oControl) {
 
@@ -123,9 +123,9 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText"],
 	 *
 	 * This method should be used when text is reached frequently.
 	 *
-	 * @param {String} sKey Key of the announcement
-	 * @param {String} sBundleText Key of the announcement
-	 * @returns {String} Id of the generated invisible aria node
+	 * @param {string} sKey Key of the announcement
+	 * @param {string} sBundleText Key of the announcement
+	 * @returns {string} Id of the generated invisible aria node
 	 * @protected
 	 */
 	FacetFilterRenderer.getAriaAnnouncement = function(sKey, sBundleText) {
@@ -168,7 +168,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText"],
 	/**
 	 * Prepares the "Add Filter" button by adding positioning information and then renders it.
 	 *
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.FacetFilter} oControl An object representation of the control that should be rendered
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
 	 *
 	 * @returns {FacetFilterRenderer} <code>this</code> to allow method chaining
@@ -186,7 +186,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText"],
 	/**
 	 * Replaces the old positioning information with updated one.
 	 *
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.FacetFilter} oControl An object representation of the control that should be rendered
 	 * @param {sap.m.Button} oButton The button on which positioning information will be added
 	 * @param {int} iPosInSet Button's position in the set
 	 * @param {int} iSetSize Set's total size
@@ -204,7 +204,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText"],
 	/**
 	 * Removes the old positioning information.
 	 *
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.FacetFilter} oControl An object representation of the control that should be rendered
 	 * @param {sap.m.Button} oButton The button from which old positioning information will be removed
 	 * @returns {FacetFilterRenderer} <code>this</code> to allow method chaining
 	 */
@@ -231,7 +231,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText"],
 	/**
 	 * Creates a label in the static area, which contains positioning information.
 	 *
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+	 * @param {sap.m.FacetFilter} oControl An object representation of the control that should be rendered
 	 * @param {int} iPosInSet Position in the set
 	 * @param {int} iSetSize Set's total size
 	 * @returns {sap.ui.core.InvisibleText} oStaticLabel The newly created label

package/src/sap/m/FeedContent.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @since 1.34
 	 *
 	 * @public
@@ -133,7 +133,7 @@ sap.ui.define([
 
 	/**
 	 * Returns the Alttext
-	 * @returns {String} The AltText text
+	 * @returns {string} The AltText text
 	 */
 	FeedContent.prototype.getAltText = function() {
 		var sAltText = "";

package/src/sap/m/FeedInput.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @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/FeedInputRenderer.js

@@ -18,7 +18,7 @@ sap.ui.define([],
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.FeedInput} oControl an object representation of the control that should be rendered
 	 */
 	FeedInputRenderer.render = function (oRm, oControl) {
 		var sMyId = oControl.getId();