@sapui5/sap.suite.ui.generic.template 1.145.0 → 1.145.2

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,66 @@ sap.ui.define([
 			};
 			return extend({}, oWrapper, oOverride);
 		}
-		
+
+		/**
+		 * 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 {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(sType, mParams, oControl) {
+			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 +159,66 @@ 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;
+
+					// 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, fnBoundCreator);
+
+					// 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 +227,15 @@ 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 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, fnBoundCreator);
+
+					mWrappers[sId] = oPreliminaryWrapper;
 				}
 				return mWrappers[sId];
 			}
@@ -207,4 +248,4 @@ sap.ui.define([
 			extend(this, getMethods(oController));
 		}
 	});
-});
+});

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/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;
-});
+});