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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.142.6",
+  "version": "1.142.7",
   "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.6</version>
+	<version>1.142.7</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.6"
+			"version": "1.142.7"
 		},
 		"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.6"
+			"version": "1.142.7"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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

@@ -1,5 +1,6 @@
 sap.ui.define([
 	"sap/ui/model/Filter",
+	"sap/ui/model/FilterOperator",
 	"sap/suite/ui/generic/template/ListReport/extensionAPI/ExtensionAPI",
 	"sap/suite/ui/generic/template/listTemplates/listUtils",
 	"sap/suite/ui/generic/template/listTemplates/controller/MessageStripHelper",
@@ -31,6 +32,7 @@ sap.ui.define([
 	"sap/fe/controls/easyFilter/PXFeedback"
 ], function (
 	Filter,
+	FilterOperator,
 	ExtensionAPI,
 	listUtils,
 	MessageStripHelper,
@@ -464,7 +466,7 @@ sap.ui.define([
 			/**
 			 * When no data message is displayed as illustration, SmartTable overrides the "illustrationType" to "NoEntries".
 			 * Here, we reset back to "BeforeSearch".
-			 * 
+			 *
 			 * TODO: Sync with table colleagues
 			 */
 			function fnSetInitialNoDataMessageForTable (oSmartTable) {
@@ -590,10 +592,89 @@ sap.ui.define([
 				return restoreFocusHelper;
 			}
 
-			// // Expose selected private functions to unit tests
-			// var getDownloadUrl = testableHelper.testable(getDownloadUrl, "getDownloadUrl");
+			/**
+			 * Helper function to get missing navigation properties from the current variant.
+			 * This logic was moved from SmartFilterBarWrapper to avoid control-specific
+			 * business logic in the wrapper layer.
+			 * @param {object} oSmartFilterBar - The SmartFilterBar control
+			 * @returns {Array} Array of missing navigation property filters
+			 */
+			function fnGetMissingNavProperties(oSmartFilterBar) {
+				//Fetch the navigation properties
+				const oMetaModel = oSmartFilterBar.getModel().getMetaModel(),
+					sEntitySet = oSmartFilterBar.getEntitySet(),
+					oDataEntitySet = oMetaModel.getODataEntitySet(sEntitySet),
+					oDataEntityType = oMetaModel.getODataEntityType(oDataEntitySet.entityType),
+					aNavigationProperties = oDataEntityType['navigationProperty'];
+				//Fetch the added filters in the current variant
+				const sCurrentVariantID = oSmartFilterBar.getVariantManagement().getCurrentVariantId(),
+					oCurrentVariant = oSmartFilterBar.getVariantManagement().getAllVariants().find(function(variant) {
+						return variant.getId() === sCurrentVariantID;
+					});
+				if (!oCurrentVariant
+					|| !oCurrentVariant.getContent()
+					|| !oCurrentVariant.getContent().searchListReportVariant
+					|| !oCurrentVariant.getContent().searchListReportVariant.filterBarVariant
+					|| !aNavigationProperties
+					|| !aNavigationProperties.length
+				) {
+					return [];
+				}
+				const oManifestNavigationProperties = oSmartFilterBar.getNavigationProperties() ?
+					oSmartFilterBar.getNavigationProperties().split(",").reduce(function(accumulator, currentValue){
+						accumulator[currentValue] = true;
+						return accumulator;
+					}, {}) : {},
+					oNavigationProperties = aNavigationProperties.reduce(function(accumulator, currentValue){
+						accumulator[currentValue.name] = true;
+						return accumulator;
+					}, {}),
+					oSmartFilterBarVariant = JSON.parse(oCurrentVariant.getContent().searchListReportVariant.filterBarVariant),
+					aMissing = [];
+				delete oSmartFilterBarVariant["_CUSTOM"];
+
+				// Compare the filter source and navigation properties
+				// Take into account if parameter is already specified in page setting in manifest.json - settings->filterSettings->navigationProperties
+				// If parameter exist in navigationProperties -> SFB will handle specific parameter and code ignore it
+				for (const sFilterKey in oSmartFilterBarVariant) {
+					const sParamName = sFilterKey.split(".")[0]; // take first part from navigation parameter. Example: to_Currency.Currency_Code -> to_Currency
+					if (!oNavigationProperties[sParamName] || oManifestNavigationProperties[sParamName]
+					) {
+						// Parameter is
+						// 1) not navigation property -> we don't process it
+						// 2) is defined in manifest.json - settings->filterSettings->navigationProperties -> value will be handled by SFB
+						continue;
+					}
+					if (oSmartFilterBarVariant[sFilterKey].items && oSmartFilterBarVariant[sFilterKey].items.length) {
+						aMissing.push(oSmartFilterBarVariant[sFilterKey].items.map(function(entry) {
+							return {
+								exclude: false,
+								field: sFilterKey,
+								operation: FilterOperator.EQ,
+								value1: entry.key
+							};
+						}));
+						continue;
+					}
+					if (oSmartFilterBarVariant[sFilterKey].ranges && oSmartFilterBarVariant[sFilterKey].ranges.length) {
+						aMissing.push(oSmartFilterBarVariant[sFilterKey].ranges.map(function(entry) {
+							return {
+								exclude: entry.exclude,
+								field: entry.keyField,
+								operation: entry.operation,
+								value1: entry.value1,
+								value2: entry.value2
+							};
+						}));
+					}
+				}
+				return aMissing;
+			}
+
+			// Expose selected private functions to unit tests
 			/* eslint-enable */
 			testableHelper.testableStatic(onShareListReportActionButtonPressImpl, "ControllerImplementation_onShareListReportActionButtonPressImpl");
+			testableHelper.testable(fnGetMissingNavProperties, "fnGetMissingNavProperties");
 
 			// Generation of Event Handlers
 			return {
@@ -751,8 +832,11 @@ sap.ui.define([
 						onShareListReportActionButtonPressImpl(oMenuButton);
 					});
 				},
-				
+
 				handlers: {
+					onAfterVariantInitialise: function(oEvent) {
+						oTemplateUtils.oCommonUtils.getControlStateWrapper(oEvent.getSource()).onAfterVariantInitialise();
+					},
 					addEntry: addEntry,
 					addEntryWithFilters: addEntryWithFilters,
 					deleteEntries: fnDeleteEntries,
@@ -798,6 +882,8 @@ sap.ui.define([
 					onAfterSFBVariantLoad: function (oEvent) {
 						oState.oIappStateHandler.onAfterSFBVariantLoad(oEvent);
 						oState.oEasyFilterBarHandler && oState.oEasyFilterBarHandler.handleVariantLoad(oEvent);
+						// Cache missing navigation property filters for performance
+						oState.aMissingNavFilters = fnGetMissingNavProperties(oState.oSmartFilterbar);
 					},
 					onSmartListDataReceived: function (oEvent) {
 						var oSmartList = oEvent.getSource();
@@ -850,11 +936,8 @@ sap.ui.define([
 						// However, this connection is not there in the multi view multi table scenario which is the only case in which this snapshot
 						// will be used later.
 						var aFiltersFromRebindEvent = oBindingParams.filters.slice(0);
-						// To get the missing navigation properties from the user variant
-						var oSmartFilterBarId = oState.oSmartFilterbar.getId(),
-							oSmartFilterBarWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapperById(oSmartFilterBarId, "SmartFilterBar"),
-							aMissingFilters = oSmartFilterBarWrapper.getMissingNavProperties();
-						if (aMissingFilters.length) {
+						// To get the missing navigation properties from the user variant (cached from last variant load)
+						if (oState.aMissingNavFilters && oState.aMissingNavFilters.length) {
 							// Display message to the user, which filters currently are not visible
 							var sCurrentVariant =  oState.oSmartFilterbar.getVariantManagement().getId(),
 								sCurrentVariantId =  oState.oSmartFilterbar.getCurrentVariantId(),
@@ -870,7 +953,7 @@ sap.ui.define([
 										}
 										return accumulator;
 									}, {}),
-								aMissingPropertyNames = aMissingFilters.reduce(function(accumulator, currentValue) {
+								aMissingPropertyNames = oState.aMissingNavFilters.reduce(function(accumulator, currentValue) {
 									var sName = currentValue[0].field.split(".")[0];
 									if (oMappedProperty[sName]) {
 										accumulator.push(oMappedProperty[sName]);
@@ -888,7 +971,7 @@ sap.ui.define([
 							// Generate filters and set them into binding parameters
 							// use same logic as in sap.ui.comp.smartfilterbar.FilterProviderUtils, method generateFilters()
 							var aFilters = [];
-							aMissingFilters.forEach(function(oEntry) {
+							oState.aMissingNavFilters.forEach(function(oEntry) {
 								var aIncludeFilters = [],
 									aExcludeFilters = [];
 								oEntry.forEach(function(oFilterEntry) {

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

@@ -214,12 +214,6 @@ sap.ui.define([
 		// However, for iAppState case, SVM wrapper also needs to contain SFB wrapper (and not oCustomFiltersWrapper directly)
 
 
-		// DynamicPage state: header pinned
-		var oDynamicPage = oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}));
-		// TODO: Discuss: should this state (header pinned) be part of variant (only page variant or SFB variant)? Assumption: no
-		var oDynamicPageWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oDynamicPage);
-		aControlStateWrappers.push(oDynamicPageWrapper);
-
 		// SmartVariantManagement state: Selected Variant and whether it's dirty, including wrappers for managed controls (all controls, for which the corresponding state
 		// information should be part of the variant)
 		// Due to direct connection between SVM and SFB, also their wrappers need to each other directly. Remarks:
@@ -229,14 +223,19 @@ sap.ui.define([
 		var oSmartVariantManagement = oState.oSmartFilterbar.getSmartVariant();
 		if (oSmartVariantManagement){
 			var oSmartVariantManagementWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartVariantManagement, {
-				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper]),
-				dynamicPageWrapper: oDynamicPageWrapper
+				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper])
 			});
 			aControlStateWrappers.push(oSmartVariantManagementWrapper);
 		} else {
 			aControlStateWrappers.push(oSmartFilterBarWrapper);
 		}
 
+		// DynamicPage state: header pinned
+		var oDynamicPage = oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}));
+		// The DynamicPage state (header pinned) is intentionally stored only in iAppState and not included in any variant (neither page variant nor SFB variant).
+		var oDynamicPageWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oDynamicPage);
+		aControlStateWrappers.push(oDynamicPageWrapper);
+
 
 		// Wrapper to control whether data is loaded
 
@@ -774,7 +773,8 @@ sap.ui.define([
 				// For desktop devices, expand the header for Standard and Custom variants and for tablet and mobile devices,
 				// collapse the header only if search is triggered.
 				if (Device.system.desktop) {
-					oTemplateUtils.oCommonUtils.getControlStateWrapper(oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}))).setHeaderState(oController, true);
+					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+					oTemplatePrivateModel.setProperty("/listReport/isHeaderExpanded", true);
 				} else {
 					collapseHeader();
 				}
@@ -909,6 +909,16 @@ sap.ui.define([
                 }
                 sap.ui.getCore().getMessageManager().removeMessages(removedMessages);
             }
+
+			// Restore header collapse logic (originally removed in change 5641712)
+			// Collapse header when user manually selects a variant (context === undefined) that has executeOnSelect set to true
+			var oContext = oEvent.getParameter("context");
+			var bExecuteOnSelect = oEvent.getParameter("executeOnSelect");
+
+			if (oContext === undefined && bExecuteOnSelect) {
+				collapseHeader();
+			}
+
 			fnRestoreExtendedFilterDataOnAfterSFBVariantLoad(oEvent);
 		}
 

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.6"
+			"version": "1.142.7"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/SmartChart.fragment.xml

@@ -8,7 +8,8 @@
 
 	<template:with path="entityType>com.sap.vocabularies.UI.v1.HeaderInfo" var="header">
 		<smartChart:SmartChart
-			id="listReport{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'AH.getSuffixFromIconTabFilterKey'} : ''}" 
+			id="listReport{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'AH.getSuffixFromIconTabFilterKey'} : ''}"
+			afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
 			visible="{path: 'tabItem>', formatter: 'AHMultipleViews.getVisibleForTableTabs'}"
 			smartFilterId=""
 			persistencyKey="listReportChart{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'AH.getSuffixFromIconTabFilterKey'} : ''}"

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/SmartTable.fragment.xml

@@ -17,8 +17,9 @@
 			<template:with path="tableAnnotationPath>" helper="AH.searchForFirstSemKey_Title_Description" var="targetColumn">
 				<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="smartControlId">
 					<template:if test="{= ${smartControlId>}.buildStableId({type: 'ListReportTable', subType: 'SmartTable', sQuickVariantKey: ${tabItem>key}})}" />
-					<smarttable:SmartTable id="{smartControlId>id}" useDateRangeType="{= ${parameter>/settings/filterSettings/dateSettings/useDateRange} }"
-						smartFilterId="{= ${parameter>/settings/quickVariantSelectionX} ? '' : 'listReportFilter'}"
+				<smarttable:SmartTable id="{smartControlId>id}" useDateRangeType="{= ${parameter>/settings/filterSettings/dateSettings/useDateRange} }"
+					afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
+					smartFilterId="{= ${parameter>/settings/quickVariantSelectionX} ? '' : 'listReportFilter'}"
 						visible="{path: 'tabItem>', formatter: 'AHMultipleViews.getVisibleForTableTabs'}"
 						initialise="._templateEventHandlers.onTableInit"
 						persistencyKey="{= ${path: 'parameter>/settings/routeConfig/', formatter: 'AH.getPersistencyKeyForSmartTable'} }{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'AH.getSuffixFromIconTabFilterKey'} : ''}"

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

@@ -2479,8 +2479,11 @@ sap.ui.define([
 						});
 					}
 				},
-				handlers: {
-					onEditAndActiveToggle: function () { // Implementation of draft toggle for static header
+			handlers: {
+				onAfterVariantInitialise: function(oEvent) {
+					oTemplateUtils.oCommonUtils.getControlStateWrapper(oEvent.getSource()).onAfterVariantInitialise();
+				},
+				onEditAndActiveToggle: function () { // Implementation of draft toggle for static header
 						var oUIModel = oObjectPage.getModel("ui");
 						var bIsEditable = oUIModel.getProperty("/editable");
 

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

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

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartChart.fragment.xml

@@ -11,8 +11,9 @@
 					<template:if test="{:= ${smartChartId>}.set(AH.getStableIdPartFromFacet(${facet>}) + '::Chart') }"/>
 					<!-- Header Level for Smart Chart is hardcoded here with "H5" for fallback scenarios, After Section Title hiding logic, if required the level is calculated on the class /ObjectPage/controller/SectionTitleHandler.js-->
 					<!-- Header Style for Smart Chart is hardcoded here with "H5" for all Scenarios.-->
-					<smartChart:SmartChart
-						id="{smartChartId>value}"
+				<smartChart:SmartChart
+					id="{smartChartId>value}"
+					afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
 						header="{chartAnnotation>Title/String}"
 						initialized="._templateEventHandlers.onChartInit"
 						requestAtLeastFields="{parts: [{path: 'chartAnnotation>'}, {path: 'entitySet>entityType'}], formatter: 'AH.getApplicablePathForChartToolbarActions'}"

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartTable.fragment.xml

@@ -16,8 +16,9 @@
 								<template:if test="{= ${smartControlId>}.buildStableId({type: 'ObjectPageTable', subType: 'SmartTable', sFacet: ${facetId>id}})}" />
 								<!-- Header Level for Smart Table is hardcoded here with "H5" for fallback scenarios, After Section Title hiding logic, if required the level is calculated on the class /ObjectPage/controller/SectionTitleHandler.js-->
 								<!-- Header Style for Smart Table is hardcoded here with "H5" for all Scenarios.-->
-								<st:SmartTable id="{smartControlId>id}"
-									initialise="._templateEventHandlers.onTableInit($event, '{facetId>id}')"
+							<st:SmartTable id="{smartControlId>id}"
+								afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
+								initialise="._templateEventHandlers.onTableInit($event, '{facetId>id}')"
 									persistencyKey="{parts: [{path: 'smartControlId>id'}, {path: 'objectPageTableSettings>value/persistencyKeyState'}], formatter: 'AH.getPersistencyKey'}"
 									tableBindingPath="{= ${path: 'target>AnnotationPath'}.slice(0, ${path: 'target>AnnotationPath'}.lastIndexOf('/')) }"
 									fitContainer="false"

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.142.6"
+			"version": "1.142.7"
 		},
 		"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.6"
+		"version": "1.142.7"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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