@openui5/sap.ui.integration 1.118.0 → 1.119.0

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

@@ -31,7 +31,6 @@ sap.ui.define([
 	"sap/ui/integration/util/HeaderFactory",
 	"sap/ui/integration/util/ContentFactory",
 	"sap/ui/integration/util/BindingResolver",
-	"sap/ui/integration/util/BindingHelper",
 	"sap/ui/integration/util/ErrorHandler",
 	"sap/ui/integration/formatters/IconFormatter",
 	"sap/ui/integration/cards/filters/FilterBarFactory",
@@ -69,7 +68,6 @@ sap.ui.define([
 	HeaderFactory,
 	ContentFactory,
 	BindingResolver,
-	BindingHelper,
 	ErrorHandler,
 	IconFormatter,
 	FilterBarFactory,
@@ -99,11 +97,6 @@ sap.ui.define([
 		MODEL_SIZE_LIMIT: "/sap.card/configuration/modelSizeLimit"
 	};
 
-	/**
-	 * @const A list of model names which are used internally by the card.
-	 */
-	var INTERNAL_MODEL_NAMES = ["parameters", "filters", "paginator", "form", "messages", "context", "i18n"];
-
 	var RESERVED_PARAMETER_NAMES = ["visibleItems", "allItems"];
 
 	var HeaderPosition = fLibrary.cards.HeaderPosition;
@@ -185,7 +178,7 @@ sap.ui.define([
 	 * @extends sap.f.CardBase
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @public
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
@@ -533,10 +526,8 @@ sap.ui.define([
 		this.setAggregation("_loadingProvider", new LoadingProvider());
 
 		this._oIntegrationRb = Core.getLibraryResourceBundle("sap.ui.integration");
-
 		this._iModelSizeLimit = DEFAULT_MODEL_SIZE_LIMIT;
 		this._initModels();
-
 		this._oContentFactory = new ContentFactory(this);
 		this._oCardObserver = new CardObserver(this);
 		this._aSevereErrors = [];
@@ -555,7 +546,7 @@ sap.ui.define([
 		 * @experimental since 1.79
 		 * @public
 		 * @author SAP SE
-		 * @version 1.118.0
+		 * @version 1.119.0
 		 * @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
@@ -626,37 +617,49 @@ sap.ui.define([
 	 * Initializes the internally used models.
 	 */
 	Card.prototype._initModels = function () {
-		var oModel = new JSONModel();
-		this.setModel(oModel);
-
-		INTERNAL_MODEL_NAMES.forEach(function (sModelName) {
-			switch (sModelName) {
-				case "context":
-					oModel = new ContextModel();
-					break;
-				case "i18n":
-					oModel = new ResourceModel({
-						bundle: this._oIntegrationRb
-					});
-					break;
-				case "parameters":
-					oModel = new JSONModel(
-						ParameterMap.getParamsForModel()
-					);
-					break;
-				case "messages":
-					oModel = new JSONModel({
-						hasErrors: false,
-						hasWarnings: false,
-						records: []
-					});
-					break;
-				default:
-					oModel = new JSONModel();
+		this._INTERNAL_MODELS = {
+			"default": {
+				init: () => this.setModel(new JSONModel()),
+				reset: () => this.getModel().setData({})
+			},
+			parameters: {
+				init: () => this.setModel(new JSONModel(ParameterMap.getParamsForModel()), "parameters")
+			},
+			filters: {
+				init: () => this.setModel(new JSONModel(), "filters"),
+				reset: () => this.getModel("filters").setData({})
+			},
+			paginator: {
+				init: () => this.setModel(new JSONModel({
+					skip: 0
+				}),  "paginator"),
+				reset: () => this.getModel("paginator").setData({
+					skip: 0
+				})
+			},
+			form: {
+				init: () => this.setModel(new JSONModel(), "form")
+			},
+			messages: {
+				init: () => this.setModel(new JSONModel({
+					hasErrors: false,
+					hasWarnings: false,
+					records: []
+				}), "messages")
+			},
+			context: {
+				init: () => this.setModel(new ContextModel(), "context")
+			},
+			i18n: {
+				init: () => this.setModel(new ResourceModel({
+					bundle: this._oIntegrationRb
+				}), "i18n")
 			}
+		};
 
-			this.setModel(oModel, sModelName);
-		}.bind(this));
+		for (const modelName in this._INTERNAL_MODELS) {
+			this._INTERNAL_MODELS[modelName].init();
+		}
 	};
 
 	/**
@@ -1363,10 +1366,11 @@ sap.ui.define([
 			delete this._fnOnModelChange;
 		}
 
-		this.getModel().setData({});
-		this.getModel("filters").setData({});
-		this.getModel("parameters").setData({});
-		this.getModel("paginator").setData({});
+		for (const modelName in this._INTERNAL_MODELS) {
+			if (this._INTERNAL_MODELS[modelName].reset) {
+				this._INTERNAL_MODELS[modelName].reset();
+			}
+		}
 
 		this._oContextParameters = null;
 
@@ -1788,7 +1792,6 @@ sap.ui.define([
 	 */
 
 	Card.prototype._setParametersModelData = function () {
-
 		var oPredefinedParameters = ParameterMap.getParamsForModel(),
 			oCustomParameters = {},
 			oCombinedParameters = this.getCombinedParameters(),
@@ -2089,7 +2092,13 @@ sap.ui.define([
 	 * @returns {boolean} If the card is rendered as a tile variant
 	 */
 	Card.prototype.isTileDisplayVariant = function () {
-		return [CardDisplayVariant.TileStandard, CardDisplayVariant.TileStandardWide].indexOf(this.getDisplayVariant()) > -1;
+		const aTileVariants = [
+			CardDisplayVariant.TileStandard,
+			CardDisplayVariant.TileStandardWide,
+			CardDisplayVariant.TileFlat,
+			CardDisplayVariant.TileFlatWide
+		];
+		return aTileVariants.indexOf(this.getDisplayVariant()) > -1;
 	};
 
 	Card.prototype.createHeader = function () {
@@ -2588,7 +2597,7 @@ sap.ui.define([
 				return;
 			}
 
-			if (INTERNAL_MODEL_NAMES.indexOf(sModelName) > -1) {
+			if (this._INTERNAL_MODELS[sModelName]) {
 				Log.error("The model name (data section name) '" + sModelName + "' is reserved for cards. Can not be used for creating a custom model.");
 				return;
 			}

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

@@ -45,7 +45,7 @@ sap.ui.define([
 				oRm.class("sapFCardPreview");
 			}
 
-			oRm.class("sapUiIntCardDisplayVariant" + oCard.getDisplayVariant());
+			oRm.class("sapUiIntCard" + oCard.getDisplayVariant());
 		},
 
 		/**

package/src/sap-ui-integration.js

@@ -110,15 +110,15 @@
 	}
 
 	function registerLibraryTags(sLibrary) {
-		var oLibrary = coreInstance.getLoadedLibraries()[sLibrary];
-		//collect the prefix and the relevant tags
-		var aTags = Object.keys(oLibrary.customElements);
+		var oLibrary = coreInstance.getLoadedLibraries()[sLibrary],
+			mCustomElements = oLibrary.extensions["sap.ui.integration"].customElements,
+			aTags = Object.keys(mCustomElements);
 
 		//collect all the implementation classes and require them
 		window.sap.ui.require(
 			aTags.map(
 				function (o, i) {
-					return oLibrary.customElements[aTags[i]];
+					return mCustomElements[aTags[i]];
 				}
 			)
 		);