@sapui5/sap.suite.ui.generic.template 1.142.7 → 1.142.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.142.7",
+  "version": "1.142.9",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.142.7</version>
+	<version>1.142.9</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.142.7"
+			"version": "1.142.9"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.142.7"
+			"version": "1.142.9"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/controller/IappStateHandler.js

@@ -223,7 +223,8 @@ sap.ui.define([
 		var oSmartVariantManagement = oState.oSmartFilterbar.getSmartVariant();
 		if (oSmartVariantManagement){
 			var oSmartVariantManagementWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartVariantManagement, {
-				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper])
+				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper]),
+				smartFilterBarWrapper: oSmartFilterBarWrapper
 			});
 			aControlStateWrappers.push(oSmartVariantManagementWrapper);
 		} else {

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.142.7"
+			"version": "1.142.9"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -1493,7 +1493,7 @@ sap.ui.define([
 						return null;
 					}
 					if (controlHelper.isSmartField(oControl)){ // check whether the SmartField is the correct target for focussing
-						return  controlHelper.getSmartFieldIsFocussableForInputPromise(oControl).then(function(bIsFocussable){
+						return  controlHelper.getSmartFieldIsFocussableForInputPromise(oControl, true).then(function(bIsFocussable){
 							return bIsFocussable && oControl; // If the SmartField has turned out to be focussable take it. Otherwise no need to investigate the subtree below it.
 						});
 					}
@@ -1553,7 +1553,7 @@ sap.ui.define([
 						//set the focus on the control passed by application
 						if (controlHelper.isSmartField(oFocusControl)) {
 							// check whether the SmartField is the correct target for focussing
-							controlHelper.getSmartFieldIsFocussableForInputPromise(oFocusControl).then(function (bIsFocusable) {
+							controlHelper.getSmartFieldIsFocussableForInputPromise(oFocusControl, true).then(function (bIsFocusable) {
 								if (bIsFocusable) {
 									controlHelper.focusUI5Control(oFocusControl);
 								} else {

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.142.7"
+			"version": "1.142.9"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.142.7"
+			"version": "1.142.9"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.142.7"
+		"version": "1.142.9"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/genericUtilities/ControlStateWrapperFactory.js

@@ -93,15 +93,16 @@ sap.ui.define([
 		}
 
 		/**
-		 * Private helper function to create the real wrapper based on control and type.
+		 * Private helper function to create the real wrapper based on type and control.
 		 * This function is injected into PreliminaryWrapper and not exposed in the factory's public API.
+		 * Parameters are ordered to allow using .bind() for partial application.
 		 *
-		 * @param {sap.ui.core.Control} oControl - The control instance
 		 * @param {string} sType - The type of control (e.g., "SmartTable", "SmartChart")
 		 * @param {object} [mParams] - Additional parameters passed to constructor of wrapper
+		 * @param {sap.ui.core.Control} oControl - The control instance (last to enable .bind())
 		 * @return {object} The real wrapper object for the control with helper methods attached
 		 */
-		function fnCreateRealWrapper(oControl, sType, mParams) {
+		function fnCreateRealWrapper(sType, mParams, oControl) {
 			var oWrapper;
 			switch (sType) {
 				case "SmartFilterBar":
@@ -190,8 +191,11 @@ sap.ui.define([
 							return oDummyWrapper;
 					}
 
+					// Create bound function with type and params, leaving oControl to be provided later
+					var fnBoundCreator = fnCreateRealWrapper.bind(null, sType, mParams);
+
 					// Always create a PreliminaryWrapper
-					var oPreliminaryWrapper = new PreliminaryWrapper(sId, sType, fnCreateRealWrapper, oController, mParams);
+					var oPreliminaryWrapper = new PreliminaryWrapper(sId, fnBoundCreator);
 
 					// Since control is available, immediately set it
 					oPreliminaryWrapper.setControl(oControl);
@@ -225,8 +229,11 @@ sap.ui.define([
 				}
 				var sId = oController.getView().getLocalId(sControlId);
 				if (!mWrappers[sId]) {
+					// Create bound function with type and params, leaving oControl to be provided later
+					var fnBoundCreator = fnCreateRealWrapper.bind(null, sControlType, mParams);
+
 					// Create a PreliminaryWrapper (control will be set later)
-					var oPreliminaryWrapper = new PreliminaryWrapper(sId, sControlType, fnCreateRealWrapper, oController, mParams);
+					var oPreliminaryWrapper = new PreliminaryWrapper(sId, fnBoundCreator);
 
 					mWrappers[sId] = oPreliminaryWrapper;
 				}

package/src/sap/suite/ui/generic/template/genericUtilities/controlHelper.js

@@ -1,29 +1,29 @@
 sap.ui.define([
-	"sap/ui/dom/getFirstEditableInput", 
+	"sap/ui/dom/getFirstEditableInput",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
 	"sap/ui/core/Element",
 	"sap/ui/table/plugins/MultiSelectionPlugin"
 ], function(getFirstEditableInput, FeLogger, Element, MultiSelectionPlugin) {
 		"use strict";
-		
+
 	var oFeLogger = new FeLogger("genericUtilities.controlHelper");
 	var oLogger = oFeLogger.getLogger();
-	
+
 	var byId = Element.getElementById;
-	
+
 	function isControlOfType(sPathToType, oControl){
 		var FNClass = sap.ui.require(sPathToType);
         return typeof FNClass === "function" && (oControl instanceof FNClass);
 	}
-	
+
 	function getUI5ControlForDomElement(oDom){
 	    for (; oDom; oDom = oDom.parentNode) {
 	        if (oDom.hasAttribute && oDom.hasAttribute("data-sap-ui")) {
 				return byId(oDom.id);
 	        }
-	    }		
+	    }
 	}
-	
+
 	function focusUI5Control(oControl, oFocusInfo){
 		if (oControl && oControl.focus) {
 			oLogger.debug("Set focus on control with id " + oControl.getId());
@@ -52,9 +52,9 @@ sap.ui.define([
 			if (oTest !== oControl){
 				oLogger.warning(oCurrentFocus ? ("Focus is now on control with id " + oCurrentFocus.getId()) : "There is no focus now");
 			}
-		}		
+		}
 	}
-	
+
 	function focusDom(oDom, oFocusInfo){
 		var oUi5Control = getUI5ControlForDomElement(oDom);
 		focusUI5Control(oUi5Control, oFocusInfo);
@@ -66,12 +66,12 @@ sap.ui.define([
 	}
 
 	// returns a Promise that resolves to the boolean information whether the SmartField is a possible focus target for input.
-	function getSmartFieldIsFocussableForInputPromise(oSmartField) {
+	function getSmartFieldIsFocussableForInputPromise(oSmartField, isSmartForm) {
 		return oSmartField._getComputedMetadata().then(function () {
 			return (oSmartField.getMode() === "edit") && (oSmartField._getICRenderedPromise() || Promise.resolve());
 		}).then(function () {
-			var oFirstFocusableInput = !oSmartField._bEdmBoolDetected && getFirstEditableInput(oSmartField.getDomRef());
-			return !(!oFirstFocusableInput || oFirstFocusableInput.type === "checkbox");
+			var oFirstFocusableInput = (!oSmartField._bEdmBoolDetected || isSmartForm) && getFirstEditableInput(oSmartField.getDomRef());
+			return !(!oFirstFocusableInput || (oFirstFocusableInput.type === "checkbox" && !isSmartForm));
 		}).catch(function () {
 			return false;
 		});
@@ -82,12 +82,12 @@ sap.ui.define([
 	function getControlWithFocus(){
 		return getUI5ControlForDomElement(document.activeElement);
 	}
-	
+
 	// Returns the parent of a given sap.ui.core.Element, but considers that for Components the parent is to be found via the oContainer property.
 	function getParent(oElement){
 		return oElement.getParent() || oElement.oContainer;
 	}
-	
+
 	// If oChild is identified to be invisible, null is returned. Otherwise its parent is returned.
 	// If the parent does not exist a faulty value is returned.
 	// This is a heuristic method.
@@ -113,7 +113,7 @@ sap.ui.define([
 		}
 		return vRet;
 	}
-	
+
 // Return a list of all children of the given control (in the 'correct' order). Only implemented for certain control types.
 	// For the other control types it returns null or an empty array depending on bAlwaysReturnAList.
 	function getChildren(oControl, bAlwaysReturnAList){
@@ -127,7 +127,7 @@ sap.ui.define([
 			return oControl.getBlocks().concat(oControl.getMoreBlocks());
 		}
 		if (isControlOfType("sap/ui/comp/smartform/Group", oControl)){
-			return oControl.getFormElements();	
+			return oControl.getFormElements();
 		}
 		if (isControlOfType("sap/ui/table/Column", oControl)){
 			var aRet = oControl.getMultiLabels();
@@ -135,11 +135,11 @@ sap.ui.define([
 			if (oLabel){
 				aRet.push(oLabel);
 			}
-			return aRet;	
-		}				
+			return aRet;
+		}
 		return bAlwaysReturnAList ? [] : null;
 	}
-	
+
 	// Sorter that compares the position of two child controls which have a common parent.
 	// Returns a positive integer when oChild1 is larger, a negative number if oChild2 is larger, and 0 if they are identical.
 	// Depends on getChildren() being implemented for commonParent. If this is not the case, at least a reproducable order is guaranteed.
@@ -160,13 +160,13 @@ sap.ui.define([
 				}
 				if (iPositionCompare & Node.DOCUMENT_POSITION_FOLLOWING){
 					return -1;
-				}				
+				}
 			}
 			return 1 - 2 * (!oDomRef1 === !oDomRef2 ? oChild1.getId() < oChild2.getId() : !oDomRef2); // if we cannot determine a reasonable order we still want to have a reproducable order. Note that elements with DomRef must clearly be separated from those without.
 		}
 		return (iPos1 >= 0 && iPos2 >= 0) ? (iPos1 - iPos2) : (iPos2 - iPos1); // if only one child has been identified in the list of children it takes precedence.
 	}
-	
+
 	// This function defines which instances of sap.ui.core.Element are relevant for investigation (Currently used in fnSearchInTree).
 	// They must posess a property 'visible' (which is guaranteed for all instances of sap.ui.core.Control) which is true.
 	// If they have a property 'enabled' this must be true as well.
@@ -176,7 +176,7 @@ sap.ui.define([
 			return checkForRelevance(oCell);
 		})	: (typeof oElement.getVisible === "function" && oElement.getVisible() && (typeof oElement.getEnabled !== "function" || oElement.getEnabled()));
 	}
-	
+
 	// This function allows a depth-first search in an element tree starting with root oElement
 	// Thereby, the following logic is applied
 	// - Children of an element are determined by function getChildren in this class. If this provides an empty array method findElements of the element is used
@@ -188,14 +188,14 @@ sap.ui.define([
 	// Note that mAlreadyAnalyzed will be updated by this function
 	// fnHandleElement(oElement) is a function that will be called on all relevant elements of the tree.
 	// This function can work asynchronously (i.e. return a Promise) or synchronously (i.e. return something which is not a Promise) on a case-by-case basis.
-	// In the second case the return value will be considered as the result of the function. In the first case the value the Promise resolves to will be considered as the result. 
+	// In the second case the return value will be considered as the result of the function. In the first case the value the Promise resolves to will be considered as the result.
 	// If the result is a truthy value for one element this value is considered as the result of fnSearchInTree and the processing is stopped.
 	// fnSearchInTree returns this result synchronously if all calls of fnHandleElement which have been performed until then have worked synchronously.
 	// If the result of fnHandleElement is faulty the depth-first search of the tree proceeds. Thereby the processing of the subtree of oElement is
 	// skipped if the result was exactly false. For other faulty values the subtree will be processed next.
 	// Note that this process will never work on two elements in parallel. If the processing of one element is asynchronous the process is interrupted until
 	// the result of this step is available. Only then  the next element will be analyzed.
-	// If fnHandleElement never results in a truthy value then fnSearchInTree results in null. 
+	// If fnHandleElement never results in a truthy value then fnSearchInTree results in null.
 	function fnSearchInTree(mAlreadyAnalyzed, oElement, fnHandleElement){
 		mAlreadyAnalyzed = mAlreadyAnalyzed || Object.create(null);
 		var sId = oElement.getId();
@@ -213,7 +213,7 @@ sap.ui.define([
 			if (!aChildren){ // if getChildren does not care for the control type of oElement
 				aChildren = oElement.findElements(false);
 				aChildren.sort(fnSortChildControls.bind(null, oElement));
-			}		
+			}
 			aChildren.some(function(oChild){
 				vResult = fnSearchInTree(mAlreadyAnalyzed, oChild, fnHandleElement);
 				return vResult; // If vResult is truthy it is either a Promise (which makes the processing asynchronous) or the result of fnSearchInTree. In both cases we should stop now.
@@ -233,12 +233,12 @@ sap.ui.define([
 		}
 		// When coming here we have synchronously either found a node with a truthy result or have processed the whole tree without finding any truthy result
 		mAlreadyAnalyzed[sId] = 2;
-		return vResult || null;		
+		return vResult || null;
 	}
 
 	/**
 	 * Returns the selection plugin for the given UI table
-	 * @param {sap.ui.table.Table} oUiTable 
+	 * @param {sap.ui.table.Table} oUiTable
 	 * @returns {sap.ui.table.plugins.MultiSelectionPlugin|undefined}
 	 */
 	function fnGetSelectionPluginForUITable (oUiTable) {
@@ -286,10 +286,10 @@ sap.ui.define([
 		searchInTree: fnSearchInTree.bind(null, null),
 		getSelectionPluginForUITable: fnGetSelectionPluginForUITable
 	};
-	
+
 	oControlHelper.isTable = function(oControl){
 		return oControlHelper.isSmartTable(oControl) || oControlHelper.isUiTable(oControl) || oControlHelper.isMTable(oControl);
 	};
-	
+
 	return oControlHelper;
 });

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/PreliminaryWrapper.js

@@ -1,5 +1,6 @@
 sap.ui.define([
-], function() {
+	"sap/base/util/extend"
+], function(extend) {
 	"use strict";
 
 	/**
@@ -11,13 +12,10 @@ sap.ui.define([
 	 * real wrapper once the control is assigned via setControl().
 	 *
 	 * @param {string} sId - The local ID of the control
-	 * @param {string} sType - The type of the control (e.g., "SmartTable", "SmartChart")
-	 * @param {function} fnCreateRealWrapper - Function to create the real wrapper, injected by factory
-	 * @param {object} oController - The controller instance
-	 * @param {object} mParams - Additional parameters to pass to the real wrapper constructor
+	 * @param {function} fnCreateRealWrapper - Function to create the real wrapper, bound with type and params
 	 * @returns {object} Preliminary wrapper object that will delegate to real wrapper once control is set
 	 */
-	function PreliminaryWrapper(sId, sType, fnCreateRealWrapper, oController, mParams) {
+	function PreliminaryWrapper(sId, fnCreateRealWrapper) {
 		var oLatestState;
 		var oRealWrapper;
 		var fnResolveRealWrapperReady;
@@ -25,7 +23,7 @@ sap.ui.define([
 			fnResolveRealWrapperReady = resolve;
 		});
 
-		return {
+		var oPublicInterface = {
 			/**
 			 * Get the current state. Returns stored state before control is set,
 			 * delegates to real wrapper afterwards.
@@ -48,55 +46,62 @@ sap.ui.define([
 				}
 			},
 
-		/**
-		 * Assign the actual control and create the real wrapper.
-		 * This triggers the creation of the real wrapper, applies any stored state,
-		 * and resolves the promise that queues event handler attachments.
-		 * @param {sap.ui.core.Control} oControl - The control instance
-		 */
-		setControl: function(oControl) {
-			// Create the real wrapper using injected function
-			var oCreatedWrapper = fnCreateRealWrapper(oControl, sType, mParams);
-
-			// Check if wrapper needs time to initialize
-			var oWrapperReadyPromise = oCreatedWrapper.oReadyPromise || Promise.resolve();
-
-			// Wait for wrapper to be ready before setting oRealWrapper
-			oWrapperReadyPromise.then(function() {
-				oRealWrapper = oCreatedWrapper;
-
-				// Apply stored state if any
-				if (oLatestState !== undefined) {
-					oRealWrapper.setState(oLatestState);
-				}
+			/**
+			 * Assign the actual control and create the real wrapper.
+			 * This triggers the creation of the real wrapper, applies any stored state,
+			 * extends the preliminary wrapper with all methods from the real wrapper,
+			 * and resolves the promise that queues event handler attachments.
+			 * @param {sap.ui.core.Control} oControl - The control instance
+			 */
+			setControl: function(oControl) {
+				// Create the real wrapper using bound function (already has type and params bound)
+				var oCreatedWrapper = fnCreateRealWrapper(oControl);
+
+				// Check if wrapper needs time to initialize
+				var oWrapperReadyPromise = oCreatedWrapper.oReadyPromise || Promise.resolve();
+
+				// Wait for wrapper to be ready before setting oRealWrapper
+				oWrapperReadyPromise.then(function() {
+					oRealWrapper = oCreatedWrapper;
+
+					// Apply stored state if any
+					if (oLatestState !== undefined) {
+						oRealWrapper.setState(oLatestState);
+					}
+
+					// Extend the preliminary wrapper with all properties from the real wrapper
+					// This makes any additional methods (like setSVMWrapperCallbacks) available
+					// The nested extend ensures we keep our proxy methods (getState, setState, etc.)
+					// while adding new methods from the real wrapper
+					extend(oPublicInterface, extend({}, oRealWrapper, oPublicInterface));
+
+					// Resolve the promise - this triggers all queued attachStateChanged calls
+					fnResolveRealWrapperReady(oRealWrapper);
+				});
+			},
+
+			/**
+			 * Attach a state change handler. Uses promise to queue attachment
+			 * until the real wrapper is available and ready.
+			 * @param {function} fnHandler - The event handler function
+			 */
+			attachStateChanged: function(fnHandler) {
+				// Use promise to defer attachment until real wrapper is available and ready
+				oRealWrapperReadyPromise.then(function(oWrapper) {
+					oWrapper.attachStateChanged(fnHandler);
+				});
+			},
 
-				// Resolve the promise - this triggers all queued attachStateChanged calls
-				fnResolveRealWrapperReady(oRealWrapper);
-			});
-		},
-
-		/**
-		 * Attach a state change handler. Uses promise to queue attachment
-		 * until the real wrapper is available and ready.
-		 * @param {function} fnHandler - The event handler function
-		 */
-		attachStateChanged: function(fnHandler) {
-			// Use promise to defer attachment until real wrapper is available and ready
-			oRealWrapperReadyPromise.then(function(oWrapper) {
-				oWrapper.attachStateChanged(fnHandler);
-			});
-		},
-
-		/**
-		 * Detach a state change handler. Forwards to real wrapper once available and ready.
-		 * @param {function} fnHandler - The event handler function to detach
-		 */
-		detachStateChanged: function(fnHandler) {
-			// Forward to real wrapper once available and ready
-			oRealWrapperReadyPromise.then(function(oWrapper) {
-				oWrapper.detachStateChanged(fnHandler);
-			});
-		},
+			/**
+			 * Detach a state change handler. Forwards to real wrapper once available and ready.
+			 * @param {function} fnHandler - The event handler function to detach
+			 */
+			detachStateChanged: function(fnHandler) {
+				// Forward to real wrapper once available and ready
+				oRealWrapperReadyPromise.then(function(oWrapper) {
+					oWrapper.detachStateChanged(fnHandler);
+				});
+			},
 
 			/**
 			 * Get the local ID of the control.
@@ -116,28 +121,30 @@ sap.ui.define([
 					JSON.stringify(oState) === JSON.stringify(oLatestState);
 			},
 
-		/**
-		 * Called after variant is initialized (for SmartTable/SmartChart wrappers).
-		 * Delegates to real wrapper once control is set and ready.
-		 * Note: When this is called, the control always exists (event fired by control),
-		 * so the promise will already be resolved.
-		 */
-		onAfterVariantInitialise: function() {
-			oRealWrapperReadyPromise.then(function(oWrapper) {
-				if (oWrapper.onAfterVariantInitialise) {
-					oWrapper.onAfterVariantInitialise();
-				}
-			});
-		},
-
-		/**
-		 * Promise that resolves to the bVMConnection flag value once the real wrapper is ready.
-		 * This indicates whether the control is connected to page-wide variant management.
-		 */
-		oVMConnectionPromise: oRealWrapperReadyPromise.then(function(oWrapper) {
-			return oWrapper.bVMConnection;
-		})
+			/**
+			 * Called after variant is initialized (for SmartTable/SmartChart wrappers).
+			 * Delegates to real wrapper once control is set and ready.
+			 * Note: When this is called, the control always exists (event fired by control),
+			 * so the promise will already be resolved.
+			 */
+			onAfterVariantInitialise: function() {
+				oRealWrapperReadyPromise.then(function(oWrapper) {
+					if (oWrapper.onAfterVariantInitialise) {
+						oWrapper.onAfterVariantInitialise();
+					}
+				});
+			},
+
+			/**
+			 * Promise that resolves to the bVMConnection flag value once the real wrapper is ready.
+			 * This indicates whether the control is connected to page-wide variant management.
+			 */
+			oVMConnectionPromise: oRealWrapperReadyPromise.then(function(oWrapper) {
+				return oWrapper.bVMConnection;
+			})
 		};
+
+		return oPublicInterface;
 	}
 
 	return PreliminaryWrapper;

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js

@@ -9,7 +9,7 @@ sap.ui.define([
 	 * @param {object} oFactory - the controlStateWrapperFactory
 	 * @param {object} mParams
 	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM
-	 * (currently also including SFB wrapper - to be removed)
+	 * @param {object} mParams.smartFilterBarWrapper - explicit reference to SmartFilterBarWrapper for special handling
 	 * @returns {object}
 	 */
 
@@ -53,13 +53,15 @@ sap.ui.define([
 			});
 		});
 
+		// Get SmartFilterBarWrapper explicitly from params.
+		// This connection is needed because SmartFilterBar provides special callbacks to store/restore state
+		// for controls that don't have a direct variant management connection (bVMConnection = false), such as:
+		// - Extension filters (custom filters added via app or adaptation extensions)
+		// - Multiple views state (selected tab in multi-table/chart scenarios)
+		// These controls need their state saved/restored with variants via the SFB's beforeVariantFetch/afterVariantLoad events.
+		var oSmartFilterBarWrapper = mParams.smartFilterBarWrapper;
 
-
-		var oSmartFilterBarWrapper = mParams.managedControlWrappers.find(function(oWrapper){
-			return oWrapper.setSVMWrapperCallbacks;
-		});
-
-		// provide callbacks needed for SFB wrapper to store/restore extension state with variant
+		// Provide callbacks needed for SFB wrapper to store/restore extension state with variant
 		if (oSmartFilterBarWrapper){
 			// Build array with wrapper + bVMConnection info once all wrappers are ready
 			Promise.all(mParams.managedControlWrappers.map(function(oWrapper){

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -959,7 +959,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.142.7
+	 * @version 1.142.9
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3213,7 +3213,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.142.7
+	 * @version 1.142.9
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

package/src/sap/suite/ui/generic/template/library.js

@@ -66,7 +66,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.142.7",
+		version: "1.142.9",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {