@openui5/sap.ui.integration 1.97.1 → 1.100.0

package/src/sap/ui/integration/cards/ListContent.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseListContent
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private
@@ -127,7 +127,7 @@ sap.ui.define([
 	 * @override
 	 */
 	ListContent.prototype.loadDependencies = function (oCardManifest) {
-		if (oCardManifest.get("/sap.card/content/item/chart")) {
+		if (!this.isSkeleton() && oCardManifest.get("/sap.card/content/item/chart")) {
 			return Microchart.loadDependencies();
 		}
 
@@ -161,23 +161,40 @@ sap.ui.define([
 	 * @override
 	 */
 	ListContent.prototype.getStaticConfiguration = function () {
-		var oConfiguration = this.getParsedConfiguration();
-		var sPath = this._sContentBindingPath || "/";
-		var aItems = this.getModel().getProperty(sPath);
-		var aResolvedItems = [];
-		var maxIndex = oConfiguration.maxItems || aItems.length;
-
-		for (var iIndex = 0; iIndex < maxIndex; iIndex++) {
-			if (sPath === "/") {
-				aResolvedItems.push(BindingResolver.resolveValue(oConfiguration.item, this, sPath + iIndex));
+		var aListItems = this.getInnerList().getItems(),
+			oConfiguration = this.getParsedConfiguration(),
+			bHasGroups = aListItems[0] && aListItems[0].isA("sap.m.GroupHeaderListItem"),
+			aResolvedItems = [],
+			aResolvedGroups = [],
+			oResolvedGroup;
+
+		aListItems.forEach(function (oItem) {
+			if (oItem.isA("sap.m.GroupHeaderListItem")) {
+				if (oResolvedGroup) {
+					aResolvedGroups.push(oResolvedGroup);
+				}
+
+				aResolvedItems = [];
+				oResolvedGroup = {
+					title: oItem.getTitle(),
+					items: aResolvedItems
+				};
 			} else {
-				aResolvedItems.push(BindingResolver.resolveValue(oConfiguration.item, this, sPath + "/" + iIndex));
+				aResolvedItems.push(BindingResolver.resolveValue(oConfiguration.item, this, oItem.getBindingContext().getPath()));
 			}
+		}.bind(this));
+
+		if (oResolvedGroup) {
+			aResolvedGroups.push(oResolvedGroup);
 		}
 
-		var oStaticConfiguration = Object.assign({}, oConfiguration);
-		delete oStaticConfiguration.item;
-		oStaticConfiguration.items = aResolvedItems;
+		var oStaticConfiguration = {};
+
+		if (bHasGroups) {
+			oStaticConfiguration.groups = aResolvedGroups;
+		} else {
+			oStaticConfiguration.items = aResolvedItems;
+		}
 
 		return oStaticConfiguration;
 	};
@@ -186,6 +203,7 @@ sap.ui.define([
 	 * Handler for when data is changed.
 	 */
 	ListContent.prototype.onDataChanged = function () {
+		this._handleNoItemsError(this.getParsedConfiguration().item);
 		this._checkHiddenNavigationItems(this.getParsedConfiguration().item);
 	};
 
@@ -219,8 +237,9 @@ sap.ui.define([
 	 * @param {Object} oConfiguration Parsed configuration object.
 	 */
 	ListContent.prototype._setItem = function (oConfiguration) {
-		var mItem = oConfiguration.item;
-		var oList = this._getList(),
+		var mItem = oConfiguration.item,
+			oList = this._getList(),
+			bIsSkeleton = this.isSkeleton(),
 			mSettings = {
 				iconDensityAware: false,
 				title: mItem.title && (mItem.title.value || mItem.title),
@@ -263,15 +282,17 @@ sap.ui.define([
 			});
 		}
 
-		if (mItem.chart) {
-			mSettings.microchart = this._createChartAndAddLegend(mItem.chart);
-		}
+		if (!bIsSkeleton) {
+			if (mItem.chart) {
+				mSettings.microchart = this._createChartAndAddLegend(mItem.chart);
+			}
 
-		if (mItem.actionsStrip) {
-			mSettings.actionsStrip = ActionsStrip.create(this.getCardInstance(), mItem.actionsStrip);
-			oList.setShowSeparators(ListSeparators.All);
-		} else {
-			oList.setShowSeparators(ListSeparators.None);
+			if (mItem.actionsStrip) {
+				mSettings.actionsStrip = ActionsStrip.create(this.getCardInstance(), mItem.actionsStrip);
+				oList.setShowSeparators(ListSeparators.All);
+			} else {
+				oList.setShowSeparators(ListSeparators.None);
+			}
 		}
 
 		this._oItemTemplate = new ListContentItem(mSettings);
@@ -295,7 +316,6 @@ sap.ui.define([
 			sorter: this._oSorter
 		};
 
-		this._filterHiddenNavigationItems(mItem, oBindingInfo);
 		this._bindAggregationToControl("items", oList, oBindingInfo);
 	};
 
@@ -359,7 +379,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * @overwrite
+	 * @override
 	 * @returns {sap.m.List} The inner list.
 	 */
 	ListContent.prototype.getInnerList = function () {

package/src/sap/ui/integration/cards/ListContentRenderer.js

@@ -38,15 +38,19 @@ sap.ui.define([
 	/**
 	 * @override
 	 */
-	ListContentRenderer.getMinHeight = function (oConfiguration, oContent) {
-		if (!oConfiguration || !oConfiguration.maxItems || !oConfiguration.item) {
+	ListContentRenderer.getMinHeight = function (oConfiguration, oContent, oCard) {
+		var iMaxItems = oCard.getContentPageSize(oConfiguration),
+			fItemHeight;
+
+		if (!oConfiguration ||
+			!oConfiguration.item ||
+			!iMaxItems) {
 			return this.DEFAULT_MIN_HEIGHT;
 		}
 
-		var fItemHeight = this.getItemMinHeight(oConfiguration, oContent),
-			iCount = parseInt(oConfiguration.maxItems) || 0;
+		fItemHeight = this.getItemMinHeight(oConfiguration, oContent);
 
-		return (iCount * fItemHeight) + "rem";
+		return (iMaxItems * fItemHeight) + "rem";
 	};
 
 	ListContentRenderer.getItemMinHeight = function (oConfiguration, oControl) {

package/src/sap/ui/integration/cards/NumericHeader.js

@@ -32,10 +32,10 @@ sap.ui.define([
 	 *
 	 * @class
 	 * Displays general information in the header of the {@link sap.ui.integration.widgets.Card}.
-	 * @extends sap.f.NumericHeader
+	 * @extends sap.f.cards.NumericHeader
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private