@openui5/sap.ui.mdc 1.96.1 → 1.97.1

package/src/sap/ui/mdc/odata/v4/ChartPropertyHelperNew.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.chartNew.PropertyHelperNew
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/odata/v4/FieldBaseDelegate.js

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

package/src/sap/ui/mdc/odata/v4/FieldValueHelpDelegate.js

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

package/src/sap/ui/mdc/odata/v4/FilterBarDelegate.js

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

package/src/sap/ui/mdc/odata/v4/ODataMetaModelUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/mdc/util/TypeUtil"], function(TypeUtil) {

package/src/sap/ui/mdc/odata/v4/TableDelegate.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -35,11 +35,11 @@ sap.ui.define([
 	var TableMap = new window.WeakMap(); // To store table-related information for easy access in the delegate.
 
 	/**
-	 * Delegate class for sap.ui.mdc.Table and ODataV4.
+	 * Delegate class for <code>sap.ui.mdc.Table</code> and <code>ODataV4</code>.
 	 * Enables additional analytical capabilities.
-	 * <b>Note:</b> The class is experimental and the API/behavior is not finalized.
 	 *
 	 * @author SAP SE
+	 * @experimental
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
@@ -49,12 +49,30 @@ sap.ui.define([
 	var Delegate = Object.assign({}, TableDelegate);
 
 	/**
-	 * Fetches the model-specific property helper class or instance.
+	 * Fetches the model-specific <code>PropertyHelper</code> class or instance.
+	 *
+	 * <b>Note:</b> The PropertyHelper adds the extension of a property to the reserved attribute "extension". It is not allowed to add an "extension"
+	 * attribute in the standard property infos.
+	 *
+	 * @example <caption>Initialize a PropertyHelper with extensions:</caption>
+	 * new PropertyHelper(
+	 *     [{
+	 *         name: "propA",
+	 *         label: "Property A",
+	 *         extension: {
+	 *             messageType: "Success"
+	 *         }
+	 *     }, {
+	 *         name: "propB",
+	 *         label: "Property B"
+	 *     }]
+	 * )
 	 *
 	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
 	 * @param {object[]} aProperties The property infos
 	 * @param {Promise<object<string, object>|null>} mExtensions The property extensions
-	 * @returns {Promise<sap.ui.mdc.table.V4AnalyticsPropertyHelper>} A promise that resolves with the property helper class or instance
+	 * @returns {Promise<sap.ui.mdc.table.V4AnalyticsPropertyHelper>} A <code>Promise</code> that resolves with the <code>PropertyHelper</code> class
+	 * or instance
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 */
@@ -66,7 +84,11 @@ sap.ui.define([
 
 	/**
 	 * Fetches the property extensions.
-	 * TODO: document structure of the extension
+	 *
+	 * <b>Note:</b> Property extensions are adding model-specific information. To ensure a clear separation from the standard property information,
+	 * the extensions need to be passed separately to the constructor, together with their attribute metadata. An extension has to be provided as a
+	 * key-value pair, where the key is the name of the property and the value is the extension of this property. It is not allowed to provide
+	 * extensions without the corresponding attribute metadata.
 	 *
 	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
 	 * @param {object[]} aProperties The property infos
@@ -79,11 +101,11 @@ sap.ui.define([
 
 	/**
 	 * Retrieves the relevant metadata that will be used for the table binding, and returns the property info array.
-	 * If not overriden, this method return the same as <code>fetchProperties</code>.
-	 * When overridding, make sure the returned result is consistent with what is returned by <code>fetchProperties</code>.
+	 * If it is not overridden, this method returns the same as <code>fetchProperties</code>.
+	 * When overriding the method make sure the returned result is consistent with what is returned by <code>fetchProperties</code>.
 	 *
-	 * @param {Object} oControl MDC Control instance
-	 * @returns {Promise} Once resolved, an array of property info objects is returned
+	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
+	 * @returns {Promise} Once resolved, an array of <code>PropertyInfo</code> objects is returned
 	 * @protected
 	*/
 	Delegate.fetchPropertiesForBinding = function(oTable) {
@@ -92,8 +114,8 @@ sap.ui.define([
 
 	/**
 	 * Fetches the property extensions that will be used for the table binding.
-	 * If not overriden, this method eturn the same as <code>fetchPropertyExtensions</code>.
-	 * When overridding, make sure the returned result is consistent with what is returned by <code>fetchPropertyExtensions</code>.
+	 * If it is not overridden, this method returns the same as <code>fetchPropertyExtensions</code>.
+	 * When overriding the method make sure the returned result is consistent with what is returned by <code>fetchPropertyExtensions</code>.
 	 *
 	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
 	 * @param {object[]} aProperties The property infos
@@ -111,6 +133,7 @@ sap.ui.define([
 	 * @param {sap.ui.model.Context} oContext Binding context
 	 * @param {string} sProperty The name of the grouped property
 	 * @returns {string | undefined} The group header title. If <code>undefined</code> is returned, the default group header title is set.
+	 * @private
 	 */
 	Delegate.formatGroupHeader = function(oTable, oContext, sProperty) {};
 
@@ -125,14 +148,14 @@ sap.ui.define([
 		});
 	};
 
-	Delegate.validateState = function(oControl, oState, sKey) {
+	Delegate.validateState = function(oTable, oState, sKey) {
 		var oBaseStates = TableDelegate.validateState.apply(this, arguments);
 		var oValidation;
 
 		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
 
 		if (sKey == "Sort" && oState.sorters) {
-			if (!checkForValidity(oControl, oState.items, oState.sorters)) {
+			if (isAnalyticsEnabled(oTable) && !checkForValidity(oTable, oState.items, oState.sorters)) {
 				oValidation = {
 					validation: coreLibrary.MessageType.Information,
 					message: oResourceBundle.getText("table.PERSONALIZATION_DIALOG_SORT_RESTRICTION")
@@ -142,9 +165,10 @@ sap.ui.define([
 			var aAggregateProperties = Object.keys(oState.aggregations);
 			var aAggregateGroupableProperties = [];
 			var oListFormat = ListFormat.getInstance();
-			aAggregateProperties.forEach(function(oItem) {
-				if (oControl.getPropertyHelper().isGroupable(oItem)) {
-					aAggregateGroupableProperties.push(oItem);
+			aAggregateProperties.forEach(function(sProperty) {
+				var oProperty = oTable.getPropertyHelper().getProperty(sProperty);
+				if (oProperty && oProperty.groupable) {
+					aAggregateGroupableProperties.push(sProperty);
 				}
 			});
 
@@ -158,11 +182,11 @@ sap.ui.define([
 			var sMessage;
 			var aAggregateProperties = oState.aggregations && Object.keys(oState.aggregations);
 
-			if (!checkForValidity(oControl, oState.items, aAggregateProperties)) {
+			if (!checkForValidity(oTable, oState.items, aAggregateProperties)) {
 				sMessage = oResourceBundle.getText("table.PERSONALIZATION_DIALOG_TOTAL_RESTRICTION");
 			}
 
-			if (!checkForValidity(oControl, oState.items, oState.sorters)) {
+			if (isAnalyticsEnabled(oTable) && !checkForValidity(oTable, oState.items, oState.sorters)) {
 				sMessage = sMessage ? sMessage + "\n" + oResourceBundle.getText("table.PERSONALIZATION_DIALOG_SORT_RESTRICTION")
 					: oResourceBundle.getText("table.PERSONALIZATION_DIALOG_SORT_RESTRICTION");
 			}
@@ -184,7 +208,7 @@ sap.ui.define([
 	 * <b>Note:</b> To remove a binding info parameter, the value must be set to <code>undefined</code>. For more information, see
 	 * {@link sap.ui.model.odata.v4.ODataListBinding#changeParameters}.
 	 *
-	 * @param {sap.ui.mdc.Table} oMDCTable The MDC table instance
+	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
 	 * @param {object} oDelegatePayload The delegate payload
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @function
@@ -202,7 +226,7 @@ sap.ui.define([
 	 * <code>model</code>... must be provided in the {@link #updateBindingInfo updateBindingInfo} method always,
 	 * and those keys must not be changed conditionally.
 	 *
-	 * @param {sap.ui.mdc.Table} oMDCTable The MDC table instance
+	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the MDC table
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model.
 	 * @param {sap.ui.model.ListBinding} [oBinding] The binding instance of the table
 	 * @protected
@@ -256,8 +280,14 @@ sap.ui.define([
 		}
 
 		var oPropertyHelper = oTable.getPropertyHelper();
-		var aGroupProperties = oPropertyHelper.getGroupableProperties(oMDCColumn.getDataProperty());
-		var aAggregateProperties = oPropertyHelper.getAggregatableProperties(oMDCColumn.getDataProperty());
+		var oProperty = oPropertyHelper.getProperty(oMDCColumn.getDataProperty());
+
+		if (!oProperty) {
+			return [];
+		}
+
+		var aGroupProperties = oProperty.getGroupableProperties();
+		var aAggregateProperties = oProperty.getAggregatableProperties();
 		var oPopover = oTable._oPopover;
 		var oAggregatePopoverItem;
 		var oGroupPopoverItem;
@@ -277,11 +307,11 @@ sap.ui.define([
 			});
 		}
 
-		if (oTable.isGroupingEnabled() && aGroupProperties && aGroupProperties.length > 0) {
+		if (oTable.isGroupingEnabled() && aGroupProperties.length > 0) {
 			oGroupPopoverItem = createGroupPopoverItem(aGroupProperties, oMDCColumn);
 		}
 
-		if (oTable.isAggregationEnabled() && aAggregateProperties && aAggregateProperties.length > 0) {
+		if (oTable.isAggregationEnabled() && aAggregateProperties.length > 0) {
 			oAggregatePopoverItem = createAggregatePopoverItem(aAggregateProperties, oMDCColumn);
 		}
 
@@ -291,8 +321,8 @@ sap.ui.define([
 	function createGroupPopoverItem(aGroupProperties, oMDCColumn) {
 		var aGroupChildren = aGroupProperties.map(function(oGroupProperty) {
 			return new Item({
-				text: oGroupProperty.getLabel(),
-				key: oGroupProperty.getName()
+				text: oGroupProperty.label,
+				key: oGroupProperty.name
 			});
 		});
 
@@ -312,8 +342,8 @@ sap.ui.define([
 	function createAggregatePopoverItem(aAggregateProperties, oMDCColumn) {
 		var aAggregateChildren = aAggregateProperties.map(function(oAggregateProperty) {
 			return new Item({
-				text: oAggregateProperty.getLabel(),
-				key: oAggregateProperty.getName()
+				text: oAggregateProperty.label,
+				key: oAggregateProperty.name
 			});
 		});
 
@@ -515,10 +545,8 @@ sap.ui.define([
 		var aUnitProperties = [];
 
 		aProperties.forEach(function(oProperty) {
-			var oUnitProperty = oProperty ? oProperty.getUnitProperty() : null;
-
-			if (oUnitProperty) {
-				aUnitProperties.push(oUnitProperty);
+			if (oProperty.unitProperty) {
+				aUnitProperties.push(oProperty.unitProperty);
 			}
 		});
 
@@ -554,9 +582,9 @@ sap.ui.define([
 	/**
 	 * Compares the message type and returns the message with higher priority.
 	 *
-	 * @param {Object} oBaseState message set by the base table delegate.
-	 * @param {Object} oValidationState message set by the odata v4 delegate.
-	 * @return {Object} A message with higher priority.
+	 * @param {Object} oBaseState Message set by the base <code>TableDelegate</code>
+	 * @param {Object} oValidationState Message set by the <code>ODataV4Delegate</code>
+	 * @return {Object} The message with higher priority
 	 * @private
 	 */
 	function mergeValidation(oBaseState, oValidationState) {
@@ -570,10 +598,10 @@ sap.ui.define([
 	}
 
 	/**
-	 * Configures the inner table to support the p13n settings of the MDC table.
+	 * Configures the inner table to support the personalization settings of the MDC table.
 	 *
 	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
-	 * @return {Promise} A promise that revolves when the inner table is configured
+	 * @return {Promise} A <code>Promise</code> that revolves when the inner table is configured
 	 */
 	function configureInnerTable(oTable) {
 		return oTable._isOfType(TableType.Table) ? configureGridTable(oTable) : configureResponsiveTable(oTable);

package/src/sap/ui/mdc/odata/v4/TypeUtil.js

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

package/src/sap/ui/mdc/odata/v4/ValueHelpDelegate.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 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([
 	var ODataV4ValueHelpDelegate = Object.assign({}, ValueHelpDelegate);
 
 	ODataV4ValueHelpDelegate.isSearchSupported = function(oPayload, oListBinding) {
-		return true; // only on V4
+		return !!oListBinding.changeParameters;
 	};
 
 	var _waitForBindingData = function (oBinding) {

package/src/sap/ui/mdc/odata/v4/util/DelegateUtil.js

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

package/src/sap/ui/mdc/odata/v4/vizChart/ChartDelegateNew.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,8 @@ sap.ui.define([
     "sap/m/VBox",
     "sap/ui/base/ManagedObjectObserver",
     "sap/ui/core/ResizeHandler",
-    "sap/ui/mdc/p13n/panels/ChartItemPanelNew"
+    "sap/ui/mdc/p13n/panels/ChartItemPanelNew",
+    "sap/m/MessageStrip"
 ], function (
     V4ChartDelegate,
     loadModules,
@@ -37,7 +38,8 @@ sap.ui.define([
     VBox,
     ManagedObjectObserver,
     ResizeHandler,
-    ChartItemPanel
+    ChartItemPanel,
+    MessageStrip
 ) {
     "use strict";
     /**
@@ -325,7 +327,14 @@ sap.ui.define([
         //var aRolesAvailable = [MDCLib.ChartItemRoleType.axis1, MDCLib.ChartItemRoleType.axis2, MDCLib.ChartItemRoleType.axis3, MDCLib.ChartItemRoleType.category, MDCLib.ChartItemRoleType.category2, MDCLib.ChartItemRoleType.series];
         var oArguments = {panelConfig: oLayoutConfig};
 
-        return Promise.resolve(new ChartItemPanel(oArguments));
+        var oPanel = new ChartItemPanel(oArguments);
+
+        if (oMDCChart.getChartType() === "heatmap"){
+            var MDCRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+            oPanel.setMessageStrip(new MessageStrip({text: MDCRb.getText("chart.PERSONALIZATION_DIALOG_MEASURE_WARNING"), type:"Warning"}));
+        }
+
+        return Promise.resolve(oPanel);
     };
 
     /**

package/src/sap/ui/mdc/p13n/AdaptationProvider.js

@@ -1,6 +1,6 @@
 /*
 * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 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/p13n/Engine.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -14,9 +14,10 @@ sap.ui.define([
 	"sap/ui/core/library",
 	"sap/ui/mdc/p13n/StateUtil",
 	"sap/ui/core/Element",
-	"sap/ui/mdc/p13n/DefaultProviderRegistry",
-	"sap/ui/mdc/p13n/UIManager"
-], function (AdaptationProvider, merge, Log, PropertyHelper, FlexModificationHandler, MessageStrip, coreLibrary, StateUtil, Element, DefaultProviderRegistry, UIManager) {
+	"sap/ui/mdc/p13n/modules/DefaultProviderRegistry",
+	"sap/ui/mdc/p13n/UIManager",
+	"sap/ui/mdc/p13n/modules/StateHandlerRegistry"
+], function (AdaptationProvider, merge, Log, PropertyHelper, FlexModificationHandler, MessageStrip, coreLibrary, StateUtil, Element, DefaultProviderRegistry, UIManager, StateHandlerRegistry) {
 	"use strict";
 
 	var ERROR_INSTANCING = "Engine: This class is a singleton. Please use the getInstance() method instead.";
@@ -39,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -56,12 +57,16 @@ sap.ui.define([
 			}
 
 			this._aRegistry = [];
+			this._aStateHandlers = [];
 
 			//Default Provider Registry to be used for internal PersistenceProvider functionality access
 			this.defaultProviderRegistry = DefaultProviderRegistry.getInstance();
 
 			//UIManager to be used for p13n UI creation
 			this.uimanager = UIManager.getInstance(this);
+
+			//Default state Handler Registry to be used for state event handling
+			this.stateHandlerRegistry = StateHandlerRegistry.getInstance();
 		}
 	});
 
@@ -200,7 +205,7 @@ sap.ui.define([
 				control: oController.getAdaptationControl(),
 				changeOperations: mchangeOperations,
 				deltaAttributes: ["name"],
-				propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){return {name: a.getName()};})
+				propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){return {name: a.name};})
 			};
 
 			//Only execute change calculation in case there is a difference (--> example: press 'Ok' without a difference)
@@ -236,6 +241,9 @@ sap.ui.define([
 
 		var oModificationSetting = this._determineModification(oControl);
 		return oModificationSetting.handler.reset(oResetConfig, oModificationSetting.payload).then(function(){
+			//trigger statehandlerregistry notification
+			this.stateHandlerRegistry.fireChange(oControl);
+
 			//Re-Init housekeeping after update
 			return this.initAdaptation(oControl, aKeys).then(function(oPropertyHelper){
 				aKeys.forEach(function(sKey){
@@ -283,7 +291,11 @@ sap.ui.define([
 	Engine.prototype._processChanges = function(vControl, aChanges) {
 		if (aChanges instanceof Array && aChanges.length > 0) {
 			var oModificationSetting = this._determineModification(vControl);
-			return oModificationSetting.handler.processChanges(aChanges, oModificationSetting.payload);
+			return oModificationSetting.handler.processChanges(aChanges, oModificationSetting.payload)
+			.then(function(aChanges){
+				this.stateHandlerRegistry.fireChange(Engine.getControlInstance(vControl));
+				return aChanges;
+			}.bind(this));
 		} else {
 			return Promise.resolve([]);
 		}
@@ -319,7 +331,10 @@ sap.ui.define([
 			fResolveRTA = resolve;
 		});
 
-		oModificationHandler.processChanges = fResolveRTA;
+		oModificationHandler.processChanges = function(aChanges) {
+			fResolveRTA(aChanges);
+			return Promise.resolve(aChanges);
+		};
 
 		this._setModificationHandler(oControl, oModificationHandler);
 
@@ -998,11 +1013,17 @@ sap.ui.define([
 	 * This method can be used for debugging to retrieve the complete registry.
 	 */
 	Engine.prototype._getRegistry = function() {
-		var oRegistry = {};
+		var oRegistry = {
+			stateHandlerRegistry: this.stateHandlerRegistry,
+			defaultProviderRegistry: this.defaultProviderRegistry,
+			controlRegistry: {}
+		};
+
 		this._aRegistry.forEach(function(sKey){
 			var oControl = sap.ui.getCore().byId(sKey);
-			oRegistry[sKey] = _mRegistry.get(oControl);
+			oRegistry.controlRegistry[sKey] = _mRegistry.get(oControl);
 		});
+
 		return oRegistry;
 	};
 
@@ -1017,6 +1038,8 @@ sap.ui.define([
 		_mRegistry.delete(this);
 		this.defaultProviderRegistry.destroy();
 		this.defaultProviderRegistry = null;
+		this.stateHandlerRegistry.destroy();
+		this.stateHandlerRegistry = null;
 		this.uimanager.destroy();
 		this.uimanager = null;
 	};

package/src/sap/ui/mdc/p13n/FlexUtil.js

@@ -1,6 +1,6 @@
 /*
 * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 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/p13n/P13nBuilder.js

@@ -1,6 +1,6 @@
 /*
 * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
 */
 sap.ui.define([
@@ -216,7 +216,7 @@ sap.ui.define([
                 }
 
                 mItem.name = oProperty.name;
-                mItem.label = oProperty.getLabel() || oProperty.name;
+                mItem.label = oProperty.label || oProperty.name;
                 mItem.tooltip = oProperty.tooltip;
 
                 if (mItemsGrouped) {

package/src/sap/ui/mdc/p13n/PersistenceProvider.js

@@ -1,11 +1,11 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/Control", 	"sap/ui/fl/variants/VariantManagement", "sap/ui/fl/Utils", "sap/ui/mdc/enum/PersistenceMode"
-], function(CoreControl, VariantManagement, Utils, mode) {
+	"sap/ui/core/Control", 	"sap/ui/fl/variants/VariantManagement", "sap/ui/fl/Utils", "sap/ui/mdc/enum/PersistenceMode", "sap/ui/layout/VerticalLayout"
+], function(CoreControl, VariantManagement, Utils, mode, VerticalLayout) {
 	"use strict";
 
 	/**
@@ -78,12 +78,23 @@ sap.ui.define([
 		this._bmodeLocked = true;
 
 		if (this.getMode() === mode.Transient) {
-			this._oVM = new VariantManagement(this.getId() + "--vm", {"for": this.getAssociation("for")});
+			var oVM = new VariantManagement(this.getId() + "--vm", {"for": this.getAssociation("for")});
 			this._oModelPromise.then(function (oModel) {
-				this._oVM.setModel(oModel, Utils.VARIANT_MODEL_NAME);
-			}.bind(this));
+				oVM.setModel(oModel, Utils.VARIANT_MODEL_NAME);
+			});
+			this._oWrapper = new VerticalLayout(this.getId() + "--accWrapper", {
+				content: [
+					oVM
+				]
+			});
+
+			this._oWrapper.onAfterRendering = function() {
+				VerticalLayout.prototype.onAfterRendering.apply(this, arguments);
+				this.getDomRef().setAttribute("aria-hidden", true);
+			};
+
 			var oStatic = sap.ui.getCore().getUIArea(sap.ui.getCore().getStaticAreaRef());
-			oStatic.addContent(this._oVM);
+			oStatic.addContent(this._oWrapper);
 		}
 
 		return this;
@@ -109,12 +120,12 @@ sap.ui.define([
 	};
 
 	PersistenceProvider.prototype.exit = function () {
-		if (this._oVM) {
+		if (this._oWrapper) {
 			var oStatic = sap.ui.getCore().getUIArea(sap.ui.getCore().getStaticAreaRef());
-			oStatic.removeContent(this._oVM);
+			oStatic.removeContent(this._oWrapper);
 
-			this._oVM.destroy();
-			this._oVM = null;
+			this._oWrapper.destroy();
+			this._oWrapper = null;
 		}
 
 		this._oModelPromise = null;

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/p13n/StateUtil.js

@@ -1,6 +1,6 @@
 /*
 * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
 */
 sap.ui.define([
@@ -108,6 +108,26 @@ sap.ui.define([
 			});
 		},
 
+		/**
+		 * Attaches an event handler to the <code>StateUtil</code>.
+		 * The event handler may be fired every time a user triggers a personalization change for a control instance during runtime.
+		 *
+		 * @param {function} fnListener fnFunction The handler function to call when the event occurs
+		 */
+		attachStateChange: function(fnListener) {
+			sap.ui.mdc.p13n.Engine.getInstance().stateHandlerRegistry.attachChange(fnListener);
+		},
+
+		/**
+		 * Removes a previously attached state change event handler from the <code>StateUtil</code> class.
+		 * The passed parameters must match those used for registration with {@link StateUtil#attachChange} beforehand.
+		 *
+		 * @param {function} fnListener fnFunction The handler function to detach from the event
+		 */
+		detachStateChange: function(fnListener) {
+			sap.ui.mdc.p13n.Engine.getInstance().stateHandlerRegistry.detachChange(fnListener);
+		},
+
 		_externalizeKeys: function(oInternalState) {
 			var mKeysForState = {
 				Sort: "sorters",