@openui5/sap.m 1.98.0 → 1.101.0

package/src/sap/m/FeedListItem.js

@@ -54,7 +54,7 @@ function(
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -432,7 +432,7 @@ function(
             oItemDomRef = oItem.getDomRef(),
             mPosition = this.getParent().getAccessbilityPosition(oItem);
 
-        if ( oItem instanceof sap.m.FeedListItem ) {
+        if ( oItem instanceof FeedListItem ) {
             oItemDomRef.setAttribute("aria-posinset", mPosition.posInset);
             oItemDomRef.setAttribute("aria-setsize", mPosition.setSize);
         }
@@ -545,7 +545,7 @@ function(
 	 * this value, the text of the FeedListItem is collapsed once the text reaches this limit.
 	 *
 	 * @private
-	 * @returns {String} Collapsed string based on the "maxCharacter" property. If the size of the string before collapsing
+	 * @returns {string} Collapsed string based on the "maxCharacter" property. If the size of the string before collapsing
 	 * is smaller than the provided threshold, it returns null.
 	 */
 	FeedListItem.prototype._getCollapsedText = function() {
@@ -650,8 +650,8 @@ function(
 	 * Converts an HTML text to plain text by removing all the HTML tags
 	 *
 	 * @private
-	 * @param {String} htmlText The HtmlText to be converted
-	 * @returns {String} plain text
+	 * @param {string} htmlText The HtmlText to be converted
+	 * @returns {string} plain text
 	 */
 	FeedListItem.prototype._convertHtmlToPlainText = function(htmlText) {
 		var oRegex = /(<([^>]+)>)/ig;
@@ -662,8 +662,8 @@ function(
 	 * Converts the plain text to HTML text by adding the corresponding HTML tags
 	 *
 	 * @private
-	 * @param {String} inputText The input plain text
-	 * @returns {String} the HTML text
+	 * @param {string} inputText The input plain text
+	 * @returns {string} the HTML text
 	 */
 	FeedListItem.prototype._convertPlainToHtmlText = function(inputText) {
 		var sFullText = this._sFullText;

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

package/src/sap/m/FeedListItemRenderer.js

@@ -21,7 +21,7 @@ sap.ui.define(["./ListItemBaseRenderer", "sap/ui/core/Renderer", "sap/ui/Device"
 	 * Make sure that parent li is displayed as a horizontal webkit-box.
 	 *
 	 * @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 feed list item that should be rendered
+	 * @param {sap.m.FeedListItem} oControl an object representation of the feed list item that should be rendered
 	 */
 	FeedListItemRenderer.renderLIAttributes = function(oRm, oControl) {
 		oRm.class("sapMFeedListItemTitleDiv");
@@ -32,7 +32,7 @@ sap.ui.define(["./ListItemBaseRenderer", "sap/ui/core/Renderer", "sap/ui/Device"
 	 * 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 feed list item that should be rendered
+	 * @param {sap.m.FeedListItem} oControl an object representation of the feed list item that should be rendered
 	 */
 	FeedListItemRenderer.renderLIContent = function(oRm, oControl) {
 		// convenience variable
@@ -49,11 +49,16 @@ sap.ui.define(["./ListItemBaseRenderer", "sap/ui/core/Renderer", "sap/ui/Device"
 
 		// action button
 		if (oControl.getActions().length > 0) {
-			oRm.openStart("div", sMyId + "-action-button");
-			oRm.class('sapMFeedListItemActionButton');
-			oRm.openEnd();
-			oRm.renderControl(oControl.getAggregation("_actionButton"));
-			oRm.close("div");
+			var isAllActionsNotVisible = oControl.getActions().every(function (oAction) {
+				return oAction.getVisible() === false ;
+			});
+			if (!isAllActionsNotVisible) {
+				oRm.openStart("div", sMyId + "-action-button");
+				oRm.class('sapMFeedListItemActionButton');
+				oRm.openEnd();
+				oRm.renderControl(oControl.getAggregation("_actionButton"));
+				oRm.close("div");
+			}
 		}
 
 		// text (starting with sender)

package/src/sap/m/Fiori20Adapter.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @class text
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @since 1.38
 	 * @alias HeaderAdapter
@@ -227,7 +227,7 @@ sap.ui.define([
 	 * Constructor for an sap.m.Fiori20Adapter.
 	 *
 	 * @class text
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @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.98.0
+	 * @version 1.101.0
 	 *
 	 * @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.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FormattedText.js

@@ -42,7 +42,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.98.0
+		 * @version 1.101.0
 		 *
 		 * @constructor
 		 * @public
@@ -367,6 +367,9 @@ function(
 			this._renderingRules = bLimit ? _limitedRenderingRules : _defaultRenderingRules;
 		};
 
+		FormattedText.prototype.getFocusDomRef = function () {
+			return this.getDomRef() && this.getDomRef().querySelector("a");
+		};
 
 		return FormattedText;
 	});

package/src/sap/m/GenericTag.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -297,7 +297,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * @private used for OverflowToolbar functionality
+	 * Used for OverflowToolbar functionality.
+	 * @private
 	 */
 
 	GenericTag.prototype._onBeforeEnterOverflow = function(oControl) {
@@ -305,7 +306,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * @private used for OverflowToolbar functionality
+	 * Used for OverflowToolbar functionality.
+	 * @private
 	 */
 
 	GenericTag.prototype._onAfterExitOverflow = function(oControl) {

package/src/sap/m/GenericTagRenderer.js

@@ -6,8 +6,9 @@
 
 sap.ui.define([
 	"./library",
-	"sap/ui/core/library"
-], function(library, coreLibrary) {
+	"sap/ui/core/library",
+	"sap/ui/core/Core"
+], function(library, coreLibrary, oCore) {
 	"use strict";
 	//shortcut for sap.m.GenericTagDesign
 	var GenericTagDesign = library.GenericTagDesign,
@@ -17,7 +18,6 @@ sap.ui.define([
 
 		//shortcut for sap.ui.core.ValueState
 		ValueState = coreLibrary.ValueState,
-		oCore = sap.ui.getCore(),
 		GenericTagRenderer = {
 			apiVersion: 2
 		};
@@ -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);

package/src/sap/m/GenericTile.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @since 1.34.0
 	 *
 	 * @public
@@ -294,7 +294,8 @@ sap.ui.define([
 
 	GenericTile._Action = {
 		Press: "Press",
-		Remove: "Remove"
+		Remove: "Remove",
+		More: "More"
 	};
 
 	GenericTile.LINEMODE_SIBLING_PROPERTIES = ["state", "subheader", "header", "scope"];
@@ -517,6 +518,11 @@ sap.ui.define([
 			this._sParentResizeListenerId = null;
 		}
 
+		//sets the extra width of 0.5rem when the grid container has 1rem gap for the TwoByxxxx tiles
+		if (this.getParent() && this.getParent().isA("sap.f.GridContainer")){
+			this._applyExtraWidth();
+		}
+
 		Device.media.detachHandler(this._handleMediaChange, this, DEVICE_SET);
 
 		if (this._$RootNode) {
@@ -526,7 +532,10 @@ sap.ui.define([
 		if (this.getFrameType() === FrameType.Auto) {
 			this.setProperty("frameType", FrameType.OneByOne, true);
 		}
-
+		//sets the maxlines for the appshortcut and systeminfo in different tile sizes
+		if (this.getMode() !== GenericTileMode.LineMode && (this.getAppShortcut() || this.getSystemInfo())) {
+			this._setMaxLines();
+		}
 		//Set Navigate Action Button Text - Only in Article Mode
 		if (this._isNavigateActionEnabled()) {
 			var sButtonText = this.getNavigationButtonText() ? this.getNavigationButtonText() : this._oRb.getText("ACTION_READ_MORE");
@@ -558,7 +567,6 @@ sap.ui.define([
 				}
 			}
 		}
-
 		// triggers update of all adjacent GenericTile LineMode siblings
 		// this is needed for their visual update if this tile's properties change causing it to expand or shrink
 		if (sMode === GenericTileMode.LineMode && this._bUpdateLineTileSiblings) {
@@ -578,7 +586,26 @@ sap.ui.define([
 
 		this.onDragComplete();
 	};
+	GenericTile.prototype._setMaxLines = function() {
+		var sFrameType = this.getFrameType(),
+			iLines = sFrameType === FrameType.OneByOne || sFrameType === FrameType.TwoByHalf ? 1 : 2;
+
+		//Default maxLines
+		this._oAppShortcut.setProperty("maxLines", iLines, true);
+		this._oSystemInfo.setProperty("maxLines", iLines, true);
 
+		if (this.getFrameType() === FrameType.TwoByHalf) {
+			var bAppShortcutMore = this.getAppShortcut().length > 11,
+				bSystemInfoMore = this.getSystemInfo().length > 11;
+
+			// Line break to happen after 11 characters, App Shortcut to have more priority in display
+			if ((bAppShortcutMore && bSystemInfoMore) || bAppShortcutMore) {
+				this._oAppShortcut.setProperty("maxLines", 2, true);
+			} else if (bSystemInfoMore) {
+				this._oSystemInfo.setProperty("maxLines", 2, true);
+			}
+		}
+	};
 	/**
 	 * Update Hover Overlay, Generic tile to remove Active Press state of generic Tile.
 	 * @private
@@ -1079,10 +1106,12 @@ sap.ui.define([
 		// when subheader is unavailable, the header can have maximal 5 lines
 
 		var frameType = this.getFrameType();
-		if (this._isIconMode()) { //Set MaxLines as 2 for IconMode
-
-            this._oTitle.setProperty("maxLines", 2, true);
-
+		if (this._isIconMode()) {
+			if (bSubheader) {
+				this._oTitle.setProperty("maxLines", 1, true);
+			} else {
+				this._oTitle.setProperty("maxLines", 2, true);
+			}
         } else if (frameType === FrameType.TwoByOne && this.getMode() === GenericTileMode.ActionMode) {
 			this._oTitle.setProperty("maxLines", 2, true);
 		} else if (frameType === FrameType.OneByHalf || frameType === FrameType.TwoByHalf) {
@@ -1170,7 +1199,7 @@ sap.ui.define([
 	 * Gets the header, subheader and image description text of GenericTile
 	 *
 	 * @private
-	 * @returns {String} The text
+	 * @returns {string} The text
 	 */
 	GenericTile.prototype._getHeaderAriaAndTooltipText = function () {
 		var sText = "";
@@ -1195,7 +1224,7 @@ sap.ui.define([
 	 * Gets the ARIA label or tooltip text of the content in GenericTile
 	 *
 	 * @private
-	 * @returns {String} The text
+	 * @returns {string} The text
 	 */
 	GenericTile.prototype._getContentAriaAndTooltipText = function () {
 		var sText = "";
@@ -1203,7 +1232,7 @@ sap.ui.define([
 		var aContent = this.getTileContent();
 		var sAdditionalTooltip = this.getAdditionalTooltip();
 
-		if (!this._isInActionScope() && this.getMode() === GenericTileMode.ContentMode) {
+		if (!this._isInActionScope() && (this.getMode() === GenericTileMode.ContentMode || this.getMode() === GenericTileMode.ArticleMode)) {
 			for (var i = 0; i < aContent.length; i++) {
 				if (typeof aContent[i]._getAriaAndTooltipText === "function") {
 					sText += (bIsFirst ? "" : "\n") + aContent[i]._getAriaAndTooltipText();
@@ -1225,7 +1254,7 @@ sap.ui.define([
 	 * Returns a text for the ARIA label as combination of header and content texts
 	 * when the tooltip is empty
 	 * @private
-	 * @returns {String} The ARIA label text
+	 * @returns {string} The ARIA label text
 	 */
 	GenericTile.prototype._getAriaAndTooltipText = function () {
 		var sAriaText = (this.getTooltip_AsString() && !this._isTooltipSuppressed())
@@ -1254,7 +1283,7 @@ sap.ui.define([
 	 * calls _getAriaAndTooltipText to get text.
 	 *
 	 * @private
-	 * @returns {String} Text for ARIA label.
+	 * @returns {string} Text for ARIA label.
 	 */
 	GenericTile.prototype._getAriaText = function () {
 		var sAriaText = this.getTooltip_Text();
@@ -1276,7 +1305,7 @@ sap.ui.define([
 	 * If the application provides a specific tooltip, the returned string is equal to the tooltip text.
 	 * If the tooltip provided by the application is a string of only white spaces, the function returns null.
 	 *
-	 * @returns {String} Text for tooltip or null.
+	 * @returns {string} Text for tooltip or null.
 	 * @private
 	 */
 	GenericTile.prototype._getTooltipText = function () {
@@ -1485,6 +1514,9 @@ sap.ui.define([
 		if ((sScope === GenericTileScope.Actions || GenericTileScope.ActionRemove) && oEvent.target.id.indexOf("-action-remove") > -1) {//tap on icon remove in Actions scope
 			sAction = GenericTile._Action.Remove;
 			oDomRef = this._oRemoveButton.getPopupAnchorDomRef();
+		} else if ((sScope === GenericTileScope.Actions || sScope === GenericTileScope.ActionMore) && this._isIconMode && this._isIconMode() && oEvent.target.id.indexOf("-action-more") > -1) {
+			sAction = GenericTile._Action.More;
+			oDomRef = this._oMoreIcon.getDomRef();
 		} else if (sScope === GenericTileScope.Actions || sScope === GenericTileScope.ActionMore) {
 			oDomRef = this._oMoreIcon.getDomRef();
 		}
@@ -1537,7 +1569,7 @@ sap.ui.define([
 	/**
 	 * Set and return aggregation of Icon to be rendered in IconMode
 	 * @param {*} oIcon Icon to be displayed on the GenericTile.
-	 * @returns {String} Returns the icon hidden aggregation
+	 * @returns {string} Returns the icon hidden aggregation
 	 * @private
 	 */
 	 GenericTile.prototype._generateIconAggregation = function (oIcon) {
@@ -1589,10 +1621,24 @@ sap.ui.define([
 	 * @returns {boolean} - true if Navigate Action Button is enabled
 	 * @private
 	 */
-	GenericTile.prototype._isNavigateActionEnabled = function() {
+GenericTile.prototype._isNavigateActionEnabled = function() {
 		return this.getMode() === GenericTileMode.ArticleMode && this.getUrl() && this.getEnableNavigationButton();
 	};
 
+	/**
+	 * An extra width of 0.5rem would be applied when the gap is 1rem(16px) in the grid container for the TwoByOne and TwoByHalf tiles
+	 * @private
+	 */
+	GenericTile.prototype._applyExtraWidth = function() {
+		var	sGap = this.getParent().getActiveLayoutSettings().getGap(),
+			bisLargeTile = this.getFrameType() === FrameType.TwoByHalf || this.getFrameType() === FrameType.TwoByOne,
+			bisGap16px = sGap === "16px" || sGap === "1rem";
+		if (bisGap16px && bisLargeTile){
+			this.addStyleClass("sapMGTWidthForGridContainer");
+		} else if (!bisGap16px && this.hasStyleClass("sapMGTWidthForGridContainer")){
+			this.removeStyleClass("sapMGTWidthForGridContainer");
+		}
+	};
 	/**
 	 * Returns true if the GenericTile is in ActionMode and frameType is TwoByOne.
 	 * @returns {boolean} - true if the GenericTile is in ActionMode

package/src/sap/m/GenericTileLineModeRenderer.js

@@ -91,6 +91,12 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS", "sap/ui/thirdpart
 				oRm.style("padding-right", "2.25rem");
 		}
 		oRm.class("sapMGTLineMode");
+		if (oControl.getSystemInfo() || oControl.getAppShortcut()) {
+			oRm.class("sapMGTInfoRendered");
+			if (!bIsScreenLarge){
+				oRm.class("sapMGTLineModeSmall");
+			}
+		}
 		this._writeDirection(oRm);
 		if (sTooltipText) {
 			oRm.attr("title", sTooltipText);
@@ -123,11 +129,21 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS", "sap/ui/thirdpart
 			oRm.close("div");
 
 			this._renderFailedIcon(oRm, oControl);
+			oRm.openStart("span", oControl.getId() + "-lineWrapper");
+			oRm.class("sapMGTLineWrapper");
+			oRm.openEnd();
+			oRm.openStart("span", oControl.getId() + "-headerWrapper");
+			oRm.class("sapMGTHeaderWrapper");
+			oRm.openEnd();
 			this._renderHeader(oRm, oControl);
 			if (oControl.getSubheader()) {
 				this._renderSubheader(oRm, oControl);
 			}
-
+			oRm.close("span");
+			if (oControl.getSystemInfo() || oControl.getAppShortcut()) {
+				this._renderInfoContainer(oRm,oControl);
+			}
+			oRm.close("span");
 			oRm.openStart("div", oControl.getId() + "-endMarker");
 			oRm.class("sapMGTEndMarker");
 			oRm.openEnd();
@@ -144,6 +160,34 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS", "sap/ui/thirdpart
 			oRm.openEnd();
 			oRm.close("div");
 
+		} else if (oControl.getSystemInfo() || oControl.getAppShortcut()){
+			oRm.openStart("div", oControl.getId() + "-touchArea");
+			oRm.class("sapMGTTouchArea");
+			oRm.openEnd();
+			this._renderFailedIcon(oRm, oControl);
+
+			oRm.openStart("span",oControl.getId() + "-lineModeHelpContainer");
+			oRm.class("sapMGTLineModeHelpContainer");
+			oRm.openEnd();
+			oRm.openStart("span", oControl.getId() + "-headerWrapper");
+			oRm.class("sapMGTHeaderWrapper");
+			oRm.openEnd();
+			this._renderHeader(oRm, oControl);
+
+			if (oControl.getSubheader()) {
+				this._renderSubheader(oRm, oControl);
+			}
+			oRm.close("span");
+			if (oControl.getSystemInfo() || oControl.getAppShortcut()) {
+				this._renderInfoContainer(oRm,oControl);
+			}
+			oRm.close("span"); //.sapMGTLineModeHelpContainer
+
+			if (oControl._isInActionScope()) {
+				this._renderActionsScope(oRm, oControl, bIsSingleAction);
+			}
+
+			oRm.close("div"); //.sapMGTTouchArea
 		} else {
 			oRm.openStart("div", oControl.getId() + "-touchArea");
 			oRm.class("sapMGTTouchArea");
@@ -175,13 +219,43 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS", "sap/ui/thirdpart
 			oRm.close("span"); //.sapMGT
 		}
 	};
-
+	GenericTileLineModeRenderer._renderInfoContainer = function(oRm,oControl){
+				oRm.openStart("span",oControl.getId() + "-sapMGTTInfoWrapper");
+				oRm.class("sapMGTTInfoWrapper").openEnd();
+				oRm.openStart("span",oControl.getId() + "-sapMGTTInfo");
+				oRm.class("sapMGTTInfo");
+				if (!(oControl.getSystemInfo() && oControl.getAppShortcut())){
+					oRm.class("sapMGTInfoNotContainsSeperator");
+				}
+				oRm.openEnd();
+				if (oControl.getAppShortcut()) {
+					oRm.openStart("span", oControl.getId() + "-appShortcut");
+					oRm.class("sapMGTAppShortcutText").openEnd();
+					oRm.renderControl(oControl._oAppShortcut);
+					oRm.close("span");
+				}
+				if (oControl.getSystemInfo()) {
+					this._renderSystemInfo(oRm,oControl);
+				}
+				oRm.close("span");
+				oRm.close("span");
+	};
 	GenericTileLineModeRenderer._writeDirection = function(oRm) {
 		if (this._bRTL) {
 			oRm.attr("dir", "rtl");
 		}
 	};
-
+	GenericTileLineModeRenderer._renderSystemInfo = function(oRm,oControl){
+		oRm.openStart("span",oControl.getId() + "-systemInfoText");
+		this._writeDirection(oRm);
+		oRm.class("sapMGTSystemInfoText");
+		if (oControl.getSystemInfo() && oControl.getAppShortcut()){
+			oRm.class("sapMGTSeperatorPresent");
+		}
+		oRm.openEnd();
+		oRm.text(oControl._oSystemInfo.getText());
+		oRm.close("span");
+	};
 	GenericTileLineModeRenderer._renderFailedIcon = function(oRm, oControl) {
 		if (oControl.getState() === LoadState.Failed) {
 			if (oControl._isCompact()) {