@sapui5/sap.suite.ui.generic.template 1.132.0 → 1.134.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.132.0",
+  "version": "1.134.1",
   "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.132.0</version>
+	<version>1.134.1</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/Component.js

@@ -302,10 +302,6 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 							if (oAlpSettings.isResponsiveTable === undefined){
 								oAlpSettings.isResponsiveTable = oVariants[sKey].tableSettings.type === "ResponsiveTable";
 							}
-							var oVariantEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
-							if (oVariantEntityType && oVariantEntityType.property && oVariants[sKey].tableSettings && oVariants[sKey].tableSettings.createWithParameterDialog) {
-								oAlpSettings.quickVariantSelectionX.variants[sKey].tableSettings.createWithParameterDialog.id = StableIdHelper.getStableId({type: 'ALPAction', subType: 'CreateWithDialog', sQuickVariantKey: oVariants[sKey].key});
-							}
 							setTargetEntity(oEntitySet);
 							// tableSettings in case of Multitable, it may contain chart or table settings.
 							oVariants[sKey].tableSettings = deepExtend(oVariants[sKey].tableSettings, fnCustomActions(oVariants[sKey].key, sKey).tableSettings, fnGetAnnotatedActionsCommandDetails(sKey).tableSettings);

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/FilterItemMicroBar.js

@@ -19,7 +19,9 @@ sap.ui.define(["sap/suite/ui/microchart/InteractiveBarChart",
 				control: {type: "sap.suite.ui.microchart.InteractiveBarChart", multiple: false}
 			}
 		},
-		renderer:{}
+		renderer: {
+			apiVersion: 2
+		}
 	});
 
 	FilterItemMicroBar.prototype.init = function() {

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/FilterItemMicroChart.js

@@ -47,7 +47,7 @@ sap.ui.define([
 				dimensionFieldIsDateTimeOffset: { type: "boolean", group: "Misc", defaultValue: false },
 				dimensionFieldDisplay: { type: "string", group: "Misc", defaultValue: null },
 				dimensionFilter: { type: "any", group: "Misc", defaultValue: null },
-				dimensionFilterExternal: { type: "sap.ui.model.Filter", group: "Misc", defaultValue: null },
+				dimensionFilterExternal: { type: "any", group: "Misc", defaultValue: null },
 				measureField: { type: "string", group: "Misc", defaultValue: null },
 				unitField: { type: "string", group: "Misc", defaultValue: null },
 				isCurrency: { type: "boolean", group: "Misc", defaultValue: false },
@@ -841,7 +841,8 @@ sap.ui.define([
 	};
 
 	FilterItemChart.prototype._onDataReceived = function(data) {
-		if (!data) {
+		// Setting custom data when the element is being destroyed will throw error and the custom data changes won't be applied.
+		if (!data || this.isDestroyStarted()) {
 			return;
 		}
 		this.data("sOverlay", "none"); //for visual filter bar aria handled by onTitleChange() only
@@ -1412,6 +1413,10 @@ sap.ui.define([
 	 * @return {void}
 	**/
 	FilterItemChart.prototype.applyOverlay = function(sI18n, sLabel) {
+		// Setting custom data when the element is being destroyed will throw error and the custom data changes won't be applied.
+		if (this.isDestroyStarted()) {
+			return;
+		}
 		if (sI18n) {
 			this._chart.setShowError(true);
 			this._chart.setErrorMessageTitle(this._getI18nText("M_VISUAL_FILTERS_ERROR_MESSAGE_TITLE"));

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/FilterItemMicroDonut.js

@@ -21,7 +21,9 @@ sap.ui.define(["sap/suite/ui/microchart/InteractiveDonutChart",
 				control: {type: "sap.suite.ui.microchart.InteractiveDonutChart", multiple: false}
 			}
 		},
-		renderer:{}
+		renderer: {
+			apiVersion: 2
+		}
 	});
 
 	FilterItemMicroDonut.prototype.init = function() {

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/FilterItemMicroLine.js

@@ -19,7 +19,9 @@ sap.ui.define(["sap/suite/ui/microchart/InteractiveLineChart",
 				control: {type: "sap.suite.ui.microchart.InteractiveLineChart", multiple : false}
 			}
 		},
-		renderer:{}
+		renderer: {
+			apiVersion: 2
+		}
 	});
 
 	FilterItemMicroLine.prototype.init = function() {

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/KpiTagController.js

@@ -1,7 +1,7 @@
 sap.ui.define([
 	"sap/suite/ui/generic/template/AnalyticalListPage/controller/KpiCard.controller",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/core/library",
+	"sap/ui/core/mvc/ViewType",
 	"sap/ui/Device",
 	"sap/m/ResponsivePopover",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
@@ -10,7 +10,7 @@ sap.ui.define([
 ], function (
 	KpiCardController,
 	JSONModel,
-	coreLibrary,
+	ViewType,
 	Device,
 	ResponsivePopover,
 	FeLogger,
@@ -19,8 +19,7 @@ sap.ui.define([
 ) {
 	"use strict";
 	var oLogger = new FeLogger("AnalyticalListPage.controller.KpiTagController").getLogger();
-	var OVPLoaded, ViewType;
-	ViewType = coreLibrary.mvc.ViewType;
+	var OVPLoaded;
 
 	var KpiTagController = {
 		_kpiCards: [],

package/src/sap/suite/ui/generic/template/AnalyticalListPage/extensionAPI/ExtensionAPI.js

@@ -208,8 +208,8 @@ sap.ui.define(["sap/ui/base/Object",
 			 * Provide an option for showing an own message in the message bar above the ALP table
 			 * @param {object} [oMessage] custom message along with type to set on table. If this parameter is faulty an existing message will be removed.
 			 * @param {string} oMessage.message message string to display
-			 * @param {string} oMessage.type indicates type of message (sap.ui.core.message.MessageType)
-			 *  whether it's sap.ui.core.message.MessageType.Success, sap.ui.core.message.MessageType.Warning, sap.ui.core.message.MessageType.Error or sap.ui.core.message.MessageType.Information.
+			 * @param {string} oMessage.type indicates type of message (sap/ui/core/message/MessageType)
+			 *  whether it's MessageType.Success, MessageType.Warning, MessageType.Error or MessageType.Information.
 			 * @param {array |string} [vTabKey]  If switching between different table views is enabled, this parameter can be used to identify the views which
 			 * are affected by this call. Faulty values indicate that all views should be affected. Otherwise the value should either be one string or an array of strings
 			 * identifying the affected variant items.

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n.properties

@@ -44,19 +44,19 @@ KPI_DETERMINING_WARNING={0}\nData is either invalid or not found.
 KPI_AUTHORIZATION_ISSUE=Authorization issue
 
 # XBUT, 90: used as error message for the KPI
-KPI_DEFAULT_PV_ERROR_MESSAGE=Presentation variant annotation is missing
+KPI_DEFAULT_PV_ERROR_MESSAGE=Presentation variant annotation is missing.
 
 # XBUT, 90: used as error message for the KPI
 KPI_DRILLDOWN_NAVIGATION_MESSAGE=Navigation details missing
 
 # XBUT, 90: used as error message for the KPI
-KPI_GENERIC_ERROR_MESSAGE=Unable to load KPI due to a technical issue
+KPI_GENERIC_ERROR_MESSAGE=Unable to load KPI due to a technical issue.
 
 #YMSW, 90: Warning message for KPI no data
-KPI_NO_DATA = KPI data not available for the chosen filter criteria
+KPI_NO_DATA = KPI data not available for the chosen filter criteria.
 
 #YINF, 90: Information message for missing mandatory filters and parameters
-KPI_INFO_FOR_MISSING_MANDATE_FILTPAR=Enter mandatory filter field values to view KPI information
+KPI_INFO_FOR_MISSING_MANDATE_FILTPAR=Enter mandatory filter field values to view KPI information.
 
 #XBUT, 30: Page header clear button
 CLEAR_FILTERS=Clear
@@ -200,10 +200,10 @@ VIS_FILTER_GRP_BASIC_TITLE=Basic
 VIS_FILTER_ITEM_ARIA=Visual filter
 
 # XACT, 30: Screen reader text for a visual filter in dialog that is a mandatory property
-VIS_FILTER_MANDATORY_PROPERTY_ARIA={0} required.
+VIS_FILTER_MANDATORY_PROPERTY_ARIA={0} required
 
 # XACT, 30: Screen reader text for a visual filter that is a mandatory property
-VIS_FILTER_MANDATORY_PROPERTY_ARIA_LABEL=required.
+VIS_FILTER_MANDATORY_PROPERTY_ARIA_LABEL=required
 
 # XACT, 100: Screen reader text for navigating between visual filters on the filter bar
 VIS_FILTER_BAR_NAVIGATE_ARIA=To move between visual filters, press right or left arrow.
@@ -324,6 +324,6 @@ NODATA_SMARTTABLE_ALP=To start, set the relevant filters and choose "Go".
 MESSAGE_MULTIPLE_VALUES_L_FORM=Some of the filters aren''t relevant for the tab \"{1}\" ({0}). Settings these filters has no effect on the results.
 
 # YMSG, 100: used to show unapplied multiple filters in mobile, tablet
-MESSAGE_MULTIPLE_VALUES_S_FORM=You can''t use the following filters on the \"{1}\" tab\: \"{0}\"
+MESSAGE_MULTIPLE_VALUES_S_FORM=You can''t use the following filters on the \"{1}\" tab\: \"{0}\".
 
 #---End of final block: texts to be redefined by the application ----------------------------------------

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

package/src/sap/suite/ui/generic/template/AnalyticalListPage/util/AnnotationHelper.js

@@ -252,6 +252,9 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @return {boolean}                [Returns status of determining actions to the xml]
 	 */
 	oAnnotationHelper.hasDeterminingActionsForALP = function(aTableTerm, aChartTerm, sEntitySet, oManifestExt) {
+		aTableTerm = aTableTerm || [];
+		aChartTerm = aChartTerm || [];
+		
 		if (sEntitySet && oManifestExt && oManifestExt["sap.suite.ui.generic.template.AnalyticalListPage.view.AnalyticalListPage"] &&
 			oAnnotationHelper._hasCustomDeterminingActionsInALP(sEntitySet, oManifestExt["sap.suite.ui.generic.template.AnalyticalListPage.view.AnalyticalListPage"]["sap.ui.generic.app"])) { //Check for AnalyticalListPage
 			return true;

package/src/sap/suite/ui/generic/template/Canvas/extensionAPI/ExtensionAPI.js

@@ -91,10 +91,18 @@ sap.ui.define(
 				 * @function
 				 */
 				getNavigationController: oBase.extensionAPI.getNavigationControllerFunction(),
+				
 				/**
-				 * @experimental
+				 * Returns a communication object for storing and accessing custom state information within the current app.
+				 * 
+				 *  - If `iLevel` is `0`, it returns a global communication object shared across components.
+				 *  - If `iLevel` is `1`, it returns a local communication object specific to the current canvas component.
+				 * 
+				 * @param {number} iLevel - The scope level of the communication object (0 for global, 1 for local).
+				 * @returns {object} The communication object.
+				 * @public
 				 */
-				getCommunicationObject: function(iLevel){
+				getCommunicationObject: function (iLevel) {
 					return oTemplateUtils.oComponentUtils.getCommunicationObject(iLevel);
 				},
 
@@ -167,7 +175,7 @@ sap.ui.define(
 				},
 
 				/**
-				 * @experimental
+				 * @deprecated As of version 1.133 without replacement as the the paginator button information is not used by canvas components.
 				 */
 				getPaginatorButtons: function(){
 					var oPaginatorButtons = oController.byId("template::UpAndDownNavigation");

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.132.0"
+			"version": "1.134.1"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/AnnotationHelperSmartList.js

@@ -65,13 +65,13 @@ sap.ui.define([
                 oDateForPath.type = 'sap.ui.model.type.DateTime';
                 aParts.push(oDateForPath);
 
-                sFunctionName = "sap.ui.core.format.DateFormat.format";
+                sFunctionName = "RuntimeFormatters.formatDate";
                 sRecordExpression = generatePathForField(aParts, sFunctionName);
             } else if (oCurrency) {
                 aParts.push(oRecord.Value);
                 aParts.push(oCurrency);
 
-                sFunctionName = "sap.ui.core.format.NumberFormat.format";
+                sFunctionName = "RuntimeFormatters.formatCurrency";
                 sRecordExpression = generatePathForField(aParts, sFunctionName);
             } else {
                 sRecordExpression = OdataAnnotationHelper.format(oInterface, oRecord.Value);

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

@@ -724,6 +724,8 @@ sap.ui.define([
 									oState.oEasyFilterBarHandler.onFilterChange(oEvent);
 								});
 							});
+						}).catch(function () {
+							oLogger.warning("Easy filter is not enabled on this tenant");
 						});
 					},
 					onAfterSFBVariantLoad: function (oEvent) {

package/src/sap/suite/ui/generic/template/ListReport/extensionAPI/ExtensionAPI.js

@@ -116,10 +116,14 @@ sap.ui.define(["sap/ui/base/Object",
 					return oNavigationController;
 				},
 				/**
-				 * @experimental
+				 * Returns the global communication object for storing and accessing custom state information within the current app.
+				 * This object can be used across components to share state information.
+				 *
+				 * @returns {object} The communication object.
+				 * @public
 				 */
-				getCommunicationObject: function(iLevel){
-					return oTemplateUtils.oComponentUtils.getCommunicationObject(iLevel);
+				getCommunicationObject: function () {
+					return oTemplateUtils.oComponentUtils.getCommunicationObject();
 				},
 
 				/**
@@ -151,21 +155,19 @@ sap.ui.define(["sap/ui/base/Object",
 					return oTemplateUtils.oCommonUtils.securedExecution(fnFunction, mParameters, oState);
 				},
 				/**
-				 * If switching between different table views is enabled, this function returns the selected key.
+				 * If multi view table is enabled, this function returns the selected variant's key.
 				 *
-				 * @returns {string} The key of the variant item that is currently selected.
+				 * @returns {string} The currently selected variant key on the table.
 				 * @public
-				 * @experimental
 				 */
 				getQuickVariantSelectionKey: function() {
 					return oState.oMultipleViewsHandler.getSelectedKey();
 				},
 
 				/**
-				 * If switching between different table views is enabled, this function sets the selected key.
-				 * @param {string} sKey The key of the variant item that is currently selected.
+				 * If multi view table is enabled, this function switches the table's view to given variant key.
+				 * @param {string} sKey The table variant key to be selected.
 				 * @public
-				 * @experimental
 				 */
 				setQuickVariantSelectionKey: function(sKey) {
 					oState.oMultipleViewsHandler.setSelectedKey(sKey);
@@ -186,8 +188,8 @@ sap.ui.define(["sap/ui/base/Object",
 				 * Provide an option for showing an own message in the message bar above the LR table
 				 * @param {object} [oMessage] custom message along with type to set on table. If this parameter is faulty an existing message will be removed.
 				 * @param {string} oMessage.message message string to display
-				 * @param {string} oMessage.type indicates type of message (sap.ui.core.message.MessageType)
-				 *  whether it's sap.ui.core.message.MessageType.Success, sap.ui.core.message.MessageType.Warning, sap.ui.core.message.MessageType.Error or sap.ui.core.message.MessageType.Information.
+				 * @param {string} oMessage.type indicates type of message (sap/ui/core/message/MessageType)
+				 *  whether it's MessageType.Success, MessageType.Warning, MessageType.Error or MessageType.Information.
 				 * @param {array |string} [vTabKey]  If switching between different table views is enabled, this parameter can be used to identify the views which
 				 * are affected by this call. Faulty values indicate that all views should be affected. Otherwise the value should either be one string or an array of strings
 				 * identifying the affected variant items.

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n.properties

@@ -114,13 +114,13 @@ DISCARD=Discard
 DELETE=Delete
 
 # XFLD,50: used in message toast after saving.
-OBJECT_SAVED=Your changes have been saved
+OBJECT_SAVED=Your changes have been saved.
 
 # XFLD,50: used in message toast after saving. if no changes have been made.
-OBJECT_NOT_MODIFIED=You haven\u2019t made any changes
+OBJECT_NOT_MODIFIED=You haven\u2019t made any changes.
 
 # XFLD,40: Not used, as of now
-OBJECT_CREATED=Object was created.
+OBJECT_CREATED=Object was created
 
 # XTIT,30: title of popover displayed when a user tries to open a locked object (in DraftAdminDataPopover.fragment.xml)
 LOCKED_OBJECT_POPOVER_TITLE=Locked

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

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

@@ -1,6 +1,6 @@
 <mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns:core="sap.ui.core"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-	template:require="sap.suite.ui.generic.template.js.StableIdHelper">
+	template:require="{StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 	
 	<core:Fragment fragmentName="sap.suite.ui.generic.template.ListReport.view.fragments.FullscreenPage" type="XML"/>
 	<!-- create with dialog fragment load if manifest setting is there -->

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

@@ -35,7 +35,7 @@
 															 label="{i18n>EDITING_STATUS}"
 															 groupId="_BASIC">
 							<smartfilterbar:customControl>
-								<Select selectedKey="{_templPriv>/listReport/vDraftState}" id="editStateFilter">
+								<Select selectedKey="{_templPriv>/listReport/vDraftState}" id="editStateFilter" wrapItemsText="true">
 									<items>
 										<core:Item key="0" text="{i18n>ALL_OBJECTS}"/>
 										<core:Item key="5" text="{i18n>ALL_OBJECTS_HIDING_DRAFT}"/>

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

@@ -188,7 +188,7 @@
 									showOverlay="{= ${_templPriv>/listReport/firstSelection} && !${_templPriv>/generic/bDataAreShownInTable}}"
 									fixedLayout="{= ${appSettings>/enableAutoColumnWidthForSmartTable} ? undefined : !!${parameter>/settings/isWorklist} }" 
 									growing="true" growingScrollToLoad="true"
-									sticky="ColumnHeaders,HeaderToolbar,InfoToolbar"
+									sticky="ColumnHeaders,HeaderToolbar,InfoToolbar,GroupHeaders"
 									mode="{tableSettings>mode}"
 									selectionChange="._templateEventHandlers.onSelectionChange"
 									beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"

package/src/sap/suite/ui/generic/template/ObjectPage/Component.js

@@ -102,7 +102,7 @@ sap.ui.define(["sap/suite/ui/generic/template/lib/TemplateAssembler",
 				return oViewProxy.prepareForControlNavigation(sControlId);
 			},
 			prepareForMessageHandling: function(aMessages, oItemBinding, oHelperModel){
-				return oViewProxy.prepareForMessageHandling(aMessages, oItemBinding, oHelperModel);	
+				return oViewProxy.prepareForMessageHandling(aMessages, oItemBinding, oHelperModel);
 			}
 		};
 		return extend(oBase, oSpecific);
@@ -117,7 +117,7 @@ sap.ui.define(["sap/suite/ui/generic/template/lib/TemplateAssembler",
 				// shall button "Related Apps" be visible on the object page?
 				"showRelatedApps": {
 					"type": "boolean",
-					"defaultValue": "false"
+					"defaultValue": false
 				},
 				// shall confirmation popup be shown in object page while saving?
 				"showConfirmationOnDraftActivate": {
@@ -135,7 +135,7 @@ sap.ui.define(["sap/suite/ui/generic/template/lib/TemplateAssembler",
 				// shall it be possible to edit the contents of the header?
 				"editableHeaderContent": {
 					"type": "boolean",
-					"defaultValue": "false"
+					"defaultValue": false
 				},
 				// enable carousel header on desktop screen
 				showHeaderAsCarouselOnDesktop: {
@@ -193,12 +193,20 @@ sap.ui.define(["sap/suite/ui/generic/template/lib/TemplateAssembler",
 				//Allow deep linking to sub object pages?
 				"allowDeepLinking": "boolean",
 				//Navigate to list report page on draft activation?
-				//This property can have 3 values -> undefined, true, false. 
+				//This property can have 3 values -> undefined, true, false.
 				// If EditFlow is display, the save and cancel stays in object page unless this property is set to true
 				// If EditFlow is direct, the save and cancel moves to LR after action, unless this property is set to false
 				// The default value of this property is undefined.
 				"navToListOnSave": "boolean",
-				"relatedAppsSettings": "object"
+				"relatedAppsSettings": "object",
+				createWithParameterDialog: {
+					type: "object",
+					properties: {
+						fields : {
+							type: "object"
+						}
+					}
+				}
 			},
 			// app descriptor format
 			"manifest": "json"

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

@@ -438,8 +438,8 @@ sap.ui.define([
 						 * 	where x is the condition provided by the user
 
 						 * Handling of the filter condition during create:
-						 *  checking the value of display Mode , iDisplayMode = 4 for create 
-						 *  if it is a create the filter condition evaluates to the user filter x 
+						 *  checking the value of display Mode , iDisplayMode = 4 for create
+						 *  if it is a create the filter condition evaluates to the user filter x
 						 */
 						var oUserFilter = FilterProcessor.groupFilters(oBindingParams.filters);
 						var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
@@ -610,7 +610,7 @@ sap.ui.define([
 						} else {
 							var getDtCardManifestPromise = new Promise(function (fnResolve) {
 								// DT Cards are not supported in sub object pages
-								if (oTemplateUtils.oComponentUtils.getViewLevel() !== 1) { 
+								if (oTemplateUtils.oComponentUtils.getViewLevel() !== 1) {
 									fnResolve(null);
 									return;
 								}
@@ -1871,7 +1871,7 @@ sap.ui.define([
 							oSection.connectToModelsAsync().then(function () {
 								oTemplateUtils.oInfoObjectHandler.setInformationWithControl(oSubSection);
 								oStrategy.activeHandler(oSubSection, oSubSectionInfoObj);
-							}); 
+							});
 						}
 					}
 				});
@@ -1920,7 +1920,7 @@ sap.ui.define([
 							oState.oSectionTitleHandler.adjustSubSectionTitle(oSubSection);
 						}
 					}
-	
+
 					if (oSubSectionInfoObj) { // In case of EditableHeaderFacet Sections & SubSection is created at runtime and there is info object handling
 						oMultipleViewsHandler.subSectionEntered(oSubSectionInfoObj); // Assigning the SubSection control MultipleViewsHandler. In case not relevant method simply returns
 						// The loading strategy of a sub-section might depend on the content of oWaitForState (together with the strategy) and whether or not the sub-section is currently in view-port.
@@ -1950,7 +1950,7 @@ sap.ui.define([
 					}
 				});
 			}
-			
+
 			oViewProxy.applyState = function (oState, bIsSameAsLast) {
 				// originally, applyState was only called when HeaderData was available, as HeaderData was always used to determine bIsSameAsLast
 				// now, in some cases bIsSameAsLast can be determined earlier, however, we don't know, whether any extensions implicitly rely on header data being available
@@ -2340,7 +2340,7 @@ sap.ui.define([
 					var oCardProviderInstance = oTemplateUtils.oServices.oInsightsFECardProvider && oTemplateUtils.oServices.oInsightsFECardProvider.getCardProviderInsightsInstance();
 
 					oState.oDTCardHelper = new DTCardHelper(oController);
-					
+
 					if (oCardProviderInstance) {
 						oTemplateUtils.oServices.oInsightsFECardProvider.fnRegisterComponentForProvider(oState.oInsightsHandler, oController.getView().getId());
 					}
@@ -2356,7 +2356,7 @@ sap.ui.define([
 						var oStreamDataSelf = oTemplateUtils.oCommonUtils.getStreamData(null, oEvent.context);
 						oTemplateUtils.oCommonUtils.setStreamData(oStreamDataSelf);
 						oTemplateUtils.oComponentUtils.hidePlaceholder();
-						
+
 					});
 					var oMenuButton = oController.byId(StableIdHelper.getStableId({
 						type: "ObjectPageAction",
@@ -2435,6 +2435,9 @@ sap.ui.define([
 
 					//Cancel event for draft and non draft case
 					onCancel: function () {
+						if (document.activeElement) {
+							document.activeElement.blur();
+						}
 						var bIsDraftEnabled = oTemplateUtils.oComponentUtils.isDraftEnabled();
 						var sCancelButtonLocalId = StableIdHelper.getStableId({
 							type: "ObjectPageAction",