@openui5/sap.ui.mdc 1.134.0 → 1.136.0

package/src/sap/ui/mdc/themes/base/ValueHelpDialog.less

@@ -1,8 +1,13 @@
+/* =========================================== */
+/* CSS for control sap.ui.mdc/ValueHelpDialog  */
+/* Base theme                                  */
+/* =========================================== */
+
 .sapMdcValueHelpPanel {
-    background-color: @sapUiBaseBG;
+    background-color: var(--sapBackgroundColor);
 }
 
-// give all panels on the valueHelpPanel a left/right padding
+/* give all panels on the valueHelpPanel a left/right padding */
 .sapMdcValueHelpPanel .sapMPanel {
 	padding-top: 0.5rem;
 	padding-left: 1rem;
@@ -12,7 +17,7 @@
 .sapMdcTokenizerPanel > .sapMPanelContent {
 	padding-left: 1rem;
 	padding-right: 1rem;
-	padding-top: 0rem;
+	padding-top: 0;
 	padding-bottom: 1rem;
 	overflow: hidden;
 }
@@ -23,7 +28,7 @@
 }
 
 .sapMdcValueHelpPanel .sapMPanel.sapMdcTokenizerPanel {
-    background-color: @sapUiBaseBG;
+	background-color: var(--sapBackgroundColor);
 }
 
 .sapMdcTablePanel > .sapMPanelHeadingDiv > .sapMPanelHdr,
@@ -33,12 +38,12 @@
 }
 
 
-// make the ITB header height 3rem
+/* make the ITB header height 3rem */
 .sapMdcValueHelpPanel .sapMITBHead {
-	margin-top: 0rem;
+	margin-top: 0;
 }
 
-// make the toolbar height 3rem and add 2rem padding left/right
+/* make the toolbar height 3rem and add 2rem padding left/right */
 .sapMdcValueHelpPanel .sapMdcValueHelpPanelFilterbar .sapMTB {
 	margin-top: 0.5rem;
 	height: 3rem;
@@ -54,87 +59,88 @@
 	margin-left: 0;
 }
 
-// padding between the Define Condition value fields
+/* padding between the Define Condition value fields */
 .sapUiMdcDefineConditionPanel .sapUiRespGrid > div {
 	padding-left: 0.25rem;
 	padding-right: 0.25rem;
 	box-sizing: border-box;
 }
 
-// correct paddings around the define conditions content
+/* correct paddings around the define conditions content */
 .sapMdcDefineconditionPanel .sapMPanelContent {
 	padding-left: 0.75rem;
-	padding-right: 0rem;
-	padding-top: 0rem;
+	padding-right: 0;
+	padding-top: 0;
 }
 
 .sapUiMdcDefineConditionPanel .sapUiMdcDefineConditionGrid {
 	margin-bottom: 0.5rem;
 }
 
-// give the Filterbar the required padding and max height
+/* give the Filterbar the required padding and max height */
 .sapMdcValueHelpPanelFilterbar {
 	margin-left: 2rem;
 	margin-right: 1rem;
 }
 
-// allign static text
+/* allign static text */
 .sapUiMdcDefineConditionPanel .sapUiRespGrid .sapMText {
 	min-height: 2.75rem;
 	padding-top: 0.6875rem;
 	padding-bottom: 0.6875rem;
 	line-height: 1.375rem;
 }
+
 .sapUiSizeCompact .sapUiMdcDefineConditionPanel .sapUiRespGrid .sapMText {
 	min-height: 2rem;
 	padding-top: 0.3125rem;
 	padding-bottom: 0.3125rem;
 }
 
-// spacing between rows
+/* spacing between rows */
 .sapUiMdcDefineConditionPanel .sapUiRespGrid.sapUiRespGridMedia-Std-Phone > .sapUiRespGridBreak:not(:first-child),
 .sapUiMdcDefineConditionPanel .sapUiRespGrid.sapUiRespGridMedia-Std-Phone > .sapUiRespGridBreak:not(:first-child) + div {
 	padding-top: 0.5rem;
 }
 
-// align add-button to the right
+/* align add-button to the right */
 .sapUiMdcDefineConditionPanel .sapUiRespGrid > div:last-child {
 	padding-top: 0.25rem;
 	position: relative;
 	height: 2.75rem;
 }
+
 .sapUiSizeCompact .sapUiMdcDefineConditionPanel .sapUiRespGrid > div:last-child {
 	height: 2rem;
 }
+
 .sapUiMdcDefineConditionPanel .sapUiRespGrid > div:last-child > button{
 	position: absolute;
 	right: 0.25rem;
 }
 
-// hide the toolbar border and give some more top margin
+/* hide the toolbar border and give some more top margin */
 .sapMdcValueHelpPanel .sapMTBStandard, .sapUiMdcDefineConditionPanel .sapMTBStandard {
 	border-bottom: solid 1px transparent;
 }
 
-// hide the panel bottom border
+/* hide the panel bottom border */
 .sapMdcValueHelpPanel .sapMPanelContent:not(.sapMPanelBGTransparent) {
 	border-bottom: none;
 }
 
-
-// show padding on top of the defineConditionPanel when used on popover
+/* show padding on top of the defineConditionPanel when used on popover */
 .sapMPopoverCont .sapMPopoverScroll > .sapUiMdcDefineConditionPanel {
 	padding-top: 1rem;
-	// padding-left: 0.75rem;
 	padding-right: 0.75rem;
 }
 
-// makes the title of the used panels smaller
+/* makes the title of the used panels smaller */
 .sapMdcValueHelpPanel .sapMPanel .sapMPanelHdr {
 	font-size: @sapMFontHeader5Size;
 }
 
-// make the title shadows transparent
+/* make the title shadows transparent */
 .sapMdcValueHelpTitleShadow.sapMDialog:not(.sapMDialogWithSubHeader) > header:first-of-type .sapMIBar {
 	box-shadow: inset 0 -0.0625rem transparent;
 }
@@ -143,25 +149,23 @@
 	box-shadow: inset 0 -0.0625rem transparent;
 }
 
-// remove some borders around the IconTabBar content
+/* remove some borders around the IconTabBar content */
 .sapMdcValueHelpPanel .sapMITBContent {
 	border-left: none;
 	border-right: none;
 	border-bottom: none;
 }
 
-// set the 2rem padding also on the OK and Cancel buttons in the footer
+/* set the 2rem padding also on the OK and Cancel buttons in the footer */
 .sapMdcValueHelpTitle.sapMDialog footer .sapMTB {
 	padding: 0 2rem;
 }
 
-
 .sapMdcValueHelpPanelTableBox {
 	padding: 0 2rem;
 }
 
 .sapMdcValueHelpPanelTableBox > .sapMFlexItem {
-	//min-height: 200px !important;
 	height: 100%;
 }
 
@@ -175,7 +179,7 @@
 }
 
 .sapMdcValueHelpPopover.sapMdcValueHelpSingleSelect .sapUiMdcDefineConditionPanel {
-	margin-left: 0rem;
+	margin-left: 0;
 	margin-right: 0.75rem;
 	margin-top: 1rem;
 }

package/src/sap/ui/mdc/themes/base/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 @import "../../../../../sap/ui/core/themes/base/base.less";
@@ -12,9 +12,7 @@
 @import "InfoPanel.less";
 @import "FilterBar.less";
 @import "AdaptFiltersPanel.less";
-@import "Wrapper.less";
 @import "PersonalizationDialog.less";
-@import "SelectionDialog.less";
 @import "ListView.less";
 @import "GroupView.less";
 @import "Table.less";

package/src/sap/ui/mdc/ushell/LinkDelegate.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -98,35 +98,35 @@ sap.ui.define([
 				return mSemanticObjects[sSemanticObject] && (mSemanticObjects[sSemanticObject].exists === true);
 			});
 		};
-		const fnRetrieveDistinctSemanticObjects = function() {
-			if (!oPromise) {
-				oPromise = Factory.getServiceAsync("Navigation").then((oNavigationService) => {
-					if (!oNavigationService) {
-						SapBaseLog.error("LinkDelegate: Service 'Navigation' could not be obtained");
-						Promise.resolve({});
-						return;
-					}
-					oNavigationService.getSemanticObjects().then((aDistinctSemanticObjects) => {
-						aDistinctSemanticObjects.forEach((sSemanticObject) => {
-							mSemanticObjects[sSemanticObject] = {
-								exists: true
-							};
-						});
-						oPromise = null;
-						return Promise.resolve(mSemanticObjects);
-					}, () => {
-						SapBaseLog.error("LinkDelegate: getSemanticObjects() of service 'Navigation' failed");
-						return Promise.resolve({});
-					});
+		const fnRetrieveDistinctSemanticObjects = async () => {
+			const oNavigationService = await Factory.getServiceAsync("Navigation");
+			if (!oNavigationService) {
+				SapBaseLog.error("LinkDelegate: Service 'Navigation' could not be obtained");
+				return Promise.resolve({});
+			}
+			try {
+				const aDistinctSemanticObjects = await oNavigationService.getSemanticObjects();
+				aDistinctSemanticObjects.forEach((sSemanticObject) => {
+					mSemanticObjects[sSemanticObject] = {
+						exists: true
+					};
 				});
+				return Promise.resolve(mSemanticObjects);
+			} catch (oError) {
+				SapBaseLog.error("LinkDelegate: getSemanticObjects() of service 'Navigation' failed");
+				return Promise.resolve({});
 			}
-			return oPromise;
 		};
 
 		if (fnHaveBeenRetrievedAllSemanticObjects(aSemanticObjects)) {
 			return Promise.resolve(fnAtLeastOneExistsSemanticObject(aSemanticObjects));
 		}
-		return fnRetrieveDistinctSemanticObjects().then(() => {
+
+		if (!oPromise) {
+			oPromise = fnRetrieveDistinctSemanticObjects();
+		}
+
+		return oPromise.then(() => {
 			return fnAtLeastOneExistsSemanticObject(aSemanticObjects);
 		});
 	};

package/src/sap/ui/mdc/ushell/SemanticObjectMapping.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.120

package/src/sap/ui/mdc/ushell/SemanticObjectMappingItem.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.120

package/src/sap/ui/mdc/ushell/SemanticObjectUnavailableAction.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.120

package/src/sap/ui/mdc/util/Common.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/util/DateUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/mdc/util/DensityHelper.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/util/FilterUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/util/IdentifierUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/util/InfoBar.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class The <code>InfoBar</code> control provides an easy way of displaying filter information inside an <code>sap.ui.mdc.Chart</code> and an <code>sap.ui.mdc.Table</code>.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/util/InfoBarRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/util/PromiseCache.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(
@@ -45,7 +45,7 @@ sap.ui.define(
 		 * Destroying the cache will cancel all registered promises and delete references. Convenience methods for promise creation, wrapping and replacement are offered.
 		 *
 		 * @author SAP SE
-		 * @version 1.134.0
+		 * @version 1.136.0
 		 * @alias sap.ui.mdc.util.PromiseCache
 		 * @since 1.85.0
 		 * @private

package/src/sap/ui/mdc/util/PropertyHelper.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -285,17 +285,35 @@ sap.ui.define([
 	];
 	const _private = new WeakMap();
 
-	function stringifyPlainObject(oObject) {
-		return JSON.stringify(oObject, (sKey, oValue) => {
-			return oValue === undefined ? null : oValue;
-		}) || "";
+
+	/**
+	 *
+	 * @param {string} sMessage Additional message that should be shown in the error
+	 * @param {Object | Array} vProperty Property or array of objects with property keys as keys
+	 * @returns {string} Error message that should be thrown
+	 */
+	function getErrorMessage(sMessage, vProperty) {
+		let sError = "";
+
+
+		if (!vProperty) {
+			sError = `Invalid property definition: ${sMessage}`;
+		} else if (Array.isArray(vProperty)) {
+			const sPropertyKeys = vProperty.map((oProp) => `'${Object.keys(oProp)[0]}'`).join(",");
+			sError = `Invalid property definition for properties with keys ${sPropertyKeys}: ${sMessage}`;
+		} else {
+			const sPropertyKey = vProperty.key ?? vProperty.name;
+			sError = `Invalid property definition for property with key '${sPropertyKey}': ${sMessage}`;
+		}
+		return sError;
 	}
 
 	function reportInvalidProperty(sMessage, oProperty) {
-		const sAdditionalInfo = stringifyPlainObject(oProperty);
+		const sError = getErrorMessage(sMessage, oProperty);
+
 		// implementation for this flag is within PropertyHelperMixin#_checkValidationExceptions
 		if (PropertyHelperUtil.bValidationException) {
-			future.errorThrows(`Invalid property definition: ${sMessage} ${sAdditionalInfo ? `\n${sAdditionalInfo}` : ""}.`, {
+			future.errorThrows(sError, {
 				suffix: `Migrate this control's propertyInfo to avoid breaking changes in the future.`
 			});
 		} else {
@@ -304,8 +322,8 @@ sap.ui.define([
 	}
 
 	function throwInvalidPropertyError(sMessage, oProperty) {
-		const sAdditionalInfo = oProperty ? stringifyPlainObject(oProperty) : null;
-		throw new Error("Invalid property definition: " + sMessage + (sAdditionalInfo ? "\n" + sAdditionalInfo : ""));
+		const sError = getErrorMessage(sMessage, oProperty);
+		throw new Error(sError);
 	}
 
 	function enrichProperties(oPropertyHelper, aProperties) {
@@ -560,7 +578,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @private
 	 * @since 1.83
@@ -905,6 +923,16 @@ sap.ui.define([
 		return mPrivate ? merge({}, mPrivate.mAttributeMetadata) : null;
 	};
 
+	/**
+	 * Gets a list of properties that are redundant and should be filtered out in the {@link sap.ui.mdc.p13n.SelectionController} for personalization.
+	 *
+	 * @protected
+	 * @returns {object[]} A list of properties
+	 */
+	PropertyHelper.prototype.getRedundantProperties = function() {
+		return [];
+	};
+
 	Object.defineProperties(PropertyHelper, {
 		reportInvalidProperty: {value: reportInvalidProperty},
 		throwInvalidPropertyError: {value: throwInvalidPropertyError}

package/src/sap/ui/mdc/util/PropertyHelperUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Provides validation functions for checking the (required) usage of the PropertyHelper.
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @alias sap.ui.mdc.util.PropertyHelperUtil
 	 * @namespace
 	 * @since 1.132.0

package/src/sap/ui/mdc/util/TypeMap.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/util/TypeUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/util/loadModules.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/mdc/valuehelp/CollectiveSearchSelect.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/valuehelp/Dialog.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -68,7 +68,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element showing a dialog.
 	 * @extends sap.ui.mdc.valuehelp.base.Container
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -218,7 +218,7 @@ sap.ui.define([
 	Dialog.prototype.getContainerControl = function() {
 		if (!this.getModel("$i18n")) {
 			// if ResourceModel not provided from outside create own one
-			this.setModel(new ResourceModel({ bundleName: "sap/ui/mdc/messagebundle", async: false }), "$i18n");
+			this.setModel(new ResourceModel({ bundleName: "sap/ui/mdc/messagebundle", async: true }), "$i18n");
 		}
 
 		const oDialog = this.getAggregation("_container");
@@ -237,6 +237,10 @@ sap.ui.define([
 					ManagedObjectModel = aModules[2];
 					MLibrary = aModules[3];
 
+					if (this.isDestroyStarted()) {
+						return null;
+					}
+
 					const { ButtonType } = MLibrary;
 
 					if (!this._oResourceBundle) {
@@ -478,6 +482,10 @@ sap.ui.define([
 					const Item = aModules[1];
 					const JSONModel = aModules[2];
 
+					if (this.isDestroyStarted()) {
+						return null;
+					}
+
 					if (!this._oGroupSelectModel) {
 						this._oGroupSelectModel = new JSONModel();
 					}
@@ -518,6 +526,10 @@ sap.ui.define([
 					IconTabFilter = aModules[1];
 					const { IconTabHeaderMode } = MLibrary;
 
+					if (this.isDestroyStarted()) {
+						return null;
+					}
+
 					this._oIconTabBar = new IconTabBar(this.getId() + "-ITB", {
 						expandable: false,
 						upperCase: false,
@@ -588,6 +600,10 @@ sap.ui.define([
 					const { BackgroundDesign } = MLibrary;
 					const { ButtonType } = MLibrary;
 
+					if (this.isDestroyStarted()) {
+						return null;
+					}
+
 					this.oTokenizerPanel = new Panel(this.getId() + "-TokenPanel", {
 						backgroundDesign: BackgroundDesign.Transparent,
 						expanded: true,
@@ -858,27 +874,30 @@ sap.ui.define([
 			}
 
 			return this._retrievePromise("open").then(() => {
-				oNextContent.onShow(bInitial);
-
-				if (bCollectiveSearchChange) {
-					const oNextDisplayContent = oNextContent.getDisplayContent();
-					const oEventDelegate = {
-						onAfterRendering: () => {
-							this._oGroupSelect.focus();
-							oNextDisplayContent.removeEventDelegate(oEventDelegate);
-						}
-					};
-					oNextDisplayContent?.addEventDelegate(oEventDelegate);
-				}
+				return oNextContent.onShow(bInitial).then(() => {
+					if (bCollectiveSearchChange) {
+						const oNextDisplayContent = oNextContent.getDisplayContent();
+						const oEventDelegate = {
+							onAfterRendering: () => {
+								this._oGroupSelect.focus();
+								oNextDisplayContent.removeEventDelegate(oEventDelegate);
+							}
+						};
+						oNextDisplayContent?.addEventDelegate(oEventDelegate);
+					}
 
-				return oNextContent;
+					return oNextContent;
+				});
 			});
 		});
 	};
 
-	Dialog.prototype.closeContainer = function() {
+	Dialog.prototype.closeContainer = function(bDoNotRestoreFocus) { // As focused control cannot be changed behind Dialog a preventing to restore the Focus is not needed
 		const oContainer = this.getAggregation("_container");
 		if (oContainer) {
+			if (bDoNotRestoreFocus) {
+				oContainer.oPopup._oPreviousFocus = null; // TODO - find real solution
+			}
 			oContainer.close();
 
 			if (this.oTokenMultiInput) { // remove tokenizer binding to prevent updates if closed