@sapui5/sap.fe.templates 1.96.0 → 1.97.0

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

@@ -7,12 +7,14 @@ sap.ui.define(
 		"sap/ui/model/json/JSONModel",
 		"./RootContainerBaseController",
 		"sap/fe/core/CommonUtils",
+		"sap/fe/core/helpers/KeepAliveHelper",
 		"sap/fe/core/controllerextensions/ViewState",
 		"sap/m/Link",
 		"sap/m/MessagePage",
-		"sap/m/MessageBox"
+		"sap/m/MessageBox",
+		"sap/base/Log"
 	],
-	function(JSONModel, BaseController, CommonUtils, ViewState, Link, MessagePage, MessageBox) {
+	function(JSONModel, BaseController, CommonUtils, KeepAliveHelper, ViewState, Link, MessagePage, MessageBox, Log) {
 		"use strict";
 
 		/**
@@ -72,7 +74,7 @@ sap.ui.define(
 
 				return oPagePromise.then(function(oCurrentPage) {
 					var oTargetView = CommonUtils.getTargetView(oCurrentPage);
-					return CommonUtils.restoreView(oTargetView);
+					return KeepAliveHelper.restoreView(oTargetView);
 				});
 			},
 
@@ -126,40 +128,60 @@ sap.ui.define(
 			_scrollTablesToLastNavigatedItems: function() {},
 
 			displayMessagePage: function(sErrorMessage, mParameters) {
-				var oNavContainer = this._getNavContainer();
+				return new Promise(
+					function(resolve, reject) {
+						try {
+							var oNavContainer = this._getNavContainer();
+
+							if (!this.oMessagePage) {
+								this.oMessagePage = new MessagePage({
+									showHeader: false,
+									icon: "sap-icon://message-error"
+								});
 
-				if (!this.oMessagePage) {
-					this.oMessagePage = new MessagePage({
-						showHeader: false,
-						icon: "sap-icon://message-error"
-					});
+								oNavContainer.addPage(this.oMessagePage);
+							}
 
-					oNavContainer.addPage(this.oMessagePage);
-				}
+							this.oMessagePage.setText(sErrorMessage);
+
+							if (mParameters.technicalMessage) {
+								this.oMessagePage.setCustomDescription(
+									new Link({
+										text: mParameters.description || mParameters.technicalMessage,
+										press: function() {
+											MessageBox.show(mParameters.technicalMessage, {
+												icon: MessageBox.Icon.ERROR,
+												title: mParameters.title,
+												actions: [MessageBox.Action.OK],
+												defaultAction: MessageBox.Action.OK,
+												details: mParameters.technicalDetails || "",
+												contentWidth: "60%"
+											});
+										}
+									})
+								);
+							} else {
+								this.oMessagePage.setDescription(mParameters.description || "");
+							}
 
-				this.oMessagePage.setText(sErrorMessage);
-
-				if (mParameters.technicalMessage) {
-					this.oMessagePage.setCustomDescription(
-						new Link({
-							text: mParameters.description || mParameters.technicalMessage,
-							press: function() {
-								MessageBox.show(mParameters.technicalMessage, {
-									icon: MessageBox.Icon.ERROR,
-									title: mParameters.title,
-									actions: [MessageBox.Action.OK],
-									defaultAction: MessageBox.Action.OK,
-									details: mParameters.technicalDetails || "",
-									contentWidth: "60%"
+							if (mParameters.handleShellBack) {
+								var oErrorOriginPage = oNavContainer.getCurrentPage(),
+									oAppComponent = CommonUtils.getAppComponent(oNavContainer.getCurrentPage());
+								oAppComponent.getShellServices().setBackNavigation(function() {
+									oNavContainer.to(oErrorOriginPage.getId());
+									oAppComponent.getShellServices().setBackNavigation();
 								});
 							}
-						})
-					);
-				} else {
-					this.oMessagePage.setDescription(mParameters.description || "");
-				}
-
-				oNavContainer.to(this.oMessagePage.getId());
+							oNavContainer.attachAfterNavigate(function() {
+								resolve(true);
+							});
+							oNavContainer.to(this.oMessagePage.getId());
+						} catch (e) {
+							reject(false);
+							Log.info(e);
+						}
+					}.bind(this)
+				);
 			}
 		});
 	},

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

@@ -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/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/controls/Table.fragment.xml

@@ -19,6 +19,8 @@
 		onSegmentedButtonPressed="{= ${converterContext>hasMultiVisualizations} ? '.handlers.onSegmentedButtonPressed' : undefined }"
 		visible="{= ${converterContext>hasMultiVisualizations} ? '{= ${pageInternal>alpContentView} !== \'Chart\'}' : 'true' }"
 		tabTitle="{view>title}"
+		fieldMode='{= ${converterContext>templateType} === "ListReport" ? "nowrapper" : ""}'
+		stateChanged='{= ${converterContext>template} !== "ObjectPage" ? ".handlers.onTableStateChanged" : undefined}'
 	>
 	</macro:Table>
 </core:FragmentDefinition>

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

@@ -46,7 +46,7 @@ sap.ui.define(
 			interfaces: [],
 			controls: [],
 			elements: [],
-			version: "1.96.0",
+			version: "1.97.0",
 			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;
-});