@sapui5/sap.fe.templates 1.96.0 → 1.97.0

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

@@ -315,7 +315,7 @@ sap.ui.define(
 				var aActions = oObjectPage.getHeaderTitle() && oObjectPage.getHeaderTitle().getActions();
 				if (aActions && aActions.length) {
 					oFirstClickableElement = aActions.find(function(oAction) {
-						return oAction.getVisible();
+						return oAction.getVisible() && oAction.getEnabled();
 					});
 				}
 				return oFirstClickableElement;
@@ -354,37 +354,28 @@ sap.ui.define(
 				return undefined;
 			},
 
-			initialTab: {
-				value: true
+			_updateFocusInEditMode: function(aSubSections) {
+				var oObjectPage = this.byId("fe::ObjectPage");
+
+				var oMandatoryField = this._getFirstEmptyMandatoryFieldFromSubSection(aSubSections);
+				var oFieldToFocus;
+				if (oMandatoryField) {
+					oFieldToFocus = oMandatoryField.content.getContentEdit()[0];
+				} else {
+					oFieldToFocus = oObjectPage._getFirstEditableInput() || this._getFirstClickableElement(oObjectPage);
+				}
+
+				if (oFieldToFocus) {
+					setTimeout(function() {
+						// We set the focus in a timeeout, otherwise the focus sometimes goes to the TabBar
+						oFieldToFocus.focus();
+					}, 0);
+				}
 			},
 
 			_handleSubSectionEnteredViewPort: function(oEvent) {
 				var oSubSection = oEvent.getParameter("subSection");
-				var oInternalModelContext = this.getView().getBindingContext("internal");
 				oSubSection.setBindingContext(undefined);
-				var oObjectPage = this.byId("fe::ObjectPage");
-				if (oObjectPage.getModel("ui").getProperty("/editMode") !== "Display") {
-					if (
-						this.getView().getViewData().sectionLayout === "Tabs" &&
-						this.initialTab.value === false &&
-						oInternalModelContext.getProperty("errorNavigationSectionFlag") === false
-					) {
-						var oFieldToFocus = this._getFirstEmptyMandatoryFieldFromSubSection([oSubSection]);
-						if (oFieldToFocus) {
-							oFieldToFocus.content.getContentEdit()[0].focus();
-						} else {
-							var oFirstEditableInput = oObjectPage._getFirstEditableInput();
-							if (oFirstEditableInput) {
-								oFirstEditableInput.focus();
-							} else {
-								var oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
-								if (oFirstClickableElement) {
-									oFirstClickableElement.focus();
-								}
-							}
-						}
-					}
-				}
 			},
 
 			_onBackNavigationInDraft: function(oContext) {
@@ -402,7 +393,8 @@ sap.ui.define(
 			_onAfterBinding: function(oBindingContext, mParameters) {
 				var oObjectPage = this.byId("fe::ObjectPage"),
 					that = this,
-					aTables = this._findTables();
+					aTables = this._findTables(),
+					aFormContainers = this._findFormContainers();
 
 				this.sideEffects.clearPropertiesStatus();
 
@@ -416,6 +408,32 @@ sap.ui.define(
 						aIBNActions = CommonUtils.getIBNActions(oSubSection, aIBNActions);
 					});
 				});
+
+				// Assign internal binding contexts to oFormContainer:
+				// 1. It is not possible to assign the internal binding context to the XML fragment
+				// (FormContainer.fragment.xml) yet - it is used already for the data-structure.
+				// 2. Another problem is, that FormContainers assigned to a 'MoreBlock' does not have an
+				// internal model context at all.
+
+				aFormContainers.forEach(function(oFormContainer) {
+					var oInternalModelContext,
+						oInternalModel = oObjectPage.getModel("internal"),
+						sPageContextPath = "/pages/" + that.getView().getId(),
+						sFormContainerContextPath = "controls/" + that.getView().getLocalId(oFormContainer.getId()),
+						SHOW_DETAILS = "showDetails";
+					if (oFormContainer.getModel("internal") === undefined) {
+						oFormContainer.setModel(oInternalModel, "internal");
+						oFormContainer.setBindingContext(
+							oInternalModel.createBindingContext(sPageContextPath + "/" + sFormContainerContextPath),
+							"internal"
+						);
+						oFormContainer.bindElement({ path: "", model: "internal" });
+					} else {
+						oFormContainer.bindElement({ path: sFormContainerContextPath, model: "internal" });
+					}
+					oInternalModelContext = oFormContainer.getBindingContext("internal");
+					oInternalModelContext.setProperty(SHOW_DETAILS, false);
+				});
 				aTables.forEach(function(oTable) {
 					var oInternalModelContext = oTable.getBindingContext("internal");
 					oInternalModelContext.setProperty("creationRowFieldValidity", {});
@@ -562,16 +580,6 @@ sap.ui.define(
 			},
 			onPageReady: function(mParameters) {
 				// Apply app state only after the page is ready with the first section selected
-				function getVisibleSections(oObjectPage) {
-					var aVisibleSections;
-					var aSections = oObjectPage.getSections();
-					if (aSections && aSections.length) {
-						aVisibleSections = aSections.filter(function(oSection) {
-							return oSection.getVisible() === true;
-						});
-					}
-					return aVisibleSections;
-				}
 				var that = this;
 				var oView = this.getView();
 				var oInternalModelContext = oView.getBindingContext("internal");
@@ -587,60 +595,39 @@ sap.ui.define(
 				this.getAppComponent()
 					.getAppStateHandler()
 					.applyAppState();
-				var oLastFocusedControl = mParameters.lastFocusedControl;
-				if (oLastFocusedControl && oLastFocusedControl.controlId && oLastFocusedControl.focusInfo) {
-					var oFocusControl = oView.byId(oLastFocusedControl.controlId);
-					if (oFocusControl) {
-						oFocusControl.applyFocusInfo(oLastFocusedControl.focusInfo);
-						return;
-					}
-				}
-				var oObjectPage = this.byId("fe::ObjectPage");
-				// set the focus to the first action button, or to the first editable input if in editable mode
-				var isInDisplayMode = oObjectPage.getModel("ui").getProperty("/editMode") === "Display";
-				var oFirstClickableElement;
-				var aVisibleSections = getVisibleSections(oObjectPage);
 
-				if (isInDisplayMode) {
-					//Focus on the first visible section if page OP is in Display Mode
-					oObjectPage.setSelectedSection(aVisibleSections[0].getId());
-					oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
-					if (oFirstClickableElement) {
-						oFirstClickableElement.focus();
-					}
-				} else {
-					//Focus on first mandatory empty field
+				if (mParameters.forceFocus) {
+					var oObjectPage = this.byId("fe::ObjectPage");
+					// set the focus to the first action button, or to the first editable input if in editable mode
+					var isInDisplayMode = oObjectPage.getModel("ui").getProperty("/editMode") === "Display";
+					var aVisibleSections = oObjectPage.getSections().filter(function(oSection) {
+						return oSection.getVisible() === true;
+					});
+					// Select the first visible section
 					oObjectPage.setSelectedSection(aVisibleSections[0].getId());
-					if (
-						oView.getViewData().sectionLayout === "Page" ||
-						(oView.getViewData().sectionLayout === "Tabs" && this.initialTab.value === true)
-					) {
-						var oFieldToFocus;
-						var aSubSections = [];
-						for (var section = 0; section < aVisibleSections.length; section++) {
-							aSubSections = aVisibleSections[section].getSubSections();
-							oFieldToFocus = this._getFirstEmptyMandatoryFieldFromSubSection(aSubSections);
-							if (oFieldToFocus) {
-								oFieldToFocus.content.getContentEdit()[0].focus();
-								break;
-							}
-						}
 
-						//this.initialTab.value = false;
-					}
-					if (!oFieldToFocus) {
-						var oFirstEditableInput = oObjectPage._getFirstEditableInput();
-						if (oFirstEditableInput) {
-							oFirstEditableInput.focus();
+					if (isInDisplayMode) {
+						var oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
+						if (oFirstClickableElement) {
+							oFirstClickableElement.focus();
+						}
+					} else {
+						var aVisibleSubSections;
+						if (oView.getViewData().sectionLayout === "Tabs") {
+							// In a tabbed layout, only the subsections of the selected section are visible on the screen
+							aVisibleSubSections = aVisibleSections[0].getSubSections();
 						} else {
-							oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
-							if (oFirstClickableElement) {
-								oFirstClickableElement.focus();
-							}
+							// In a paged layout, all subsections of the visible sections are visible on the screen
+							aVisibleSubSections = aVisibleSections
+								.map(function(oSection) {
+									return oSection.getSubSections();
+								})
+								.flat();
 						}
+						this._updateFocusInEditMode(aVisibleSubSections);
 					}
-					this.initialTab.value = false;
 				}
+
 				oInternalModelContext.setProperty("errorNavigationSectionFlag", false);
 				this._checkDataPointTitleForExternalNavigation();
 			},
@@ -899,6 +886,37 @@ sap.ui.define(
 				return aBlocks;
 			},
 
+			_findFormContainers: function() {
+				var aSubSections = this._getAllSubSections(),
+					aFormContainers = [];
+
+				function _collectFormContainersInBlocks(aBlocks) {
+					for (var i = 0; i < aBlocks.length; i++) {
+						var oElement = aBlocks[i].getContent instanceof Function && aBlocks[i].getContent();
+						if (oElement && oElement.isA && oElement.isA("sap.ui.layout.DynamicSideContent")) {
+							oElement = oElement.getMainContent instanceof Function && oElement.getMainContent();
+							if (oElement && oElement.length > 0) {
+								oElement = oElement[0];
+							}
+						}
+						if (
+							oElement &&
+							oElement.isA &&
+							oElement.isA("sap.ui.layout.form.Form") &&
+							oElement.getFormContainers instanceof Function
+						) {
+							aFormContainers = aFormContainers.concat(oElement.getFormContainers());
+						}
+					}
+				}
+
+				for (var i = 0; i < aSubSections.length; i++) {
+					_collectFormContainersInBlocks(aSubSections[i].getBlocks());
+					_collectFormContainersInBlocks(aSubSections[i].getMoreBlocks());
+				}
+				return aFormContainers;
+			},
+
 			//TODO: This is needed for two workarounds - to be removed again
 			_findTables: function() {
 				var aSubSections = this._getAllSubSections(),
@@ -1349,6 +1367,17 @@ sap.ui.define(
 					//will be called always when we click on a section tab
 					this.getExtensionAPI().updateAppState();
 					this.bSectionNavigated = true;
+
+					var oInternalModelContext = this.getView().getBindingContext("internal");
+					var oObjectPage = this.byId("fe::ObjectPage");
+					if (
+						oObjectPage.getModel("ui").getProperty("/editMode") !== "Display" &&
+						this.getView().getViewData().sectionLayout === "Tabs" &&
+						oInternalModelContext.getProperty("errorNavigationSectionFlag") === false
+					) {
+						var oSubSection = oEvent.getParameter("subSection");
+						this._updateFocusInEditMode([oSubSection]);
+					}
 				},
 				onVariantSelected: function(oEvent) {
 					this.getExtensionAPI().updateAppState();

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

@@ -67,6 +67,7 @@ sap.ui.define(
 		 */
 		StashableHBox.prototype.getTitleControl = function() {
 			var aItems = [],
+				content,
 				i;
 			if (this.getItems && this.getItems()[0] && this.getItems()[0].getItems) {
 				aItems = this.getItems()[0].getItems();
@@ -75,6 +76,13 @@ sap.ui.define(
 			}
 			for (i = 0; i < aItems.length; i++) {
 				if (aItems[i].isA("sap.m.Title") || aItems[i].isA("sap.m.Link")) {
+					if (aItems[i].isA("sap.m.Title")) {
+						// If a title was found, check if there is a link in the content aggregation
+						content = aItems[i].getContent();
+						if (content && content.isA("sap.m.Link")) {
+							return content;
+						}
+					}
 					return aItems[i];
 				}
 			}

package/src/sap/fe/templates/ObjectPage/overrides/ViewState.js

@@ -2,7 +2,7 @@
  * SAPUI5
  * (c) Copyright 2009-2021 SAP SE. All rights reserved.
  */
-sap.ui.define(["sap/fe/core/library", "sap/fe/core/CommonUtils"], function(CoreLibrary, CommonUtils) {
+sap.ui.define(["sap/fe/core/library", "sap/fe/core/helpers/KeepAliveHelper"], function(CoreLibrary, KeepAliveHelper) {
 	"use strict";
 
 	var VariantManagement = CoreLibrary.VariantManagement;
@@ -40,9 +40,29 @@ sap.ui.define(["sap/fe/core/library", "sap/fe/core/CommonUtils"], function(CoreL
 
 			aStateControls.push(oView.byId("fe::ObjectPage"));
 		},
+		adaptControlStateHandler: function(oControl, aControlHandler) {
+			if (oControl.isA("sap.ui.fl.variants.VariantManagement")) {
+				aControlHandler.push({
+					retrieve: function(oVM) {
+						return {
+							"variantId": oVM.getCurrentVariantKey()
+						};
+					},
+					apply: function(oVM, oControlState) {
+						if (
+							oControlState &&
+							oControlState.variantId !== undefined &&
+							!(oControlState.variantId === oVM.getId() && oVM.getModified() === false)
+						) {
+							oVM.setModified(true);
+						}
+					}
+				});
+			}
+		},
 		adaptBindingRefreshControls: function(aControls) {
 			var oView = this.getView(),
-				sRefreshStrategy = CommonUtils.getViewRefreshInfo(oView),
+				sRefreshStrategy = KeepAliveHelper.getViewRefreshInfo(oView),
 				oController = oView.getController(),
 				aControlsToRefresh = [];
 
@@ -52,7 +72,7 @@ sap.ui.define(["sap/fe/core/library", "sap/fe/core/CommonUtils"], function(CoreL
 			}
 			if (sRefreshStrategy !== "includingDependents") {
 				var aViewControls = oController._findTables();
-				aControlsToRefresh = aControlsToRefresh.concat(CommonUtils.getControlsForRefresh(oView, aViewControls) || []);
+				aControlsToRefresh = aControlsToRefresh.concat(KeepAliveHelper.getControlsForRefresh(oView, aViewControls) || []);
 			}
 			return aControlsToRefresh.reduce(function(aPrevControls, oControl) {
 				if (aPrevControls.indexOf(oControl) === -1) {

package/src/sap/fe/templates/ObjectPage/templating/ObjectPageTemplating.js

@@ -43,14 +43,15 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression", "sap/fe/core/converters/
    * @returns The binding expression for the object page title
    */
   var getExpressionForTitle = function (oHeaderInfo, oViewData, fullContextPath, oDraftRoot) {
-    var _oHeaderInfo$Title, _oHeaderInfo$Title2, _oHeaderInfo$Title2$V, _oHeaderInfo$Title2$V2, _oHeaderInfo$Title2$V3, _oHeaderInfo$Title2$V4, _oHeaderInfo$Title2$V5, _oHeaderInfo$Title2$V6, _oHeaderInfo$Title2$V7;
+    var _oHeaderInfo$Title, _oHeaderInfo$Title2, _oHeaderInfo$Title3, _oHeaderInfo$Title3$V, _oHeaderInfo$Title3$V2, _oHeaderInfo$Title3$V3, _oHeaderInfo$Title3$V4, _oHeaderInfo$Title3$V5, _oHeaderInfo$Title3$V6, _oHeaderInfo$Title3$V7;
 
     var titleNoHeaderInfo = CommonUtils.getTranslatedText("T_NEW_OBJECT", oViewData.resourceBundle, undefined, oViewData.entitySet);
     var titleWithHeaderInfo = CommonUtils.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE", oViewData.resourceBundle, undefined, oViewData.entitySet);
-    var titleForActiveHeaderNoHeaderInfo = CommonUtils.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO", oViewData.resourceBundle);
-    var titleValueExpression = annotationExpression(oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : (_oHeaderInfo$Title = oHeaderInfo.Title) === null || _oHeaderInfo$Title === void 0 ? void 0 : _oHeaderInfo$Title.Value);
+    var oEmptyHeaderInfoTitle = (oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Title) === undefined || (oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Title) === "" || (oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : (_oHeaderInfo$Title = oHeaderInfo.Title) === null || _oHeaderInfo$Title === void 0 ? void 0 : _oHeaderInfo$Title.Value) === "";
+    var titleForActiveHeaderNoHeaderInfo = !oEmptyHeaderInfoTitle ? CommonUtils.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO", oViewData.resourceBundle) : "";
+    var titleValueExpression = annotationExpression(oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : (_oHeaderInfo$Title2 = oHeaderInfo.Title) === null || _oHeaderInfo$Title2 === void 0 ? void 0 : _oHeaderInfo$Title2.Value);
 
-    if (oHeaderInfo !== null && oHeaderInfo !== void 0 && (_oHeaderInfo$Title2 = oHeaderInfo.Title) !== null && _oHeaderInfo$Title2 !== void 0 && (_oHeaderInfo$Title2$V = _oHeaderInfo$Title2.Value) !== null && _oHeaderInfo$Title2$V !== void 0 && (_oHeaderInfo$Title2$V2 = _oHeaderInfo$Title2$V.$target) !== null && _oHeaderInfo$Title2$V2 !== void 0 && (_oHeaderInfo$Title2$V3 = _oHeaderInfo$Title2$V2.annotations) !== null && _oHeaderInfo$Title2$V3 !== void 0 && (_oHeaderInfo$Title2$V4 = _oHeaderInfo$Title2$V3.Common) !== null && _oHeaderInfo$Title2$V4 !== void 0 && (_oHeaderInfo$Title2$V5 = _oHeaderInfo$Title2$V4.Text) !== null && _oHeaderInfo$Title2$V5 !== void 0 && (_oHeaderInfo$Title2$V6 = _oHeaderInfo$Title2$V5.annotations) !== null && _oHeaderInfo$Title2$V6 !== void 0 && (_oHeaderInfo$Title2$V7 = _oHeaderInfo$Title2$V6.UI) !== null && _oHeaderInfo$Title2$V7 !== void 0 && _oHeaderInfo$Title2$V7.TextArrangement) {
+    if (oHeaderInfo !== null && oHeaderInfo !== void 0 && (_oHeaderInfo$Title3 = oHeaderInfo.Title) !== null && _oHeaderInfo$Title3 !== void 0 && (_oHeaderInfo$Title3$V = _oHeaderInfo$Title3.Value) !== null && _oHeaderInfo$Title3$V !== void 0 && (_oHeaderInfo$Title3$V2 = _oHeaderInfo$Title3$V.$target) !== null && _oHeaderInfo$Title3$V2 !== void 0 && (_oHeaderInfo$Title3$V3 = _oHeaderInfo$Title3$V2.annotations) !== null && _oHeaderInfo$Title3$V3 !== void 0 && (_oHeaderInfo$Title3$V4 = _oHeaderInfo$Title3$V3.Common) !== null && _oHeaderInfo$Title3$V4 !== void 0 && (_oHeaderInfo$Title3$V5 = _oHeaderInfo$Title3$V4.Text) !== null && _oHeaderInfo$Title3$V5 !== void 0 && (_oHeaderInfo$Title3$V6 = _oHeaderInfo$Title3$V5.annotations) !== null && _oHeaderInfo$Title3$V6 !== void 0 && (_oHeaderInfo$Title3$V7 = _oHeaderInfo$Title3$V6.UI) !== null && _oHeaderInfo$Title3$V7 !== void 0 && _oHeaderInfo$Title3$V7.TextArrangement) {
       // In case an explicit text arrangement was set we make use of it in the description as well
       titleValueExpression = addTextArrangementToBindingExpression(titleValueExpression, fullContextPath);
     }
@@ -116,4 +117,4 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression", "sap/fe/core/converters/
   _exports.getExpressionForSaveButton = getExpressionForSaveButton;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ObjectPageTemplating.ts"],"names":["getExpressionForTitle","oHeaderInfo","oViewData","fullContextPath","oDraftRoot","titleNoHeaderInfo","CommonUtils","getTranslatedText","resourceBundle","undefined","entitySet","titleWithHeaderInfo","titleForActiveHeaderNoHeaderInfo","titleValueExpression","annotationExpression","Title","Value","$target","annotations","Common","Text","UI","TextArrangement","addTextArrangementToBindingExpression","formatValueRecursively","createModeTitle","TypeName","concat","toString","activeExpression","Entity","IsActive","compileBinding","ifElse","and","IsCreateMode","isEmpty","getExpressionForDescription","bindingExpression","Description","getExpressionForSaveButton","saveButtonText","createButtonText","saveExpression","isStickySessionSupported","startingEntitySet","IsCreateModeSticky","Draft","IsNewObject"],"mappings":";AAAA;AACA;AACA;;;;;;;;;;;;;;;;;;AAsBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMA,qBAAqB,GAAG,UACpCC,WADoC,EAEpCC,SAFoC,EAGpCC,eAHoC,EAIpCC,UAJoC,EAKR;AAAA;;AAC5B,QAAMC,iBAAiB,GAAGC,WAAW,CAACC,iBAAZ,CAA8B,cAA9B,EAA8CL,SAAS,CAACM,cAAxD,EAAwEC,SAAxE,EAAmFP,SAAS,CAACQ,SAA7F,CAA1B;AAEA,QAAMC,mBAAmB,GAAGL,WAAW,CAACC,iBAAZ,CAC3B,sDAD2B,EAE3BL,SAAS,CAACM,cAFiB,EAG3BC,SAH2B,EAI3BP,SAAS,CAACQ,SAJiB,CAA5B;AAOA,QAAME,gCAAgC,GAAGN,WAAW,CAACC,iBAAZ,CACxC,qEADwC,EAExCL,SAAS,CAACM,cAF8B,CAAzC;AAKA,QAAIK,oBAAoB,GAAGC,oBAAoB,CAAEb,WAAF,aAAEA,WAAF,6CAAEA,WAAW,CAAEc,KAAf,uDAAC,mBAAwCC,KAAzC,CAA/C;;AACA,QAAKf,WAAL,aAAKA,WAAL,sCAAKA,WAAW,CAAEc,KAAlB,yEAAI,oBAAwCC,KAA5C,4EAAI,sBAA+CC,OAAnD,6EAAI,uBAAwDC,WAA5D,6EAAI,uBAAqEC,MAAzE,6EAAI,uBAA6EC,IAAjF,6EAAI,uBAAmFF,WAAvF,6EAAI,uBAAgGG,EAApG,mDAAI,uBAAoGC,eAAxG,EAAyH;AACxH;AACAT,MAAAA,oBAAoB,GAAGU,qCAAqC,CAACV,oBAAD,EAAuBV,eAAvB,CAA5D;AACA;;AAEDU,IAAAA,oBAAoB,GAAGW,sBAAsB,CAACX,oBAAD,EAAuBV,eAAvB,CAA7C,CArB4B,CAuB5B;;AACA,QAAMsB,eAAe,GAAGxB,WAAW,SAAX,IAAAA,WAAW,WAAX,IAAAA,WAAW,CAAEyB,QAAb,GACrBC,MAAM,CAAChB,mBAAD,EAAsB,IAAtB,EAA4BG,oBAAoB,CAACb,WAAW,CAACyB,QAAZ,CAAqBE,QAArB,EAAD,CAAhD,CADe,GAErBvB,iBAFH;AAGA,QAAMwB,gBAAgB,GAAGzB,UAAU,GAAG0B,MAAM,CAACC,QAAV,GAAqB,IAAxD;AAEA,WAAOC,cAAc,CACpBC,MAAM,EACL;AACAC,IAAAA,GAAG,CAACb,EAAE,CAACc,YAAJ,EAAkBtB,oBAAoB,IAAIuB,OAAO,CAACvB,oBAAD,CAAjD,CAFE,EAILY,eAJK,EAKL;AACAQ,IAAAA,MAAM,CACLC,GAAG,CAACL,gBAAD,EAAmBhB,oBAAoB,IAAIuB,OAAO,CAACvB,oBAAD,CAAlD,CADE,EAELD,gCAFK,EAGLC,oBAHK,CAND,CADc,CAArB;AAcA,GAhDM;AAkDP;AACA;AACA;AACA;AACA;AACA;AACA;;;;;AACO,MAAMwB,2BAA2B,GAAG,UAC1CpC,WAD0C,EAE1CE,eAF0C,EAGd;AAAA;;AAC5B,QAAImC,iBAAiB,GAAGxB,oBAAoB,CAAEb,WAAF,aAAEA,WAAF,gDAAEA,WAAW,CAAEsC,WAAf,0DAAC,sBAA8CvB,KAA/C,CAA5C;;AACA,QAAKf,WAAL,aAAKA,WAAL,yCAAKA,WAAW,CAAEsC,WAAlB,6EAAI,uBAA8CvB,KAAlD,6EAAI,uBAAqDC,OAAzD,6EAAI,uBAA8DC,WAAlE,6EAAI,uBAA2EC,MAA/E,6EAAI,uBAAmFC,IAAvF,6EAAI,uBAAyFF,WAA7F,6EAAI,uBAAsGG,EAA1G,mDAAI,uBAA0GC,eAA9G,EAA+H;AAC9H;AACAgB,MAAAA,iBAAiB,GAAGf,qCAAqC,CAACe,iBAAD,EAAoBnC,eAApB,CAAzD;AACA;;AAED,WAAO6B,cAAc,CAACR,sBAAsB,CAACc,iBAAD,EAAoBnC,eAApB,CAAvB,CAArB;AACA,GAXM;AAaP;AACA;AACA;AACA;AACA;AACA;AACA;;;;;AACO,MAAMqC,0BAA0B,GAAG,UAAStC,SAAT,EAA8BC,eAA9B,EAA+F;AACxI,QAAMsC,cAAc,GAAGnC,WAAW,CAACC,iBAAZ,CAA8B,uBAA9B,EAAuDL,SAAS,CAACM,cAAjE,CAAvB;AACA,QAAMkC,gBAAgB,GAAGpC,WAAW,CAACC,iBAAZ,CAA8B,yBAA9B,EAAyDL,SAAS,CAACM,cAAnE,CAAzB;AACA,QAAImC,cAAJ;;AACA,QAAIC,wBAAwB,CAACzC,eAAe,CAAC0C,iBAAjB,CAA5B,EAAiE;AAChE;AACAF,MAAAA,cAAc,GAAGV,MAAM,CAACZ,EAAE,CAACyB,kBAAJ,EAAwBJ,gBAAxB,EAA0CD,cAA1C,CAAvB;AACA,KAHD,MAGO;AACN;AACAE,MAAAA,cAAc,GAAGV,MAAM,CAACc,KAAK,CAACC,WAAP,EAAoBN,gBAApB,EAAsCD,cAAtC,CAAvB;AACA;;AACD,WAAOT,cAAc,CAACW,cAAD,CAArB;AACA,GAZM","sourceRoot":".","sourcesContent":["// Formatters for the Object Page\nimport {\n\tand,\n\tifElse,\n\tisEmpty,\n\tconcat,\n\tannotationExpression,\n\tcompileBinding,\n\tBindingExpression\n} from \"sap/fe/core/helpers/BindingExpression\";\nimport { UI, Draft, Entity } from \"sap/fe/core/converters/helpers/BindingHelper\";\nimport { CommonUtils } from \"sap/fe/core\";\nimport { HeaderInfoType } from \"@sap-ux/vocabularies-types\";\nimport { DataModelObjectPath } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport { addTextArrangementToBindingExpression, formatValueRecursively } from \"sap/fe/macros/field/FieldTemplating\";\nimport { DataFieldTypes } from \"@sap-ux/vocabularies-types/dist/generated/UI\";\nimport { isStickySessionSupported } from \"sap/fe/core/templating/EntitySetHelper\";\nimport { ResourceBundle } from \"sap/base/i18n\";\n\ntype ViewData = {\n\tresourceBundle: ResourceBundle;\n\tentitySet: string;\n};\n\n//```mermaid\n// graph TD\n// A[Object Page Title] -->|Get DataField Value| C{Evaluate Create Mode}\n// C -->|In Create Mode| D{Is DataField Value empty}\n// D -->|Yes| F{Is there a TypeName}\n// F -->|Yes| G[Is there an custom title]\n// G -->|Yes| G1[Show the custom title + 'TypeName']\n// G -->|No| G2[Display the default title 'New + TypeName']\n// F -->|No| H[Is there a custom title]\n// H -->|Yes| I[Show the custom title]\n// H -->|No| J[Show the default 'Unamned Object']\n// D -->|No| E\n// C -->|Not in create mode| E[Show DataField Value]\n// ```\n/**\n * Compute the title for the object page.\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param oViewData The view data object we're currently on\n * @param fullContextPath The full context path used to reach that object page\n * @param oDraftRoot\n * @returns The binding expression for the object page title\n */\nexport const getExpressionForTitle = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\toViewData: ViewData,\n\tfullContextPath: DataModelObjectPath,\n\toDraftRoot: Object | undefined\n): BindingExpression<string> {\n\tconst titleNoHeaderInfo = CommonUtils.getTranslatedText(\"T_NEW_OBJECT\", oViewData.resourceBundle, undefined, oViewData.entitySet);\n\n\tconst titleWithHeaderInfo = CommonUtils.getTranslatedText(\n\t\t\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE\",\n\t\toViewData.resourceBundle,\n\t\tundefined,\n\t\toViewData.entitySet\n\t);\n\n\tconst titleForActiveHeaderNoHeaderInfo = CommonUtils.getTranslatedText(\n\t\t\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO\",\n\t\toViewData.resourceBundle\n\t);\n\n\tlet titleValueExpression = annotationExpression((oHeaderInfo?.Title as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Title as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\ttitleValueExpression = addTextArrangementToBindingExpression(titleValueExpression, fullContextPath);\n\t}\n\n\ttitleValueExpression = formatValueRecursively(titleValueExpression, fullContextPath);\n\n\t// If there is a TypeName defined, show the default title 'New + TypeName', otherwise show the custom title or the default 'New object'\n\tconst createModeTitle = oHeaderInfo?.TypeName\n\t\t? concat(titleWithHeaderInfo, \": \", annotationExpression(oHeaderInfo.TypeName.toString()))\n\t\t: titleNoHeaderInfo;\n\tconst activeExpression = oDraftRoot ? Entity.IsActive : true;\n\n\treturn compileBinding(\n\t\tifElse(\n\t\t\t// If Create Mode && Empty expression\n\t\t\tand(UI.IsCreateMode, titleValueExpression && isEmpty(titleValueExpression)),\n\n\t\t\tcreateModeTitle,\n\t\t\t// Otherwise show the default expression\n\t\t\tifElse(\n\t\t\t\tand(activeExpression, titleValueExpression && isEmpty(titleValueExpression)),\n\t\t\t\ttitleForActiveHeaderNoHeaderInfo,\n\t\t\t\ttitleValueExpression\n\t\t\t)\n\t\t)\n\t);\n};\n\n/**\n * Retrieves the expression for the description of an object page.\n *\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param fullContextPath The full context path used to reach that object page\n * @returns The binding expression for the object page description\n */\nexport const getExpressionForDescription = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\tfullContextPath: DataModelObjectPath\n): BindingExpression<string> {\n\tlet bindingExpression = annotationExpression((oHeaderInfo?.Description as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Description as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\tbindingExpression = addTextArrangementToBindingExpression(bindingExpression, fullContextPath);\n\t}\n\n\treturn compileBinding(formatValueRecursively(bindingExpression, fullContextPath));\n};\n\n/**\n * Return the expression for the save button.\n *\n * @param oViewData The current view data\n * @param fullContextPath The path used up until here\n * @returns The binding expression that shows the right save button text\n */\nexport const getExpressionForSaveButton = function(oViewData: ViewData, fullContextPath: DataModelObjectPath): BindingExpression<string> {\n\tconst saveButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_SAVE\", oViewData.resourceBundle);\n\tconst createButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_CREATE\", oViewData.resourceBundle);\n\tlet saveExpression;\n\tif (isStickySessionSupported(fullContextPath.startingEntitySet)) {\n\t\t// If we're in sticky mode AND the ui is in create mode, show Create, else show Save\n\t\tsaveExpression = ifElse(UI.IsCreateModeSticky, createButtonText, saveButtonText);\n\t} else {\n\t\t// If we're in draft AND the draft is a new object (!IsActiveEntity && !HasActiveEntity), show create, else show save\n\t\tsaveExpression = ifElse(Draft.IsNewObject, createButtonText, saveButtonText);\n\t}\n\treturn compileBinding(saveExpression);\n};\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ObjectPageTemplating.ts"],"names":["getExpressionForTitle","oHeaderInfo","oViewData","fullContextPath","oDraftRoot","titleNoHeaderInfo","CommonUtils","getTranslatedText","resourceBundle","undefined","entitySet","titleWithHeaderInfo","oEmptyHeaderInfoTitle","Title","Value","titleForActiveHeaderNoHeaderInfo","titleValueExpression","annotationExpression","$target","annotations","Common","Text","UI","TextArrangement","addTextArrangementToBindingExpression","formatValueRecursively","createModeTitle","TypeName","concat","toString","activeExpression","Entity","IsActive","compileBinding","ifElse","and","IsCreateMode","isEmpty","getExpressionForDescription","bindingExpression","Description","getExpressionForSaveButton","saveButtonText","createButtonText","saveExpression","isStickySessionSupported","startingEntitySet","IsCreateModeSticky","Draft","IsNewObject"],"mappings":"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","sourceRoot":".","sourcesContent":["// Formatters for the Object Page\nimport {\n\tand,\n\tifElse,\n\tisEmpty,\n\tconcat,\n\tannotationExpression,\n\tcompileBinding,\n\tBindingExpression\n} from \"sap/fe/core/helpers/BindingExpression\";\nimport { UI, Draft, Entity } from \"sap/fe/core/converters/helpers/BindingHelper\";\nimport { CommonUtils } from \"sap/fe/core\";\nimport { HeaderInfoType } from \"@sap-ux/vocabularies-types\";\nimport { DataModelObjectPath } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport { addTextArrangementToBindingExpression, formatValueRecursively } from \"sap/fe/macros/field/FieldTemplating\";\nimport { DataFieldTypes } from \"@sap-ux/vocabularies-types/dist/generated/UI\";\nimport { isStickySessionSupported } from \"sap/fe/core/templating/EntitySetHelper\";\nimport { ResourceBundle } from \"sap/base/i18n\";\n\ntype ViewData = {\n\tresourceBundle: ResourceBundle;\n\tentitySet: string;\n};\n\n//```mermaid\n// graph TD\n// A[Object Page Title] -->|Get DataField Value| C{Evaluate Create Mode}\n// C -->|In Create Mode| D{Is DataField Value empty}\n// D -->|Yes| F{Is there a TypeName}\n// F -->|Yes| G[Is there an custom title]\n// G -->|Yes| G1[Show the custom title + 'TypeName']\n// G -->|No| G2[Display the default title 'New + TypeName']\n// F -->|No| H[Is there a custom title]\n// H -->|Yes| I[Show the custom title]\n// H -->|No| J[Show the default 'Unamned Object']\n// D -->|No| E\n// C -->|Not in create mode| E[Show DataField Value]\n// ```\n/**\n * Compute the title for the object page.\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param oViewData The view data object we're currently on\n * @param fullContextPath The full context path used to reach that object page\n * @param oDraftRoot\n * @returns The binding expression for the object page title\n */\nexport const getExpressionForTitle = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\toViewData: ViewData,\n\tfullContextPath: DataModelObjectPath,\n\toDraftRoot: Object | undefined\n): BindingExpression<string> {\n\tconst titleNoHeaderInfo = CommonUtils.getTranslatedText(\"T_NEW_OBJECT\", oViewData.resourceBundle, undefined, oViewData.entitySet);\n\n\tconst titleWithHeaderInfo = CommonUtils.getTranslatedText(\n\t\t\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE\",\n\t\toViewData.resourceBundle,\n\t\tundefined,\n\t\toViewData.entitySet\n\t);\n\n\tconst oEmptyHeaderInfoTitle =\n\t\toHeaderInfo?.Title === undefined || oHeaderInfo?.Title === \"\" || (oHeaderInfo?.Title as DataFieldTypes)?.Value === \"\";\n\n\tconst titleForActiveHeaderNoHeaderInfo = !oEmptyHeaderInfoTitle\n\t\t? CommonUtils.getTranslatedText(\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO\", oViewData.resourceBundle)\n\t\t: \"\";\n\n\tlet titleValueExpression = annotationExpression((oHeaderInfo?.Title as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Title as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\ttitleValueExpression = addTextArrangementToBindingExpression(titleValueExpression, fullContextPath);\n\t}\n\n\ttitleValueExpression = formatValueRecursively(titleValueExpression, fullContextPath);\n\n\t// If there is a TypeName defined, show the default title 'New + TypeName', otherwise show the custom title or the default 'New object'\n\tconst createModeTitle = oHeaderInfo?.TypeName\n\t\t? concat(titleWithHeaderInfo, \": \", annotationExpression(oHeaderInfo.TypeName.toString()))\n\t\t: titleNoHeaderInfo;\n\tconst activeExpression = oDraftRoot ? Entity.IsActive : true;\n\n\treturn compileBinding(\n\t\tifElse(\n\t\t\t// If Create Mode && Empty expression\n\t\t\tand(UI.IsCreateMode, titleValueExpression && isEmpty(titleValueExpression)),\n\n\t\t\tcreateModeTitle,\n\t\t\t// Otherwise show the default expression\n\t\t\tifElse(\n\t\t\t\tand(activeExpression, titleValueExpression && isEmpty(titleValueExpression)),\n\t\t\t\ttitleForActiveHeaderNoHeaderInfo,\n\t\t\t\ttitleValueExpression\n\t\t\t)\n\t\t)\n\t);\n};\n\n/**\n * Retrieves the expression for the description of an object page.\n *\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param fullContextPath The full context path used to reach that object page\n * @returns The binding expression for the object page description\n */\nexport const getExpressionForDescription = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\tfullContextPath: DataModelObjectPath\n): BindingExpression<string> {\n\tlet bindingExpression = annotationExpression((oHeaderInfo?.Description as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Description as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\tbindingExpression = addTextArrangementToBindingExpression(bindingExpression, fullContextPath);\n\t}\n\n\treturn compileBinding(formatValueRecursively(bindingExpression, fullContextPath));\n};\n\n/**\n * Return the expression for the save button.\n *\n * @param oViewData The current view data\n * @param fullContextPath The path used up until here\n * @returns The binding expression that shows the right save button text\n */\nexport const getExpressionForSaveButton = function(oViewData: ViewData, fullContextPath: DataModelObjectPath): BindingExpression<string> {\n\tconst saveButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_SAVE\", oViewData.resourceBundle);\n\tconst createButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_CREATE\", oViewData.resourceBundle);\n\tlet saveExpression;\n\tif (isStickySessionSupported(fullContextPath.startingEntitySet)) {\n\t\t// If we're in sticky mode AND the ui is in create mode, show Create, else show Save\n\t\tsaveExpression = ifElse(UI.IsCreateModeSticky, createButtonText, saveButtonText);\n\t} else {\n\t\t// If we're in draft AND the draft is a new object (!IsActiveEntity && !HasActiveEntity), show create, else show save\n\t\tsaveExpression = ifElse(Draft.IsNewObject, createButtonText, saveButtonText);\n\t}\n\treturn compileBinding(saveExpression);\n};\n"]}

package/src/sap/fe/templates/ObjectPage/templating/ObjectPageTemplating.ts

@@ -59,10 +59,12 @@ export const getExpressionForTitle = function(
 		oViewData.entitySet
 	);
 
-	const titleForActiveHeaderNoHeaderInfo = CommonUtils.getTranslatedText(
-		"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO",
-		oViewData.resourceBundle
-	);
+	const oEmptyHeaderInfoTitle =
+		oHeaderInfo?.Title === undefined || oHeaderInfo?.Title === "" || (oHeaderInfo?.Title as DataFieldTypes)?.Value === "";
+
+	const titleForActiveHeaderNoHeaderInfo = !oEmptyHeaderInfoTitle
+		? CommonUtils.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO", oViewData.resourceBundle)
+		: "";
 
 	let titleValueExpression = annotationExpression((oHeaderInfo?.Title as DataFieldTypes)?.Value);
 	if ((oHeaderInfo?.Title as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {

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

@@ -19,15 +19,22 @@
 				text="{sap.fe.i18n>T_HEADER_DATAPOINT_TITLE_LINK_EXTERNAL_ARIA}"
 				id="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
 			/>
-			<Link
-				unittest:id="headerDataPointLinkTest"
-				id="{= ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]) }"
-				text="{dataPoint>Title@@MODEL.value}"
+			<Title
+				unittest:id="headerDataPointLinkTitleTest"
+				level="H3"
 				visible="{= COMMON.getHeaderDataPointLinkVisibility(ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]), true, ${dataPoint>@@FIELD.isNotAlwaysHidden}) }"
-				press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation'], ${manifest>/sap.app/crossNavigation/outbounds})}"
-				ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
-				class="sapUiTinyMarginBottom"
-			/>
+			>
+				<content>
+					<Link
+						unittest:id="headerDataPointLinkInsideTitleTest"
+						id="{= ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]) }"
+						text="{dataPoint>Title@@MODEL.value}"
+						press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation'], ${manifest>/sap.app/crossNavigation/outbounds})}"
+						ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
+						class="sapUiTinyMarginBottom"
+					/>
+				</content>
+			</Title>
 
 			<Title
 				unittest:id="headerDataPointTitleTest"
@@ -47,14 +54,17 @@
 				text="{sap.fe.i18n>T_COMMON_HEADERDP_TITLE_LINK_INPAGE_ARIA}"
 				id="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
 			/>
-			<Link
-				unittest:id="HeaderDataPointInternalLinkTest"
-				id="{= ID.generate(['fe', 'HeaderDPLink', ${headerFacet>Target/$AnnotationPath}]) }"
-				text="{dataPoint>Title@@MODEL.value}"
-				visible="{= !!${dataPoint>Title}}"
-				press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation']) }"
-				ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
-			/>
+			<Title level="H3" visible="{= !!${dataPoint>Title}}">
+				<content>
+					<Link
+						unittest:id="HeaderDataPointInternalLinkTest"
+						id="{= ID.generate(['fe', 'HeaderDPLink', ${headerFacet>Target/$AnnotationPath}]) }"
+						text="{dataPoint>Title@@MODEL.value}"
+						press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation']) }"
+						ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
+					/>
+				</content>
+			</Title>
 		</template:elseif>
 		<template:else>
 			<Title

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

@@ -3,12 +3,12 @@
 	xmlns="sap.m"
 	xmlns:internalMacro="sap.fe.macros.internal"
 	xmlns:core="sap.ui.core"
-	xmlns:l="sap.ui.layout"
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	template:require="{
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
 		ID: 'sap/fe/core/helpers/StableIdHelper',
-		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper'
+		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		FIELD: 'sap/fe/macros/field/FieldHelper'
 	}"
 >
 	<VBox id="{= ${converterHeaderFacet>headerFormData/id} }" displayInline="true">
@@ -38,10 +38,10 @@
 									<Label
 										unittest:id="ObjectPageHeaderLabelTest"
 										id="{= ID.generate([ ${formElement>idPrefix}, 'Label'])}"
-										text="{formElement>label}:"
-										visible="{= ${formElement>label} ? 'true':'false'}"
+										text="{= ${dataField>@@FIELD.computeLabelText} + ':' }"
+										visible="{= !!${dataField>@@FIELD.computeLabelText} }"
 										class="sapUiTinyMarginEnd"
-										vAlign="{= ${formElement>isValueMultilineText} === true ? 'Middle' : 'Bottom' }"
+										vAlign="{= ${formElement>isValueMultilineText} === true ? 'Middle' : 'Inherit' }"
 									/>
 									<internalMacro:Field
 										idPrefix="{formElement>idPrefix}"

package/src/sap/fe/templates/RootContainer/controller/Fcl.controller.js

@@ -9,7 +9,7 @@ sap.ui.define(
 		"./RootContainerBaseController",
 		"sap/f/FlexibleColumnLayoutSemanticHelper",
 		"sap/ui/core/Component",
-		"sap/fe/core/CommonUtils",
+		"sap/fe/core/helpers/KeepAliveHelper",
 		"sap/fe/core/controllerextensions/ViewState",
 		"sap/m/Link",
 		"sap/m/MessagePage",
@@ -21,7 +21,7 @@ sap.ui.define(
 		BaseController,
 		FlexibleColumnLayoutSemanticHelper,
 		Component,
-		CommonUtils,
+		KeepAliveHelper,
 		ViewState,
 		Link,
 		MessagePage,
@@ -536,9 +536,11 @@ sap.ui.define(
 				if (FCLLevel >= this._oFCLConfig.maxColumnsCount) {
 					// The view is on a level > max number of columns. It's always fullscreen without close/exit buttons
 					viewColumn = oFclColName[this._oFCLConfig.maxColumnsCount - 1];
+					oUIState.actionButtonsInfo.midColumn.fullScreen = null;
 					oUIState.actionButtonsInfo.midColumn.exitFullScreen = null;
 					oUIState.actionButtonsInfo.midColumn.closeColumn = null;
 					oUIState.actionButtonsInfo.endColumn.exitFullScreen = null;
+					oUIState.actionButtonsInfo.endColumn.fullScreen = null;
 					oUIState.actionButtonsInfo.endColumn.closeColumn = null;
 				} else {
 					viewColumn = oFclColName[FCLLevel];
@@ -558,7 +560,13 @@ sap.ui.define(
 				// so we have to add this info manually
 				oUIState.actionButtonsInfo.beginColumn = { fullScreen: null, exitFullScreen: null, closeColumn: null };
 
-				oView.getModel("fclhelper").setProperty("/actionButtonsInfo", Object.assign({}, oUIState.actionButtonsInfo[viewColumn]));
+				var oActionButtonInfos = Object.assign({}, oUIState.actionButtonsInfo[viewColumn]);
+				oActionButtonInfos.switchVisible = oActionButtonInfos.fullScreen !== null || oActionButtonInfos.exitFullScreen !== null;
+				oActionButtonInfos.switchIcon =
+					oActionButtonInfos.fullScreen !== null ? "sap-icon://full-screen" : "sap-icon://exit-full-screen";
+				oActionButtonInfos.isFullScreen = oActionButtonInfos.fullScreen === null;
+
+				oView.getModel("fclhelper").setProperty("/actionButtonsInfo", oActionButtonInfos);
 
 				oView.getModel("fclhelper").setProperty("/showShareIcon", this._updateShareButtonVisibility(viewColumn, sLayout));
 			},
@@ -589,11 +597,7 @@ sap.ui.define(
 
 					// Update the layout of the FlexibleColumnLayout
 					if (sLayout) {
-						if (!this.getFclControl().getModel("fcl")) {
-							this.getFclControl().setModel(new JSONModel(), "fcl");
-							this.getFclControl().bindProperty("layout", "fcl>/layout");
-						}
-						this.getFclControl().setProperty("layout", sLayout);
+						this.getFclControl().setLayout(sLayout);
 					}
 				}
 			},
@@ -749,13 +753,63 @@ sap.ui.define(
 			},
 
 			onContainerReady: function() {
+				// Restore views if neccessary.
 				var aViews = this._getAllVisibleViews();
 				var aRestorePromises = [];
 				aViews.reduce(function(aPromises, oTargetView) {
-					aPromises.push(CommonUtils.restoreView(oTargetView));
+					aPromises.push(KeepAliveHelper.restoreView(oTargetView));
 					return aPromises;
 				}, aRestorePromises);
 				return Promise.all(aRestorePromises);
+			},
+			
+			getRightmostContext: function() {
+				var oContext;
+				switch (this.getFclControl().getLayout()) {
+					case sap.f.LayoutType.OneColumn:
+						if (this.getFclControl().getCurrentBeginColumnPage()) {
+							oContext = _getViewFromContainer(this.getFclControl().getCurrentBeginColumnPage()).getBindingContext();
+						}
+						break;
+
+					case sap.f.LayoutType.TwoColumnsBeginExpanded:
+					case sap.f.LayoutType.TwoColumnsMidExpanded:
+						if (this.getFclControl().getCurrentMidColumnPage()) {
+							oContext = _getViewFromContainer(this.getFclControl().getCurrentMidColumnPage()).getBindingContext();
+						}
+						break;
+
+					case sap.f.LayoutType.ThreeColumnsEndExpanded:
+					case sap.f.LayoutType.ThreeColumnsMidExpanded:
+					case sap.f.LayoutType.ThreeColumnsMidExpandedEndHidden:
+					case sap.f.LayoutType.ThreeColumnsBeginExpandedEndHidden:
+					case sap.f.LayoutType.EndColumnFullScreen:
+						if (this.getFclControl().getCurrentEndColumnPage()) {
+							oContext = _getViewFromContainer(this.getFclControl().getCurrentEndColumnPage()).getBindingContext();
+						}
+						break;
+
+					case sap.f.LayoutType.MidColumnFullScreen:
+						// In this case we need to determine if this mid column fullscreen comes from a 2 or a 3 column layout
+						var sLayoutWhenExitFullScreen = this.getHelper().getCurrentUIState().actionButtonsInfo.midColumn.exitFullScreen;
+						if (sLayoutWhenExitFullScreen.indexOf("ThreeColumn") >= 0) {
+							// We come from a 3 column layout
+							if (this.getFclControl().getCurrentEndColumnPage()) {
+								oContext = _getViewFromContainer(this.getFclControl().getCurrentEndColumnPage()).getBindingContext();
+							}
+						} else {
+							// We come from a 2 column layout
+							if (this.getFclControl().getCurrentMidColumnPage()) {
+								oContext = _getViewFromContainer(this.getFclControl().getCurrentMidColumnPage()).getBindingContext();
+							}
+						}
+						break;
+
+					default:
+						Log.error("Unhandled switch case for " + this.getFclControl().getLayout());
+				}
+
+				return oContext;
 			}
 		});
 	},