@sapui5/sap.fe.templates 1.148.1 → 1.148.2

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

@@ -184,6 +184,8 @@ class ObjectPageController extends PageController {
 
 	private mergePatchDraft = false;
 
+	private fclCloseHandlerSet = false;
+
 	private autoQueueLock: ReturnType<ODataModel["lock"]> | undefined;
 
 	private messageBinding?: Binding;
@@ -353,7 +355,9 @@ class ObjectPageController extends PageController {
 	 */
 	private checkSectionsForNonResponsiveTable(subSections: ObjectPageSubSection[]): void {
 		const changeClassForTables = (event: Event, visibleSubSection: ObjectPageSubSection): void => {
-			const blocks = [...visibleSubSection.getBlocks(), ...visibleSubSection.getMoreBlocks()];
+			const blocks = [...visibleSubSection.getBlocks(), ...visibleSubSection.getMoreBlocks()].filter((block) =>
+				block.isA("sap.fe.templates.ObjectPage.controls.SubSectionBlock")
+			);
 			if (blocks.length === 1) {
 				const table = this.searchTableInBlock(blocks[0] as SubSectionBlock);
 				if (!table) {
@@ -1368,6 +1372,22 @@ class ObjectPageController extends PageController {
 
 			this.mergePatchDraft = true;
 		}
+
+		// When the user clicks the FCL Close button while a key property field has focus,
+		// the field's focus-loss triggers side effects that refresh the OData binding and
+		// re-render the ObjectPage header title — removing the Close button from the DOM
+		// before the click event fires, so the press is silently lost.
+		// Listening on mousedown (which fires before focus-loss) ensures closeColumn() is
+		// always called regardless of the subsequent 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;
+		}
 	}
 
 	/**
@@ -1684,6 +1704,7 @@ class ObjectPageController extends PageController {
 				if (error !== RecommendationDialogDecision.Continue) {
 					messagePopoverErr = (error as string) ?? "";
 				}
+				throw error;
 			}
 		} finally {
 			if (BusyLocker.isLocked(model)) {

package/src/sap/fe/templates/ObjectPage/controls/SubSectionBlock.js

@@ -52,7 +52,8 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/fe/core/CommonUtils", "sap/fe/co
     };
     _proto.onAfterRendering = function onAfterRendering(oEvent) {
       const subSection = this._oParentObjectPageSubSection;
-      if (subSection.getBlocks().length === 1 && this.content && this.content.isA("sap.fe.macros.Table")) {
+      const subSectionBlocks = subSection.getBlocks().filter(block => block.isA("sap.fe.templates.ObjectPage.controls.SubSectionBlock"));
+      if (subSectionBlocks.length === 1 && this.content && this.content.isA("sap.fe.macros.Table")) {
         const view = CommonUtils.getTargetView(this);
         const sectionLayout = view?.getViewData()?.sectionLayout;
         const tableControl = this.content.getTableDefinition().control;
@@ -91,4 +92,4 @@ sap.ui.define(["sap/fe/base/ClassSupport", "sap/fe/core/CommonUtils", "sap/fe/co
   }), _class2)) || _class);
   return SubSectionBlock;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["BlockBaseFormAdjustment","uxapLib","SubSectionBlock","_dec","defineUI5Class","_dec2","property","type","group","defaultValue","_dec3","aggregation","multiple","_class","_class2","_BlockBase","_this","_len","arguments","length","args","Array","_key","call","_initializerDefineProperty","_descriptor","_descriptor2","_inheritsLoose","_proto","prototype","init","_bConnected","_applyFormAdjustment","sFormAdjustment","getFormAdjustment","oView","_getSelectedViewContent","oParent","_oParentObjectPageSubSection","oFormAdjustmentFields","None","_computeFormAdjustmentFields","_oLayoutConfig","_adjustForm","onAfterRendering","oEvent","subSection","getBlocks","content","isA","view","CommonUtils","getTargetView","sectionLayout","getViewData","tableControl","getTableDefinition","control","rowCountMode","creationMode","CreationMode","CreationRow","hasStyleClass","addStyleClass","setMode","sMode","setProperty","connectToModels","getAggregation","BlockBase","_applyDecoratedDescriptor","configurable","enumerable","writable","initializer"],"sourceRoot":".","sources":["SubSectionBlock.ts"],"sourcesContent":["import { aggregation, defineUI5Class, property } from \"sap/fe/base/ClassSupport\";\nimport CommonUtils from \"sap/fe/core/CommonUtils\";\nimport { CreationMode, type ObjectPageManifestSettings } from \"sap/fe/core/converters/ManifestSettings\";\nimport type SubSection from \"sap/fe/macros/controls/section/SubSection\";\nimport type TableAPI from \"sap/fe/macros/Table\";\nimport type ManagedObject from \"sap/ui/base/ManagedObject\";\nimport type Control from \"sap/ui/core/Control\";\nimport BlockBase from \"sap/uxap/BlockBase\";\nimport type { BlockBaseColumnLayout } from \"sap/uxap/library\";\nimport uxapLib from \"sap/uxap/library\";\nconst BlockBaseFormAdjustment = uxapLib.BlockBaseFormAdjustment;\n@defineUI5Class(\"sap.fe.templates.ObjectPage.controls.SubSectionBlock\")\nclass SubSectionBlock extends BlockBase {\n\t@property({ type: \"sap.uxap.BlockBaseColumnLayout\", group: \"Behavior\", defaultValue: \"4\" })\n\tcolumnLayout!: BlockBaseColumnLayout;\n\n\t@aggregation({ type: \"sap.ui.core.Control\", multiple: false })\n\tcontent!: Control;\n\n\tprivate _oParentObjectPageSubSection!: { _oLayoutConfig: unknown };\n\n\tinit(): void {\n\t\tsuper.init();\n\t\t(this as unknown as { _bConnected: boolean })._bConnected = true;\n\t}\n\n\t_applyFormAdjustment(): void {\n\t\tconst sFormAdjustment = this.getFormAdjustment(),\n\t\t\toView = this._getSelectedViewContent(),\n\t\t\toParent = this._oParentObjectPageSubSection;\n\t\tlet oFormAdjustmentFields;\n\n\t\tif (sFormAdjustment !== BlockBaseFormAdjustment.None && oView && oParent) {\n\t\t\toFormAdjustmentFields = this._computeFormAdjustmentFields(sFormAdjustment, oParent._oLayoutConfig);\n\n\t\t\tthis._adjustForm(oView, oFormAdjustmentFields);\n\t\t}\n\t}\n\n\tonAfterRendering(oEvent: jQuery.Event): void | undefined {\n\t\tconst subSection = this._oParentObjectPageSubSection as unknown as SubSection;\n\t\tif (subSection.getBlocks().length === 1 && this.content && this.content.isA<TableAPI>(\"sap.fe.macros.Table\")) {\n\t\t\tconst view = CommonUtils.getTargetView(this);\n\t\t\tconst sectionLayout = (view?.getViewData() as ObjectPageManifestSettings)?.sectionLayout;\n\t\t\tconst tableControl = this.content.getTableDefinition().control;\n\n\t\t\tif (\n\t\t\t\ttableControl.rowCountMode === \"Auto\" &&\n\t\t\t\t// Exclude CreationRow mode unless sectionLayout is Tabs: the fit-container style creates whitespace in the subsection in display mode when CreationRow is used in TableCreationOptions\n\t\t\t\t(tableControl.creationMode !== CreationMode.CreationRow || sectionLayout === \"Tabs\") &&\n\t\t\t\t!subSection.hasStyleClass(\"sapUxAPObjectPageSubSectionFitContainer\")\n\t\t\t) {\n\t\t\t\tsubSection.addStyleClass(\"sapUxAPObjectPageSubSectionFitContainer\");\n\t\t\t}\n\t\t}\n\t\treturn super.onAfterRendering(oEvent);\n\t}\n\n\tsetMode(sMode: string): void {\n\t\tthis.setProperty(\"mode\", sMode);\n\t\t// OPTIONAL: this.internalModel.setProperty(\"/mode\", sMode);\n\t}\n\n\tconnectToModels(): void {\n\t\t// View is already connected to the UI5 model tree, hence no extra logic required here\n\t}\n\n\t/// SubSectionBlock use aggregation instead of a view, i.e. return that as the view content\n\t_getSelectedViewContent(): ManagedObject | ManagedObject[] | null {\n\t\treturn this.getAggregation(\"content\");\n\t}\n}\n\ninterface SubSectionBlock {\n\t_adjustForm(view: ManagedObject | ManagedObject[], formFields: unknown): void;\n\t_computeFormAdjustmentFields(sFormAdjustment: string, _oLayoutConfig: unknown): unknown;\n}\n\nexport default SubSectionBlock;\n"],"mappings":"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","ignoreList":[]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["BlockBaseFormAdjustment","uxapLib","SubSectionBlock","_dec","defineUI5Class","_dec2","property","type","group","defaultValue","_dec3","aggregation","multiple","_class","_class2","_BlockBase","_this","_len","arguments","length","args","Array","_key","call","_initializerDefineProperty","_descriptor","_descriptor2","_inheritsLoose","_proto","prototype","init","_bConnected","_applyFormAdjustment","sFormAdjustment","getFormAdjustment","oView","_getSelectedViewContent","oParent","_oParentObjectPageSubSection","oFormAdjustmentFields","None","_computeFormAdjustmentFields","_oLayoutConfig","_adjustForm","onAfterRendering","oEvent","subSection","subSectionBlocks","getBlocks","filter","block","isA","content","view","CommonUtils","getTargetView","sectionLayout","getViewData","tableControl","getTableDefinition","control","rowCountMode","creationMode","CreationMode","CreationRow","hasStyleClass","addStyleClass","setMode","sMode","setProperty","connectToModels","getAggregation","BlockBase","_applyDecoratedDescriptor","configurable","enumerable","writable","initializer"],"sourceRoot":".","sources":["SubSectionBlock.ts"],"sourcesContent":["import { aggregation, defineUI5Class, property } from \"sap/fe/base/ClassSupport\";\nimport CommonUtils from \"sap/fe/core/CommonUtils\";\nimport { CreationMode, type ObjectPageManifestSettings } from \"sap/fe/core/converters/ManifestSettings\";\nimport type SubSection from \"sap/fe/macros/controls/section/SubSection\";\nimport type TableAPI from \"sap/fe/macros/Table\";\nimport type ManagedObject from \"sap/ui/base/ManagedObject\";\nimport type Control from \"sap/ui/core/Control\";\nimport BlockBase from \"sap/uxap/BlockBase\";\nimport type { BlockBaseColumnLayout } from \"sap/uxap/library\";\nimport uxapLib from \"sap/uxap/library\";\nconst BlockBaseFormAdjustment = uxapLib.BlockBaseFormAdjustment;\n@defineUI5Class(\"sap.fe.templates.ObjectPage.controls.SubSectionBlock\")\nclass SubSectionBlock extends BlockBase {\n\t@property({ type: \"sap.uxap.BlockBaseColumnLayout\", group: \"Behavior\", defaultValue: \"4\" })\n\tcolumnLayout!: BlockBaseColumnLayout;\n\n\t@aggregation({ type: \"sap.ui.core.Control\", multiple: false })\n\tcontent!: Control;\n\n\tprivate _oParentObjectPageSubSection!: { _oLayoutConfig: unknown };\n\n\tinit(): void {\n\t\tsuper.init();\n\t\t(this as unknown as { _bConnected: boolean })._bConnected = true;\n\t}\n\n\t_applyFormAdjustment(): void {\n\t\tconst sFormAdjustment = this.getFormAdjustment(),\n\t\t\toView = this._getSelectedViewContent(),\n\t\t\toParent = this._oParentObjectPageSubSection;\n\t\tlet oFormAdjustmentFields;\n\n\t\tif (sFormAdjustment !== BlockBaseFormAdjustment.None && oView && oParent) {\n\t\t\toFormAdjustmentFields = this._computeFormAdjustmentFields(sFormAdjustment, oParent._oLayoutConfig);\n\n\t\t\tthis._adjustForm(oView, oFormAdjustmentFields);\n\t\t}\n\t}\n\n\tonAfterRendering(oEvent: jQuery.Event): void | undefined {\n\t\tconst subSection = this._oParentObjectPageSubSection as unknown as SubSection;\n\t\tconst subSectionBlocks = subSection\n\t\t\t.getBlocks()\n\t\t\t.filter((block) => block.isA(\"sap.fe.templates.ObjectPage.controls.SubSectionBlock\"));\n\t\tif (subSectionBlocks.length === 1 && this.content && this.content.isA<TableAPI>(\"sap.fe.macros.Table\")) {\n\t\t\tconst view = CommonUtils.getTargetView(this);\n\t\t\tconst sectionLayout = (view?.getViewData() as ObjectPageManifestSettings)?.sectionLayout;\n\t\t\tconst tableControl = this.content.getTableDefinition().control;\n\n\t\t\tif (\n\t\t\t\ttableControl.rowCountMode === \"Auto\" &&\n\t\t\t\t// Exclude CreationRow mode unless sectionLayout is Tabs: the fit-container style creates whitespace in the subsection in display mode when CreationRow is used in TableCreationOptions\n\t\t\t\t(tableControl.creationMode !== CreationMode.CreationRow || sectionLayout === \"Tabs\") &&\n\t\t\t\t!subSection.hasStyleClass(\"sapUxAPObjectPageSubSectionFitContainer\")\n\t\t\t) {\n\t\t\t\tsubSection.addStyleClass(\"sapUxAPObjectPageSubSectionFitContainer\");\n\t\t\t}\n\t\t}\n\t\treturn super.onAfterRendering(oEvent);\n\t}\n\n\tsetMode(sMode: string): void {\n\t\tthis.setProperty(\"mode\", sMode);\n\t\t// OPTIONAL: this.internalModel.setProperty(\"/mode\", sMode);\n\t}\n\n\tconnectToModels(): void {\n\t\t// View is already connected to the UI5 model tree, hence no extra logic required here\n\t}\n\n\t/// SubSectionBlock use aggregation instead of a view, i.e. return that as the view content\n\t_getSelectedViewContent(): ManagedObject | ManagedObject[] | null {\n\t\treturn this.getAggregation(\"content\");\n\t}\n}\n\ninterface SubSectionBlock {\n\t_adjustForm(view: ManagedObject | ManagedObject[], formFields: unknown): void;\n\t_computeFormAdjustmentFields(sFormAdjustment: string, _oLayoutConfig: unknown): unknown;\n}\n\nexport default SubSectionBlock;\n"],"mappings":"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","ignoreList":[]}

package/src/sap/fe/templates/ObjectPage/controls/SubSectionBlock.ts

@@ -39,7 +39,10 @@ class SubSectionBlock extends BlockBase {
 
 	onAfterRendering(oEvent: jQuery.Event): void | undefined {
 		const subSection = this._oParentObjectPageSubSection as unknown as SubSection;
-		if (subSection.getBlocks().length === 1 && this.content && this.content.isA<TableAPI>("sap.fe.macros.Table")) {
+		const subSectionBlocks = subSection
+			.getBlocks()
+			.filter((block) => block.isA("sap.fe.templates.ObjectPage.controls.SubSectionBlock"));
+		if (subSectionBlocks.length === 1 && this.content && this.content.isA<TableAPI>("sap.fe.macros.Table")) {
 			const view = CommonUtils.getTargetView(this);
 			const sectionLayout = (view?.getViewData() as ObjectPageManifestSettings)?.sectionLayout;
 			const tableControl = this.content.getTableDefinition().control;

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

@@ -4,7 +4,7 @@
 		"id": "sap.fe.templates.ObjectPage",
 		"type": "component",
 		"applicationVersion": {
-			"version": "1.148.1"
+			"version": "1.148.2"
 		},
 		"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/ExpandedHeading.fragment.xml

@@ -38,7 +38,7 @@ OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating'
 						<template:if test="{header>aiNotice/contentFragmentName}">
 							<template:then>
 								<fpm:CustomFragment
-									id="fe::expandedHeaderNotice"
+									id="{aiNoticeId>}"
 									fragmentName="{header>aiNotice/contentFragmentName}"
 									contextPath="{fullContextPath>}"
 								/>

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

@@ -19,7 +19,9 @@
 	<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
 		<template:with path="header>avatar" var="avatar">
 			<uxap:expandedHeading>
-				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.ExpandedHeading" type="XML" />
+				<template:with path="header>aiNotice/expandedHeadingId" var="aiNoticeId">
+					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.ExpandedHeading" type="XML" />
+				</template:with>
 			</uxap:expandedHeading>
 			<uxap:snappedHeading>
 				<FlexBox renderType="Bare">
@@ -64,8 +66,10 @@
 			</uxap:snappedHeading>
 			<template:if test="{= !${header>hasContent} }">
 				<uxap:heading>
-					<!-- Default, we fall back to expanded heading -->
-					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.ExpandedHeading" type="XML" />
+					<!-- Falls back to the expanded heading; uses a distinct id since both slots coexist in the control tree. -->
+					<template:with path="header>aiNotice/defaultHeadingId" var="aiNoticeId">
+						<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.ExpandedHeading" type="XML" />
+					</template:with>
 				</uxap:heading>
 			</template:if>
 			<uxap:snappedContent>

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}"
@@ -59,7 +59,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.148.1",
+    version: "1.148.2",
     noLibraryCSS: true
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   });