@openui5/sap.ui.integration 1.129.0 → 1.130.0

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.m:
 
-Component: purify.js, version: 2.3.8
+Component: purify.js, version: 3.1.7
 Copyright: Mario Heiderich
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.integration",
-  "version": "1.129.0",
+  "version": "1.130.0",
   "description": "OpenUI5 UI Library sap.ui.integration",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,11 +14,11 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.129.0",
-    "@openui5/sap.f": "1.129.0",
-    "@openui5/sap.m": "1.129.0",
-    "@openui5/sap.ui.unified": "1.129.0",
-    "@openui5/sap.ui.layout": "1.129.0",
-    "@openui5/sap.ui.table": "1.129.0"
+    "@openui5/sap.ui.core": "1.130.0",
+    "@openui5/sap.f": "1.130.0",
+    "@openui5/sap.m": "1.130.0",
+    "@openui5/sap.ui.unified": "1.130.0",
+    "@openui5/sap.ui.layout": "1.130.0",
+    "@openui5/sap.ui.table": "1.130.0"
   }
 }

package/src/sap/ui/integration/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.129.0</version>
+  <version>1.130.0</version>
 
   <documentation>SAPUI5 library with integration-related controls.</documentation>
 

package/src/sap/ui/integration/ActionDefinition.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/integration/Designtime.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/integration/Extension.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/integration/Host.js

@@ -30,7 +30,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.129.0
+		 * @version 1.130.0
 		 *
 		 * @constructor
 		 * @public

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

@@ -35,7 +35,7 @@ sap.ui.define([
 		 * @extends sap.ui.integration.cards.BaseContent
 		 *
 		 * @author SAP SE
-		 * @version 1.129.0
+		 * @version 1.130.0
 		 *
 		 * @constructor
 		 * @private

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

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -74,7 +74,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -111,7 +111,6 @@ sap.ui.define([
 				}
 			},
 			aggregations: {
-
 				/**
 				 * Defines the content of the control.
 				 */
@@ -583,7 +582,7 @@ sap.ui.define([
 
 				this.getLoadDependenciesPromise().then(function (bLoadSuccessful){
 					if (bLoadSuccessful && !this.isDestroyed()) {
-						oModel.setData(oData);
+						this.setModelData(oData, oModel);
 					}
 				}.bind(this));
 			}.bind(this));
@@ -591,7 +590,7 @@ sap.ui.define([
 			this._oDataProvider.attachError(function (oEvent) {
 				this.handleError({
 					requestErrorParams: oEvent.getParameters(),
-					requestSettings: this._oDataProvider.getSettings()
+					requestSettings: this._oDataProvider.getResolvedConfiguration()
 				});
 				this.onDataRequestComplete();
 			}.bind(this));
@@ -685,6 +684,10 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	BaseContent.prototype.setModelData = function (vData, oModel) {
+		oModel.setData(vData);
+	};
+
 	/**
 	 * Binds an aggregation to the binding path of the BaseContent.
 	 * Observes the aggregation to update parameters>/visibleItems.
@@ -876,8 +879,6 @@ sap.ui.define([
 		return oCard && oCard.isSkeleton();
 	};
 
-	BaseContent.prototype.sliceData = function (iStartIndex, iEndIndex) { };
-
 	BaseContent.prototype.getDataLength = function () {
 		return 0;
 	};
@@ -898,7 +899,7 @@ sap.ui.define([
 	};
 
 	BaseContent.prototype._isDataProviderJson = function () {
-		return this._oDataProvider && this._oDataProvider.getSettings() && this._oDataProvider.getSettings()["json"];
+		return !!this._oDataProvider?.getConfiguration()?.json;
 	};
 
 	/*

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

@@ -38,8 +38,6 @@ sap.ui.define([
 			sName = oCardContent.getMetadata().getName(),
 			sType = sName.slice(sName.lastIndexOf(".") + 1),
 			oCard = oCardContent.getCardInstance(),
-			bLoading = oCardContent.isLoading(),
-			bIsAbstractPreviewMode =  oCard && oCard.getPreviewMode() === CardPreviewMode.Abstract,
 			oMessageContainer = oCardContent.getAggregation("_messageContainer"),
 			oBlockingMessage = oCardContent.getAggregation("_blockingMessage");
 
@@ -58,15 +56,11 @@ sap.ui.define([
 			oRm.style("min-height", sHeight);
 		}
 
-		if (bLoading || bIsAbstractPreviewMode) {
-			oRm.class("sapFCardContentLoading");
-		}
+		this.renderLoadingClass(oRm, oCardContent);
 
 		oRm.openEnd();
 
-		if (bLoading || bIsAbstractPreviewMode) {
-			oRm.renderControl(oCardContent.getAggregation("_loadingPlaceholder"));
-		}
+		this.renderLoadingPlaceholder(oRm, oCardContent);
 
 		if (oMessageContainer) {
 			oRm.renderControl(oMessageContainer);
@@ -90,6 +84,34 @@ sap.ui.define([
 		oRm.renderControl(oCardContent.getAggregation("_content"));
 	};
 
+	/**
+	 * @protected
+	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the Render-Output-Buffer
+	 * @param {sap.ui.integration.cards.BaseContent} oCardContent an object representation of the control that should be rendered
+	 */
+	BaseContentRenderer.renderLoadingClass = function (oRm, oCardContent) {
+		const oCard = oCardContent.getCardInstance();
+		const bIsAbstractPreviewMode =  oCard && oCard.getPreviewMode() === CardPreviewMode.Abstract;
+
+		if (oCardContent.isLoading() || bIsAbstractPreviewMode) {
+			oRm.class("sapFCardContentLoading");
+		}
+	};
+
+	/**
+	 * @protected
+	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the Render-Output-Buffer
+	 * @param {sap.ui.integration.cards.BaseContent} oCardContent an object representation of the control that should be rendered
+	 */
+	BaseContentRenderer.renderLoadingPlaceholder = function (oRm, oCardContent) {
+		const oCard = oCardContent.getCardInstance();
+		const bIsAbstractPreviewMode = oCard && oCard.getPreviewMode() === CardPreviewMode.Abstract;
+
+		if (oCardContent.isLoading() || bIsAbstractPreviewMode) {
+			oRm.renderControl(oCardContent.getAggregation("_loadingPlaceholder"));
+		}
+	};
+
 	/**
 	 * @protected
 	 * @param {object} oConfiguration The manifest configuration of the content

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

@@ -5,7 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/ui/integration/cards/BaseContent",
+	"./BaseContent",
+	"./BaseListContentRenderer",
 	"sap/ui/integration/util/BindingResolver",
 	"sap/m/IllustratedMessageType",
 	"sap/ui/integration/library",
@@ -13,6 +14,7 @@ sap.ui.define([
 	"sap/ui/model/Sorter"
 ], function (
 	BaseContent,
+	BaseListContentRenderer,
 	BindingResolver,
 	IllustratedMessageType,
 	library,
@@ -33,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -44,9 +46,7 @@ sap.ui.define([
 		metadata: {
 			library: "sap.ui.integration"
 		},
-		renderer: {
-			apiVersion: 2
-		}
+		renderer: BaseListContentRenderer
 	});
 
 	/**
@@ -85,6 +85,21 @@ sap.ui.define([
 				title: this.getCardInstance().getTranslatedText("CARD_NO_ITEMS_ERROR_LISTS")
 			});
 		}
+
+		this.getPaginator()?.onDataChanged(this);
+	};
+
+	/**
+	 * @override
+	 */
+	BaseListContent.prototype.setModelData = function (vData, oModel) {
+		const oPaginator = this.getPaginator();
+
+		if (oPaginator?.isLoadingMore()) {
+			oPaginator.setModelData(vData, oModel);
+		} else {
+			BaseContent.prototype.setModelData.apply(this, arguments);
+		}
 	};
 
 	BaseListContent.prototype._keepHeight = function () {
@@ -131,19 +146,28 @@ sap.ui.define([
 		}
 
 		var oList = this.getInnerList(),
-			bHasPaginator = this.getCard() ? this.getCardInstance().hasPaginator() : false,
 			maxItems = BindingResolver.resolveValue(oConfiguration.maxItems, this);
 
 		if (!Number.isNaN(parseInt(maxItems))) {
 			maxItems = parseInt(maxItems);
 		}
 
-		if (oList && maxItems && !bHasPaginator) {
-			oList.applySettings({
-				growing: true,
-				growingThreshold: maxItems
-			});
-			oList.addStyleClass("sapFCardMaxItems");
+		const oPaginator = this.getPaginator();
+
+		if (oList && (!oPaginator || !oPaginator.getActive())) {
+			let iDisplayCount = maxItems;
+
+			if (oPaginator) {
+				iDisplayCount = oPaginator.getPageSize();
+			}
+
+			if (iDisplayCount) {
+				oList.applySettings({
+					growing: true,
+					growingThreshold: iDisplayCount
+				});
+				oList.addStyleClass("sapFCardMaxItems");
+			}
 		}
 
 		this._fMinHeight = 0;
@@ -168,6 +192,14 @@ sap.ui.define([
 		return 0;
 	};
 
+	BaseListContent.prototype.setPaginator = function (oPaginator) {
+		this._oPaginator = oPaginator;
+	};
+
+	BaseListContent.prototype.getPaginator = function () {
+		return this._oPaginator;
+	};
+
 	/**
 	 * Used to check which content items should be hidden based on the Navigation Service.
 	 *
@@ -274,13 +306,6 @@ sap.ui.define([
 		return oSorter;
 	};
 
-	BaseListContent.prototype.sliceData = function (iStartIndex, iEndIndex) {
-		this.getModel().sliceData(iStartIndex, iEndIndex);
-		if (iStartIndex !== 0) {
-			this._keepHeight();
-		}
-	};
-
 	BaseListContent.prototype.getDataLength = function () {
 		var oData = this.getModel().getProperty(this.getInnerList().getBindingContext().getPath());
 

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

@@ -0,0 +1,52 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"./BaseContentRenderer"
+], function (BaseContentRenderer) {
+	"use strict";
+
+	/**
+	 * BaseContent renderer.
+	 * @author SAP SE
+	 * @namespace
+	 */
+	var BaseListContentRenderer = BaseContentRenderer.extend("sap.ui.integration.cards.BaseListContentRenderer", {
+		apiVersion: 2
+	});
+
+	/**
+	 * @override
+	 */
+	BaseListContentRenderer.renderContent = function (oRm, oCardContent) {
+		oRm.renderControl(oCardContent.getAggregation("_content"));
+		oCardContent.getPaginator()?.render(oRm);
+	};
+
+	/**
+	 * @override
+	 */
+	BaseListContentRenderer.renderLoadingClass = function (oRm, oCardContent) {
+		if (oCardContent.getPaginator()?.isLoadingMore()) {
+			return;
+		}
+
+		BaseContentRenderer.renderLoadingClass(oRm, oCardContent);
+	};
+
+	/**
+	 * @override
+	 */
+	BaseListContentRenderer.renderLoadingPlaceholder = function (oRm, oCardContent) {
+		if (oCardContent.getPaginator()?.isLoadingMore()) {
+			return;
+		}
+
+		BaseContentRenderer.renderLoadingPlaceholder(oRm, oCardContent);
+	};
+
+	return BaseListContentRenderer;
+});

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

@@ -79,7 +79,7 @@ sap.ui.define([
 		 * @extends sap.ui.integration.cards.BaseContent
 		 *
 		 * @author SAP SE
-		 * @version 1.129.0
+		 * @version 1.130.0
 		 *
 		 * @constructor
 		 * @private
@@ -99,7 +99,9 @@ sap.ui.define([
 					/**
 					 * Defines the text that is displayed when no {@link sap.f.CalendarAppointmentInCard CalendarAppointmentInCard} are assigned.
 					 */
-					noAppointmentsText : {type : "string", group : "Misc", defaultValue : null}
+					noAppointmentsText : {type : "string", group : "Misc", defaultValue : null},
+
+					use12HourFormat : { type : "boolean", defaultValue : false }
 				},
 				aggregations: {
 					/**
@@ -330,6 +332,10 @@ sap.ui.define([
 				this._addMaxLegendItems(oConfiguration.maxLegendItems);
 			}
 
+			if (oConfiguration.use12HourFormat) {
+				this.setUse12HourFormat(oConfiguration.use12HourFormat);
+			}
+
 			if (oConfiguration.noItemsText) {
 				this._addNoItemsText(oConfiguration.noItemsText);
 			}
@@ -341,6 +347,10 @@ sap.ui.define([
 					control: this._getMoreButton()
 				});
 			}
+
+			if (oConfiguration.calendarWeekNumbering) {
+				this._oCalendar.setCalendarWeekNumbering(oConfiguration.calendarWeekNumbering);
+			}
 		};
 
 		CalendarContent.prototype._getStaticConfigurationLegendItems = function (aLegendItems, aLegendAppointmentItems, oConfiguration, oLegend) {

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

@@ -129,12 +129,12 @@ sap.ui.define([
 		oRm.openStart("div");
 		oRm.class("sapUiCalendarAppStart");
 		oRm.openEnd();
-		oRm.text(oAppointment._getDateRangeIntersectionText(oSelectedDate).start);
+		oRm.text(oAppointment._getDateRangeIntersectionText(oSelectedDate, oCalendarContent.getUse12HourFormat()).start);
 		oRm.close("div");
 		oRm.openStart("div");
 		oRm.class("sapUiCalendarAppEnd");
 		oRm.openEnd();
-		oRm.text(oAppointment._getDateRangeIntersectionText(oSelectedDate).end);
+		oRm.text(oAppointment._getDateRangeIntersectionText(oSelectedDate, oCalendarContent.getUse12HourFormat()).end);
 		oRm.close("div");
 		oRm.close("div");
 		oRm.openStart("div");

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

@@ -10,14 +10,14 @@ sap.ui.define([
 	"sap/ui/integration/library",
 	"sap/m/IllustratedMessageType",
 	"sap/ui/core/ComponentContainer",
-	"sap/ui/core/Component"
+	"sap/ui/core/ComponentHooks"
 ], function (
 	BaseContent,
 	ComponentContentRenderer,
 	library,
 	IllustratedMessageType,
 	ComponentContainer,
-	Component
+	ComponentHooks
 ) {
 	"use strict";
 
@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.0
 	 *
 	 * @experimental
 	 * @constructor
@@ -55,12 +55,12 @@ sap.ui.define([
 	 * Global hook when a new component instance of any kind is created.
 	 * @param {sap.ui.core.Component} oInstance The created component instance.
 	 */
-	Component._fnOnInstanceCreated = function (oInstance) {
+	ComponentHooks.onInstanceCreated.register(function (oInstance) {
 		var oCompData = oInstance.getComponentData();
 		if (oCompData && oCompData["__sapUiIntegration_card"] && oInstance.onCardReady) {
 			oInstance.onCardReady(oCompData["__sapUiIntegration_card"]);
 		}
-	};
+	});
 
 	ComponentContent.prototype.onAfterRendering = function () {
 		if (this._oComponent?.tileSetVisible) {