@openui5/sap.m 1.117.1 → 1.119.0

package/src/sap/m/GenericTile.js

@@ -81,7 +81,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @since 1.34.0
 	 *
 	 * @public
@@ -246,7 +246,16 @@ sap.ui.define([
 				 * @experimental Since 1.113
 				 * @since 1.113
 				 */
-				tileBadge: { type: "string", group: "Misc", defaultValue: "" }
+				tileBadge: { type: "string", group: "Misc", defaultValue: "" },
+				/**
+				 * Sets the offset for the Drop Area associated with a Generic Tile.
+				 * The offset is applied uniformly to all the tile edges.
+				 * @experimental Since 1.113
+				 * @internal
+				 * @since 1.118
+				 * @ui5-restricted Used by S/4 MyHome (ux.eng.s4producthomes1)
+				 */
+				dropAreaOffset: { type: "int", group: "Misc", defaultValue: 0 }
 			},
 			defaultAggregation: "tileContent",
 			aggregations: {
@@ -1203,6 +1212,10 @@ sap.ui.define([
 		}
 	};
 
+	GenericTile.prototype.ondragend = function() {
+		this.onDragComplete();
+	};
+
 	GenericTile.prototype.ontap = function (event) {
 		if (!_isInnerTileButtonPressed(event, this)) {
 			var oParams;
@@ -1972,6 +1985,28 @@ GenericTile.prototype._isNavigateActionEnabled = function() {
 		URLHelper.redirect(sURL, true);
 	};
 
+	/**
+	 * Calculates and returns the bounding client rectangle
+	 * of the drop area taking the offset property into account.
+	 * @private
+	 * @param {string} sDropLayout - current drop layout
+	 * @returns {object} mDropRect - bounding rectangle information factoring in offset, if required
+	 */
+	GenericTile.prototype.getDropAreaRect = function(sDropLayout) {
+		var mDropRect = this.getDomRef().getBoundingClientRect().toJSON();
+		var iDropAreaOffset = this.getDropAreaOffset();
+
+		if (sDropLayout === "Horizontal") {
+			mDropRect.left -= iDropAreaOffset;
+			mDropRect.right += iDropAreaOffset;
+		} else {
+			mDropRect.top -= iDropAreaOffset;
+			mDropRect.bottom += iDropAreaOffset;
+		}
+
+		return mDropRect;
+	};
+
 	/**
 	 * Checks if any of the inner buttons in the Tile are focused or clicked
 	 * @param {object} event - jQuery event object

package/src/sap/m/GroupHeaderListItem.js

@@ -29,8 +29,10 @@ sap.ui.define(["sap/ui/core/library", "./library", "./ListItemBase", "./GroupHea
 	 *
 	 * @extends sap.m.ListItemBase
 	 *
+	 * @implements sap.m.ITableItem
+
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public
@@ -39,7 +41,9 @@ sap.ui.define(["sap/ui/core/library", "./library", "./ListItemBase", "./GroupHea
 	 */
 	var GroupHeaderListItem = ListItemBase.extend("sap.m.GroupHeaderListItem", /** @lends sap.m.GroupHeaderListItem.prototype */ {
 		metadata : {
-
+			interfaces : [
+				"sap.m.ITableItem"
+			],
 			library : "sap.m",
 			properties : {
 
@@ -99,12 +103,11 @@ sap.ui.define(["sap/ui/core/library", "./library", "./ListItemBase", "./GroupHea
 
 			// defines the tag name
 			this.TagName = "tr";
+			this.aAriaOwns = [];
 		}
 	};
 
 	GroupHeaderListItem.prototype.getAccessibilityType = function(oBundle) {
-		var sType = this.getTable() ? "ROW" : "LISTITEM";
-		return oBundle.getText("LIST_ITEM_GROUP_HEADER") + " " + oBundle.getText("ACC_CTR_TYPE_" + sType);
 	};
 
 	GroupHeaderListItem.prototype.getContentAnnouncement = function() {

package/src/sap/m/GroupHeaderListItemRenderer.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRenderer", "./ColumnListItemRenderer"],
-	function(coreLibrary, Renderer, ListItemBaseRenderer, ColumnListItemRenderer) {
+sap.ui.define(["sap/ui/core/Core", "sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRenderer", "./ColumnListItemRenderer"],
+	function(Core, coreLibrary, Renderer, ListItemBaseRenderer, ColumnListItemRenderer) {
 	"use strict";
 
 
@@ -21,22 +21,34 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRen
 	GroupHeaderListItemRenderer.apiVersion = 2;
 
 	GroupHeaderListItemRenderer.renderType = function(rm, oLI) {
-		var fnBase = oLI.getTable() ? ColumnListItemRenderer : ListItemBaseRenderer;
-		fnBase.renderType.apply(this, arguments);
+		var oTable = oLI.getTable();
+		if (!oTable || !oTable.doItemsNeedTypeColumn()) {
+			return;
+		}
+
+		rm.openStart("td", oLI.getId() + "-TypeCell");
+		rm.class("sapMListTblNavCol");
+		rm.attr("role", "presentation");
+		rm.openEnd().close("td");
 	};
 
 	GroupHeaderListItemRenderer.renderNavigated = function(rm, oLI) {
-		var fnBase = oLI.getTable() ? ColumnListItemRenderer : ListItemBaseRenderer;
-		fnBase.renderNavigated.apply(this, arguments);
+		var oBaseRenderer = oLI.getTable() ? ColumnListItemRenderer : ListItemBaseRenderer;
+		oBaseRenderer.renderNavigated.apply(oBaseRenderer, arguments);
 	};
 
 	// for dummy cell rendering position inherit from ColumnListItemRenderer
-	GroupHeaderListItemRenderer.renderContentLatter = ColumnListItemRenderer.renderContentLatter;
+	GroupHeaderListItemRenderer.renderContentLatter = function(rm, oLI) {
+		ColumnListItemRenderer.renderContentLatter.apply(this, arguments);
+	};
 
 	// GroupHeaderListItem does not respect mode, counter and highlight property of the LIB
-	GroupHeaderListItemRenderer.renderMode = function(rm, oLI) {};
-	GroupHeaderListItemRenderer.renderCounter = function(rm, oLI) {};
-	GroupHeaderListItemRenderer.renderHighlight = function(rm, oLI) {};
+	GroupHeaderListItemRenderer.renderMode = function() {};
+	GroupHeaderListItemRenderer.renderCounter = function() {};
+	GroupHeaderListItemRenderer.renderHighlight = function() {};
+
+	// accesibility position is only relevant for the Table case therefore use the logic of CLI
+	GroupHeaderListItemRenderer.getAccessbilityPosition = ColumnListItemRenderer.getAccessbilityPosition;
 
 	/**
 	 * Renders the attributes for the given list item, using the provided
@@ -54,6 +66,11 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRen
 		if (oLI.getUpperCase()) {
 			rm.class("sapMGHLIUpperCase");
 		}
+
+		var oTable = oLI.getTable();
+		if (oTable) {
+			rm.attr("aria-roledescription", Core.getLibraryResourceBundle("sap.m").getText("TABLE_GROUP_ROW"));
+		}
 	};
 
 
@@ -70,15 +87,21 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRen
 	GroupHeaderListItemRenderer.renderLIContentWrapper = function(rm, oLI) {
 		var oTable = oLI.getTable();
 		if (oTable) {
-			rm.openStart("td");
+			rm.openStart("td", oLI.getId() + "-cell");
 			rm.class("sapMGHLICell");
-			rm.attr("colspan", oTable.getColCount() - 2 /* Type and Navigated cells are always rendered */- oTable.shouldRenderDummyColumn());
+			rm.attr("role", "gridcell");
+			ColumnListItemRenderer.makeFocusable(rm);
+			rm.attr("colspan", oTable.getColCount() - oTable.doItemsNeedTypeColumn() - oTable.shouldRenderDummyColumn() - 1 /* Navigated cells are always rendered */);
 			rm.openEnd();
 		}
 
 		ListItemBaseRenderer.renderLIContentWrapper.apply(this, arguments);
 
 		if (oTable) {
+			// create dummy contents for the item navigation to mimic a matrix
+			for (var i = 1; i < oTable._colHeaderAriaOwns.length; i++) {
+				rm.openStart("div").class("sapMTblItemNav").openEnd().close("div");
+			}
 			rm.close("td");
 		}
 	};
@@ -112,11 +135,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRen
 	};
 
 	GroupHeaderListItemRenderer.getAriaRole = function(oLI) {
-		if (oLI.getTable()) {
-			return "row";
-		}
-
-		return ListItemBaseRenderer.getAriaRole.apply(this, arguments);
+		return oLI.getTable() ? "row" : "listitem";
 	};
 
 	return GroupHeaderListItemRenderer;

package/src/sap/m/GrowingEnablement.js

@@ -139,19 +139,23 @@ sap.ui.define([
 			// Navigate from last item to growing trigger and vice versa via arrow keys
 			var oControl = this._oControl;
 			if (oControl._oItemNavigation && !oEvent.isMarked()) {
-				var aItemDomRefs = oControl._oItemNavigation.getItemDomRefs();
+				var oItemNavigation = oControl._oItemNavigation;
+				var aItemDomRefs = oItemNavigation.getItemDomRefs();
+				var oFirstItemDomRef = aItemDomRefs[0];
+				var oLastItemDomRef = aItemDomRefs[aItemDomRefs.length - oItemNavigation.iColumns];
 				var sDir = oControl.getGrowingDirection();
-				if ((sDir != ListGrowingDirection.Upwards && oEvent.type == "sapdown" && oEvent.target === aItemDomRefs[aItemDomRefs.length - 1])
-						|| (sDir == ListGrowingDirection.Upwards && oEvent.type == "sapup" && oEvent.target === aItemDomRefs[0])) {
+				if ((sDir != ListGrowingDirection.Upwards && oEvent.type == "sapdown" && oEvent.target === oLastItemDomRef)
+						|| (sDir == ListGrowingDirection.Upwards && oEvent.type == "sapup" && oEvent.target === oFirstItemDomRef)) {
 					var $Trigger = oControl.$("trigger");
 					$Trigger.trigger("focus");
 					oEvent.setMarked();
 					oEvent.stopImmediatePropagation(); // to prevent ItemNavigation
-				} else if ((sDir == ListGrowingDirection.Upwards && oEvent.type == "sapdown")
-						|| (sDir != ListGrowingDirection.Upwards && oEvent.type == "sapup")
+				} else if (((sDir == ListGrowingDirection.Upwards && oEvent.type == "sapdown")
+						|| (sDir != ListGrowingDirection.Upwards && oEvent.type == "sapup"))
 						&& oEvent.target === oControl.getDomRef("trigger")) {
-					jQuery(aItemDomRefs[oEvent.type == "sapdown" ? 0 : aItemDomRefs.length - 1]).trigger("focus");
+					jQuery(oEvent.type == "sapdown" ? oFirstItemDomRef : oLastItemDomRef).trigger("focus");
 					oEvent.setMarked();
+					oEvent.stopImmediatePropagation(); // to prevent ItemNavigation
 				}
 			}
 		},

package/src/sap/m/GrowingList.js

@@ -22,7 +22,7 @@ sap.ui.define(['./List', './library', './GrowingListRenderer', 'sap/ui/core/Conf
 	 * @extends sap.m.List
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/HBox.js

@@ -25,7 +25,7 @@ sap.ui.define(['./FlexBox', './library', './HBoxRenderer'],
 	 * @extends sap.m.FlexBox
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/HeaderContainer.js

@@ -124,7 +124,7 @@ sap.ui.define([
 		 * @since 1.44.0
 		 *
 		 * @author SAP SE
-		 * @version 1.117.1
+		 * @version 1.119.0
 		 *
 		 * @public
 		 * @alias sap.m.HeaderContainer

package/src/sap/m/HeaderContainerItemNavigator.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @since 1.67.0
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @alias sap.m.HeaderContainerItemNavigator

package/src/sap/m/IconTabBar.js

@@ -94,7 +94,7 @@ sap.ui.define([
 	 * @implements sap.m.ObjectHeaderContainer, sap.f.IDynamicPageStickyContent
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @public
 	 * @alias sap.m.IconTabBar
@@ -628,7 +628,7 @@ sap.ui.define([
 	 * @returns {sap.m.IconTabBar|null} Aggregation for the IconTabBar.
 	 */
 	IconTabBar.prototype._getIconTabHeader = function () {
-		if (this.isDestroyed()) {
+		if (this.isDestroyStarted()) {
 			return null;
 		}
 

package/src/sap/m/IconTabBarRenderer.js

@@ -72,7 +72,7 @@ sap.ui.define([],
 
 		if (oHeader.oSelectedItem) {
 			oRM.accessibilityState({
-				labelledby: oHeader.oSelectedItem.getId()
+				labelledby: oHeader.oSelectedItem._getRootTab().getId()
 			});
 		}
 

package/src/sap/m/IconTabBarSelectList.js

@@ -12,7 +12,8 @@ sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/core/delegate/ItemNavigation",
 	"sap/ui/core/theming/Parameters",
-	"sap/ui/core/library"
+	"sap/ui/core/library",
+	"sap/ui/events/KeyCodes"
 ], function(
 	library,
 	IconTabBarDragAndDropUtil,
@@ -20,7 +21,8 @@ sap.ui.define([
 	Control,
 	ItemNavigation,
 	Parameters,
-	coreLibrary
+	coreLibrary,
+	KeyCodes
 ) {
 	"use strict";
 
@@ -38,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @private
@@ -241,10 +243,37 @@ sap.ui.define([
 	};
 
 	/**
-	 * Handles tap event.
+	 * Handle the key down event for SPACE and ENTER.
+	 * @param {jQuery.Event} oEvent - the keyboard event.
 	 * @private
 	 */
-	IconTabBarSelectList.prototype.ontap = function (oEvent) {
+	IconTabBarSelectList.prototype.onkeydown = function(oEvent) {
+		switch (oEvent.which) {
+			case KeyCodes.ENTER:
+				this._selectItem(oEvent);
+				oEvent.preventDefault();
+				break;
+			case KeyCodes.SPACE:
+				oEvent.preventDefault(); // prevent scrolling when focused on the tab
+				break;
+		}
+	};
+
+	IconTabBarSelectList.prototype.onkeyup = function(oEvent) {
+		if (oEvent.which === KeyCodes.SPACE) {
+			this._selectItem(oEvent);
+		}
+	};
+
+	IconTabBarSelectList.prototype.ontap = function(oEvent) {
+		this._selectItem(oEvent);
+	};
+
+	/**
+	 * Handles tab selection.
+	 * @private
+	 */
+	IconTabBarSelectList.prototype._selectItem = function (oEvent) {
 		var oTappedItem = oEvent.srcControl;
 
 		if (!oTappedItem) {
@@ -261,17 +290,13 @@ sap.ui.define([
 
 		oEvent.preventDefault();
 
-		if (oTappedItem != this.getSelectedItem()) {
+		if (oTappedItem !== this.getSelectedItem()) {
 			this.fireSelectionChange({
 				selectedItem: oTappedItem
 			});
 		}
-
 	};
 
-	IconTabBarSelectList.prototype.onsapenter = IconTabBarSelectList.prototype.ontap;
-	IconTabBarSelectList.prototype.onsapspace = IconTabBarSelectList.prototype.ontap;
-
 	/**
 	 * Checks if only an icon should be rendered.
 	 * @private

package/src/sap/m/IconTabFilter.js

@@ -93,7 +93,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public
@@ -1360,7 +1360,7 @@ sap.ui.define([
 				oRbArgs = [sText, oRootTab.getText()];
 			} else {
 				sRbKey = "ICONTABFILTER_BADGE_MSG";
-				oRbArgs = sText;
+				oRbArgs = [sText];
 			}
 		}
 

package/src/sap/m/IconTabFilterExpandButtonBadge.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/IconTabHeader.js

@@ -77,7 +77,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public
@@ -581,7 +581,7 @@ sap.ui.define([
 			} else {
 				//change the content aria-labelled by the newly selected tab;
 				if (bIsParentIconTabBar) {
-					oParent.$("content").attr('aria-labelledby', oItem.sId);
+					oParent.$("content").attr('aria-labelledby', oItem._getRootTab().getId());
 				}
 
 				// set new item
@@ -1765,6 +1765,8 @@ sap.ui.define([
 		var oTab = oEvent.srcControl,
 			iTabStripEnd = this.indexOfItem(this._getItemsInStrip().pop());
 
+		oEvent.preventDefault();
+
 		this._moveTab(oTab, oEvent.keyCode, iTabStripEnd);
 		oTab.$().trigger("focus");
 	};

package/src/sap/m/IconTabSeparator.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/IllustratedMessage.js

@@ -86,7 +86,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Illustration.js

@@ -9,15 +9,24 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/Control",
 	"./IllustrationRenderer",
-	"./IllustrationPool"
+	"./IllustrationPool",
+	"sap/ui/core/Core"
 ], function(
 	Log,
 	Control,
 	IllustrationRenderer,
-	IllustrationPool
+	IllustrationPool,
+	Core
 ) {
 	"use strict";
 
+	var oCollectionMap = {
+		"sap_horizon": 'v5/',
+		"sap_horizon_dark": 'v5/',
+		"sap_horizon_hcb": 'v5/hc/',
+		"sap_horizon_hcw": 'v5/hc/'
+	};
+
 	/**
 	 * Constructor for a new <code>Illustration</code>.
 	 *
@@ -32,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public
@@ -94,32 +103,75 @@ sap.ui.define([
 	Illustration.prototype.onBeforeRendering = function() {
 		this._buildSymbolId();
 		if (this._sSymbolId) {
-			IllustrationPool.loadAsset(this._sSymbolId, this._sId);
+			IllustrationPool.loadAsset(this._sSymbolId, this._sId, this._sIdPrefix);
 		} else {
 			Log.warning(Illustration.CAN_NOT_BUILD_SYMBOL_MSG);
 		}
 	};
 
+	Illustration.prototype.onThemeChanged = function() {
+		this.invalidate();
+	};
+
 	/**
 	 * PRIVATE METHODS
 	 */
 
 	/**
 	 * Builds the Symbol ID which will be used for requiring the Illustration asset.
+	 * If mapping is provided for the current theme, the Symbol ID will be built using the mapped type.
 	 * @private
 	 */
-	Illustration.prototype._buildSymbolId = function() {
+	Illustration.prototype._buildSymbolId = function () {
 		var sSet = this.getSet(),
 			sMedia = this.getMedia(),
-			sType = this.getType();
+			sType = this.getType(),
+			oResult;
 
 		this._sSymbolId = "";
+		this._sIdPrefix = "";
 
 		if (sSet && sMedia && sType) {
-			this._sSymbolId = sSet + "-" + sMedia + "-" + sType;
+			oResult = this._formatType(sSet, sType);
+			this._sSymbolId = sSet + "-" + sMedia + "-" + oResult.mappedType;
+			this._sIdPrefix = oResult.prefix;
 		}
 	};
 
+	/**
+	 * Formats the type of the Illustration based on the current theme.
+	 * @param {string} sSet The name of the Illustration set
+	 * @param {string} sType The type of the Illustration
+	 * @returns {string} The formatted type of the Illustration
+	 * @private
+	 */
+	Illustration.prototype._formatType = function (sSet, sType) {
+		var sMappedType = sType,
+			sPrefix = "",
+			oMetadata = IllustrationPool.getIllustrationSetMetadata(sSet),
+			sCurrentTheme = Core.getConfiguration().getTheme(),
+			sCollectionPath = oCollectionMap[sCurrentTheme];
+
+		if (
+			sCollectionPath &&
+			oMetadata &&
+			oMetadata.aCollections &&
+			oMetadata.aCollections.length
+		) {
+			oMetadata.aCollections.forEach(function (oThemeMapping) {
+				if (oThemeMapping.prefix === sCollectionPath && oThemeMapping.mappings[sType]) {
+					sMappedType = oThemeMapping.mappings[sType];
+					sPrefix = oThemeMapping.prefix;
+				}
+			});
+		}
+
+		return {
+			mappedType: sMappedType,
+			prefix: sPrefix
+		};
+	};
+
 	return Illustration;
 
 });