@sapui5/sap.fe.templates 1.96.2 → 1.96.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.templates",
-	"version": "1.96.2",
+	"version": "1.96.3",
 	"description": "SAPUI5 Library sap.fe.templates",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",

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

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.96.2</version>
+    <version>1.96.3</version>
 
     <documentation>UI5 library: sap.fe.templates</documentation>
 

package/src/sap/fe/templates/AnalyticalListPage/Component.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(
 	["sap/fe/templates/ListComponent"],

package/src/sap/fe/templates/AnalyticalListPage/chart/FEChartDelegate.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 // ---------------------------------------------------------------------------------------
 // Helper class used to help create content in the chart/item and fill relevant metadata

package/src/sap/fe/templates/ListComponent.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(
 	["sap/fe/core/TemplateComponent", "sap/fe/core/library"],

package/src/sap/fe/templates/ListReport/Component.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(
 	["sap/fe/templates/ListComponent"],

package/src/sap/fe/templates/ListReport/ExtensionAPI.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(["sap/fe/core/ExtensionAPI", "sap/fe/macros/filter/FilterUtils", "sap/fe/macros/chart/ChartUtils"], function(
 	ExtensionAPI,

package/src/sap/fe/templates/ListReport/ListReportController.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(
@@ -245,21 +245,14 @@ sap.ui.define(
 					});
 			},
 			onPageReady: function(mParameters) {
-				var oLastFocusedControl = mParameters.lastFocusedControl;
-				var oView = this.getView();
-				// set the focus to the first action button, or to the first editable input if in editable mode
-				if (oLastFocusedControl && oLastFocusedControl.controlId && oLastFocusedControl.focusInfo) {
-					var oFocusControl = oView.byId(oLastFocusedControl.controlId);
-					if (oFocusControl) {
-						oFocusControl.applyFocusInfo(oLastFocusedControl.focusInfo);
-					}
-				}
-
 				// Enabling mandatory filter fields message dialog and focusing on them
-				var oFilterBar = this._getFilterBarControl();
-				if (oFilterBar && !oFilterBar.getShowMessages()) {
-					oFilterBar.setShowMessages(true);
-					oFilterBar.setFocusOnFirstErroneousField();
+				if (mParameters.forceFocus) {
+					var oFilterBar = this._getFilterBarControl();
+
+					if (oFilterBar && !oFilterBar.getShowMessages()) {
+						oFilterBar.setShowMessages(true);
+						oFilterBar.setFocusOnFirstErroneousField();
+					}
 				}
 			},
 

package/src/sap/fe/templates/ListReport/overrides/IntentBasedNavigation.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(["sap/fe/core/CommonUtils", "sap/fe/macros/filter/FilterUtils"], function(CommonUtils, FilterUtils) {
 	"use strict";

package/src/sap/fe/templates/ListReport/overrides/Share.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(
 	["sap/fe/core/helpers/SemanticDateOperators", "sap/ui/core/routing/HashChanger", "sap/fe/core/CommonUtils", "sap/base/Log"],
@@ -52,11 +52,19 @@ sap.ui.define(
 		}
 
 		function getShareUrl() {
-			var sShareUrl;
-			var sHash = HashChanger.getInstance().getHash();
-			var sBasePath = HashChanger.getInstance().hrefForAppSpecificHash ? HashChanger.getInstance().hrefForAppSpecificHash("") : "";
-			sShareUrl = sHash ? sBasePath + sHash : window.location.hash;
-			return sShareUrl;
+			var oUShellContainer = sap.ushell && sap.ushell.Container;
+			if (oUShellContainer) {
+				return oUShellContainer
+					.getFLPUrlAsync(true)
+					.then(function(sFLPUrl) {
+						return sFLPUrl;
+					})
+					.catch(function(sError) {
+						Log.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)", sError);
+					});
+			} else {
+				return Promise.resolve(document.URL);
+			}
 		}
 
 		function getSaveAsTileServiceUrl(oController) {
@@ -99,22 +107,29 @@ sap.ui.define(
 		return {
 			adaptShareMetadata: function(oShareMetadata) {
 				var that = this;
-				return Promise.resolve(getJamUrl()).then(function(sJamUrl) {
-					var oAppComponent = CommonUtils.getAppComponent(that.base.getView());
-					var oMetadata = oAppComponent.getMetadata();
-					var oUIManifest = oMetadata.getManifestEntry("sap.ui");
-					var sIcon = (oUIManifest && oUIManifest.icons && oUIManifest.icons.icon) || "";
-					var oAppManifest = oMetadata.getManifestEntry("sap.app");
-					var sTitle = (oAppManifest && oAppManifest.title) || "";
-					// TODO: check if there is any semantic date used before adding serviceURL as BLI:FIORITECHP1-18023
-					oShareMetadata.tile = {
-						icon: sIcon,
-						title: sTitle,
-						queryUrl: getSaveAsTileServiceUrl(that.base)
-					};
-					oShareMetadata.title = document.title;
-					oShareMetadata.url = getShareUrl();
-					oShareMetadata.jam.url = sJamUrl;
+				Promise.resolve(getJamUrl())
+					.then(function(sJamUrl) {
+						var oAppComponent = CommonUtils.getAppComponent(that.base.getView());
+						var oMetadata = oAppComponent.getMetadata();
+						var oUIManifest = oMetadata.getManifestEntry("sap.ui");
+						var sIcon = (oUIManifest && oUIManifest.icons && oUIManifest.icons.icon) || "";
+						var oAppManifest = oMetadata.getManifestEntry("sap.app");
+						var sTitle = (oAppManifest && oAppManifest.title) || "";
+						// TODO: check if there is any semantic date used before adding serviceURL as BLI:FIORITECHP1-18023
+						oShareMetadata.tile = {
+							icon: sIcon,
+							title: sTitle,
+							queryUrl: getSaveAsTileServiceUrl(that.base)
+						};
+						oShareMetadata.title = document.title;
+						oShareMetadata.jam.url = sJamUrl;
+					})
+					.catch(function(error) {
+						Log.error(error);
+					});
+
+				return Promise.resolve(getShareUrl()).then(function(sFLPUrl) {
+					oShareMetadata.url = sFLPUrl;
 					return oShareMetadata;
 				});
 			}

package/src/sap/fe/templates/ListReport/overrides/ViewState.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(
 	[

package/src/sap/fe/templates/ObjectPage/AnnotationHelper.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(
@@ -447,6 +447,26 @@ sap.ui.define(
 						return undefined;
 					}
 				}
+			},
+			isSubSectionTitleVisible: function(sSubSectionvisible, sSubSectiontitle, sSubSectionshowTitle) {
+				if (sSubSectionvisible.indexOf("{=") === 0) {
+					// Dynamic expression
+					var sExpressionResult = sSubSectionvisible.substring(
+						sSubSectionvisible.indexOf("{=") + 2,
+						sSubSectionvisible.lastIndexOf("}")
+					);
+					return (
+						"{= (" +
+						sExpressionResult +
+						") && ('" +
+						sSubSectiontitle +
+						"' !=='undefined') && (" +
+						sSubSectionshowTitle +
+						" ? true : false) }"
+					);
+				} else {
+					return sSubSectionvisible && sSubSectiontitle !== "undefined" && (sSubSectionshowTitle ? true : false);
+				}
 			}
 		};
 

package/src/sap/fe/templates/ObjectPage/Component.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(
 	[

package/src/sap/fe/templates/ObjectPage/ExtensionAPI.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(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/core/converters/helpers/ID"], function(
 	ExtensionAPI,

package/src/sap/fe/templates/ObjectPage/ObjectPageController.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(
 	[
@@ -295,7 +295,9 @@ sap.ui.define(
 							// In IconTabBar mode keep the second section bound if there is an editable header and we are switching to display mode
 							if (iSkip < 1 || (bUseIconTabBar && (iSection > 1 || (iSection === 1 && !bEditableHeader && !bIsInEditMode)))) {
 								var oSubSection = aSubSections[iSubSection];
-								oSubSection.setBindingContext(null);
+								if (oSubSection.data().isVisibilityDynamic !== "true") {
+									oSubSection.setBindingContext(null);
+								}
 							}
 						}
 					}
@@ -315,7 +317,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 +356,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) {
@@ -562,16 +555,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 +570,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();
 			},
@@ -805,20 +767,19 @@ sap.ui.define(
 						);
 					}
 				});
-				return Promise.all(aWaitCreateDocuments).then(function(aBindings) {
-					var mParameters = {
-						bExecuteSideEffectsOnError: bExecuteSideEffectsOnError,
-						bindings: aBindings
-					};
-					return that.editFlow
-						.saveDocument(oContext, mParameters)
-						.catch(that._showMessagePopover.bind(that))
-						.finally(function() {
-							if (BusyLocker.isLocked(oModel)) {
-								BusyLocker.unlock(oModel);
-							}
-						});
-				});
+				return Promise.all(aWaitCreateDocuments)
+					.then(function(aBindings) {
+						var mParameters = {
+							bExecuteSideEffectsOnError: bExecuteSideEffectsOnError,
+							bindings: aBindings
+						};
+						return that.editFlow.saveDocument(oContext, mParameters).catch(that._showMessagePopover.bind(that));
+					})
+					.finally(function() {
+						if (BusyLocker.isLocked(oModel)) {
+							BusyLocker.unlock(oModel);
+						}
+					});
 			},
 
 			_cancelDocument: function(oContext, mParameters) {
@@ -1349,6 +1310,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

@@ -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(
 	["sap/m/HBox", "sap/m/HBoxRenderer", "sap/ui/core/StashedControlSupport"],

package/src/sap/fe/templates/ObjectPage/controls/StashableVBox.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(
 	["sap/m/VBox", "sap/m/VBoxRenderer", "sap/ui/core/StashedControlSupport"],

package/src/sap/fe/templates/ObjectPage/controls/SubSectionBlock.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(["sap/uxap/BlockBase"], function(BlockBase) {

package/src/sap/fe/templates/ObjectPage/designtime/FlexBox.designtime.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 // Provides the Design Time Metadata for the sap.m.FlexBox control
 sap.ui.define([], function() {

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the Design Time Metadata for the sap.fe.templates.ObjectPage.controls.StashableHBox control

package/src/sap/fe/templates/ObjectPage/designtime/StashableVBox.designtime.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the Design Time Metadata for the sap.fe.templates.ObjectPage.controls.StashableVBox control

package/src/sap/fe/templates/ObjectPage/flexibility/StashableHBox.flexibility.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(["sap/ui/fl/changeHandler/BaseRename"], function(BaseRename) {

package/src/sap/fe/templates/ObjectPage/flexibility/StashableVBox.flexibility.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([], function() {

package/src/sap/fe/templates/ObjectPage/overrides/IntentBasedNavigation.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(["sap/fe/core/CommonUtils", "sap/fe/navigation/SelectionVariant"], function(CommonUtils, SelectionVariant) {
 	"use strict";

package/src/sap/fe/templates/ObjectPage/overrides/InternalRouting.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(["sap/fe/core/CommonUtils", "sap/fe/navigation/SelectionVariant"], function(CommonUtils, SelectionVariant) {
 	"use strict";

package/src/sap/fe/templates/ObjectPage/overrides/MessageHandler.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([], function() {
 	"use strict";

package/src/sap/fe/templates/ObjectPage/overrides/Paginator.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([], function() {
 	"use strict";

package/src/sap/fe/templates/ObjectPage/overrides/Share.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(
 	[
@@ -229,25 +229,29 @@ sap.ui.define(
 			}
 		}
 
-		/**
-		 * Get share URL.
-		 * @param sEditMode
-		 * @param bIsStickySupported
-		 * @param aActiveContextPaths
-		 * @returns {string} The share URL
-		 * @protected
-		 * @static
-		 */
-		function getShareUrl(sEditMode, bIsStickySupported, aActiveContextPaths) {
-			var sShareUrl;
-			var sHash = HashChanger.getInstance().getHash();
-			var sBasePath = HashChanger.getInstance().hrefForAppSpecificHash ? HashChanger.getInstance().hrefForAppSpecificHash("") : "";
-			if (sEditMode === "Editable" && !bIsStickySupported && aActiveContextPaths) {
-				sShareUrl = sBasePath + aActiveContextPaths.join("/");
+		// /**
+		//  * Get share URL.
+		//  * @param sEditMode
+		//  * @param bIsStickySupported
+		//  * @param aActiveContextPaths
+		//  * @returns {string} The share URL
+		//  * @protected
+		//  * @static
+		//  */
+		function getShareUrl() {
+			var oUShellContainer = sap.ushell && sap.ushell.Container;
+			if (oUShellContainer) {
+				return oUShellContainer
+					.getFLPUrlAsync(true)
+					.then(function(sFLPUrl) {
+						return sFLPUrl;
+					})
+					.catch(function(sError) {
+						Log.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)", sError);
+					});
 			} else {
-				sShareUrl = sHash ? sBasePath + sHash : window.location.hash;
+				return Promise.resolve(document.URL);
 			}
-			return sShareUrl;
 		}
 
 		function getJamUrl(sEditMode, bIsStickySupported, aActiveContextPaths) {
@@ -290,22 +294,29 @@ sap.ui.define(
 							._getPageTitleInformation()
 					);
 					aPromises.push(getJamUrl(sEditMode, bIsStickySupported, aActiveContextPaths));
-					return Promise.all(aPromises).then(function(oData) {
-						var oPageTitleInfo = oData[0];
-						var sJamUrl = oData[1];
-						var sTitle = oPageTitleInfo.title;
-						var sObjectSubtitle = oPageTitleInfo.subtitle.toString();
-						if (sObjectSubtitle) {
-							sTitle = sTitle + " - " + sObjectSubtitle;
-						}
-						oShareMetadata.tile = {
-							title: oPageTitleInfo.title,
-							subtitle: oPageTitleInfo.subtitle.toString()
-						};
-						oShareMetadata.email.title = sTitle;
-						oShareMetadata.title = sTitle;
-						oShareMetadata.url = getShareUrl(sEditMode, bIsStickySupported, aActiveContextPaths);
-						oShareMetadata.jam.url = sJamUrl;
+					Promise.all(aPromises)
+						.then(function(oData) {
+							var oPageTitleInfo = oData[0];
+							var sJamUrl = oData[1];
+							var sTitle = oPageTitleInfo.title;
+							var sObjectSubtitle = oPageTitleInfo.subtitle.toString();
+							if (sObjectSubtitle) {
+								sTitle = sTitle + " - " + sObjectSubtitle;
+							}
+							oShareMetadata.tile = {
+								title: oPageTitleInfo.title,
+								subtitle: oPageTitleInfo.subtitle.toString()
+							};
+							oShareMetadata.email.title = sTitle;
+							oShareMetadata.title = sTitle;
+							oShareMetadata.jam.url = sJamUrl;
+						})
+						.catch(function(error) {
+							Log.error(error);
+						});
+
+					return Promise.resolve(getShareUrl()).then(function(sFLPUrl) {
+						oShareMetadata.url = sFLPUrl;
 						return oShareMetadata;
 					});
 				});

package/src/sap/fe/templates/ObjectPage/overrides/ViewState.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(["sap/fe/core/library", "sap/fe/core/CommonUtils"], function(CoreLibrary, CommonUtils) {
 	"use strict";

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

@@ -57,6 +57,7 @@
 						>
 							<uxap:customData>
 								<core:CustomData key="strategyForVisibilityChange" value="lazyLoading" />
+								<core:CustomData key="isVisibilityDynamic" value="{subSection>isVisibilityDynamic}" />
 							</uxap:customData>
 							<template:if test="{= ${subSection>type} === 'Mixed'}">
 								<template:then>

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/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(
 	[
@@ -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);
 					}
 				}
 			},
@@ -756,6 +760,55 @@ sap.ui.define(
 					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;
 			}
 		});
 	},

package/src/sap/fe/templates/RootContainer/controller/NavContainer.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(
 	[

package/src/sap/fe/templates/RootContainer/controller/RootContainerBaseController.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(
 	[
@@ -53,12 +53,12 @@ sap.ui.define(
 				this.oPlaceholder.attachRouteMatchers();
 				this.getAppComponent()
 					.getRoutingService()
-					.attachAfterRouteMatched(this.shellTitleHandler, this);
+					.attachAfterRouteMatched(this._onAfterRouteMatched, this);
 			},
 			onExit: function() {
 				this.getAppComponent()
 					.getRoutingService()
-					.detachAfterRouteMatched(this.shellTitleHandler, this);
+					.detachAfterRouteMatched(this._onAfterRouteMatched, this);
 				this.oRouter = null;
 
 				SizeHelper.exit();
@@ -132,46 +132,49 @@ sap.ui.define(
 			},
 
 			/**
-			 * This function is updating the shell title after each navigation.
+			 * Callback when the navigation is done.
+			 *  - update the shell title.
+			 *  - update table scroll.
+			 *  - call onPageReady on the rightMostView.
 			 *
 			 * @param oEvent
-			 * @name sap.fe.templates.RootContainer.controller.BaseController#shellTitleHandler
+			 * @name sap.fe.templates.RootContainer.controller.BaseController#_onAfterRouteMatched
 			 * @memberof sap.fe.templates.RootContainer.controller.BaseController
 			 */
-			shellTitleHandler: function(oEvent) {
+			_onAfterRouteMatched: function(oEvent) {
 				var that = this;
-				if (!that.oShellTitlePromise) {
-					that.oShellTitlePromise = that
+				if (!that._oRouteMatchedPromise) {
+					that._oRouteMatchedPromise = that
 						.waitForRightMostViewReady(oEvent)
 						.then(function(oView) {
+							// The autoFocus is initially disabled on the navContainer or the FCL, so that the focus stays on the Shell menu
+							// even if the app takes a long time to launch
+							// The first time the view is displayed, we need to enable the autofocus so that it's managed properly during navigation
+							var oRootControl = that.getView().getContent()[0];
+							if (oRootControl && oRootControl.getAutoFocus && !oRootControl.getAutoFocus()) {
+								oRootControl.setProperty("autoFocus", true, true); // Do not mark the container as invalid, otherwise it's re-rendered
+							}
+
 							var oAppComponent = that.getAppComponent();
 							var oData = { oView: oView, oAppComponent: oAppComponent };
 							that._scrollTablesToLastNavigatedItems();
 							if (oAppComponent.getEnvironmentCapabilities().getCapabilities().UShell) {
 								that.computeTitleHierarchy(oData);
 							}
-							var oLastFocusedControl = oAppComponent.getRouterProxy().getFocusControlForCurrentHash();
+							var bForceFocus = oAppComponent.getRouterProxy().isFocusForced();
+							oAppComponent.getRouterProxy().setFocusForced(false); // reset
 							if (oView.getController() && oView.getController().onPageReady) {
-								if (oLastFocusedControl) {
-									oView.getParent().onPageReady({ lastFocusedControl: oLastFocusedControl });
-								} else {
-									var currentFocusedControlId = sap.ui.getCore().getCurrentFocusedControlId();
-									var oCurrentFocusedControl = {
-										controlId: currentFocusedControlId,
-										focusInfo: { id: currentFocusedControlId }
-									};
-									oView.getParent().onPageReady({ lastFocusedControl: oCurrentFocusedControl });
-								}
+								oView.getParent().onPageReady({ forceFocus: bForceFocus });
 							}
 							if (that.onContainerReady) {
 								that.onContainerReady();
 							}
-
-							that.oShellTitlePromise = null;
 						})
 						.catch(function(oError) {
 							Log.error("An error occurs while computing the title hierarchy and calling focus method", oError);
-							that.oShellTitlePromise = null;
+						})
+						.finally(function() {
+							that._oRouteMatchedPromise = null;
 						});
 				}
 			},

package/src/sap/fe/templates/RootContainer/overrides/EditFlow.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([], function() {
 	"use strict";

package/src/sap/fe/templates/RootContainer/view/Fcl.view.xml

@@ -8,8 +8,9 @@
 	<FlexibleColumnLayout
 		id="appContent"
 		backgroundDesign="Transparent"
-		layout="{fcl>/layout}"
 		stateChange="onStateChanged"
 		afterEndColumnNavigate="onStateChanged"
+		restoreFocusOnBackNavigation="true"
+		autoFocus="false"
 	/>
 </mvc:View>

package/src/sap/fe/templates/RootContainer/view/NavContainer.view.xml

@@ -5,5 +5,5 @@
 	height="100%"
 	controllerName="sap.fe.templates.RootContainer.controller.NavContainer"
 >
-	<NavContainer id="appContent" />
+	<NavContainer id="appContent" autoFocus="false" />
 </mvc:View>

package/src/sap/fe/templates/TableScroller.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(
 	[],

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 /**
  * Initialization Code and shared classes of library sap.fe.templates
@@ -46,7 +46,7 @@ sap.ui.define(
 			interfaces: [],
 			controls: [],
 			elements: [],
-			version: "1.96.2",
+			version: "1.96.3",
 			noLibraryCSS: true
 		});
 		if (!sap.fe.templates.ObjectPage) {

package/src/sap/fe/templates/controls/OverflowToolbarButtonHover.js

@@ -1,25 +0,0 @@
-/*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
- */
-
-sap.ui.define(["sap/m/OverflowToolbarButton"], function(OverflowToolbarButton) {
-	"use strict";
-
-	var OverflowToolbarButtonHover = OverflowToolbarButton.extend("sap.fe.templates.ObjectPage.controls.OverflowToolbarButtonHover", {
-		metadata: {
-			events: {
-				hover: {} // this Button has also a "hover" event, in addition to "press" of the normal Button
-			}
-		},
-
-		// the hover event handler:
-		onmouseover: function(evt) {
-			// is called when the Button is hovered - no event registration required
-			this.fireHover();
-		},
-		renderer: {}
-	});
-
-	return OverflowToolbarButtonHover;
-});