@sapui5/sap.suite.ui.generic.template 1.136.13 → 1.136.15

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

@@ -8,18 +8,19 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/DynamicPageWrapper",
 	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper",
 	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/ObjectPageLayoutWrapper",
-	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SearchFieldWrapper"
+	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SearchFieldWrapper",
+	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/PreliminaryWrapper"
 ], function (BaseObject, extend, controlHelper, SmartFilterBarWrapper, SmartTableWrapper, SmartChartWrapper,
-	DynamicPageWrapper, SmartVariantManagementWrapper, ObjectPageLayoutWrapper, SearchFieldWrapper) {
+	DynamicPageWrapper, SmartVariantManagementWrapper, ObjectPageLayoutWrapper, SearchFieldWrapper, PreliminaryWrapper) {
 	"use strict";
-	
+
 	/**
 	 * Dummy wrapper for not existing or not (yet) supported controls (either not carrying a state or to be added in future). Also used as interface description for wrapper classes.
 	 */
 	 var oDummyWrapper = {
 		/**
 		 * Retrieve the current state of the control
-		 * 
+		 *
 		 * @return {object} serializable json object describing the current state of the control. Will be provided to setState exactly the same when restoring the state. Note: Structure of this object
 		 *         is up to the wrapper, no one outside will rely on it - with one exception: legacyStateHandler translates legacy states (without clear separation per control) to this format. Open:
 		 *         Should legacyStateHandler be responsible for providing most current version, or only first control specific version (i.e. first version using wrapper), and wrapper should be
@@ -28,7 +29,7 @@ sap.ui.define([
 		getState: Function.prototype,
 		/**
 		 * Restore the control to the given state
-		 * 
+		 *
 		 * @param {object} oState json object describing the state as provided by getState. Note: can also be undefined, if an old state is restored (from a release where the state of this control was
 		 *           not stored), if a state is provided in the URL that cannot be read (anymore), or on OP in discovery mode, if the user navigates to a new object instance - in these cases, the
 		 *           control has to be brought (back) into its initial state. Currently, expectation is the state to be restored synchronously. Planned:
@@ -40,13 +41,13 @@ sap.ui.define([
 		 * wrapper must provide an event to indicate a state change. Must be called whenever a user interacts with the control to change its state, but not when state is changed programmatically (e.g.
 		 * from setState, or when user interacts with a different control causing also this one to change (in that case, the event from the other control should be called) Function to register for that
 		 * event
-		 * 
+		 *
 		 * @param {function} fnHandler event handler function being attached
 		 */
 		attachStateChanged: Function.prototype,
 		/**
 		 * Function to deregister from event. Currently not used, but should be provided for symmetry reasons.
-		 * 
+		 *
 		 * @param {function} fnHandler event handler function being attached. Should only be deregistered, if provided exactly like in registration
 		 */
 		detachStateChanged: Function.prototype,
@@ -57,7 +58,7 @@ sap.ui.define([
 
 		/**
 		 * Returns true if the state provided as argument is same as the state applied.
-		 * @param {Object} oState State object which needs to be checked against the current 
+		 * @param {Object} oState State object which needs to be checked against the current
 		 * state of the wrapper.
 		 * @returns {boolean} True in case State object passed as argument match with current state else false.
 		 */
@@ -90,15 +91,65 @@ sap.ui.define([
 			};
 			return extend({}, oWrapper, oOverride);
 		}
-		
+
+		/**
+		 * Private helper function to create the real wrapper based on control and type.
+		 * This function is injected into PreliminaryWrapper and not exposed in the factory's public API.
+		 *
+		 * @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
+		 * @return {object} The real wrapper object for the control with helper methods attached
+		 */
+		function fnCreateRealWrapper(oControl, sType, mParams) {
+			var oWrapper;
+			switch (sType) {
+				case "SmartFilterBar":
+					oWrapper = new SmartFilterBarWrapper(oControl, oFactory, mParams);
+					break;
+				case "SmartTable":
+					oWrapper = new SmartTableWrapper(oControl, oController, oFactory);
+					break;
+				case "SmartChart":
+					oWrapper = new SmartChartWrapper(oControl, oController, oFactory);
+					break;
+				case "DynamicPage":
+					oWrapper = new DynamicPageWrapper(oControl);
+					break;
+				case "SmartVariantManagement":
+					oWrapper = new SmartVariantManagementWrapper(oControl, oController, oFactory, mParams);
+					break;
+				case "ObjectPageLayout":
+					oWrapper = new ObjectPageLayoutWrapper(oControl);
+					break;
+				case "SearchField":
+					oWrapper = new SearchFieldWrapper(oControl);
+					break;
+				default:
+					// control not carrying a state or no wrapper built yet
+					oWrapper = oDummyWrapper;
+			}
+
+			// Add helper methods to the real wrapper
+			var sId = oController.getView().getLocalId(oControl.getId());
+			oWrapper.getLocalId = function() { return sId; };
+			oWrapper.isCurrentState = oWrapper.isCurrentState || function (oState) {
+				return JSON.stringify(oState) === JSON.stringify(oWrapper.getState());
+			};
+
+			return oWrapper;
+		}
+
 		var oFactory = {
 			getSuppressChangeEventWhenApplyingWrapper: getSuppressChangeEventWhenApplyingWrapper,
+
 			/**
-			 * Factory function to generate control wrapper object based on control type
-			 * 
+			 * Factory function to generate control wrapper object based on control type.
+			 * Always returns a PreliminaryWrapper, which delegates to the real wrapper internally.
+			 *
 			 * @param {sap.ui.core.Control} oControl - control a wrapper should be provided for
 			 * @param {object} [mParams] - map with any additional parameters passed to constructor of wrapper
-			 * @return {object} wrapper object for the control
+			 * @return {object} wrapper object for the control (always a PreliminaryWrapper)
 			 */
 			getControlStateWrapper: function (oControl, mParams) {
 				// checking for control here (instead of at all callers) allows simple use for optional controls
@@ -107,52 +158,63 @@ sap.ui.define([
 					// no need to add the dummy to the map
 					return oDummyWrapper;
 				}
-				var sId =  oController.getView().getLocalId(oControl.getId());
+				var sId = oController.getView().getLocalId(oControl.getId());
+
 				if (!mWrappers[sId]) {
-					var oWrapper;
+					// Determine control type
+					var sType;
 					switch (true) {
 						case controlHelper.isSmartFilterBar(oControl):
-							oWrapper = new SmartFilterBarWrapper(oControl, oFactory, mParams);
+							sType = "SmartFilterBar";
 							break;
 						case controlHelper.isSmartTable(oControl):
-							oWrapper = new SmartTableWrapper(oControl, oController, oFactory);
+							sType = "SmartTable";
 							break;
 						case controlHelper.isSmartChart(oControl):
-							oWrapper = new SmartChartWrapper(oControl, oController, oFactory);
+							sType = "SmartChart";
 							break;
 						case controlHelper.isDynamicPage(oControl):
-							oWrapper = new DynamicPageWrapper(oControl);
+							sType = "DynamicPage";
 							break;
 						case controlHelper.isSmartVariantManagement(oControl):
-							oWrapper = new SmartVariantManagementWrapper(oControl, oController, oFactory, mParams);
+							sType = "SmartVariantManagement";
 							break;
 						case controlHelper.isObjectObjectPageLayout(oControl):
-							oWrapper = new ObjectPageLayoutWrapper(oControl);
+							sType = "ObjectPageLayout";
 							break;
 						case controlHelper.isSearchField(oControl):
-							oWrapper = new SearchFieldWrapper(oControl);
+							sType = "SearchField";
 							break;
 						default:
-							// control not carrying a state or no wrapper build yet
-							oWrapper = oDummyWrapper;
+							// control not carrying a state or no wrapper built yet
+							return oDummyWrapper;
 					}
-					oWrapper.getLocalId = function() { return sId; };
-					oWrapper.isCurrentState = oWrapper.isCurrentState || function (oState) {
-						return JSON.stringify(oState) === JSON.stringify(oWrapper.getState());
-					};
-					
-					mWrappers[sId] = oWrapper;
+
+					// Always create a PreliminaryWrapper
+					var oPreliminaryWrapper = new PreliminaryWrapper(sId, sType, fnCreateRealWrapper, oController, mParams);
+
+					// Since control is available, immediately set it
+					oPreliminaryWrapper.setControl(oControl);
+
+					// Store the PreliminaryWrapper in map (not the real wrapper)
+					mWrappers[sId] = oPreliminaryWrapper;
+				} else if (mWrappers[sId].setControl) {
+					// PreliminaryWrapper already exists but control wasn't set yet - set it now
+					mWrappers[sId].setControl(oControl);
 				}
+
 				return mWrappers[sId];
 			},
 
 			/**
-			 * Factory function to generate control wrapper object based on control type
-			 * 
-			 * @param {string} sId - Id of the control for which wrapper needs to be initiated
+			 * Factory function to generate control wrapper object based on control ID and type.
+			 * Creates a PreliminaryWrapper when the control doesn't exist yet (e.g., lazy loading).
+			 * Always returns a PreliminaryWrapper, which delegates to the real wrapper internally.
+			 *
+			 * @param {string} sControlId - ID of the control for which wrapper needs to be initiated
 			 * @param {string} sControlType - Type of the control for which wrapper needs to be initiated
 			 * @param {object} [mParams] - map with any additional parameters passed to constructor of wrapper
-			 * @return {object} wrapper object for the control
+			 * @return {object} wrapper object for the control (always a PreliminaryWrapper)
 			 */
 			getControlStateWrapperById: function (sControlId, sControlType, mParams) {
 				// checking for control here (instead of at all callers) allows simple use for optional controls
@@ -161,40 +223,12 @@ sap.ui.define([
 					// no need to add the dummy to the map
 					return oDummyWrapper;
 				}
-				var sId =  oController.getView().getLocalId(sControlId);
+				var sId = oController.getView().getLocalId(sControlId);
 				if (!mWrappers[sId]) {
-					var oWrapper;
-					switch (sControlType) {
-						case "SmartFilterBar":
-							oWrapper = new SmartFilterBarWrapper(sControlId, oFactory, mParams);
-							break;
-						case "SmartTable":
-							oWrapper = new SmartTableWrapper(sControlId, oController, oFactory);
-							break;
-						case "SmartChart":
-							oWrapper = new SmartChartWrapper(sControlId, oController, oFactory);
-							break;
-						case "DynamicPage":
-							oWrapper = new DynamicPageWrapper();
-							break;
-						case "SmartVariantManagement":
-							oWrapper = new SmartVariantManagementWrapper(sControlId, oController, oFactory, mParams);
-							break;
-						case "ObjectPageLayout":
-							oWrapper = new ObjectPageLayoutWrapper(sControlId);
-							break;
-						case "SearchField":
-							oWrapper = new SearchFieldWrapper(sControlId);
-							break;
-						default:
-							// control not carrying a state or no wrapper build yet
-							oWrapper = oDummyWrapper;
-					}
-					oWrapper.getLocalId = function() { return sId; };
-					oWrapper.isCurrentState = oWrapper.isCurrentState || function (oState) {
-						return JSON.stringify(oState) === JSON.stringify(oWrapper.getState());
-					};
-					mWrappers[sId] = oWrapper;
+					// Create a PreliminaryWrapper (control will be set later)
+					var oPreliminaryWrapper = new PreliminaryWrapper(sId, sControlType, fnCreateRealWrapper, oController, mParams);
+
+					mWrappers[sId] = oPreliminaryWrapper;
 				}
 				return mWrappers[sId];
 			}
@@ -207,4 +241,4 @@ sap.ui.define([
 			extend(this, getMethods(oController));
 		}
 	});
-});
+});

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

@@ -2,67 +2,35 @@ sap.ui.define([
 ], function() {
 	"use strict";
 
-    function DynamicPageWrapper(vTarget) {
-        var oDynamicPage;
-        var oPreliminaryState;
-        var oControlAssignedResolve;
-        var oControlAssignedPromise = new Promise(function(resolve) {
-            oControlAssignedResolve = resolve;
-        });
-
-        if (typeof vTarget !== "string") {
-            fnSetControl(vTarget);
-        }
-        
+    function DynamicPageWrapper(oDynamicPage) {
         // Returns the state of the dynamic page
-        // Right now we only consider the pinned status of the dynamic page header 
+        // Right now we only consider the pinned status of the dynamic page header
         function fnGetState() {
-            if (oDynamicPage) {
-                var oControlState = {};
-                oControlState.headerPinned = oDynamicPage.getHeaderPinned();
-                return oControlState;
-            }
-
-            return oPreliminaryState;
+            var oControlState = {};
+            oControlState.headerPinned = oDynamicPage.getHeaderPinned();
+            return oControlState;
         }
 
         function fnSetState(oState) {
-            // Store the state till the control is initialized
-            oPreliminaryState = oState;
-            oControlAssignedPromise.then(function() {
-                if (oPreliminaryState && oPreliminaryState.headerPinned) {
-                    // There is a possibility that the header is collapsed at this point. Make sure it is expanded if we know the header is to be pinned.
-                    oDynamicPage.setHeaderExpanded(true);
-                    oDynamicPage.setHeaderPinned(true);
-                } else {
-                    oDynamicPage.setHeaderPinned(false);
-                }
-            });
+            if (oState && oState.headerPinned) {
+                // There is a possibility that the header is collapsed at this point. Make sure it is expanded if we know the header is to be pinned.
+                oDynamicPage.setHeaderExpanded(true);
+                oDynamicPage.setHeaderPinned(true);
+            } else {
+                oDynamicPage.setHeaderPinned(false);
+            }
         }
 
         function fnAttachStateChanged(fnHandler) {
-            oControlAssignedPromise.then(function() {
-                oDynamicPage.attachPinnedStateChange(fnHandler);
-            });
-        }
-
-        function fnSetControl(oControl) {
-            oDynamicPage = oControl;
-            oControlAssignedResolve(oDynamicPage);
-        }
-
-        function fnSetHeaderState(oController, bHeaderToBeExpanded) {
-            oController.getOwnerComponent().getModel("_templPriv").setProperty("/listReport/isHeaderExpanded", bHeaderToBeExpanded);
+            oDynamicPage.attachPinnedStateChange(fnHandler);
         }
 
-        return {
-            getState: fnGetState,
-            setState: fnSetState,
-            setControl: fnSetControl,
-            attachStateChanged: fnAttachStateChanged,
-            setHeaderState: fnSetHeaderState
-        };
+		return {
+			getState: fnGetState,
+			setState: fnSetState,
+			attachStateChanged: fnAttachStateChanged
+		};
     }
 
     return DynamicPageWrapper;
-});
+});

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

@@ -2,57 +2,35 @@ sap.ui.define([
 ], function() {
 	"use strict";
 
-    function ObjectPageLayoutWrapper(vTarget) {
-        var oObjectPageLayout, oControlAssignedResolve, oPreliminaryState;
-        var oControlAssignedPromise = new Promise(function(resolve) {
-            oControlAssignedResolve = resolve;
-        });
-
-        if (typeof vTarget !== "string") {
-            fnSetControl(vTarget);
-        }
+    function ObjectPageLayoutWrapper(oControl) {
+        var oObjectPageLayout = oControl;
 
         // Returns the state of the ObjectPageLayout
-        // Right now we only consider the pinned status of the ObjectPageLayout 
+        // Right now we only consider the pinned status of the ObjectPageLayout
         function fnGetObjectPageLayoutState() {
-            if (!oObjectPageLayout) {
-                return oPreliminaryState;
-            }
-
             var oControlState = {};
             oControlState.headerPinned = oObjectPageLayout.getHeaderContentPinned();
             return oControlState;
         }
 
         function fnSetObjectPageLayoutState(oState) {
-            oPreliminaryState = oState;
-            oControlAssignedPromise.then(function() {
-                if (oPreliminaryState && oPreliminaryState.headerPinned) {
-                    oObjectPageLayout.setHeaderContentPinned(true);
-                } else {
-                    oObjectPageLayout.setHeaderContentPinned(false);
-                }
-            });
+            if (oState && oState.headerPinned) {
+                oObjectPageLayout.setHeaderContentPinned(true);
+            } else {
+                oObjectPageLayout.setHeaderContentPinned(false);
+            }
         }
 
         function fnAttachStateChanged(fnHandler) {
-            oControlAssignedPromise.then(function() {
-                oObjectPageLayout.attachHeaderContentPinnedStateChange(fnHandler);
-            });
-        }
-
-        function fnSetControl(oControl) {
-            oObjectPageLayout = oControl;
-            oControlAssignedResolve(oObjectPageLayout);
+            oObjectPageLayout.attachHeaderContentPinnedStateChange(fnHandler);
         }
 
         return {
             getState: fnGetObjectPageLayoutState,
             setState: fnSetObjectPageLayoutState,
-            setControl: fnSetControl,
             attachStateChanged: fnAttachStateChanged
         };
     }
 
     return ObjectPageLayoutWrapper;
-});
+});

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

@@ -0,0 +1,144 @@
+sap.ui.define([
+], function() {
+	"use strict";
+
+	/**
+	 * PreliminaryWrapper - Acts as a proxy wrapper before the real control is available.
+	 *
+	 * This wrapper is created when a control state wrapper is requested by ID and type,
+	 * but the actual control instance doesn't exist yet (e.g., due to lazy loading on ObjectPage).
+	 * It stores state operations and event handler registrations, then transfers them to the
+	 * 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
+	 * @returns {object} Preliminary wrapper object that will delegate to real wrapper once control is set
+	 */
+	function PreliminaryWrapper(sId, sType, fnCreateRealWrapper, oController, mParams) {
+		var oLatestState;
+		var oRealWrapper;
+		var fnResolveRealWrapperReady;
+		var oRealWrapperReadyPromise = new Promise(function(resolve) {
+			fnResolveRealWrapperReady = resolve;
+		});
+
+		return {
+			/**
+			 * Get the current state. Returns stored state before control is set,
+			 * delegates to real wrapper afterwards.
+			 * @returns {object} The current state
+			 */
+			getState: function() {
+				return oRealWrapper ? oRealWrapper.getState() : oLatestState;
+			},
+
+			/**
+			 * Set the state. Stores state before control is set,
+			 * delegates to real wrapper afterwards.
+			 * @param {object} oState - The state to set
+			 */
+			setState: function(oState) {
+				if (oRealWrapper) {
+					oRealWrapper.setState(oState);
+				} else {
+					oLatestState = oState;
+				}
+			},
+
+		/**
+		 * 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);
+				}
+
+				// 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);
+			});
+		},
+
+			/**
+			 * Get the local ID of the control.
+			 * @returns {string} The local ID
+			 */
+			getLocalId: function() {
+				return sId;
+			},
+
+			/**
+			 * Check if the provided state matches the current state.
+			 * @param {object} oState - The state to compare
+			 * @returns {boolean} True if states match
+			 */
+			isCurrentState: function(oState) {
+				return oRealWrapper ? oRealWrapper.isCurrentState(oState) :
+					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;
+		})
+		};
+	}
+
+	return PreliminaryWrapper;
+});

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

@@ -2,54 +2,32 @@ sap.ui.define([
 ], function() {
 	"use strict";
 
-	function SearchFieldWrapper(vTarget) {
-		var oSearchField, oControlAssignedResolve, oPreliminaryState;
-        var oControlAssignedPromise = new Promise(function(resolve) {
-            oControlAssignedResolve = resolve;
-        });
-
-        if (typeof vTarget !== "string") {
-            fnSetControl(vTarget);
-        }
+	function SearchFieldWrapper(oControl) {
+		var oSearchField = oControl;
 
 		function fnGetState() {
-			if (!oSearchField) {
-				return oPreliminaryState;
-			}
-
 			return {
 				searchString: oSearchField.getValue()
 			};
 		}
 
 		function fnSetState(oState) {
-			oPreliminaryState = oState;
-			oControlAssignedPromise.then(function() {
-				oSearchField.setValue(oState.searchString);
-				// original implementation also called fireSearch. Seems to be superfluous (would fire the search event, on which worklisthandler is registered and finally calls rebindTable
-				// when restoring from an appState of a worklist, always data should be shown at time of saving the state and thus automatically search would be triggered again
-				// oSearchField.fireSearch();
-			});
+			oSearchField.setValue(oState.searchString);
+			// original implementation also called fireSearch. Seems to be superfluous (would fire the search event, on which worklisthandler is registered and finally calls rebindTable
+			// when restoring from an appState of a worklist, always data should be shown at time of saving the state and thus automatically search would be triggered again
+			// oSearchField.fireSearch();
 		}
 
 		function fnAttachStateChanged(fnHandler) {
-			oControlAssignedPromise.then(function() {
-				oSearchField.attachLiveChange(fnHandler);
-			});
+			oSearchField.attachLiveChange(fnHandler);
 		}
 
-		function fnSetControl(oControl) {
-            oSearchField = oControl;
-            oControlAssignedResolve(oSearchField);
-        }
-
 		return {
 			getState: fnGetState,
 			setState: fnSetState,
-			setControl: fnSetControl,
 			attachStateChanged: fnAttachStateChanged
 		};
 	}
 
 	return SearchFieldWrapper;
-});
+});