@sapui5/sap.fe.templates 1.95.0 → 1.98.0

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/ObjectPage/view/fragments/Section.fragment.xml

@@ -55,17 +55,36 @@
 							showTitle="{subSection>showTitle}"
 							visible="{subSection>visible}"
 						>
-							<uxap:customData>
+							<!--uxap:customData>
 								<core:CustomData key="strategyForVisibilityChange" value="lazyLoading" />
+							</uxap:customData-->
+							<uxap:customData>
+								<core:CustomData key="isVisibilityDynamic" value="{subSection>isVisibilityDynamic}" />
 							</uxap:customData>
 							<template:if test="{= ${subSection>type} === 'Mixed'}">
 								<template:then>
-									<template:repeat list="{subSection>content}" var="subSection">
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
-									</template:repeat>
+									<template:if test="{viewData>/useNewLazyLoading}">
+										<template:then>
+											<template:repeat list="{subSection>content}" var="subSection">
+												<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader" type="XML" />
+											</template:repeat>
+										</template:then>
+										<template:else>
+											<template:repeat list="{subSection>content}" var="subSection">
+												<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+											</template:repeat>
+										</template:else>
+									</template:if>
 								</template:then>
 								<template:else>
-									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+									<template:if test="{viewData>/useNewLazyLoading}">
+										<template:then>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader" type="XML" />
+										</template:then>
+										<template:else>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+										</template:else>
+									</template:if>
 								</template:else>
 							</template:if>
 						</uxap:ObjectPageSubSection>

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

@@ -131,10 +131,7 @@
                 <template:elseif test="{= ${subSection>type} === 'DataVisualization'}">
                     <uxap:blocks>
                         <template:if test="{= ${subSection>level} === 2}">
-                            <Title
-							text="{subSection>title}"
-							visible="{= ${subSection>visible} &amp;&amp; ${subSection>title} !=='undefined' &amp;&amp; ${subSection>showTitle} ? true : false}"
-						/>
+                            <Title text="{subSection>title}" visible="{subSection>titleVisible}" />
                         </template:if>
                          <opcontrol:SubSectionBlock visible="{subSection>visible}">
                             <opcontrol:content>

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

@@ -0,0 +1,181 @@
+<core:FragmentDefinition
+	xmlns:uxap="sap.uxap"
+	xmlns:core="sap.ui.core"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	xmlns:fpm="sap.fe.macros.fpm"
+	xmlns:macro="sap.fe.macros"
+	xmlns:layout="sap.ui.layout"
+	xmlns:dt="sap.ui.dt"
+	xmlns="sap.m"
+	xmlns:opcontrol="sap.fe.templates.ObjectPage.controls"
+	template:require="{
+		fpm: 'sap/fe/macros/fpm/fpm',
+		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		COMMON: 'sap/fe/macros/CommonHelper',
+		ID: 'sap/fe/core/helpers/StableIdHelper'
+	}"
+>
+		<!-- We want to ensure that statically non visible sections are non visible-->
+         <template:if test="{subSection>visible}">
+            <template:if test="{= ${subSection>type} === 'XMLFragment'}">
+                <template:then>
+                    <core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
+                    <uxap:blocks>
+						<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                        <opcontrol:SubSectionBlock>
+                            <opcontrol:content>
+                                <template:if test="{= ${subSection>sideContent} !== undefined}">
+                                    <template:then>
+                                        <layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+                                            <layout:mainContent>
+                                                <core:Fragment
+													fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionCustomSection"
+													type="XML"
+												/>
+                                            </layout:mainContent>
+                                            <layout:sideContent>
+                                                <core:Fragment
+													fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer"
+													type="XML"
+												/>
+                                            </layout:sideContent>
+                                        </layout:DynamicSideContent>
+                                    </template:then>
+                                    <template:else>
+                                        <core:Fragment
+											fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionCustomSection"
+											type="XML"
+										/>
+                                    </template:else>
+                                </template:if>
+                            </opcontrol:content>
+                        </opcontrol:SubSectionBlock>
+						</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+
+                </template:then>
+                <template:elseif test="{= ${subSection>type} === 'Form'}">
+                    <core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
+                    <uxap:blocks>
+					<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                    <opcontrol:SubSectionBlock>
+                        <opcontrol:content>
+							<template:if test="{= ${subSection>sideContent} !== undefined}">
+							<template:then>
+								<layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+									<layout:mainContent>
+										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent" type="XML" />
+									</layout:mainContent>
+									<layout:sideContent>
+										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer" type="XML" />
+									</layout:sideContent>
+								</layout:DynamicSideContent>
+
+							</template:then>
+							<template:else>
+								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent" type="XML" />
+							</template:else>
+							</template:if>
+                        </opcontrol:content>
+                    </opcontrol:SubSectionBlock>
+					</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+                    <template:if test="{subSection>formDefinition/hasFacetsNotPartOfPreview}">
+                        <template:then>
+                            <!-- Button "Show More / Less" is displayed for a collection facets that contains at least one reference facets with annotation "PartOfPreview === TRUE" -->
+                            <uxap:moreBlocks>
+                                <template:if test="{= ${subSection>level} === 2}">
+                                    <Title text="{subSection>title}" />
+                                </template:if>
+                                <opcontrol:SubSectionBlock>
+                                    <opcontrol:content>
+										<template:if test="{= ${subSection>sideContent} !== undefined}">
+										<template:then>
+											<layout:DynamicSideContent
+												id="{= ID.generate(['fe', ${subSection>key}, 'MoreSideContentLayout'])}"
+												showMainContent="true"
+												showSideContent="{subSection>sideContent/visible}"
+												sideContentFallDown="BelowM"
+												containerQuery="true"
+												equalSplit="{subSection>sideContent/equalSplit}"
+											>
+												<layout:mainContent>
+													<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent" type="XML" />
+												</layout:mainContent>
+												<layout:sideContent>
+													<!--No Side Content for MoreBlocks so far-->
+												</layout:sideContent>
+											</layout:DynamicSideContent>
+										</template:then>
+										<template:else>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent" type="XML" />
+										</template:else>
+										</template:if>
+                                    </opcontrol:content>
+                                </opcontrol:SubSectionBlock>
+                            </uxap:moreBlocks>
+                        </template:then>
+                    </template:if>
+                </template:elseif>
+                <template:elseif test="{= ${subSection>type} === 'DataVisualization'}">
+                    <uxap:blocks>
+						<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                        <template:if test="{= ${subSection>level} === 2}">
+                            <Title
+								text="{subSection>title}"
+								visible="{= ${subSection>visible} &amp;&amp; ${subSection>title} !=='undefined' &amp;&amp; ${subSection>showTitle} ? true : false}"
+							/>
+                        </template:if>
+                         <opcontrol:SubSectionBlock visible="{subSection>visible}">
+                            <opcontrol:content>
+								<template:if test="{= ${subSection>sideContent} !== undefined}">
+								<template:then>
+									<layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+										<layout:mainContent>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization" type="XML" />
+										</layout:mainContent>
+										<layout:sideContent>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer" type="XML" />
+										</layout:sideContent>
+									</layout:DynamicSideContent>
+								</template:then>
+								<template:else>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization" type="XML" />
+								</template:else>
+								</template:if>
+                            </opcontrol:content>
+                        </opcontrol:SubSectionBlock>
+					</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+                </template:elseif>
+                <template:elseif test="{= ${subSection>type} === 'Unknown'}">
+                    <Text text="{subSection>text}" />
+                </template:elseif>
+                <template:else>
+
+                </template:else>
+            </template:if>
+        </template:if>
+</core:FragmentDefinition>

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

@@ -14,5 +14,6 @@
 		useFormContainerLabels="{= ${subSection>formDefinition/useFormContainerLabels}}"
 		partOfPreview="true"
 		formContainers="{subSection>formDefinition/formContainers}"
+		isVisible="{subSection>formDefinition/isVisible}"
 	/>
 </core:FragmentDefinition>

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

@@ -14,5 +14,6 @@
 		useFormContainerLabels="{= ${subSection>formDefinition/useFormContainerLabels}}"
 		partOfPreview="false"
 		formContainers="{subSection>formDefinition/formContainers}"
+		isVisible="{subSection>formDefinition/isVisible}"
 	/>
 </core:FragmentDefinition>

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -9,12 +9,24 @@ sap.ui.define(
 		"./RootContainerBaseController",
 		"sap/f/FlexibleColumnLayoutSemanticHelper",
 		"sap/ui/core/Component",
+		"sap/fe/core/helpers/KeepAliveHelper",
 		"sap/fe/core/controllerextensions/ViewState",
 		"sap/m/Link",
 		"sap/m/MessagePage",
 		"sap/m/MessageBox"
 	],
-	function(Log, JSONModel, BaseController, FlexibleColumnLayoutSemanticHelper, Component, ViewState, Link, MessagePage, MessageBox) {
+	function(
+		Log,
+		JSONModel,
+		BaseController,
+		FlexibleColumnLayoutSemanticHelper,
+		Component,
+		KeepAliveHelper,
+		ViewState,
+		Link,
+		MessagePage,
+		MessageBox
+	) {
 		"use strict";
 
 		var CONSTANTS = {
@@ -75,6 +87,33 @@ sap.ui.define(
 							});
 							aStateControls.push(pChildView);
 						});
+				},
+				onRestore: function() {
+					var oView = this.getView(),
+						oNavContainer = oView.byId("appContent");
+					var oInternalModel = oNavContainer.getModel("internal");
+					var oPages = oInternalModel.getProperty("/pages");
+
+					for (var sComponentId in oPages) {
+						oInternalModel.setProperty("/pages/" + sComponentId + "/restoreStatus", "pending");
+					}
+				},
+				onSuspend: function() {
+					var oFCLController = this.getView().getController();
+					var oFCLControl = oFCLController.getFclControl();
+					var aBeginColumnPages = oFCLControl.getBeginColumnPages() || [];
+					var aMidColumnPages = oFCLControl.getMidColumnPages() || [];
+					var aEndColumnPages = oFCLControl.getEndColumnPages() || [];
+					var aPages = [].concat(aBeginColumnPages, aMidColumnPages, aEndColumnPages);
+
+					aPages.forEach(function(oPage) {
+						var oTargetView = _getViewFromContainer(oPage);
+
+						var oController = oTargetView && oTargetView.getController();
+						if (oController && oController.viewState && oController.viewState.onSuspend) {
+							return oController.viewState.onSuspend();
+						}
+					});
 				}
 			}),
 
@@ -497,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];
@@ -519,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));
 			},
@@ -550,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);
 					}
 				}
 			},
@@ -707,6 +750,66 @@ sap.ui.define(
 				}
 
 				return aViews;
+			},
+
+			onContainerReady: function() {
+				// Restore views if neccessary.
+				var aViews = this._getAllVisibleViews();
+				var aRestorePromises = [];
+				aViews.reduce(function(aPromises, 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;
 			}
 		});
 	},