@openui5/sap.ui.integration 1.92.0 → 1.93.3

package/src/sap/ui/integration/widgets/Card.js

@@ -5,6 +5,7 @@
  */
 sap.ui.define([
 	"./CardRenderer",
+	"../cards/Footer",
 	"../controls/ActionsToolbar",
 	"sap/ui/base/Interface",
 	"sap/ui/thirdparty/jquery",
@@ -14,7 +15,6 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/merge",
 	"sap/base/util/deepEqual",
-	"sap/base/util/isPlainObject",
 	"sap/ui/integration/util/DataProviderFactory",
 	"sap/m/HBox",
 	"sap/ui/core/Icon",
@@ -30,7 +30,6 @@ sap.ui.define([
 	"sap/ui/integration/util/Destinations",
 	"sap/ui/integration/util/LoadingProvider",
 	"sap/ui/integration/util/HeaderFactory",
-	"sap/ui/integration/util/FooterFactory",
 	"sap/ui/integration/util/ContentFactory",
 	"sap/ui/integration/util/BindingResolver",
 	"sap/ui/integration/formatters/IconFormatter",
@@ -39,6 +38,7 @@ sap.ui.define([
 	"sap/ui/integration/util/CardObserver"
 ], function (
 	CardRenderer,
+	Footer,
 	ActionsToolbar,
 	Interface,
 	jQuery,
@@ -48,7 +48,6 @@ sap.ui.define([
 	Log,
 	merge,
 	deepEqual,
-	isPlainObject,
 	DataProviderFactory,
 	HBox,
 	Icon,
@@ -64,7 +63,6 @@ sap.ui.define([
 	Destinations,
 	LoadingProvider,
 	HeaderFactory,
-	FooterFactory,
 	ContentFactory,
 	BindingResolver,
 	IconFormatter,
@@ -80,8 +78,8 @@ sap.ui.define([
 		DATA: "/sap.card/data",
 		HEADER: "/sap.card/header",
 		HEADER_POSITION: "/sap.card/headerPosition",
-		FOOTER: "/sap.card/footer",
 		CONTENT: "/sap.card/content",
+		FOOTER: "/sap.card/footer",
 		SERVICES: "/sap.ui5/services",
 		APP_TYPE: "/sap.app/type",
 		PARAMS: "/sap.card/configuration/parameters",
@@ -161,7 +159,7 @@ sap.ui.define([
 	 * @extends sap.f.CardBase
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @public
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
@@ -385,6 +383,7 @@ sap.ui.define([
 		CardBase.prototype.init.call(this);
 
 		this.setAggregation("_loadingProvider", new LoadingProvider());
+		this.setModel(new JSONModel()); // always create a default model to isolate the card from a propagated default model
 		this.setModel(new JSONModel(), "parameters");
 		this.setModel(new JSONModel(), "filters");
 		this.setModel(new ContextModel(), "context");
@@ -403,14 +402,18 @@ sap.ui.define([
 		 * @experimental since 1.79
 		 * @public
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.93.3
+		 * @borrows sap.ui.integration.widgets.Card#getDomRef as getDomRef
+		 * @borrows sap.ui.integration.widgets.Card#setVisible as setVisible
 		 * @borrows sap.ui.integration.widgets.Card#getParameters as getParameters
 		 * @borrows sap.ui.integration.widgets.Card#getCombinedParameters as getCombinedParameters
 		 * @borrows sap.ui.integration.widgets.Card#getManifestEntry as getManifestEntry
 		 * @borrows sap.ui.integration.widgets.Card#resolveDestination as resolveDestination
 		 * @borrows sap.ui.integration.widgets.Card#request as request
+		 * @borrows sap.ui.integration.widgets.Card#refresh as refresh
 		 * @borrows sap.ui.integration.widgets.Card#showMessage as showMessage
 		 * @borrows sap.ui.integration.widgets.Card#getBaseUrl as getBaseUrl
+		 * @borrows sap.ui.integration.widgets.Card#getRuntimeUrl as getRuntimeUrl
 		 * @borrows sap.ui.integration.widgets.Card#getTranslatedText as getTranslatedText
 		 * @borrows sap.ui.integration.widgets.Card#getModel as getModel
 		 * @borrows sap.ui.integration.widgets.Card#triggerAction as triggerAction
@@ -424,13 +427,17 @@ sap.ui.define([
 		 * @borrows sap.ui.integration.widgets.Card#hideLoadingPlaceholders as hideLoadingPlaceholders
 		 */
 		this._oLimitedInterface = new Interface(this, [
+			"getDomRef",
+			"setVisible",
 			"getParameters",
 			"getCombinedParameters",
 			"getManifestEntry",
 			"resolveDestination",
 			"request",
+			"refresh",
 			"showMessage",
 			"getBaseUrl",
+			"getRuntimeUrl",
 			"getTranslatedText",
 			"getModel",
 			"triggerAction",
@@ -1437,11 +1444,6 @@ sap.ui.define([
 		this.setAggregation("_filterBar", oFilterBar);
 	};
 
-	/**
-	 * Lazily load and create a footer
-	 *
-	 * @private
-	 */
 	Card.prototype._applyFooterManifestSettings = function () {
 		var oFooter = this.createFooter();
 
@@ -1528,10 +1530,13 @@ sap.ui.define([
 	};
 
 	Card.prototype.createFooter = function () {
-		var oManifestFooter = this._oCardManifest.get(MANIFEST_PATHS.FOOTER),
-			oFooterFactory = new FooterFactory(this);
+		var oManifestFooter = this._oCardManifest.get(MANIFEST_PATHS.FOOTER);
+
+		if (!oManifestFooter) {
+			return null;
+		}
 
-		return oFooterFactory.create(oManifestFooter);
+		return Footer.create(this, oManifestFooter);
 	};
 
 	Card.prototype.getContentManifest = function () {

package/src/sap/ui/integration/widgets/CardRenderer.js

@@ -29,14 +29,17 @@ sap.ui.define([
 			if (oCardManifest && oCardManifest.get(MANIFEST_PATHS.TYPE) && oCardManifest.get(MANIFEST_PATHS.TYPE).toLowerCase() === "analytical") {
 				oRm.class("sapUiIntCardAnalytical");
 			}
+
+			if (oCard.getAggregation("_footer")) {
+				oRm.class("sapUiIntCardWithFooter");
+			}
 		},
 
 		/**
 		 * @override
 		 */
 		renderContentSection: function (oRm, oCard) {
-			var oFilterBar = oCard.getAggregation("_filterBar"),
-				oFooter = oCard.getAggregation("_footer"); // move to sap.f.CardRenderer
+			var oFilterBar = oCard.getAggregation("_filterBar");
 
 			if (oFilterBar) {
 				oRm.openStart("div")
@@ -49,15 +52,16 @@ sap.ui.define([
 			}
 
 			FCardRenderer.renderContentSection.apply(this, arguments);
+		},
 
-			if (oFooter) {
-				oRm.openStart("div")
-					.class("sapFCardFooter")
-					.openEnd();
+		/**
+		 * @override
+		 */
+		renderFooterSection: function (oRm, oCard) {
+			var oFooter = oCard.getAggregation("_footer");
 
+			if (oFooter) {
 				oRm.renderControl(oFooter);
-
-				oRm.close("div");
 			}
 		}
 	});

package/src/sap/ui/integration/util/FooterFactory.js

@@ -1,114 +0,0 @@
-/*!
- * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-sap.ui.define([
-	"./BaseFactory",
-	"./CardActions",
-	"sap/ui/integration/library",
-	"sap/m/Button",
-	"sap/m/OverflowToolbarButton",
-	"sap/m/OverflowToolbar",
-	"sap/m/OverflowToolbarLayoutData",
-	"sap/m/ToolbarSpacer"
-], function (
-	BaseFactory,
-	CardActions,
-	library,
-	Button,
-	OverflowToolbarButton,
-	OverflowToolbar,
-	OverflowToolbarLayoutData,
-	ToolbarSpacer
-) {
-	"use strict";
-
-	var ActionArea = library.CardActionArea;
-
-
-	/**
-	 * Constructor for a new <code>FooterFactory</code>.
-	 *
-	 * @class
-	 *
-	 * @extends sap.ui.integration.util.BaseFactory
-	 *
-	 * @author SAP SE
-	 * @version 1.92.0
-	 *
-	 * @constructor
-	 * @private
-	 * @alias sap.ui.integration.util.FooterFactory
-	 */
-	var FooterFactory = BaseFactory.extend("sap.ui.integration.util.FooterFactory");
-
-	FooterFactory.prototype.create = function (mConfiguration) {
-		if (!mConfiguration || !mConfiguration.toolbar) {
-			return null;
-		}
-
-		//@todo what should be the default button type
-		var oToolbar = new OverflowToolbar(),
-			oCard = this._oCard,
-			oActions = new CardActions({
-				card: oCard
-			}),
-			bHasSpacer;
-
-		mConfiguration = this.createBindingInfos(mConfiguration, oCard.getBindingNamespaces());
-
-		mConfiguration.toolbar.forEach(function (mConfig) {
-			if (mConfig.type === "ToolbarSpacer") {
-				bHasSpacer = true;
-				oToolbar.addContent(new ToolbarSpacer());
-				return;
-			}
-
-			var aActions = mConfig.actions,
-				oOverflow = new OverflowToolbarLayoutData({
-					group: mConfig.group,
-					priority: mConfig.overflowPriority
-				}),
-				mButtonSettings,
-				oButton,
-				sTooltip = mConfig.tooltip;
-
-			if (!sTooltip && mConfig.icon) {
-				sTooltip = mConfig.text;
-			}
-
-			mButtonSettings = {
-				type: mConfig.buttonType,
-				text: mConfig.text,
-				icon: mConfig.icon,
-				tooltip: sTooltip
-			};
-
-			if (mConfig.icon) {
-				oButton = new OverflowToolbarButton(mButtonSettings);
-			} else {
-				oButton = new Button(mButtonSettings);
-			}
-
-			oButton.setLayoutData(oOverflow);
-
-			oActions.attach({
-				area: ActionArea.Footer,
-				control: oButton,
-				actions: aActions,
-				enabledPropertyName: "enabled"
-			});
-
-			oToolbar.addContent(oButton);
-		});
-
-		if (!bHasSpacer) {
-			oToolbar.insertContent(new ToolbarSpacer(), 0);
-		}
-
-		return oToolbar;
-	};
-
-	return FooterFactory;
-});