@sapui5/sap.suite.ui.generic.template 1.146.0 → 1.147.1

package/src/sap/suite/ui/generic/template/fragments/ContactDetails.fragment.xml

@@ -8,8 +8,8 @@
 		placement="Auto"
 		showHeader="false"
 		contentWidth="20rem"
-		afterClose="afterClose"
-		afterOpen="afterOpen">
+		afterClose=".afterClose"
+		afterOpen=".afterOpen">
         <VBox>
             <HBox class="sapUiSmallMarginBottom">
                 <Avatar
@@ -31,7 +31,7 @@
 			<!-- render options for teams contact collaboration -->
 			<VBox visible="{= ${contact>/teamsCollabOptions} !== undefined &amp;&amp; ${contact>/teamsCollabOptions}.length > 0 }" class="sapUiSmallMarginBottom">
 				<Toolbar >
-					<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
+					<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/>
 					<ToolbarSpacer/>
 					<Button
 						icon="{contact>/teamsCollabOptions/0/icon}"
@@ -79,12 +79,12 @@
 				<Label text="{i18n>CONTACT_PHONE}:" labelFor="template:::contact:::contactDetails::phone"/>
 				<Link id="template:::contact:::contactDetails::phone" text="{contact>/work}" href="{path: 'contact>/work', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
 			</VBox>
-			
+
 			<VBox visible="{= !!${contact>/cell}}" class="sapUiTinyMarginBottom">
 				<Label text="{i18n>CONTACT_MOBILE}:" labelFor="template:::contact:::contactDetails::mobile"/>
 				<Link id="template:::contact:::contactDetails::mobile" text="{contact>/cell}" href="{path: 'contact>/cell', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
 			</VBox>
-			
+
 			<VBox visible="{= !!${contact>/fax}}" class="sapUiTinyMarginBottom">
 				<Label text="{i18n>CONTACT_FAX}:" labelFor="template:::contact:::contactDetails::fax"/>
 				<Text id="template:::contact:::contactDetails::fax" text="{contact>/fax}" class="sapUiTinyMarginBottom" />

package/src/sap/suite/ui/generic/template/fragments/DataLoss.fragment.xml

@@ -5,9 +5,9 @@
 		</content>
 		<buttons>
 			<Button text="{= ${dataLoss>/isLeaving} ? ${i18n>DATA_LOSS_LEAVE_BTN} : ${i18n>PROCEED} }"
-				press="onDataLossOK" type="Emphasized" />
+				press=".onDataLossOK" type="Emphasized" />
 			<Button text="{i18n>CANCEL}"
-				press="onDataLossCancel" />
+				press=".onDataLossCancel" />
 		</buttons>
 	</Dialog>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/DataLossTechnicalError.fragment.xml

@@ -5,10 +5,10 @@
 		</content>
 		<buttons>
 			<Button text="{i18n>DATA_LOSS_DISCARD_CHANGES}"
-				press="onDataLossOK"
+				press=".onDataLossOK"
 				visible="{dataLoss>/isLeaving}" type="Emphasized"/>
 			<Button text="{= ${dataLoss>/isLeaving} ? ${i18n>CANCEL} : ${i18n>CLOSE} }"
-				press="onDataLossCancel" />
+				press=".onDataLossCancel" />
 		</buttons>
 	</Dialog>
-</core:FragmentDefinition>		
+</core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/DiscardEditPopover.fragment.xml

@@ -1,8 +1,8 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
-	<Popover id="DiscardDraftPopover" placement="{discard>/placement}" showHeader="false" class="sapUiContentPadding" ariaLabelledBy="DiscardDraftText" beforeClose="beforeClose" afterClose="afterClose">
+	<Popover id="DiscardDraftPopover" placement="{discard>/placement}" showHeader="false" class="sapUiContentPadding" ariaLabelledBy="DiscardDraftText" beforeClose=".beforeClose" afterClose=".afterClose">
 		<VBox id="DiscardDraftBox">
 			<Text id="DiscardDraftText" width="16rem" text="{discard>/text}"/>
-			<Button id="DiscardDraftConfirmButton" text="{i18n>DISCARD}" width="100%" press="onDiscardConfirm" />	
-		</VBox>	
+			<Button id="DiscardDraftConfirmButton" text="{i18n>DISCARD}" width="100%" press=".onDiscardConfirm" />
+		</VBox>
 	</Popover>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/DraftAdminDataPopover.fragment.xml

@@ -7,7 +7,7 @@
 			 placement="Auto"
 			 class="sapSmartTemplatesListReportPopover sapUiContentPadding">
 		<endButton>
-				<Button icon="sap-icon://decline" tooltip="{i18n>CLOSE}" press="closeDraftAdminPopover" />
+				<Button icon="sap-icon://decline" tooltip="{i18n>CLOSE}" press=".closeDraftAdminPopover" />
 		</endButton>
 
 		<VBox class="sapUiContentPadding">

package/src/sap/suite/ui/generic/template/fragments/MessageDialog.fragment.xml

@@ -1,10 +1,10 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
-	<Dialog class="sapUiNoContentPadding" state="{settings>/state}" type="Message" afterClose="afterClose"
-		showHeader="true" horizontalScrolling="false" draggable="true" 
+	<Dialog class="sapUiNoContentPadding" state="{settings>/state}" type="Message" afterClose=".afterClose"
+		showHeader="true" horizontalScrolling="false" draggable="true"
 		contentHeight="440px" contentWidth="440px" verticalScrolling="false" resizable="true">
 		<content>
-			<MessageView items="{settings>/messages}" showDetailsPageHeader="false" itemSelect="onMessageSelect" groupItems="{settings>/grouping}">
-				<MessageItem type="{settings>type}" title="{settings>message}" description="{settings>description}" 
+			<MessageView items="{settings>/messages}" showDetailsPageHeader="false" itemSelect=".onMessageSelect" groupItems="{settings>/grouping}">
+				<MessageItem type="{settings>type}" title="{settings>message}" description="{settings>description}"
 							longtextUrl="{settings>descriptionUrl}" groupName="{= ${settings>/messageToGroupName}[${settings>id}] || ${settings>/genericGroupName} }" />
 			</MessageView>
 		</content>
@@ -14,7 +14,7 @@
 					<Text text="{settings>/title}" />
 				</contentMiddle>
 				<contentLeft>
-					<Button icon="sap-icon://nav-back" visible="{settings>/backButtonVisible}" press="onBackButtonPress"/>
+					<Button icon="sap-icon://nav-back" visible="{settings>/backButtonVisible}" press=".onBackButtonPress"/>
 					<core:Icon
 						src="{path: 'settings>/state', formatter: '.getSeverityIconFromIconPool'}"
 						color="{path: 'settings>/state', formatter: '.getIconColor'}"
@@ -23,8 +23,8 @@
 			</Bar>
 		</customHeader>
 		<buttons>
-			<Button text="{settings>/actionButtonText}" visible="{settings>/showActionButton}" press="onActionButtonPressed"  type="Emphasized"/>
-			<Button text="{=${settings>/showActionButton} ? ${settings>/cancelButtonText} : ${settings>/closeButtonText}}" press="onMessageDialogClose"/>
+			<Button text="{settings>/actionButtonText}" visible="{settings>/showActionButton}" press=".onActionButtonPressed"  type="Emphasized"/>
+			<Button text="{=${settings>/showActionButton} ? ${settings>/cancelButtonText} : ${settings>/closeButtonText}}" press=".onMessageDialogClose"/>
 		</buttons>
 	</Dialog>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/MessageInfluencingCRUDAction.fragment.xml

@@ -1,12 +1,12 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
-	<Dialog class="sapUiNoContentPadding" id="ShowConfirmationOnDraftActivate" state="{model>/state}" afterClose="afterClose" type="Message" initialFocus="Close" 
+	<Dialog class="sapUiNoContentPadding" id="ShowConfirmationOnDraftActivate" state="{model>/state}" afterClose=".afterClose" type="Message" initialFocus="Close"
 		showHeader="true" horizontalScrolling="false" draggable="true"
 		contentHeight="440px" contentWidth="440px" verticalScrolling="false" resizable="true">
 		<content>
-			<MessageView  id="messageView" items="{msg>/}" showDetailsPageHeader="false" itemSelect="onMessageSelect" activeTitlePress="titlePressed" groupItems="true">
-				<MessageItem id="messageItem" type="{msg>type}" title="{msg>message}" description="{msg>description}" 
+			<MessageView  id="messageView" items="{msg>/}" showDetailsPageHeader="false" itemSelect=".onMessageSelect" activeTitlePress=".titlePressed" groupItems="true">
+				<MessageItem id="messageItem" type="{msg>type}" title="{msg>message}" description="{msg>description}"
 						subtitle="{= (${model>/messageToSubtitle} || {})[${msg>id}]  }"
-						longtextUrl="{msg>descriptionUrl}" activeTitle="{path: 'msg>controlIds', formatter: '.isPositionable'}" 
+						longtextUrl="{msg>descriptionUrl}" activeTitle="{path: 'msg>controlIds', formatter: '.isPositionable'}"
 						groupName="{= (${model>/messageToGroupName} || {})[${msg>id}]  }" />
 			</MessageView>
 		</content>
@@ -16,7 +16,7 @@
 					<Title level="H1" text="{model>/title}"/>
 				</contentMiddle>
 				<contentLeft>
-					<Button icon="sap-icon://nav-back" visible="{model>/backbtnvisibility}" press="onBackButtonPress" tooltip="{i18n>BACK}" />
+					<Button icon="sap-icon://nav-back" visible="{model>/backbtnvisibility}" press=".onBackButtonPress" tooltip="{i18n>BACK}" />
 					<core:Icon
 						src="{path: 'model>/messageType', formatter: '.getSeverityIconFromIconPool'}"
 						color="{path: 'model>/messageType', formatter: '.getIconColor'}"/>
@@ -24,10 +24,10 @@
 			</Bar>
 		</customHeader>
 		<beginButton>
-			<Button text="{model>/CRUDAction}" visible="{= ${model>/situation} === 4}"  press="onAccept" type="Emphasized"/>
+			<Button text="{model>/CRUDAction}" visible="{= ${model>/situation} === 4}"  press=".onAccept" type="Emphasized"/>
 		</beginButton>
 		<endButton>
-			<Button text="{i18n>CANCEL}" press="onReject"/>
+			<Button text="{i18n>CANCEL}" press=".onReject"/>
 		</endButton>
 	</Dialog>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/MessagePopover.fragment.xml

@@ -1,7 +1,7 @@
 <core:FragmentDefinition
 		xmlns="sap.m"
 		xmlns:core="sap.ui.core">
-	<MessagePopover groupItems="true" items="{msg>/}" activeTitlePress="titlePressed" beforeOpen="beforeOpen" afterClose="afterClose" >
+	<MessagePopover groupItems="true" items="{msg>/}" activeTitlePress=".titlePressed" beforeOpen=".beforeOpen" afterClose=".afterClose" >
 		<MessageItem  type="{msg>type}"  title="{msg>message}"
 					subtitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>additionalText'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getSubtitle'}"
 					description="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>description'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getDescription'}"
@@ -13,7 +13,7 @@
 						text="{i18n>ST_AI_EE_BUTTON_LABEL}"
 						icon="sap-icon://ai"
 						visible="{= ${helper>/isAIErrorExplanationEnabled} &amp;&amp; ${msg>type} !== 'Information'}"
-						press="generateErrorExplanation">
+						press=".generateErrorExplanation">
 						<customData>
 							<core:CustomData key="message" value="{msg>message}" />
 							<core:CustomData key="description" value="{msg>description}" />

package/src/sap/suite/ui/generic/template/fragments/ShareSheet.fragment.xml

@@ -1,7 +1,7 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:footerbar="sap.ushell.ui.footerbar">
 	<Menu>
-        <MenuItem id="shareEmailButton" icon="sap-icon://email" press="sharePageToPressed('Email')" text="{share>/emailButtonText}" class="sapMFlexBox" visible="{= !${ui>/createMode}}"/>
-        <MenuItem id="shareJamButton" icon="sap-icon://share-2" press="shareJamPressed" text="{share>/jamButtonText}" visible="{share>/jamVisible}" class="sapMFlexBox"/>
-        <MenuItem id="bookmarkButton" icon="{share>/tileIcon}" press="shareTilePressed" text="{share>/tileText}" visible="{share>/tileVisible}" class="sapMFlexBox"/>
+        <MenuItem id="shareEmailButton" icon="sap-icon://email" press=".sharePageToPressed('Email')" text="{share>/emailButtonText}" class="sapMFlexBox" visible="{= !${ui>/createMode}}"/>
+        <MenuItem id="shareJamButton" icon="sap-icon://share-2" press=".shareJamPressed" text="{share>/jamButtonText}" visible="{share>/jamVisible}" class="sapMFlexBox"/>
+        <MenuItem id="bookmarkButton" icon="{share>/tileIcon}" press=".shareTilePressed" text="{share>/tileText}" visible="{share>/tileVisible}" class="sapMFlexBox"/>
     </Menu>
 </core:FragmentDefinition>

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