@sapui5/sap.fe.templates 1.136.19 → 1.136.20

package/src/sap/fe/templates/ObjectPage/ObjectPageController.controller.ts

@@ -2,7 +2,7 @@ import type { SemanticObjectMappingType } from "@sap-ux/vocabularies-types/vocab
 import Log from "sap/base/Log";
 import merge from "sap/base/util/merge";
 import type { EnhanceWithUI5 } from "sap/fe/base/ClassSupport";
-import { defineUI5Class, extensible, finalExtension, publicExtension, usingExtension } from "sap/fe/base/ClassSupport";
+import { defineUI5Class,extensible,finalExtension,publicExtension,usingExtension } from "sap/fe/base/ClassSupport";
 import ActionRuntime from "sap/fe/core/ActionRuntime";
 import type { FEView } from "sap/fe/core/BaseController";
 import CommonUtils from "sap/fe/core/CommonUtils";
@@ -23,7 +23,7 @@ import UiModelConstants from "sap/fe/core/controllerextensions/editFlow/editFlow
 import NavigationReason from "sap/fe/core/controllerextensions/routing/NavigationReason";
 import type CommandExecution from "sap/fe/core/controls/CommandExecution";
 import { RecommendationDialogDecision } from "sap/fe/core/controls/Recommendations/ConfirmRecommendationDialog";
-import type { HiddenDraft, MicroChartManifestConfiguration } from "sap/fe/core/converters/ManifestSettings";
+import type { HiddenDraft,MicroChartManifestConfiguration } from "sap/fe/core/converters/ManifestSettings";
 import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import { getResourceModel } from "sap/fe/core/helpers/ResourceModelHelper";
@@ -174,6 +174,8 @@ class ObjectPageController extends PageController {
 
 	private mergePatchDraft = false;
 
+	private fclCloseHandlerSet = false;
+
 	private autoQueueLock: ReturnType<ODataModel["lock"]> | undefined;
 
 	private messageBinding?: Binding;
@@ -777,12 +779,16 @@ class ObjectPageController extends PageController {
 	 * @param cards Array of cards to be updated
 	 */
 	async _updateAvailableCards(cards: WrappedCard[]): Promise<void> {
-		await this.collaborationManager.collectAvailableCards(cards);
-		if (cards.length > 0) {
-			const cardObject = this.collaborationManager.updateCards(cards);
-			const parentAppId = this.getAppComponent().getId();
-			this.getAppComponent().getCollaborationManagerService().addCardsToCollaborationManager(cardObject, parentAppId);
-			this.getAppComponent().getCollaborationManagerService().shareAvailableCards();
+		const collaborationManagerService = this.getAppComponent().getCollaborationManagerService();
+		// Only collect cards when consumers are connected to the cards channel
+		if (collaborationManagerService.hasCollaborationManagerConnected()) {
+			await this.collaborationManager.collectAvailableCards(cards);
+			if (cards.length > 0) {
+				const cardObject = this.collaborationManager.updateCards(cards);
+				const parentAppId = this.getAppComponent().getId();
+				collaborationManagerService.addCardsToCollaborationManager(cardObject, parentAppId);
+				collaborationManagerService.shareAvailableCards();
+			}
 		}
 	}
 
@@ -913,6 +919,20 @@ class ObjectPageController extends PageController {
 
 			this.mergePatchDraft = true;
 		}
+
+		// The FCL Close button loses its DOM node between mousedown and mouseup when the Name
+		// (EditableHeaderTitle) field has focus: blur triggers side effects → OData refresh →
+		// OPDT re-renders navActionsToolbar, detaching the node before click fires.
+		// Calling closeColumn() on mousedown captures the intent before the re-render.
+		if (!this.fclCloseHandlerSet && !Device.support.touch) {
+			const fclCloseButton = oView.byId("fe::FCLStandardAction::Close");
+			if (fclCloseButton?.isA<Button>("sap.m.Button")) {
+				fclCloseButton.attachBrowserEvent("mousedown", (): void => {
+					this._routing.closeColumn();
+				});
+			}
+			this.fclCloseHandlerSet = true;
+		}
 	}
 
 	/**

package/src/sap/fe/templates/ObjectPage/manifest.json

@@ -4,7 +4,7 @@
 		"id": "sap.fe.templates.ObjectPage",
 		"type": "component",
 		"applicationVersion": {
-			"version": "1.136.19"
+			"version": "1.136.20"
 		},
 		"title": "Object Page",
 		"tags": {

package/src/sap/fe/templates/ObjectPage/view/fragments/EditableHeaderFacet.fragment.xml

@@ -40,7 +40,7 @@
 			>
 				<template:if test="{sap.fe.i18n>T_COMMON_OBJECT_PAGE_OBJECT_INFO}">
 					<f:title>
-						<core:Title level="H4" text="{sap.fe.i18n>T_COMMON_OBJECT_PAGE_OBJECT_INFO}" />
+						<core:Title level="H3" text="{sap.fe.i18n>T_COMMON_OBJECT_PAGE_OBJECT_INFO}" />
 					</f:title>
 				</template:if>
 				<f:dependents>
@@ -149,7 +149,7 @@
 									>
 										<template:if test="{subSection>title}">
 											<f:title>
-												<core:Title level="H4" text="{subSection>title}" />
+												<core:Title level="H3" text="{subSection>title}" />
 											</f:title>
 										</template:if>
 										<f:formElements>

package/src/sap/fe/templates/ObjectPage/view/fragments/Section.fragment.xml

@@ -24,7 +24,7 @@
 				dt:designtime="not-adaptable-visibility"
 				id="{headerSection>id}"
 				title="{headerSection>title}"
-				titleLevel="H3"
+				titleLevel="H2"
 				visible="{headerSection>visible}"
 				titleUppercase="false"
 				onSectionLoaded="{section>onSectionLoaded}"
@@ -32,7 +32,7 @@
 				retrieveStateHandler="{headerSection>retrieveState}"
 			>
 				<macroControl:subSections>
-					<macroSectionContent:SubSection id="fe::EditableHeaderSubSection" title="{headerSection>title}" titleLevel="H4">
+					<macroSectionContent:SubSection id="fe::EditableHeaderSubSection" title="{headerSection>title}" titleLevel="H3">
 						<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.EditableHeaderFacet" type="XML" />
 					</macroSectionContent:SubSection>
 				</macroControl:subSections>
@@ -44,7 +44,7 @@
 			<macroControl:Section
 				id="{section>id}"
 				title="{section>title}"
-				titleLevel="H3"
+				titleLevel="H2"
 				showTitle="{section>showTitle}"
 				titleUppercase="false"
 				visible="{section>visible}"
@@ -58,7 +58,7 @@
 						<macroSectionContent:SubSection
 							id="{subSection>id}"
 							title="{subSection>title}"
-							titleLevel="H4"
+							titleLevel="H3"
 							showTitle="{subSection>showSubSectionTitle}"
 							visible="{subSection>visible}"
 							class="{subSection>class}"

package/src/sap/fe/templates/library.js

@@ -36,7 +36,7 @@ sap.ui.define(["sap/f/library", "sap/fe/core/library", "sap/fe/macros/library",
     controls: [],
     elements: [],
     // eslint-disable-next-line no-template-curly-in-string
-    version: "1.136.19",
+    version: "1.136.20",
     noLibraryCSS: true
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   });