@sapui5/sap.fe.core 1.93.3 → 1.97.0

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

@@ -63,6 +63,12 @@ sap.ui.define(
 					 */
 					allowDeepLinking: {
 						type: "boolean"
+					},
+					/**
+					 * Defines the context path on the component that is refreshed when the app is restored using keep alive mode
+					 */
+					refreshStrategyOnAppRestore: {
+						type: "object"
 					}
 				},
 				events: {
@@ -96,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);
 				}
 			},