@sapui5/sap.fe.core 1.96.0 → 1.97.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.core",
-	"version": "1.96.0",
+	"version": "1.97.0",
 	"description": "SAPUI5 Library sap.fe.core",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -10,9 +10,9 @@
 		"build-local": "tsc --project tsconfig-local.json && copyfiles -u 6 \"../../node_modules/@sap-ux/annotation-converter/ui5-dist/**/*.js\" dist-local/src && copyfiles ui5.yaml dist-local",
 		"copy-dependency": "copyfiles -u 6 \"../../node_modules/@sap-ux/annotation-converter/ui5-dist/**/*.js\" target/classes/META-INF/resources",
 		"prepare-npm-sources": "copyfiles -u 6 \"../../node_modules/@sap-ux/annotation-converter/ui5-dist/**/*.js\" target/npm-sources/src && babel target/npm-sources/src --out-dir target/npm-sources/src --extensions \".ts\" --config-file ../../.babelrc",
-		"test": "jest --detectOpenHandles --forceExit",
-		"test-refs": "jest --detectOpenHandles --forceExit --config jest.config-refs.js",
-		"test-updateSnapshots": "jest --detectOpenHandles --forceExit -u",
+		"test": "jest",
+		"test-refs": "jest --config jest.config-refs.js",
+		"test-updateSnapshots": "jest -u",
 		"watch-local": "npm run build-local && tsc --project tsconfig-local.json --watch"
 	},
 	"keywords": [
@@ -21,7 +21,7 @@
 	],
 	"devDependencies": {
 		"@babel/cli": "^7.14.8",
-		"@ui5/cli": "^2.10.0",
+		"@ui5/cli": "^2.14.0",
 		"copyfiles": "2.2.0"
 	}
 }

package/src/sap/fe/core/.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.0</version>
+    <version>1.97.0</version>
 
     <documentation>UI5 library: sap.fe.core</documentation>
 

package/src/sap/fe/core/AnnotationHelper.js

@@ -362,8 +362,8 @@ sap.ui.define(
 			buildActionWrapper: function(oAction, oThis) {
 				var aParams = [
 					"$event",
-					CommonHelper.addSingleQuotes(oAction.handlerModule),
-					CommonHelper.addSingleQuotes(oAction.handlerMethod)
+					CommonHelper.addSingleQuotes(oAction.handlerModule, true),
+					CommonHelper.addSingleQuotes(oAction.handlerMethod, true)
 				];
 
 				if (oThis && oThis.id) {

package/src/sap/fe/core/CommonUtils.js

@@ -77,9 +77,31 @@ sap.ui.define(
 		];
 
 		/**
-		 * Returns the actual property type of a given datafield or property.
+		 * Method to split the search term on spaces and wrap each word in double quotes.
 		 *
-		 * @param {sap.ui.model.Context} oNavigationContext The metamodel context
+		 * @param {string} sSearchTerm The search term
+		 * @returns {string|undefined} The normalized search term, undefined if empty
+		 */
+		function normalizeSearchTerm(sSearchTerm) {
+			if (!sSearchTerm) {
+				return undefined;
+			}
+
+			return sSearchTerm
+				.replace(/"/g, " ")
+				.split(/\s+/)
+				.reduce(function(sNormalized, sCurrentWord) {
+					if (sCurrentWord !== "") {
+						sNormalized = (sNormalized ? sNormalized + " " : "") + '"' + sCurrentWord + '"';
+					}
+					return sNormalized;
+				}, undefined);
+		}
+
+		/**
+		 * Returns the actual property type of a given data field or property.
+		 *
+		 * @param {sap.ui.model.Context} oNavigationContext The MetaModel context
 		 * @returns {string} The name of the actual data type
 		 */
 		function getPropertyDataType(oNavigationContext) {
@@ -1645,32 +1667,37 @@ sap.ui.define(
 		}
 
 		/**
-		 * Sets the FLP user defaults.
+		 * Defines the user default settings for the SAP Fiori Launchpad.
 		 *
 		 * @function
 		 * @name sap.fe.core.CommonUtils.setUserDefaults
 		 * @memberof sap.fe.core.CommonUtils
 		 * @param {object} [oAppComponent] The AppComponent
 		 * @param {Array} [aParameters] Parameters in the dialog
-		 * @param {object} [oModel] Model to which the default value has to be set
+		 * @param {object} [oModel]  Model for which the default value has to be set
 		 * @param {boolean} [bIsAction] `true` if aParameters contains action parameters
+		 * @param {boolean} [bIsCreate] `true` if preferredMode is 'create'
+		 * @param {object} [oActionDefaultValues] Inbound Create Parameters from the Manifest
 		 * @returns {Promise}
 		 * @ui5-restricted
 		 * @final
 		 **/
-		function setUserDefaults(oAppComponent, aParameters, oModel, bIsAction) {
+		function setUserDefaults(oAppComponent, aParameters, oModel, bIsAction, bIsCreate, oActionDefaultValues) {
 			return new Promise(function(resolve, reject) {
 				var oComponentData = oAppComponent.getComponentData(),
 					oStartupParameters = (oComponentData && oComponentData.startupParameters) || {},
 					oShellServices = oAppComponent.getShellServices();
-
 				if (!oShellServices.hasUShell()) {
 					aParameters.map(function(oParameter) {
 						var sPropertyName = bIsAction
 							? "/" + oParameter.$Name
 							: oParameter.getPath().slice(oParameter.getPath().lastIndexOf("/") + 1);
 						var sParameterName = bIsAction ? sPropertyName.slice(1) : sPropertyName;
-						if (oStartupParameters[sParameterName]) {
+						if (oActionDefaultValues && bIsCreate) {
+							if (oActionDefaultValues[sParameterName]) {
+								oModel.setProperty(sPropertyName, oActionDefaultValues[sParameterName]);
+							}
+						} else if (oStartupParameters[sParameterName]) {
 							oModel.setProperty(sPropertyName, oStartupParameters[sParameterName][0]);
 						}
 					});
@@ -1684,7 +1711,11 @@ sap.ui.define(
 							? "/" + oParameter.$Name
 							: oParameter.getPath().slice(oParameter.getPath().lastIndexOf("/") + 1);
 						var sParameterName = bIsAction ? sPropertyName.slice(1) : sPropertyName;
-						if (oStartupParameters[sParameterName]) {
+						if (oActionDefaultValues && bIsCreate) {
+							if (oActionDefaultValues[sParameterName]) {
+								oModel.setProperty(sPropertyName, oActionDefaultValues[sParameterName]);
+							}
+						} else if (oStartupParameters[sParameterName]) {
 							oModel.setProperty(sPropertyName, oStartupParameters[sParameterName][0]);
 						} else if (aExtendedParameters.length > 0) {
 							for (var i in aExtendedParameters) {
@@ -1703,6 +1734,24 @@ sap.ui.define(
 			});
 		}
 
+		function getAdditionalParamsForCreate(oStartupParameters, oInboundParameters) {
+			var oInbounds = oInboundParameters,
+				aCreateParameters = oInbounds
+					? Object.keys(oInbounds).filter(function(sParameter) {
+							return oInbounds[sParameter].useForCreate;
+					  })
+					: [],
+				oRet;
+			for (var i = 0; i < aCreateParameters.length; i++) {
+				var sCreateParameter = aCreateParameters[i];
+				var aValues = oStartupParameters && oStartupParameters[sCreateParameter];
+				if (aValues && aValues.length === 1) {
+					oRet = oRet || Object.create(null);
+					oRet[sCreateParameter] = aValues[0];
+				}
+			}
+			return oRet;
+		}
 		/**
 		 * Gets semantic object mappings defined in app descriptor outbounds.
 		 *
@@ -2264,263 +2313,6 @@ sap.ui.define(
 			});
 		}
 
-		/**
-		 * Check if given path resides in the context path provided.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.isPathApplicableToContextPath
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oMetaModel] MetaModel to be used
-		 * @param {string} [sContextPath] Context path to be used
-		 * @param {string} [sPath] Path to be used
-		 * @param {string} [sStrategy] Strategy, it could be 'self' | 'includingDependents'
-		 * @returns {boolean} If path is applicable to context.
-		 **/
-		function isPathApplicableToContextPath(oMetaModel, sContextPath, sPath, sStrategy) {
-			var sContextPathToCheck = sContextPath.startsWith("/") ? sContextPath : "/" + sContextPath,
-				sPathToCheck = sPath.startsWith("/") ? sPath : "/" + sPath,
-				fnIsApplicable = function(sPrimaryPath, sKey) {
-					return sPrimaryPath === sKey || (sStrategy === "includingDependents" && sPrimaryPath.startsWith(sKey));
-				},
-				fnSimplifyEntitySetPath = function(sEntitySetPathToUse) {
-					var sEntitySetPath = ModelHelper.getEntitySetPath(sEntitySetPathToUse);
-					var sEntitySet = sEntitySetPath.indexOf("$NavigationPropertyBinding") > -1 && oMetaModel.getObject(sEntitySetPath);
-					return sEntitySet ? "/" + sEntitySet : sEntitySetPathToUse;
-				};
-
-			if (!fnIsApplicable(sContextPathToCheck, sPathToCheck)) {
-				sContextPathToCheck = fnSimplifyEntitySetPath(sContextPathToCheck);
-
-				if (!fnIsApplicable(sContextPathToCheck, sPathToCheck)) {
-					sPathToCheck = fnSimplifyEntitySetPath(sPathToCheck);
-				} else {
-					return true;
-				}
-			}
-
-			return fnIsApplicable(sContextPathToCheck, sPathToCheck);
-		}
-
-		/**
-		 * Get controls to refresh in a view.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getControlsForRefresh
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oView] View of the controls
-		 * @param {Array} [aViewControls] Controls to be checked
-		 * @returns {Array} Controls that need to be refreshed
-		 **/
-		function getControlsForRefresh(oView, aViewControls) {
-			var aControls = [],
-				oMetaModel = oView.getModel().getMetaModel(),
-				oInternalModel = oView.getModel("internal"),
-				oRefreshStrategyForKeepAliveRestore = oInternalModel.getProperty("/refreshStrategyOnAppRestore") || {};
-
-			if (aViewControls) {
-				aViewControls.forEach(function(oControl) {
-					var sContextPath = oControl.data("targetCollectionPath");
-
-					for (var sKey in oRefreshStrategyForKeepAliveRestore) {
-						var sStrategy = oRefreshStrategyForKeepAliveRestore[sKey];
-						if (CommonUtils.isPathApplicableToContextPath(oMetaModel, sContextPath, sKey, sStrategy)) {
-							aControls.push(oControl);
-						}
-					}
-				});
-			}
-
-			return aControls;
-		}
-
-		/**
-		 * Get refresh strategy for the control for a context path.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getControlRefreshStrategyForContextPath
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oControl] Control from which refresh info is needed
-		 * @param {string} sContextPath ContextPath for properities
-		 * @returns {string} Strategy for control refresh
-		 **/
-
-		function getControlRefreshStrategyForContextPath(oControl, sContextPath) {
-			var oMetaModel = oControl.getModel().getMetaModel(),
-				oInternalModel = oControl.getModel("internal"),
-				oRefreshStrategyForKeepAliveRestore = oInternalModel.getProperty("/refreshStrategyOnAppRestore"),
-				sStrategy;
-
-			if (sContextPath) {
-				for (var sKey in oRefreshStrategyForKeepAliveRestore) {
-					var sStrategyToCheck = oRefreshStrategyForKeepAliveRestore[sKey];
-					if (CommonUtils.isPathApplicableToContextPath(oMetaModel, sContextPath, sKey, sStrategyToCheck)) {
-						sStrategy = sStrategyToCheck;
-						if (sStrategy === "includingDependents") {
-							break;
-						}
-					}
-				}
-			}
-
-			return sStrategy;
-		}
-
-		/**
-		 * Get refresh info from view.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getViewRefreshInfo
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oView] View from which refresh info is needed
-		 * @returns {string} Strategy for view refresh
-		 **/
-		function getViewRefreshInfo(oView) {
-			var mViewData = oView.getViewData(),
-				sContextPath = mViewData && (mViewData.contextPath || "/" + mViewData.entitySet);
-
-			return CommonUtils.getControlRefreshStrategyForContextPath(oView, sContextPath);
-		}
-
-		/**
-		 * Get MetaPath for the context.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getMetaPathForContext
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oContext] Outbound defined in app descriptor
-		 * @returns {string} Meta path for the context
-		 **/
-		function getMetaPathForContext(oContext) {
-			var oModel = oContext && oContext.getModel && oContext.getModel(),
-				oMetaModel = oModel && oModel.getMetaModel && oModel.getMetaModel(),
-				sPath = oContext && oContext.getPath && oContext.getPath();
-
-			return oMetaModel && sPath && oMetaModel.getMetaPath && oMetaModel.getMetaPath(sPath);
-		}
-
-		/**
-		 * Get MetaPath for the listbinding.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getAbsoluteMetaPathForListBinding
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oView] The View
-		 * @param {sap.ui.model.odata.v4.ODataListBinding|string} vListBinding  ODataListBinding object or the binding path for a temporary list binding
-		 * @returns {string} Meta path for the listbinding
-		 **/
-		function getAbsoluteMetaPathForListBinding(oView, vListBinding) {
-			var oMetaModel = oView.getModel().getMetaModel(),
-				sMetaPath;
-			if (vListBinding && typeof vListBinding === "object") {
-				// we already get a list binding use this one
-				var oBinding = vListBinding;
-				var oRootBinding = oBinding.getRootBinding();
-				if (oBinding === oRootBinding) {
-					// absolute path
-					sMetaPath = oMetaModel.getMetaPath(oBinding.getPath());
-				} else {
-					// relative path
-					var sRootBindingPath = oRootBinding.getPath();
-					var sRelativePath = oBinding.getPath();
-					sMetaPath = oMetaModel.getMetaPath(sRootBindingPath + "/" + sRelativePath);
-				}
-			} else if (typeof vListBinding === "string") {
-				if (vListBinding.startsWith("/")) {
-					// absolute path
-					sMetaPath = oMetaModel.getMetaPath(vListBinding);
-				} else {
-					// relative path
-					var oBindingContext = oView.getBindingContext();
-					var sRootContextPath = oBindingContext.getPath();
-					sMetaPath = oMetaModel.getMetaPath(sRootContextPath + "/" + vListBinding);
-				}
-			}
-			return sMetaPath;
-		}
-
-		/**
-		 * Get refresh strategy for an intent.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getRefreshStrategyForIntent
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} mRefreshStrategies RefreshStrategies to consider
-		 * @param {string} sSemanticObject Outbound Semantic Object
-		 * @param {string} sAction Outbound Action
-		 * @returns {object} Meta path for the context
-		 **/
-		function getRefreshStrategyForIntent(mRefreshStrategies, sSemanticObject, sAction) {
-			return (
-				(mRefreshStrategies.intents &&
-					((sSemanticObject && sAction && mRefreshStrategies.intents[sSemanticObject + "-" + sAction]) ||
-						(sSemanticObject && mRefreshStrategies.intents[sSemanticObject]))) ||
-				mRefreshStrategies["defaultBehavior"] ||
-				mRefreshStrategies["_feDefault"]
-			);
-		}
-
-		/**
-		 * Store control refresh strategy for hash in the internal model.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.storeControlRefreshStrategyForHash
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} oControl Control for the refresh strategy
-		 * @param {object} oHash Shell hash object
-		 **/
-		function storeControlRefreshStrategyForHash(oControl, oHash) {
-			if (oControl && oControl.getModel("viewData") && oControl.getModel("internal")) {
-				var mViewData = oControl.getModel("viewData");
-				var oRefreshStrategies = mViewData.getObject("/refreshStrategyOnAppRestore");
-				if (oRefreshStrategies) {
-					var mInternalModel = oControl.getModel("internal");
-					var oRefreshStrategy = CommonUtils.getRefreshStrategyForIntent(
-						oRefreshStrategies,
-						oHash && oHash.semanticObject,
-						oHash && oHash.action
-					);
-
-					mInternalModel.setProperty("/refreshStrategyOnAppRestore", oRefreshStrategy);
-				}
-			}
-		}
-		/**
-		 * Method to refresh and restore the view if neccessary.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.restoreView
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} oView Control for the refresh strategy
-		 * @returns {Promise} A promise after view refresh and restore are triggered
-		 **/
-		function restoreView(oView) {
-			var oInternalModelContext = oView.getBindingContext("internal");
-			var oController = oView.getController();
-			var oViewState = oController.viewState;
-			var pRefreshBindings = Promise.resolve();
-			if (oInternalModelContext.getProperty("restoreStatus") === "pending") {
-				if (oViewState.refreshViewBindings) {
-					pRefreshBindings = oViewState.refreshViewBindings();
-					pRefreshBindings
-						.then(function() {
-							Log.info("FE V4: Refresh was triggered successfull: " + oView.getId());
-						})
-						.catch(function(err) {
-							Log.warning("FE V4: Refresh was unsuccessfull: " + oView.getId(), err);
-						});
-				}
-				pRefreshBindings
-					.then(function() {
-						oViewState.onRestore();
-						oInternalModelContext.setProperty("restoreStatus", "done");
-					})
-					.catch(function(err) {
-						Log.warning("FE V4: Restore was unsuccessfull: " + oView.getId());
-					});
-			}
-			return pRefreshBindings;
-		}
-
 		var CommonUtils = {
 			isPropertyFilterable: isPropertyFilterable,
 			isFieldControlPathInapplicable: isFieldControlPathInapplicable,
@@ -2563,6 +2355,7 @@ sap.ui.define(
 			getSearchRestrictions: getSearchRestrictions,
 			getFilterRestrictionsByPath: getFilterRestrictionsByPath,
 			getSpecificAllowedExpression: getSpecificAllowedExpression,
+			getAdditionalParamsForCreate: getAdditionalParamsForCreate,
 			requestSingletonProperty: requestSingletonProperty,
 			templateControlFragment: templateControlFragment,
 			addEventToBindingInfo: addEventToBindingInfo,
@@ -2580,15 +2373,7 @@ sap.ui.define(
 				"MultiRangeOrSearchExpression"
 			],
 			fnProcessDataLossOrDraftDiscardConfirmation: fnProcessDataLossOrDraftDiscardConfirmation,
-			isPathApplicableToContextPath: isPathApplicableToContextPath,
-			getControlsForRefresh: getControlsForRefresh,
-			getViewRefreshInfo: getViewRefreshInfo,
-			getMetaPathForContext: getMetaPathForContext,
-			getAbsoluteMetaPathForListBinding: getAbsoluteMetaPathForListBinding,
-			getControlRefreshStrategyForContextPath: getControlRefreshStrategyForContextPath,
-			getRefreshStrategyForIntent: getRefreshStrategyForIntent,
-			storeControlRefreshStrategyForHash: storeControlRefreshStrategyForHash,
-			restoreView: restoreView
+			normalizeSearchTerm: normalizeSearchTerm
 		};
 
 		return CommonUtils;

package/src/sap/fe/core/RouterProxy.js

@@ -128,6 +128,7 @@ sap.ui.define(
 				this._bDisableOnHashChange = false;
 				this._bIgnoreRestore = false;
 				this._bCleanedRestore = false;
+				this._bForceFocus = true; // Trigger the focus mechanism for the first view displayed by the app
 			},
 
 			destroy: function() {
@@ -158,6 +159,14 @@ sap.ui.define(
 				return this._oRouter.getHashChanger().getHash();
 			},
 
+			isFocusForced: function() {
+				return this._bForceFocus;
+			},
+
+			setFocusForced: function(bForced) {
+				this._bForceFocus = bForced;
+			},
+
 			/**
 			 * Resets the internal variable sIAppStateKey.
 			 *
@@ -180,42 +189,31 @@ sap.ui.define(
 			 * @param {string} sHash Hash to be navigated to
 			 * @param {boolean} bPreserveHistory If set to true, non-ancestor entries in history will be retained
 			 * @param {boolean} bDisablePreservationCache If set to true, cache preservation mechanism is disabled for the current navigation
+			 * @param {boolean} bForceFocus If set to true, the logic to set the focus once the navigation is finalized will be triggered (onPageReady)
 			 * @returns {Promise} Promise that is resolved when the navigation is finalized
 			 * @ui5-restricted
 			 */
-			navToHash: function(sHash, bPreserveHistory, bDisablePreservationCache) {
+			navToHash: function(sHash, bPreserveHistory, bDisablePreservationCache, bForceFocus) {
 				var that = this;
 
 				if (this._oRouteMatchSynchronization) {
 					return this._oRouteMatchSynchronization.waitFor().then(function() {
 						that._oRouteMatchSynchronization = null;
-						return that._internalNavToHash(sHash, bPreserveHistory, bDisablePreservationCache);
+						return that._internalNavToHash(sHash, bPreserveHistory, bDisablePreservationCache, bForceFocus);
 					});
 				} else {
 					if (this._bActivateRouteMatchSynchro) {
 						this.waitForRouteMatchBeforeNavigation();
 					}
-					return that._internalNavToHash(sHash, bPreserveHistory, bDisablePreservationCache);
+					return that._internalNavToHash(sHash, bPreserveHistory, bDisablePreservationCache, bForceFocus);
 				}
 			},
 
-			_internalNavToHash: function(sHash, bPreserveHistory, bDisablePreservationCache) {
-				var that = this,
-					sLastFocusControlId = sap.ui.getCore().getCurrentFocusedControlId(),
-					sLastFocusInfo =
-						sLastFocusControlId && sap.ui.getCore().byId(sLastFocusControlId)
-							? sap.ui
-									.getCore()
-									.byId(sLastFocusControlId)
-									.getFocusInfo()
-							: null,
-					shashBeforeRoutechanged = this.getHash();
-
+			_internalNavToHash: function(sHash, bPreserveHistory, bDisablePreservationCache, bForceFocus) {
 				// Add the app state in the hash if needed
 				if (this.fclEnabled && this.sIAppStateKey && !findAppStateInHash(sHash)) {
 					sHash = setAppStateInHash(sHash, this.sIAppStateKey);
 				}
-				var oNewState = this._extractStateFromHash(sHash);
 
 				if (!this.checkHashWithGuard(sHash)) {
 					if (!this.oResourceBundle) {
@@ -230,11 +228,24 @@ sap.ui.define(
 					}
 					this.bIsGuardCrossAllowed = true;
 				}
+
+				// In case the navigation will cause a new view to be displayed, we force the focus
+				// I.e. if the keys for the hash we're navigating to is a superset of the current hash keys.
+				var oNewState = this._extractStateFromHash(sHash);
+				if (!this._bForceFocus) {
+					// If the focus was already forced, keep it
+					var aCurrentHashKeys = this._extractKeysFromHash(this.getHash());
+					this._bForceFocus =
+						bForceFocus ||
+						(aCurrentHashKeys.length < oNewState.keys.length &&
+							aCurrentHashKeys.every(function(key, index) {
+								return key === oNewState.keys[index];
+							}));
+				}
+
 				var oHistoryAction = this._pushNewState(oNewState, false, bPreserveHistory, bDisablePreservationCache);
 
-				return this._rebuildBrowserHistory(oHistoryAction, false).then(function() {
-					that.storeFocusForHash(sLastFocusControlId, sLastFocusInfo, shashBeforeRoutechanged);
-				});
+				return this._rebuildBrowserHistory(oHistoryAction, false);
 			},
 
 			/**
@@ -258,34 +269,6 @@ sap.ui.define(
 				}
 			},
 
-			getFocusControlForCurrentHash: function() {
-				var sCurrenthash = this.getHash();
-				var oLastFocusedControl;
-				for (var i = this._oManagedHistory.length - 1; i >= 0; i--) {
-					if (sCurrenthash === this._oManagedHistory[i].hash) {
-						oLastFocusedControl = this._oManagedHistory[i].oLastFocusControl;
-						break;
-					} else {
-						this._oManagedHistory[i].oLastFocusControl = undefined;
-					}
-				}
-
-				return oLastFocusedControl;
-			},
-
-			storeFocusForHash: function(sLastFocusControlId, sLastFocusInfo, sHash) {
-				var oManagedhistory = this._oManagedHistory;
-				for (var i = 0; i < oManagedhistory.length; i++) {
-					if (sHash === oManagedhistory[i].hash) {
-						oManagedhistory[i].oLastFocusControl = {
-							controlId: sLastFocusControlId,
-							focusInfo: sLastFocusInfo
-						};
-						break;
-					}
-				}
-			},
-
 			/**
 			 * Navigates back in the history.
 			 *
@@ -432,6 +415,24 @@ sap.ui.define(
 				this._bActivateRouteMatchSynchro = false;
 			},
 
+			_extractKeysFromHash: function(sHash) {
+				if (sHash === undefined) {
+					sHash = "";
+				}
+				var sHashNoParams = sHash.split("?")[0]; // remove params
+				var aTokens = sHashNoParams.split("/");
+				var aKeys = [];
+
+				aTokens.forEach(function(sToken) {
+					var regexKey = /[^\(\)]+\([^\(\)]+\)/; // abc(def)
+					if (regexKey.test(sToken)) {
+						aKeys.push(sToken.split("(")[0]);
+					}
+				});
+
+				return aKeys;
+			},
+
 			/**
 			 * Builds a state from a hash.
 			 *
@@ -441,22 +442,13 @@ sap.ui.define(
 			 * @ui5-restricted
 			 */
 			_extractStateFromHash: function(sHash) {
-				var oState = {
-					keys: []
-				};
-
-				// Retrieve object keys
 				if (sHash === undefined) {
 					sHash = "";
 				}
-				var sHashNoParams = sHash.split("?")[0];
-				var sTokens = sHashNoParams.split("/");
-				sTokens.forEach(function(sToken) {
-					var regexKey = /[^\(\)]+\([^\(\)]+\)/; // abc(def)
-					if (regexKey.test(sToken)) {
-						oState.keys.push(sToken.split("(")[0]);
-					}
-				});
+
+				var oState = {
+					keys: this._extractKeysFromHash(sHash)
+				};
 
 				// Retrieve layout (if any)
 				var aLayout = sHash.match(new RegExp("\\?.*" + enumURLParams.LAYOUTPARAM + "=([^&]*)"));
@@ -518,7 +510,6 @@ sap.ui.define(
 				}
 
 				// 3. Then pop all states until we find an ancestor of the new state, or we find a state that need to be preserved
-				var oLastFocusControl;
 				var oLastRemovedItem;
 				while (this._oManagedHistory.length > 0) {
 					var oTopState = this._oManagedHistory[this._oManagedHistory.length - 1];
@@ -527,13 +518,11 @@ sap.ui.define(
 						this._compareCacheStates(oTopState, oNewState) !== enumState.ANCESTOR
 					) {
 						// The top state is not an ancestor of oNewState and is not preserved --> we can pop it
-						oLastFocusControl = oTopState.oLastFocusControl;
 						oLastRemovedItem = this._oManagedHistory.pop();
 						iPopCount++;
 					} else if (oTopState.preserved && removeAppStateInHash(oTopState.hash) === removeAppStateInHash(oNewState.hash)) {
 						// We try to add a state that is already in cache (due to preserved flag) but with a different iapp-state
 						// --> we should delete the previous entry (it will be later replaced by the new one) and stop popping
-						oLastFocusControl = oTopState.oLastFocusControl;
 						oLastRemovedItem = this._oManagedHistory.pop();
 						iPopCount++;
 						oNewState.preserved = true;
@@ -565,7 +554,6 @@ sap.ui.define(
 				}
 
 				// 5. Now we can push the state at the top of the internal history
-				oNewState.oLastFocusControl = oLastFocusControl;
 				var bHasSameHash = oLastRemovedItem && oNewState.hash === oLastRemovedItem.hash;
 				if (this._oManagedHistory.length === 0 || this._oManagedHistory[this._oManagedHistory.length - 1].hash !== oNewState.hash) {
 					this._oManagedHistory.push(oNewState);

package/src/sap/fe/core/TemplateComponent.js

@@ -102,11 +102,11 @@ sap.ui.define(
 				return this.oAppComponent;
 			},
 
-			onPageReady: function(oLastFocusedControl) {
+			onPageReady: function(mParameters) {
 				if (this.getRootControl() && this.getRootControl().getController() && this.getRootControl().getController().onPageReady) {
 					this.getRootControl()
 						.getController()
-						.onPageReady(oLastFocusedControl);
+						.onPageReady(mParameters);
 				}
 			},