@sapui5/sap.fe.core 1.134.0 → 1.136.0

package/src/sap/fe/core/buildingBlocks/templating/BuildingBlockTemplateProcessor.ts

@@ -55,6 +55,7 @@ export type TemplateProcessorSettings = {
 	models: Record<string, Model> & {
 		converterContext: JSONModel;
 		viewData: JSONModel;
+		internal: JSONModel;
 		metaModel: ODataMetaModel;
 		"sap.fe.i18n"?: ResourceModel;
 	};
@@ -515,7 +516,7 @@ export type BuildingBlockAggregation = {
 async function parseAggregation(
 	oVisitor: IVisitorCallback,
 	oAggregation?: Element,
-	processAggregations?: Function
+	definition?: BuildingBlockAggregationDefinition
 ): Promise<Record<string, BuildingBlockAggregation>> {
 	const oOutObjects: Record<string, BuildingBlockAggregation> = {};
 	if (oAggregation && oAggregation.children.length > 0) {
@@ -530,7 +531,10 @@ async function parseAggregation(
 		const children = oAggregation.children;
 		for (let childIdx = 0; childIdx < children.length; childIdx++) {
 			const childDefinition = children[childIdx];
-			let childKey = childDefinition.getAttribute("key") || childDefinition.getAttribute("id");
+			let childKey =
+				childDefinition.getAttribute("key") ||
+				childDefinition.getAttribute("id") ||
+				(definition?.skipKey && definition.multiple === false && uid());
 			if (childKey) {
 				childKey = `InlineXML_${childKey}`;
 				childDefinition.setAttribute("key", childKey);
@@ -542,8 +546,8 @@ async function parseAggregation(
 					},
 					type: "Slot"
 				};
-				if (processAggregations) {
-					aggregationObject = processAggregations(childDefinition, aggregationObject);
+				if (definition?.processAggregations) {
+					aggregationObject = definition.processAggregations(childDefinition, aggregationObject);
 				}
 				oOutObjects[aggregationObject.key] = aggregationObject;
 			} else if (childDefinition.tagName !== "slot") {
@@ -624,11 +628,7 @@ async function processChildren(
 				}
 				const aggregationDefinition = oMetadata.aggregations[sAggregationName];
 				if (aggregationDefinition !== undefined && !aggregationDefinition.slot) {
-					const parsedAggregation = await parseAggregation(
-						oVisitor,
-						oFirstElementChild,
-						aggregationDefinition.processAggregations
-					);
+					const parsedAggregation = await parseAggregation(oVisitor, oFirstElementChild, aggregationDefinition);
 					propertyValues[sAggregationName] = parsedAggregation;
 					for (const parsedAggregationKey in parsedAggregation) {
 						oMetadata.aggregations[parsedAggregationKey] = parsedAggregation[parsedAggregationKey];

package/src/sap/fe/core/buildingBlocks/templating/BuildingBlockTemplatingBase.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2024 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2025 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/base/util/deepClone", "sap/base/util/merge", "sap/fe/core/buildingBlocks/templating/BuildingBlockTemplateProcessor", "sap/fe/core/converters/ConverterContext", "sap/fe/core/converters/ManifestWrapper", "sap/fe/core/helpers/StableIdHelper", "sap/fe/core/templating/DataModelPathHelper"], function (deepClone, merge, BuildingBlockTemplateProcessor, ConverterContext, ManifestWrapper, StableIdHelper, DataModelPathHelper) {
   "use strict";

package/src/sap/fe/core/controllerextensions/BaseControllerExtension.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2024 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2025 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/mvc/ControllerExtension"], function (ClassSupport, ControllerExtension) {
   "use strict";
@@ -52,12 +52,14 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/mvc/ControllerExtension"
                 if (method.overrideExecution === "BeforeAsync") {
                   methodArrays.reverse();
                 }
+                let result;
                 for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
                   args[_key] = arguments[_key];
                 }
                 for (const arg of methodArrays) {
-                  await arg.apply(_this2, args);
+                  result = await arg.apply(_this2, args);
                 }
+                return result;
               };
             }
           });
@@ -70,4 +72,4 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/mvc/ControllerExtension"
   _exports = BaseControllerExtension;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJCYXNlQ29udHJvbGxlckV4dGVuc2lvbiIsIl9kZWMiLCJkZWZpbmVVSTVDbGFzcyIsIl9jbGFzcyIsIl9Db250cm9sbGVyRXh0ZW5zaW9uIiwiX3RoaXMiLCJjYWxsIiwiaW5pdCIsIl9leHBvcnRzIiwiX2luaGVyaXRzTG9vc2UiLCJfcHJvdG8iLCJwcm90b3R5cGUiLCJnZXRJbnRlcmZhY2UiLCJfdGhpczIiLCJpbnRlcmZhY2VPYmoiLCJtZXRhZGF0YSIsImdldE1ldGFkYXRhIiwiYWxsTWV0aG9kcyIsImdldEFsbE1ldGhvZHMiLCJtZXRob2RIb2xkZXIiLCJtZXRob2ROYW1lIiwibWV0aG9kIiwib3ZlcnJpZGVFeGVjdXRpb24iLCJPYmplY3QiLCJkZWZpbmVQcm9wZXJ0eSIsImNvbmZpZ3VyYWJsZSIsInNldCIsInYiLCJwdXNoIiwiZ2V0IiwibWV0aG9kQXJyYXlzIiwicmV2ZXJzZSIsIl9sZW4iLCJhcmd1bWVudHMiLCJsZW5ndGgiLCJhcmdzIiwiQXJyYXkiLCJfa2V5IiwiYXJnIiwiYXBwbHkiLCJDb250cm9sbGVyRXh0ZW5zaW9uIl0sInNvdXJjZVJvb3QiOiIuIiwic291cmNlcyI6WyJCYXNlQ29udHJvbGxlckV4dGVuc2lvbi50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZWZpbmVVSTVDbGFzcyB9IGZyb20gXCJzYXAvZmUvYmFzZS9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCB0eXBlIEJhc2VPYmplY3QgZnJvbSBcInNhcC91aS9iYXNlL09iamVjdFwiO1xuaW1wb3J0IENvbnRyb2xsZXJFeHRlbnNpb24gZnJvbSBcInNhcC91aS9jb3JlL212Yy9Db250cm9sbGVyRXh0ZW5zaW9uXCI7XG5pbXBvcnQgdHlwZSBDb250cm9sbGVyTWV0YWRhdGEgZnJvbSBcInNhcC91aS9jb3JlL212Yy9Db250cm9sbGVyTWV0YWRhdGFcIjtcbi8qKlxuICogQSBiYXNlIGltcGxlbWVudGF0aW9uIGZvciBjb250cm9sbGVyIGV4dGVuc2lvbiB1c2VkIGludGVybmFsbHkgaW4gc2FwLmZlIGZvciBjZW50cmFsIGZ1bmN0aW9uYWxpdGllcy5cbiAqIEBwdWJsaWNcbiAqIEBzaW5jZSAxLjExOC4wXG4gKi9cbkBkZWZpbmVVSTVDbGFzcyhcInNhcC5mZS5jb3JlLmNvbnRyb2xsZXJleHRlbnNpb25zLkJhc2VDb250cm9sbGVyRXh0ZW5zaW9uXCIpXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBCYXNlQ29udHJvbGxlckV4dGVuc2lvbiBleHRlbmRzIENvbnRyb2xsZXJFeHRlbnNpb24ge1xuXHRjb25zdHJ1Y3RvcigpIHtcblx0XHRzdXBlcigpO1xuXHRcdCh0aGlzIGFzIHVua25vd24gYXMgeyBpbml0OiBGdW5jdGlvbiB9KS5pbml0KCk7XG5cdH1cblxuXHQvKipcblx0ICogVGhpcyBtZXRob2QgaXMgY2FsbGVkIHdoZW4gdGhlIGNvbnRyb2xsZXIgZXh0ZW5zaW9uIGlzIGluc3RhbnRpYXRlZC5cblx0ICogV2UgbmVlZCB0byBvdmVycmlkZSBpdCBmb3IgdGhlIHNwZWNpZmljIGhhbmRsaW5nIGZvciBCZWZvcmVBc3luYyBhbmQgQWZ0ZXJBc3luYyBtZXRob2RzLCBvdGhlcndpc2UgdGhlIGxhc3QgbGV2ZWwgb2YgZXh0ZW5zaW9uIGp1c3QgcmVwbGFjZSBvdXIgaW1wbGVtZW50YXRpb24uXG5cdCAqIEByZXR1cm5zIFRoZSBpbnRlcmZhY2UgZm9yIHRoaXMgY29udHJvbGxlciBleHRlbnNpb25cblx0ICovXG5cdGdldEludGVyZmFjZSgpOiBCYXNlT2JqZWN0IHtcblx0XHRjb25zdCBpbnRlcmZhY2VPYmogPSBzdXBlci5nZXRJbnRlcmZhY2UoKTtcblx0XHRjb25zdCBtZXRhZGF0YSA9IHRoaXMuZ2V0TWV0YWRhdGEoKSBhcyBDb250cm9sbGVyTWV0YWRhdGE7XG5cdFx0Y29uc3QgYWxsTWV0aG9kcyA9IG1ldGFkYXRhLmdldEFsbE1ldGhvZHMoKTtcblx0XHRjb25zdCBtZXRob2RIb2xkZXI6IFJlY29yZDxzdHJpbmcsIEZ1bmN0aW9uW10+ID0ge307XG5cblx0XHRmb3IgKGNvbnN0IG1ldGhvZE5hbWUgaW4gYWxsTWV0aG9kcykge1xuXHRcdFx0Y29uc3QgbWV0aG9kID0gYWxsTWV0aG9kc1ttZXRob2ROYW1lXTtcblx0XHRcdGlmIChtZXRob2Qub3ZlcnJpZGVFeGVjdXRpb24gJiYgKG1ldGhvZC5vdmVycmlkZUV4ZWN1dGlvbiA9PT0gXCJBZnRlckFzeW5jXCIgfHwgbWV0aG9kLm92ZXJyaWRlRXhlY3V0aW9uID09PSBcIkJlZm9yZUFzeW5jXCIpKSB7XG5cdFx0XHRcdG1ldGhvZEhvbGRlclttZXRob2ROYW1lXSA9IFsoaW50ZXJmYWNlT2JqIGFzIHVua25vd24gYXMgUmVjb3JkPHN0cmluZywgRnVuY3Rpb24+KVttZXRob2ROYW1lXV07XG5cdFx0XHRcdE9iamVjdC5kZWZpbmVQcm9wZXJ0eShpbnRlcmZhY2VPYmosIG1ldGhvZE5hbWUsIHtcblx0XHRcdFx0XHRjb25maWd1cmFibGU6IHRydWUsXG5cdFx0XHRcdFx0c2V0OiAodjogRnVuY3Rpb24pID0+IHtcblx0XHRcdFx0XHRcdHJldHVybiBtZXRob2RIb2xkZXJbbWV0aG9kTmFtZV0ucHVzaCh2KTtcblx0XHRcdFx0XHR9LFxuXHRcdFx0XHRcdGdldDogKCkgPT4ge1xuXHRcdFx0XHRcdFx0cmV0dXJuIGFzeW5jICguLi5hcmdzOiB1bmtub3duW10pID0+IHtcblx0XHRcdFx0XHRcdFx0Y29uc3QgbWV0aG9kQXJyYXlzID0gbWV0aG9kSG9sZGVyW21ldGhvZE5hbWVdO1xuXHRcdFx0XHRcdFx0XHRpZiAobWV0aG9kLm92ZXJyaWRlRXhlY3V0aW9uID09PSBcIkJlZm9yZUFzeW5jXCIpIHtcblx0XHRcdFx0XHRcdFx0XHRtZXRob2RBcnJheXMucmV2ZXJzZSgpO1xuXHRcdFx0XHRcdFx0XHR9XG5cdFx0XHRcdFx0XHRcdGZvciAoY29uc3QgYXJnIG9mIG1ldGhvZEFycmF5cykge1xuXHRcdFx0XHRcdFx0XHRcdGF3YWl0IGFyZy5hcHBseSh0aGlzLCBhcmdzKTtcblx0XHRcdFx0XHRcdFx0fVxuXHRcdFx0XHRcdFx0fTtcblx0XHRcdFx0XHR9XG5cdFx0XHRcdH0pO1xuXHRcdFx0fVxuXHRcdH1cblxuXHRcdHJldHVybiBpbnRlcmZhY2VPYmo7XG5cdH1cbn1cbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0VBSUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtFQUpBLElBTXFCQSx1QkFBdUIsSUFBQUMsSUFBQSxHQUQzQ0MsY0FBYyxDQUFDLDBEQUEwRCxDQUFDLEVBQUFELElBQUEsQ0FBQUUsTUFBQSwwQkFBQUMsb0JBQUE7SUFFMUUsU0FBQUosd0JBQUEsRUFBYztNQUFBLElBQUFLLEtBQUE7TUFDYkEsS0FBQSxHQUFBRCxvQkFBQSxDQUFBRSxJQUFBLEtBQU0sQ0FBQztNQUNQRCxLQUFBLENBQXdDRSxJQUFJLENBQUMsQ0FBQztNQUFDLE9BQUFGLEtBQUE7SUFDaEQ7O0lBRUE7QUFDRDtBQUNBO0FBQ0E7QUFDQTtJQUpDRyxRQUFBLEdBQUFSLHVCQUFBO0lBQUFTLGNBQUEsQ0FBQVQsdUJBQUEsRUFBQUksb0JBQUE7SUFBQSxJQUFBTSxNQUFBLEdBQUFWLHVCQUFBLENBQUFXLFNBQUE7SUFBQUQsTUFBQSxDQUtBRSxZQUFZLEdBQVosU0FBQUEsWUFBWUEsQ0FBQSxFQUFlO01BQUEsSUFBQUMsTUFBQTtNQUMxQixNQUFNQyxZQUFZLEdBQUFWLG9CQUFBLENBQUFPLFNBQUEsQ0FBU0MsWUFBWSxDQUFBTixJQUFBLE1BQUU7TUFDekMsTUFBTVMsUUFBUSxHQUFHLElBQUksQ0FBQ0MsV0FBVyxDQUFDLENBQXVCO01BQ3pELE1BQU1DLFVBQVUsR0FBR0YsUUFBUSxDQUFDRyxhQUFhLENBQUMsQ0FBQztNQUMzQyxNQUFNQyxZQUF3QyxHQUFHLENBQUMsQ0FBQztNQUVuRCxLQUFLLE1BQU1DLFVBQVUsSUFBSUgsVUFBVSxFQUFFO1FBQ3BDLE1BQU1JLE1BQU0sR0FBR0osVUFBVSxDQUFDRyxVQUFVLENBQUM7UUFDckMsSUFBSUMsTUFBTSxDQUFDQyxpQkFBaUIsS0FBS0QsTUFBTSxDQUFDQyxpQkFBaUIsS0FBSyxZQUFZLElBQUlELE1BQU0sQ0FBQ0MsaUJBQWlCLEtBQUssYUFBYSxDQUFDLEVBQUU7VUFDMUhILFlBQVksQ0FBQ0MsVUFBVSxDQUFDLEdBQUcsQ0FBRU4sWUFBWSxDQUF5Q00sVUFBVSxDQUFDLENBQUM7VUFDOUZHLE1BQU0sQ0FBQ0MsY0FBYyxDQUFDVixZQUFZLEVBQUVNLFVBQVUsRUFBRTtZQUMvQ0ssWUFBWSxFQUFFLElBQUk7WUFDbEJDLEdBQUcsRUFBR0MsQ0FBVyxJQUFLO2NBQ3JCLE9BQU9SLFlBQVksQ0FBQ0MsVUFBVSxDQUFDLENBQUNRLElBQUksQ0FBQ0QsQ0FBQyxDQUFDO1lBQ3hDLENBQUM7WUFDREUsR0FBRyxFQUFFQSxDQUFBLEtBQU07Y0FDVixPQUFPLGtCQUE4QjtnQkFDcEMsTUFBTUMsWUFBWSxHQUFHWCxZQUFZLENBQUNDLFVBQVUsQ0FBQztnQkFDN0MsSUFBSUMsTUFBTSxDQUFDQyxpQkFBaUIsS0FBSyxhQUFhLEVBQUU7a0JBQy9DUSxZQUFZLENBQUNDLE9BQU8sQ0FBQyxDQUFDO2dCQUN2QjtnQkFBQyxTQUFBQyxJQUFBLEdBQUFDLFNBQUEsQ0FBQUMsTUFBQSxFQUplQyxJQUFJLE9BQUFDLEtBQUEsQ0FBQUosSUFBQSxHQUFBSyxJQUFBLE1BQUFBLElBQUEsR0FBQUwsSUFBQSxFQUFBSyxJQUFBO2tCQUFKRixJQUFJLENBQUFFLElBQUEsSUFBQUosU0FBQSxDQUFBSSxJQUFBO2dCQUFBO2dCQUtwQixLQUFLLE1BQU1DLEdBQUcsSUFBSVIsWUFBWSxFQUFFO2tCQUMvQixNQUFNUSxHQUFHLENBQUNDLEtBQUssQ0FBQzFCLE1BQUksRUFBRXNCLElBQUksQ0FBQztnQkFDNUI7Y0FDRCxDQUFDO1lBQ0Y7VUFDRCxDQUFDLENBQUM7UUFDSDtNQUNEO01BRUEsT0FBT3JCLFlBQVk7SUFDcEIsQ0FBQztJQUFBLE9BQUFkLHVCQUFBO0VBQUEsRUExQ21Ed0MsbUJBQW1CLE1BQUFyQyxNQUFBO0VBQUFLLFFBQUEsR0FBQVIsdUJBQUE7RUFBQSxPQUFBUSxRQUFBO0FBQUEiLCJpZ25vcmVMaXN0IjpbXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJCYXNlQ29udHJvbGxlckV4dGVuc2lvbiIsIl9kZWMiLCJkZWZpbmVVSTVDbGFzcyIsIl9jbGFzcyIsIl9Db250cm9sbGVyRXh0ZW5zaW9uIiwiX3RoaXMiLCJjYWxsIiwiaW5pdCIsIl9leHBvcnRzIiwiX2luaGVyaXRzTG9vc2UiLCJfcHJvdG8iLCJwcm90b3R5cGUiLCJnZXRJbnRlcmZhY2UiLCJfdGhpczIiLCJpbnRlcmZhY2VPYmoiLCJtZXRhZGF0YSIsImdldE1ldGFkYXRhIiwiYWxsTWV0aG9kcyIsImdldEFsbE1ldGhvZHMiLCJtZXRob2RIb2xkZXIiLCJtZXRob2ROYW1lIiwibWV0aG9kIiwib3ZlcnJpZGVFeGVjdXRpb24iLCJPYmplY3QiLCJkZWZpbmVQcm9wZXJ0eSIsImNvbmZpZ3VyYWJsZSIsInNldCIsInYiLCJwdXNoIiwiZ2V0IiwibWV0aG9kQXJyYXlzIiwicmV2ZXJzZSIsInJlc3VsdCIsIl9sZW4iLCJhcmd1bWVudHMiLCJsZW5ndGgiLCJhcmdzIiwiQXJyYXkiLCJfa2V5IiwiYXJnIiwiYXBwbHkiLCJDb250cm9sbGVyRXh0ZW5zaW9uIl0sInNvdXJjZVJvb3QiOiIuIiwic291cmNlcyI6WyJCYXNlQ29udHJvbGxlckV4dGVuc2lvbi50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZWZpbmVVSTVDbGFzcyB9IGZyb20gXCJzYXAvZmUvYmFzZS9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCB0eXBlIEJhc2VPYmplY3QgZnJvbSBcInNhcC91aS9iYXNlL09iamVjdFwiO1xuaW1wb3J0IENvbnRyb2xsZXJFeHRlbnNpb24gZnJvbSBcInNhcC91aS9jb3JlL212Yy9Db250cm9sbGVyRXh0ZW5zaW9uXCI7XG5pbXBvcnQgdHlwZSBDb250cm9sbGVyTWV0YWRhdGEgZnJvbSBcInNhcC91aS9jb3JlL212Yy9Db250cm9sbGVyTWV0YWRhdGFcIjtcbi8qKlxuICogQSBiYXNlIGltcGxlbWVudGF0aW9uIGZvciBjb250cm9sbGVyIGV4dGVuc2lvbiB1c2VkIGludGVybmFsbHkgaW4gc2FwLmZlIGZvciBjZW50cmFsIGZ1bmN0aW9uYWxpdGllcy5cbiAqIEBwdWJsaWNcbiAqIEBzaW5jZSAxLjExOC4wXG4gKi9cbkBkZWZpbmVVSTVDbGFzcyhcInNhcC5mZS5jb3JlLmNvbnRyb2xsZXJleHRlbnNpb25zLkJhc2VDb250cm9sbGVyRXh0ZW5zaW9uXCIpXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBCYXNlQ29udHJvbGxlckV4dGVuc2lvbiBleHRlbmRzIENvbnRyb2xsZXJFeHRlbnNpb24ge1xuXHRjb25zdHJ1Y3RvcigpIHtcblx0XHRzdXBlcigpO1xuXHRcdCh0aGlzIGFzIHVua25vd24gYXMgeyBpbml0OiBGdW5jdGlvbiB9KS5pbml0KCk7XG5cdH1cblxuXHQvKipcblx0ICogVGhpcyBtZXRob2QgaXMgY2FsbGVkIHdoZW4gdGhlIGNvbnRyb2xsZXIgZXh0ZW5zaW9uIGlzIGluc3RhbnRpYXRlZC5cblx0ICogV2UgbmVlZCB0byBvdmVycmlkZSBpdCBmb3IgdGhlIHNwZWNpZmljIGhhbmRsaW5nIGZvciBCZWZvcmVBc3luYyBhbmQgQWZ0ZXJBc3luYyBtZXRob2RzLCBvdGhlcndpc2UgdGhlIGxhc3QgbGV2ZWwgb2YgZXh0ZW5zaW9uIGp1c3QgcmVwbGFjZSBvdXIgaW1wbGVtZW50YXRpb24uXG5cdCAqIEByZXR1cm5zIFRoZSBpbnRlcmZhY2UgZm9yIHRoaXMgY29udHJvbGxlciBleHRlbnNpb25cblx0ICovXG5cdGdldEludGVyZmFjZSgpOiBCYXNlT2JqZWN0IHtcblx0XHRjb25zdCBpbnRlcmZhY2VPYmogPSBzdXBlci5nZXRJbnRlcmZhY2UoKTtcblx0XHRjb25zdCBtZXRhZGF0YSA9IHRoaXMuZ2V0TWV0YWRhdGEoKSBhcyBDb250cm9sbGVyTWV0YWRhdGE7XG5cdFx0Y29uc3QgYWxsTWV0aG9kcyA9IG1ldGFkYXRhLmdldEFsbE1ldGhvZHMoKTtcblx0XHRjb25zdCBtZXRob2RIb2xkZXI6IFJlY29yZDxzdHJpbmcsIEZ1bmN0aW9uW10+ID0ge307XG5cblx0XHRmb3IgKGNvbnN0IG1ldGhvZE5hbWUgaW4gYWxsTWV0aG9kcykge1xuXHRcdFx0Y29uc3QgbWV0aG9kID0gYWxsTWV0aG9kc1ttZXRob2ROYW1lXTtcblx0XHRcdGlmIChtZXRob2Qub3ZlcnJpZGVFeGVjdXRpb24gJiYgKG1ldGhvZC5vdmVycmlkZUV4ZWN1dGlvbiA9PT0gXCJBZnRlckFzeW5jXCIgfHwgbWV0aG9kLm92ZXJyaWRlRXhlY3V0aW9uID09PSBcIkJlZm9yZUFzeW5jXCIpKSB7XG5cdFx0XHRcdG1ldGhvZEhvbGRlclttZXRob2ROYW1lXSA9IFsoaW50ZXJmYWNlT2JqIGFzIHVua25vd24gYXMgUmVjb3JkPHN0cmluZywgRnVuY3Rpb24+KVttZXRob2ROYW1lXV07XG5cdFx0XHRcdE9iamVjdC5kZWZpbmVQcm9wZXJ0eShpbnRlcmZhY2VPYmosIG1ldGhvZE5hbWUsIHtcblx0XHRcdFx0XHRjb25maWd1cmFibGU6IHRydWUsXG5cdFx0XHRcdFx0c2V0OiAodjogRnVuY3Rpb24pID0+IHtcblx0XHRcdFx0XHRcdHJldHVybiBtZXRob2RIb2xkZXJbbWV0aG9kTmFtZV0ucHVzaCh2KTtcblx0XHRcdFx0XHR9LFxuXHRcdFx0XHRcdGdldDogKCkgPT4ge1xuXHRcdFx0XHRcdFx0cmV0dXJuIGFzeW5jICguLi5hcmdzOiB1bmtub3duW10pID0+IHtcblx0XHRcdFx0XHRcdFx0Y29uc3QgbWV0aG9kQXJyYXlzID0gbWV0aG9kSG9sZGVyW21ldGhvZE5hbWVdO1xuXHRcdFx0XHRcdFx0XHRpZiAobWV0aG9kLm92ZXJyaWRlRXhlY3V0aW9uID09PSBcIkJlZm9yZUFzeW5jXCIpIHtcblx0XHRcdFx0XHRcdFx0XHRtZXRob2RBcnJheXMucmV2ZXJzZSgpO1xuXHRcdFx0XHRcdFx0XHR9XG5cdFx0XHRcdFx0XHRcdGxldCByZXN1bHQ7XG5cdFx0XHRcdFx0XHRcdGZvciAoY29uc3QgYXJnIG9mIG1ldGhvZEFycmF5cykge1xuXHRcdFx0XHRcdFx0XHRcdHJlc3VsdCA9IGF3YWl0IGFyZy5hcHBseSh0aGlzLCBhcmdzKTtcblx0XHRcdFx0XHRcdFx0fVxuXHRcdFx0XHRcdFx0XHRyZXR1cm4gcmVzdWx0O1xuXHRcdFx0XHRcdFx0fTtcblx0XHRcdFx0XHR9XG5cdFx0XHRcdH0pO1xuXHRcdFx0fVxuXHRcdH1cblxuXHRcdHJldHVybiBpbnRlcmZhY2VPYmo7XG5cdH1cbn1cbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0VBSUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtFQUpBLElBTXFCQSx1QkFBdUIsSUFBQUMsSUFBQSxHQUQzQ0MsY0FBYyxDQUFDLDBEQUEwRCxDQUFDLEVBQUFELElBQUEsQ0FBQUUsTUFBQSwwQkFBQUMsb0JBQUE7SUFFMUUsU0FBQUosd0JBQUEsRUFBYztNQUFBLElBQUFLLEtBQUE7TUFDYkEsS0FBQSxHQUFBRCxvQkFBQSxDQUFBRSxJQUFBLEtBQU0sQ0FBQztNQUNQRCxLQUFBLENBQXdDRSxJQUFJLENBQUMsQ0FBQztNQUFDLE9BQUFGLEtBQUE7SUFDaEQ7O0lBRUE7QUFDRDtBQUNBO0FBQ0E7QUFDQTtJQUpDRyxRQUFBLEdBQUFSLHVCQUFBO0lBQUFTLGNBQUEsQ0FBQVQsdUJBQUEsRUFBQUksb0JBQUE7SUFBQSxJQUFBTSxNQUFBLEdBQUFWLHVCQUFBLENBQUFXLFNBQUE7SUFBQUQsTUFBQSxDQUtBRSxZQUFZLEdBQVosU0FBQUEsWUFBWUEsQ0FBQSxFQUFlO01BQUEsSUFBQUMsTUFBQTtNQUMxQixNQUFNQyxZQUFZLEdBQUFWLG9CQUFBLENBQUFPLFNBQUEsQ0FBU0MsWUFBWSxDQUFBTixJQUFBLE1BQUU7TUFDekMsTUFBTVMsUUFBUSxHQUFHLElBQUksQ0FBQ0MsV0FBVyxDQUFDLENBQXVCO01BQ3pELE1BQU1DLFVBQVUsR0FBR0YsUUFBUSxDQUFDRyxhQUFhLENBQUMsQ0FBQztNQUMzQyxNQUFNQyxZQUF3QyxHQUFHLENBQUMsQ0FBQztNQUVuRCxLQUFLLE1BQU1DLFVBQVUsSUFBSUgsVUFBVSxFQUFFO1FBQ3BDLE1BQU1JLE1BQU0sR0FBR0osVUFBVSxDQUFDRyxVQUFVLENBQUM7UUFDckMsSUFBSUMsTUFBTSxDQUFDQyxpQkFBaUIsS0FBS0QsTUFBTSxDQUFDQyxpQkFBaUIsS0FBSyxZQUFZLElBQUlELE1BQU0sQ0FBQ0MsaUJBQWlCLEtBQUssYUFBYSxDQUFDLEVBQUU7VUFDMUhILFlBQVksQ0FBQ0MsVUFBVSxDQUFDLEdBQUcsQ0FBRU4sWUFBWSxDQUF5Q00sVUFBVSxDQUFDLENBQUM7VUFDOUZHLE1BQU0sQ0FBQ0MsY0FBYyxDQUFDVixZQUFZLEVBQUVNLFVBQVUsRUFBRTtZQUMvQ0ssWUFBWSxFQUFFLElBQUk7WUFDbEJDLEdBQUcsRUFBR0MsQ0FBVyxJQUFLO2NBQ3JCLE9BQU9SLFlBQVksQ0FBQ0MsVUFBVSxDQUFDLENBQUNRLElBQUksQ0FBQ0QsQ0FBQyxDQUFDO1lBQ3hDLENBQUM7WUFDREUsR0FBRyxFQUFFQSxDQUFBLEtBQU07Y0FDVixPQUFPLGtCQUE4QjtnQkFDcEMsTUFBTUMsWUFBWSxHQUFHWCxZQUFZLENBQUNDLFVBQVUsQ0FBQztnQkFDN0MsSUFBSUMsTUFBTSxDQUFDQyxpQkFBaUIsS0FBSyxhQUFhLEVBQUU7a0JBQy9DUSxZQUFZLENBQUNDLE9BQU8sQ0FBQyxDQUFDO2dCQUN2QjtnQkFDQSxJQUFJQyxNQUFNO2dCQUFDLFNBQUFDLElBQUEsR0FBQUMsU0FBQSxDQUFBQyxNQUFBLEVBTEtDLElBQUksT0FBQUMsS0FBQSxDQUFBSixJQUFBLEdBQUFLLElBQUEsTUFBQUEsSUFBQSxHQUFBTCxJQUFBLEVBQUFLLElBQUE7a0JBQUpGLElBQUksQ0FBQUUsSUFBQSxJQUFBSixTQUFBLENBQUFJLElBQUE7Z0JBQUE7Z0JBTXBCLEtBQUssTUFBTUMsR0FBRyxJQUFJVCxZQUFZLEVBQUU7a0JBQy9CRSxNQUFNLEdBQUcsTUFBTU8sR0FBRyxDQUFDQyxLQUFLLENBQUMzQixNQUFJLEVBQUV1QixJQUFJLENBQUM7Z0JBQ3JDO2dCQUNBLE9BQU9KLE1BQU07Y0FDZCxDQUFDO1lBQ0Y7VUFDRCxDQUFDLENBQUM7UUFDSDtNQUNEO01BRUEsT0FBT2xCLFlBQVk7SUFDcEIsQ0FBQztJQUFBLE9BQUFkLHVCQUFBO0VBQUEsRUE1Q21EeUMsbUJBQW1CLE1BQUF0QyxNQUFBO0VBQUFLLFFBQUEsR0FBQVIsdUJBQUE7RUFBQSxPQUFBUSxRQUFBO0FBQUEiLCJpZ25vcmVMaXN0IjpbXX0=

package/src/sap/fe/core/controllerextensions/BaseControllerExtension.ts

@@ -40,9 +40,11 @@ export default class BaseControllerExtension extends ControllerExtension {
 							if (method.overrideExecution === "BeforeAsync") {
 								methodArrays.reverse();
 							}
+							let result;
 							for (const arg of methodArrays) {
-								await arg.apply(this, args);
+								result = await arg.apply(this, args);
 							}
+							return result;
 						};
 					}
 				});

package/src/sap/fe/core/controllerextensions/BusyLocker.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2024 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2025 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/base/Log"], function (Log) {
   "use strict";

package/src/sap/fe/core/controllerextensions/CollaborativeDraft.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2024 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2025 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/Element", "../templating/UIFormatters", "./BaseControllerExtension", "./collaboration/CollaborationCommon"], function (ClassSupport, Element, UIFormatters, BaseControllerExtension, CollaborationCommon) {
   "use strict";
@@ -26,12 +26,12 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/Element", "../templating
     }
 
     /**
-     * Callback when the focus is set in the FieldAPI or one of its children.
+     * Callback when the focus is set in the Field or one of its children.
      * @param source
      * @param focusEvent
      */;
     _proto.handleContentFocusIn = function handleContentFocusIn(source, focusEvent) {
-      // We send the event only if the focus was previously out of the FieldAPI
+      // We send the event only if the focus was previously out of the Field
       if (source.isA("sap.m.Tokenizer")) {
         source = source.getParent()?.getParent();
       }
@@ -40,7 +40,7 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/Element", "../templating
         targetOutsideOfControlDomRef = !source.getDomRef()?.contains(focusEvent.relatedTarget);
       }
       if (source.isA("sap.ui.mdc.MultiValueField") || targetOutsideOfControlDomRef) {
-        // We need to handle the case where the newly focused FieldAPI is different from the previous one, but they share the same fieldGroupIDs
+        // We need to handle the case where the newly focused Field is different from the previous one, but they share the same fieldGroupIDs
         // (e.g. fields in different rows in the same column of a table)
         // In such case, the focusOut handler was not called (because we stay in the same fieldGroupID), so we need to send a focusOut event manually
         const lastFocusId = this.getLastFocusId();
@@ -54,7 +54,7 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/Element", "../templating
     }
 
     /**
-     * Callback when the focus is removed from the FieldAPI or one of its children.
+     * Callback when the focus is removed from the Field or one of its children.
      * @param fieldGroupEvent
      */;
     _proto.handleContentFocusOut = function handleContentFocusOut(fieldGroupEvent) {
@@ -63,7 +63,7 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/Element", "../templating
         control = control.getParent()?.getParent();
       }
       if (!control.isA("sap.ui.mdc.MultiValueField")) {
-        while (control && !control?.isA("sap.fe.macros.field.FieldAPI")) {
+        while (control && !control?.isA("sap.fe.macros.Field")) {
           control = control?.getParent();
         }
         if (!control) return;
@@ -93,7 +93,7 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/Element", "../templating
     }
 
     /**
-     * Gets the id of the last focused FieldAPI (if any).
+     * Gets the id of the last focused Field (if any).
      * @returns ID
      */;
     _proto.getLastFocusId = function getLastFocusId() {
@@ -101,7 +101,7 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/Element", "../templating
     }
 
     /**
-     * Gets the fieldgroups of the last focused FieldAPI (if any).
+     * Gets the fieldgroups of the last focused Field (if any).
      * @returns A string containing the fieldgroups separated by ','
      */;
     _proto.getLastFocusFieldGroups = function getLastFocusFieldGroups() {
@@ -109,12 +109,12 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/Element", "../templating
     }
 
     /**
-     * Stores information about the last focused FieldAPI (id and fieldgroups).
-     * @param focusedFieldAPI
+     * Stores information about the last focused Field (id and fieldgroups).
+     * @param focusedField
      */;
-    _proto.setLastFocusInformation = function setLastFocusInformation(focusedFieldAPI) {
-      this.lastFocusId = focusedFieldAPI?.getId();
-      this.lastFocusFieldGroups = focusedFieldAPI?.getFieldGroupIds().join(",");
+    _proto.setLastFocusInformation = function setLastFocusInformation(focusedField) {
+      this.lastFocusId = focusedField?.getId();
+      this.lastFocusFieldGroups = focusedField?.getFieldGroupIds().join(",");
     }
 
     /**
@@ -160,7 +160,7 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/Element", "../templating
       if (!bindingContext) {
         return;
       }
-      if (field.isA("sap.fe.macros.field.FieldAPI")) {
+      if (field.isA("sap.fe.macros.Field")) {
         if (!field.getMainPropertyRelativePath()) {
           return undefined;
         }
@@ -204,4 +204,4 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/Element", "../templating
   _exports = CollaborationDraft;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["CollaborationDraft","_dec","defineUI5Class","_class","_BaseControllerExtens","apply","arguments","_exports","_inheritsLoose","_proto","prototype","getCollaborativeDraftService","collaborativeDraftService","base","getAppComponent","handleContentFocusIn","source","focusEvent","isA","getParent","targetOutsideOfControlDomRef","getDomRef","contains","relatedTarget","lastFocusId","getLastFocusId","getId","getLastFocusFieldGroups","getFieldGroupIds","join","lastFocused","Element","getElementById","sendFocusOutMessage","setLastFocusInformation","sendFocusInMessage","handleContentFocusOut","fieldGroupEvent","control","getSource","fieldGroupIds","getParameter","some","groupId","startsWith","CollaborationFieldGroupPrefix","sourceControl","currentFocusedControl","getActiveElement","undefined","lastFocusFieldGroups","focusedFieldAPI","fieldpAPI","collaborationPath","getCollaborationPath","send","action","Activity","Lock","content","Unlock","field","bindingContext","getBindingContext","getMainPropertyRelativePath","fieldWrapper","FieldEditMode","Editable","EditableDisplay","EditableReadOnly","includes","getProperty","getPath","keypath","getBindingInfo","template","getBindingPath","path","message","getView","isConnected","connect","disconnect","isCollaborationEnabled","retainAsyncMessages","activityPaths","releaseAsyncMessages","updateLocksForContextPath","oldContextPath","newContextPath","BaseControllerExtension"],"sourceRoot":".","sources":["CollaborativeDraft.ts"],"sourcesContent":["import { defineUI5Class } from \"sap/fe/base/ClassSupport\";\nimport type FieldWrapper from \"sap/fe/macros/controls/FieldWrapper\";\nimport type FieldAPI from \"sap/fe/macros/field/FieldAPI\";\nimport type Tokenizer from \"sap/m/Tokenizer\";\nimport type ManagedObject from \"sap/ui/base/ManagedObject\";\nimport type Control from \"sap/ui/core/Control\";\nimport type { Control$ValidateFieldGroupEvent } from \"sap/ui/core/Control\";\nimport Element from \"sap/ui/core/Element\";\nimport type MultiValueField from \"sap/ui/mdc/MultiValueField\";\nimport type Context from \"sap/ui/model/odata/v4/Context\";\nimport type { FEView } from \"../BaseController\";\nimport type PageController from \"../PageController\";\nimport type { CollaborativeDraftService } from \"../services/collaborativeDraftServiceFactory\";\nimport { FieldEditMode } from \"../templating/UIFormatters\";\nimport BaseControllerExtension from \"./BaseControllerExtension\";\nimport { Activity, CollaborationFieldGroupPrefix } from \"./collaboration/CollaborationCommon\";\n\n@defineUI5Class(\"sap.fe.core.controllerextensions.CollaborationDraft\")\nexport default class CollaborationDraft extends BaseControllerExtension {\n\tprivate base!: PageController;\n\n\tprivate lastFocusId: string | undefined;\n\n\tprivate lastFocusFieldGroups: string | undefined;\n\n\tprivate collaborativeDraftService!: CollaborativeDraftService;\n\n\tprivate getCollaborativeDraftService(): CollaborativeDraftService {\n\t\tthis.collaborativeDraftService = this.collaborativeDraftService ?? this.base.getAppComponent().getCollaborativeDraftService();\n\t\treturn this.collaborativeDraftService;\n\t}\n\n\t/**\n\t * Callback when the focus is set in the FieldAPI or one of its children.\n\t * @param source\n\t * @param focusEvent\n\t */\n\tpublic handleContentFocusIn(source: FieldAPI | MultiValueField, focusEvent?: FocusEvent): void {\n\t\t// We send the event only if the focus was previously out of the FieldAPI\n\t\tif (source.isA<Tokenizer>(\"sap.m.Tokenizer\")) {\n\t\t\tsource = source.getParent()?.getParent() as MultiValueField;\n\t\t}\n\t\tlet targetOutsideOfControlDomRef = false;\n\t\tif (focusEvent) {\n\t\t\ttargetOutsideOfControlDomRef = !source.getDomRef()?.contains(focusEvent.relatedTarget as Node);\n\t\t}\n\t\tif (source.isA<MultiValueField>(\"sap.ui.mdc.MultiValueField\") || targetOutsideOfControlDomRef) {\n\t\t\t// We need to handle the case where the newly focused FieldAPI is different from the previous one, but they share the same fieldGroupIDs\n\t\t\t// (e.g. fields in different rows in the same column of a table)\n\t\t\t// In such case, the focusOut handler was not called (because we stay in the same fieldGroupID), so we need to send a focusOut event manually\n\t\t\tconst lastFocusId = this.getLastFocusId();\n\t\t\tif (lastFocusId && lastFocusId !== source.getId() && this.getLastFocusFieldGroups() === source.getFieldGroupIds().join(\",\")) {\n\t\t\t\tconst lastFocused = Element.getElementById(lastFocusId) as FieldAPI;\n\t\t\t\tthis?.sendFocusOutMessage(lastFocused);\n\t\t\t}\n\n\t\t\tthis.setLastFocusInformation(source);\n\n\t\t\tthis.sendFocusInMessage(source);\n\t\t}\n\t}\n\n\t/**\n\t * Callback when the focus is removed from the FieldAPI or one of its children.\n\t * @param fieldGroupEvent\n\t */\n\tpublic handleContentFocusOut(fieldGroupEvent: Control$ValidateFieldGroupEvent): void {\n\t\tlet control: ManagedObject | null = fieldGroupEvent.getSource();\n\t\tif (control.isA<Tokenizer>(\"sap.m.Tokenizer\")) {\n\t\t\tcontrol = control.getParent()?.getParent() as MultiValueField;\n\t\t}\n\t\tif (!control.isA<MultiValueField>(\"sap.ui.mdc.MultiValueField\")) {\n\t\t\twhile (control && !control?.isA<FieldAPI>(\"sap.fe.macros.field.FieldAPI\")) {\n\t\t\t\tcontrol = control?.getParent();\n\t\t\t}\n\t\t\tif (!control) return;\n\t\t}\n\n\t\tconst fieldGroupIds = fieldGroupEvent.getParameter(\"fieldGroupIds\") as string[];\n\n\t\t// We send the event only if the validated fieldCroup corresponds to a collaboration group\n\t\tif (\n\t\t\tfieldGroupIds.some((groupId) => {\n\t\t\t\treturn groupId.startsWith(CollaborationFieldGroupPrefix);\n\t\t\t})\n\t\t) {\n\t\t\tconst sourceControl: Control = fieldGroupEvent.getSource();\n\n\t\t\t// Determine if the control that sent the event still has the focus (or one of its children).\n\t\t\t// This could happen e.g. if the user pressed <Enter> to validate the input.\n\t\t\tlet currentFocusedControl: ManagedObject | null | undefined = Element.getActiveElement();\n\t\t\twhile (currentFocusedControl && currentFocusedControl !== sourceControl) {\n\t\t\t\tcurrentFocusedControl = currentFocusedControl.getParent();\n\t\t\t}\n\t\t\tif (currentFocusedControl !== sourceControl) {\n\t\t\t\t// The control that sent the event isn't focused anymore\n\t\t\t\tthis.sendFocusOutMessage(control);\n\t\t\t\tif (this.getLastFocusId() === control.getId()) {\n\t\t\t\t\tthis.setLastFocusInformation(undefined);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\t/**\n\t * Gets the id of the last focused FieldAPI (if any).\n\t * @returns ID\n\t */\n\tprivate getLastFocusId(): string | undefined {\n\t\treturn this.lastFocusId;\n\t}\n\n\t/**\n\t * Gets the fieldgroups of the last focused FieldAPI (if any).\n\t * @returns A string containing the fieldgroups separated by ','\n\t */\n\tprivate getLastFocusFieldGroups(): string | undefined {\n\t\treturn this.lastFocusFieldGroups;\n\t}\n\n\t/**\n\t * Stores information about the last focused FieldAPI (id and fieldgroups).\n\t * @param focusedFieldAPI\n\t */\n\tprivate setLastFocusInformation(focusedFieldAPI: FieldAPI | MultiValueField | undefined): void {\n\t\tthis.lastFocusId = focusedFieldAPI?.getId();\n\t\tthis.lastFocusFieldGroups = focusedFieldAPI?.getFieldGroupIds().join(\",\");\n\t}\n\n\t/**\n\t * If collaboration is enabled, send a Lock collaboration message.\n\t * @param fieldpAPI\n\t */\n\tprivate sendFocusInMessage(fieldpAPI: FieldAPI | MultiValueField): void {\n\t\tconst collaborationPath = this.getCollaborationPath(fieldpAPI);\n\n\t\tif (collaborationPath) {\n\t\t\tthis.send({ action: Activity.Lock, content: collaborationPath });\n\t\t}\n\t}\n\n\t/**\n\t * If collaboration is enabled, send an Unlock collaboration message.\n\t * @param fieldpAPI\n\t */\n\tprivate sendFocusOutMessage(fieldpAPI: FieldAPI | MultiValueField | undefined): void {\n\t\tif (!fieldpAPI) {\n\t\t\treturn;\n\t\t}\n\t\tconst collaborationPath = this.getCollaborationPath(fieldpAPI);\n\t\tif (collaborationPath) {\n\t\t\tthis.send({ action: Activity.Unlock, content: collaborationPath });\n\t\t}\n\t}\n\n\t/**\n\t * Gets the path used to send collaboration messages.\n\t * @param field\n\t * @returns The path (or undefined is no valid path could be found)\n\t */\n\tprivate getCollaborationPath(field: FieldAPI | MultiValueField): string | undefined {\n\t\t// Note: we send messages even if the context is inactive (empty creation rows),\n\t\t// otherwise we can't update the corresponding locks when the context is activated.\n\t\tconst bindingContext = field?.getBindingContext() as Context | undefined;\n\t\tif (!bindingContext) {\n\t\t\treturn;\n\t\t}\n\t\tif (field.isA<FieldAPI>(\"sap.fe.macros.field.FieldAPI\")) {\n\t\t\tif (!field.getMainPropertyRelativePath()) {\n\t\t\t\treturn undefined;\n\t\t\t}\n\n\t\t\tconst fieldWrapper = field.content as FieldWrapper | undefined;\n\t\t\tif (\n\t\t\t\t![FieldEditMode.Editable, FieldEditMode.EditableDisplay, FieldEditMode.EditableReadOnly].includes(\n\t\t\t\t\tfieldWrapper?.getProperty(\"editMode\")\n\t\t\t\t)\n\t\t\t) {\n\t\t\t\t// The field is not in edit mode --> no collaboration messages\n\t\t\t\treturn undefined;\n\t\t\t}\n\n\t\t\treturn `${bindingContext.getPath()}/${field.getMainPropertyRelativePath()}`;\n\t\t} else if (field.isA<MultiValueField>(\"sap.ui.mdc.MultiValueField\")) {\n\t\t\tconst keypath = field.getBindingInfo(\"items\").template.getBindingPath(\"key\");\n\t\t\treturn `${bindingContext.getPath()}/${field.getBindingInfo(\"items\").path}/${keypath}`;\n\t\t}\n\t}\n\n\tpublic send(message: {\n\t\taction: Activity;\n\t\tcontent: string | string[] | undefined;\n\t\ttriggeredActionName?: string;\n\t\trefreshListBinding?: boolean;\n\t\tactionRequestedProperties?: string[];\n\t}): void {\n\t\tthis.getCollaborativeDraftService().send(this.getView(), message);\n\t}\n\n\tpublic isConnected(): boolean {\n\t\treturn this.getCollaborativeDraftService().isConnected(this.getView());\n\t}\n\n\tpublic async connect(): Promise<void> {\n\t\treturn this.getCollaborativeDraftService().connect(this.getView() as FEView);\n\t}\n\n\tpublic disconnect(): void {\n\t\treturn this.getCollaborativeDraftService().disconnect(this.getView() as FEView);\n\t}\n\n\tpublic isCollaborationEnabled(): boolean {\n\t\treturn this.getCollaborativeDraftService().isCollaborationEnabled(this.getView());\n\t}\n\n\tpublic retainAsyncMessages(activityPaths: string | string[]): void {\n\t\treturn this.getCollaborativeDraftService().retainAsyncMessages(this.getView(), activityPaths);\n\t}\n\n\tpublic releaseAsyncMessages(activityPaths: string | string[]): void {\n\t\treturn this.getCollaborativeDraftService().releaseAsyncMessages(this.getView(), activityPaths);\n\t}\n\n\tpublic updateLocksForContextPath(oldContextPath: string, newContextPath: string): void {\n\t\treturn this.getCollaborativeDraftService().updateLocksForContextPath(this.getView(), oldContextPath, newContextPath);\n\t}\n}\n"],"mappings":"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","ignoreList":[]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["CollaborationDraft","_dec","defineUI5Class","_class","_BaseControllerExtens","apply","arguments","_exports","_inheritsLoose","_proto","prototype","getCollaborativeDraftService","collaborativeDraftService","base","getAppComponent","handleContentFocusIn","source","focusEvent","isA","getParent","targetOutsideOfControlDomRef","getDomRef","contains","relatedTarget","lastFocusId","getLastFocusId","getId","getLastFocusFieldGroups","getFieldGroupIds","join","lastFocused","Element","getElementById","sendFocusOutMessage","setLastFocusInformation","sendFocusInMessage","handleContentFocusOut","fieldGroupEvent","control","getSource","fieldGroupIds","getParameter","some","groupId","startsWith","CollaborationFieldGroupPrefix","sourceControl","currentFocusedControl","getActiveElement","undefined","lastFocusFieldGroups","focusedField","fieldpAPI","collaborationPath","getCollaborationPath","send","action","Activity","Lock","content","Unlock","field","bindingContext","getBindingContext","getMainPropertyRelativePath","fieldWrapper","FieldEditMode","Editable","EditableDisplay","EditableReadOnly","includes","getProperty","getPath","keypath","getBindingInfo","template","getBindingPath","path","message","getView","isConnected","connect","disconnect","isCollaborationEnabled","retainAsyncMessages","activityPaths","releaseAsyncMessages","updateLocksForContextPath","oldContextPath","newContextPath","BaseControllerExtension"],"sourceRoot":".","sources":["CollaborativeDraft.ts"],"sourcesContent":["import { defineUI5Class } from \"sap/fe/base/ClassSupport\";\nimport type Field from \"sap/fe/macros/Field\";\nimport type FieldWrapper from \"sap/fe/macros/controls/FieldWrapper\";\nimport type Tokenizer from \"sap/m/Tokenizer\";\nimport type ManagedObject from \"sap/ui/base/ManagedObject\";\nimport type Control from \"sap/ui/core/Control\";\nimport type { Control$ValidateFieldGroupEvent } from \"sap/ui/core/Control\";\nimport Element from \"sap/ui/core/Element\";\nimport type MultiValueField from \"sap/ui/mdc/MultiValueField\";\nimport type Context from \"sap/ui/model/odata/v4/Context\";\nimport type { FEView } from \"../BaseController\";\nimport type PageController from \"../PageController\";\nimport type { CollaborativeDraftService } from \"../services/collaborativeDraftServiceFactory\";\nimport { FieldEditMode } from \"../templating/UIFormatters\";\nimport BaseControllerExtension from \"./BaseControllerExtension\";\nimport { Activity, CollaborationFieldGroupPrefix } from \"./collaboration/CollaborationCommon\";\n\n@defineUI5Class(\"sap.fe.core.controllerextensions.CollaborationDraft\")\nexport default class CollaborationDraft extends BaseControllerExtension {\n\tprivate base!: PageController;\n\n\tprivate lastFocusId: string | undefined;\n\n\tprivate lastFocusFieldGroups: string | undefined;\n\n\tprivate collaborativeDraftService!: CollaborativeDraftService;\n\n\tprivate getCollaborativeDraftService(): CollaborativeDraftService {\n\t\tthis.collaborativeDraftService = this.collaborativeDraftService ?? this.base.getAppComponent().getCollaborativeDraftService();\n\t\treturn this.collaborativeDraftService;\n\t}\n\n\t/**\n\t * Callback when the focus is set in the Field or one of its children.\n\t * @param source\n\t * @param focusEvent\n\t */\n\tpublic handleContentFocusIn(source: Field | MultiValueField, focusEvent?: FocusEvent): void {\n\t\t// We send the event only if the focus was previously out of the Field\n\t\tif (source.isA<Tokenizer>(\"sap.m.Tokenizer\")) {\n\t\t\tsource = source.getParent()?.getParent() as MultiValueField;\n\t\t}\n\t\tlet targetOutsideOfControlDomRef = false;\n\t\tif (focusEvent) {\n\t\t\ttargetOutsideOfControlDomRef = !source.getDomRef()?.contains(focusEvent.relatedTarget as Node);\n\t\t}\n\t\tif (source.isA<MultiValueField>(\"sap.ui.mdc.MultiValueField\") || targetOutsideOfControlDomRef) {\n\t\t\t// We need to handle the case where the newly focused Field is different from the previous one, but they share the same fieldGroupIDs\n\t\t\t// (e.g. fields in different rows in the same column of a table)\n\t\t\t// In such case, the focusOut handler was not called (because we stay in the same fieldGroupID), so we need to send a focusOut event manually\n\t\t\tconst lastFocusId = this.getLastFocusId();\n\t\t\tif (lastFocusId && lastFocusId !== source.getId() && this.getLastFocusFieldGroups() === source.getFieldGroupIds().join(\",\")) {\n\t\t\t\tconst lastFocused = Element.getElementById(lastFocusId) as Field;\n\t\t\t\tthis?.sendFocusOutMessage(lastFocused);\n\t\t\t}\n\n\t\t\tthis.setLastFocusInformation(source);\n\n\t\t\tthis.sendFocusInMessage(source);\n\t\t}\n\t}\n\n\t/**\n\t * Callback when the focus is removed from the Field or one of its children.\n\t * @param fieldGroupEvent\n\t */\n\tpublic handleContentFocusOut(fieldGroupEvent: Control$ValidateFieldGroupEvent): void {\n\t\tlet control: ManagedObject | null = fieldGroupEvent.getSource();\n\t\tif (control.isA<Tokenizer>(\"sap.m.Tokenizer\")) {\n\t\t\tcontrol = control.getParent()?.getParent() as MultiValueField;\n\t\t}\n\t\tif (!control.isA<MultiValueField>(\"sap.ui.mdc.MultiValueField\")) {\n\t\t\twhile (control && !control?.isA<Field>(\"sap.fe.macros.Field\")) {\n\t\t\t\tcontrol = control?.getParent();\n\t\t\t}\n\t\t\tif (!control) return;\n\t\t}\n\n\t\tconst fieldGroupIds = fieldGroupEvent.getParameter(\"fieldGroupIds\") as string[];\n\n\t\t// We send the event only if the validated fieldCroup corresponds to a collaboration group\n\t\tif (\n\t\t\tfieldGroupIds.some((groupId) => {\n\t\t\t\treturn groupId.startsWith(CollaborationFieldGroupPrefix);\n\t\t\t})\n\t\t) {\n\t\t\tconst sourceControl: Control = fieldGroupEvent.getSource();\n\n\t\t\t// Determine if the control that sent the event still has the focus (or one of its children).\n\t\t\t// This could happen e.g. if the user pressed <Enter> to validate the input.\n\t\t\tlet currentFocusedControl: ManagedObject | null | undefined = Element.getActiveElement();\n\t\t\twhile (currentFocusedControl && currentFocusedControl !== sourceControl) {\n\t\t\t\tcurrentFocusedControl = currentFocusedControl.getParent();\n\t\t\t}\n\t\t\tif (currentFocusedControl !== sourceControl) {\n\t\t\t\t// The control that sent the event isn't focused anymore\n\t\t\t\tthis.sendFocusOutMessage(control);\n\t\t\t\tif (this.getLastFocusId() === control.getId()) {\n\t\t\t\t\tthis.setLastFocusInformation(undefined);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\t/**\n\t * Gets the id of the last focused Field (if any).\n\t * @returns ID\n\t */\n\tprivate getLastFocusId(): string | undefined {\n\t\treturn this.lastFocusId;\n\t}\n\n\t/**\n\t * Gets the fieldgroups of the last focused Field (if any).\n\t * @returns A string containing the fieldgroups separated by ','\n\t */\n\tprivate getLastFocusFieldGroups(): string | undefined {\n\t\treturn this.lastFocusFieldGroups;\n\t}\n\n\t/**\n\t * Stores information about the last focused Field (id and fieldgroups).\n\t * @param focusedField\n\t */\n\tprivate setLastFocusInformation(focusedField: Field | MultiValueField | undefined): void {\n\t\tthis.lastFocusId = focusedField?.getId();\n\t\tthis.lastFocusFieldGroups = focusedField?.getFieldGroupIds().join(\",\");\n\t}\n\n\t/**\n\t * If collaboration is enabled, send a Lock collaboration message.\n\t * @param fieldpAPI\n\t */\n\tprivate sendFocusInMessage(fieldpAPI: Field | MultiValueField): void {\n\t\tconst collaborationPath = this.getCollaborationPath(fieldpAPI);\n\n\t\tif (collaborationPath) {\n\t\t\tthis.send({ action: Activity.Lock, content: collaborationPath });\n\t\t}\n\t}\n\n\t/**\n\t * If collaboration is enabled, send an Unlock collaboration message.\n\t * @param fieldpAPI\n\t */\n\tprivate sendFocusOutMessage(fieldpAPI: Field | MultiValueField | undefined): void {\n\t\tif (!fieldpAPI) {\n\t\t\treturn;\n\t\t}\n\t\tconst collaborationPath = this.getCollaborationPath(fieldpAPI);\n\t\tif (collaborationPath) {\n\t\t\tthis.send({ action: Activity.Unlock, content: collaborationPath });\n\t\t}\n\t}\n\n\t/**\n\t * Gets the path used to send collaboration messages.\n\t * @param field\n\t * @returns The path (or undefined is no valid path could be found)\n\t */\n\tprivate getCollaborationPath(field: Field | MultiValueField): string | undefined {\n\t\t// Note: we send messages even if the context is inactive (empty creation rows),\n\t\t// otherwise we can't update the corresponding locks when the context is activated.\n\t\tconst bindingContext = field?.getBindingContext() as Context | undefined;\n\t\tif (!bindingContext) {\n\t\t\treturn;\n\t\t}\n\t\tif (field.isA<Field>(\"sap.fe.macros.Field\")) {\n\t\t\tif (!field.getMainPropertyRelativePath()) {\n\t\t\t\treturn undefined;\n\t\t\t}\n\n\t\t\tconst fieldWrapper = field.content as FieldWrapper | undefined;\n\t\t\tif (\n\t\t\t\t![FieldEditMode.Editable, FieldEditMode.EditableDisplay, FieldEditMode.EditableReadOnly].includes(\n\t\t\t\t\tfieldWrapper?.getProperty(\"editMode\")\n\t\t\t\t)\n\t\t\t) {\n\t\t\t\t// The field is not in edit mode --> no collaboration messages\n\t\t\t\treturn undefined;\n\t\t\t}\n\n\t\t\treturn `${bindingContext.getPath()}/${field.getMainPropertyRelativePath()}`;\n\t\t} else if (field.isA<MultiValueField>(\"sap.ui.mdc.MultiValueField\")) {\n\t\t\tconst keypath = field.getBindingInfo(\"items\").template.getBindingPath(\"key\");\n\t\t\treturn `${bindingContext.getPath()}/${field.getBindingInfo(\"items\").path}/${keypath}`;\n\t\t}\n\t}\n\n\tpublic send(message: {\n\t\taction: Activity;\n\t\tcontent: string | string[] | undefined;\n\t\ttriggeredActionName?: string;\n\t\trefreshListBinding?: boolean;\n\t\tactionRequestedProperties?: string[];\n\t}): void {\n\t\tthis.getCollaborativeDraftService().send(this.getView(), message);\n\t}\n\n\tpublic isConnected(): boolean {\n\t\treturn this.getCollaborativeDraftService().isConnected(this.getView());\n\t}\n\n\tpublic async connect(): Promise<void> {\n\t\treturn this.getCollaborativeDraftService().connect(this.getView() as FEView);\n\t}\n\n\tpublic disconnect(): void {\n\t\treturn this.getCollaborativeDraftService().disconnect(this.getView() as FEView);\n\t}\n\n\tpublic isCollaborationEnabled(): boolean {\n\t\treturn this.getCollaborativeDraftService().isCollaborationEnabled(this.getView());\n\t}\n\n\tpublic retainAsyncMessages(activityPaths: string | string[]): void {\n\t\treturn this.getCollaborativeDraftService().retainAsyncMessages(this.getView(), activityPaths);\n\t}\n\n\tpublic releaseAsyncMessages(activityPaths: string | string[]): void {\n\t\treturn this.getCollaborativeDraftService().releaseAsyncMessages(this.getView(), activityPaths);\n\t}\n\n\tpublic updateLocksForContextPath(oldContextPath: string, newContextPath: string): void {\n\t\treturn this.getCollaborativeDraftService().updateLocksForContextPath(this.getView(), oldContextPath, newContextPath);\n\t}\n}\n"],"mappings":"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","ignoreList":[]}

package/src/sap/fe/core/controllerextensions/CollaborativeDraft.ts

@@ -1,6 +1,6 @@
 import { defineUI5Class } from "sap/fe/base/ClassSupport";
+import type Field from "sap/fe/macros/Field";
 import type FieldWrapper from "sap/fe/macros/controls/FieldWrapper";
-import type FieldAPI from "sap/fe/macros/field/FieldAPI";
 import type Tokenizer from "sap/m/Tokenizer";
 import type ManagedObject from "sap/ui/base/ManagedObject";
 import type Control from "sap/ui/core/Control";
@@ -31,12 +31,12 @@ export default class CollaborationDraft extends BaseControllerExtension {
 	}
 
 	/**
-	 * Callback when the focus is set in the FieldAPI or one of its children.
+	 * Callback when the focus is set in the Field or one of its children.
 	 * @param source
 	 * @param focusEvent
 	 */
-	public handleContentFocusIn(source: FieldAPI | MultiValueField, focusEvent?: FocusEvent): void {
-		// We send the event only if the focus was previously out of the FieldAPI
+	public handleContentFocusIn(source: Field | MultiValueField, focusEvent?: FocusEvent): void {
+		// We send the event only if the focus was previously out of the Field
 		if (source.isA<Tokenizer>("sap.m.Tokenizer")) {
 			source = source.getParent()?.getParent() as MultiValueField;
 		}
@@ -45,12 +45,12 @@ export default class CollaborationDraft extends BaseControllerExtension {
 			targetOutsideOfControlDomRef = !source.getDomRef()?.contains(focusEvent.relatedTarget as Node);
 		}
 		if (source.isA<MultiValueField>("sap.ui.mdc.MultiValueField") || targetOutsideOfControlDomRef) {
-			// We need to handle the case where the newly focused FieldAPI is different from the previous one, but they share the same fieldGroupIDs
+			// We need to handle the case where the newly focused Field is different from the previous one, but they share the same fieldGroupIDs
 			// (e.g. fields in different rows in the same column of a table)
 			// In such case, the focusOut handler was not called (because we stay in the same fieldGroupID), so we need to send a focusOut event manually
 			const lastFocusId = this.getLastFocusId();
 			if (lastFocusId && lastFocusId !== source.getId() && this.getLastFocusFieldGroups() === source.getFieldGroupIds().join(",")) {
-				const lastFocused = Element.getElementById(lastFocusId) as FieldAPI;
+				const lastFocused = Element.getElementById(lastFocusId) as Field;
 				this?.sendFocusOutMessage(lastFocused);
 			}
 
@@ -61,7 +61,7 @@ export default class CollaborationDraft extends BaseControllerExtension {
 	}
 
 	/**
-	 * Callback when the focus is removed from the FieldAPI or one of its children.
+	 * Callback when the focus is removed from the Field or one of its children.
 	 * @param fieldGroupEvent
 	 */
 	public handleContentFocusOut(fieldGroupEvent: Control$ValidateFieldGroupEvent): void {
@@ -70,7 +70,7 @@ export default class CollaborationDraft extends BaseControllerExtension {
 			control = control.getParent()?.getParent() as MultiValueField;
 		}
 		if (!control.isA<MultiValueField>("sap.ui.mdc.MultiValueField")) {
-			while (control && !control?.isA<FieldAPI>("sap.fe.macros.field.FieldAPI")) {
+			while (control && !control?.isA<Field>("sap.fe.macros.Field")) {
 				control = control?.getParent();
 			}
 			if (!control) return;
@@ -103,7 +103,7 @@ export default class CollaborationDraft extends BaseControllerExtension {
 	}
 
 	/**
-	 * Gets the id of the last focused FieldAPI (if any).
+	 * Gets the id of the last focused Field (if any).
 	 * @returns ID
 	 */
 	private getLastFocusId(): string | undefined {
@@ -111,7 +111,7 @@ export default class CollaborationDraft extends BaseControllerExtension {
 	}
 
 	/**
-	 * Gets the fieldgroups of the last focused FieldAPI (if any).
+	 * Gets the fieldgroups of the last focused Field (if any).
 	 * @returns A string containing the fieldgroups separated by ','
 	 */
 	private getLastFocusFieldGroups(): string | undefined {
@@ -119,19 +119,19 @@ export default class CollaborationDraft extends BaseControllerExtension {
 	}
 
 	/**
-	 * Stores information about the last focused FieldAPI (id and fieldgroups).
-	 * @param focusedFieldAPI
+	 * Stores information about the last focused Field (id and fieldgroups).
+	 * @param focusedField
 	 */
-	private setLastFocusInformation(focusedFieldAPI: FieldAPI | MultiValueField | undefined): void {
-		this.lastFocusId = focusedFieldAPI?.getId();
-		this.lastFocusFieldGroups = focusedFieldAPI?.getFieldGroupIds().join(",");
+	private setLastFocusInformation(focusedField: Field | MultiValueField | undefined): void {
+		this.lastFocusId = focusedField?.getId();
+		this.lastFocusFieldGroups = focusedField?.getFieldGroupIds().join(",");
 	}
 
 	/**
 	 * If collaboration is enabled, send a Lock collaboration message.
 	 * @param fieldpAPI
 	 */
-	private sendFocusInMessage(fieldpAPI: FieldAPI | MultiValueField): void {
+	private sendFocusInMessage(fieldpAPI: Field | MultiValueField): void {
 		const collaborationPath = this.getCollaborationPath(fieldpAPI);
 
 		if (collaborationPath) {
@@ -143,7 +143,7 @@ export default class CollaborationDraft extends BaseControllerExtension {
 	 * If collaboration is enabled, send an Unlock collaboration message.
 	 * @param fieldpAPI
 	 */
-	private sendFocusOutMessage(fieldpAPI: FieldAPI | MultiValueField | undefined): void {
+	private sendFocusOutMessage(fieldpAPI: Field | MultiValueField | undefined): void {
 		if (!fieldpAPI) {
 			return;
 		}
@@ -158,14 +158,14 @@ export default class CollaborationDraft extends BaseControllerExtension {
 	 * @param field
 	 * @returns The path (or undefined is no valid path could be found)
 	 */
-	private getCollaborationPath(field: FieldAPI | MultiValueField): string | undefined {
+	private getCollaborationPath(field: Field | MultiValueField): string | undefined {
 		// Note: we send messages even if the context is inactive (empty creation rows),
 		// otherwise we can't update the corresponding locks when the context is activated.
 		const bindingContext = field?.getBindingContext() as Context | undefined;
 		if (!bindingContext) {
 			return;
 		}
-		if (field.isA<FieldAPI>("sap.fe.macros.field.FieldAPI")) {
+		if (field.isA<Field>("sap.fe.macros.Field")) {
 			if (!field.getMainPropertyRelativePath()) {
 				return undefined;
 			}

package/src/sap/fe/core/controllerextensions/ContextSharing.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2024 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2025 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/fe/base/ClassSupport", "sap/ui/core/mvc/ControllerExtension", "sap/ui/core/mvc/OverrideExecution"], function (ClassSupport, ControllerExtension, OverrideExecution) {
   "use strict";