@openui5/sap.m 1.124.0 → 1.124.2

package/src/sap/m/Wizard.js

@@ -104,7 +104,7 @@ sap.ui.define([
 		 *
 		 * @extends sap.ui.core.Control
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.124.2
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/WizardProgressNavigator.js

@@ -45,7 +45,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/WizardStep.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * <li>If the execution needs to branch after a given step, you should set all possible next steps in the <code>subsequentSteps</code> aggregation.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/changeHandler/AddTableColumn.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.m.changeHandler.AddTableColumn
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @private
 	 * @since 1.51.0
 	 */

package/src/sap/m/changeHandler/ChangeLinkTarget.js

@@ -12,7 +12,7 @@ sap.ui.define(function () {
 	 *
 	 * @alias sap.m.changeHandler.ChangeLinkTarget
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @experimental Since 1.71
 	 */
 	var ChangeLinkTarget = {};

package/src/sap/m/changeHandler/CombineButtons.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.m.changeHandler.CombineButtons
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @experimental Since 1.48
 	 */
 	var CombineButtons = {};

package/src/sap/m/changeHandler/MoveTableColumns.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/base/Log"], function(Log) {
 	 *
 	 * @alias sap.m.changeHandler.MoveTableColumns
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @private
 	 * @since 1.48.0
 	 */

package/src/sap/m/changeHandler/SelectIconTabBarFilter.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.m.changeHandler.SelectIconTabBarFilter
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @since 1.96
 	 * @private
 	 */

package/src/sap/m/changeHandler/SplitMenuButton.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.m.changeHandler.SplitMenuButton
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @experimental Since 1.48
 	 */
 	var SplitMenuButton = {};

package/src/sap/m/library.js

@@ -75,14 +75,14 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.m
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @since 1.4
 	 * @public
 	 */
 	var thisLib = Library.init({
 		apiVersion: 2,
 		name : "sap.m",
-		version: "1.124.0",
+		version: "1.124.2",
 		dependencies : ["sap.ui.core"],
 		designtime: "sap/m/designtime/library.designtime",
 		types: [

package/src/sap/m/p13n/AbstractContainer.js

@@ -22,12 +22,12 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @constructor
 	 * @alias sap.m.p13n.AbstractContainer
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @since 1.96
 	 *
 	 * @private

package/src/sap/m/p13n/AbstractContainerItem.js

@@ -20,12 +20,12 @@ sap.ui.define(['sap/ui/core/Element'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.124.2
 		 *
 		 * @constructor
 		 * @alias sap.m.p13n.AbstractContainerItem
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.124.2
 		 * @since 1.96
 		 * @private
 		 * @ui5-restricted

package/src/sap/m/p13n/BasePanel.js

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 * @abstract

package/src/sap/m/p13n/Container.js

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.AbstractContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @private
 	 * @ui5-restricted

package/src/sap/m/p13n/Engine.js

@@ -69,7 +69,7 @@ sap.ui.define([
 	 * @alias sap.m.p13n.Engine
 	 * @extends sap.m.p13n.modules.AdaptationProvider
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @public
 	 * @since 1.104
 	 */

package/src/sap/m/p13n/FilterController.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.SelectionController
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @since 1.121
 	 * @public
 	 * @alias sap.m.p13n.FilterController

package/src/sap/m/p13n/FilterPanel.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @private
 	 * @since 1.121

package/src/sap/m/p13n/GroupController.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.SelectionController
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @public
 	 * @since 1.104
 	 * @alias sap.m.p13n.GroupController

package/src/sap/m/p13n/GroupPanel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 * @alias sap.m.p13n.GroupPanel

package/src/sap/m/p13n/Popup.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 * @since 1.97

package/src/sap/m/p13n/QueryPanel.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 *

package/src/sap/m/p13n/SelectionController.js

@@ -58,7 +58,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 * @alias sap.m.p13n.SelectionController
@@ -198,9 +198,12 @@ sap.ui.define([
 		const oXConfig = xConfigAPI.readConfig(this.getAdaptationControl()) || {};
 		const oItemXConfig = oXConfig.hasOwnProperty("aggregations") ? oXConfig.aggregations[this._sTargetAggregation] : {};
 		const aItemXConfig = [];
-		Object.entries(oItemXConfig).forEach(([sKey, oConfig]) => {
-			aItemXConfig.push({key: sKey, position: oConfig.position, visible: oConfig.visible});
-		});
+		if (oItemXConfig) {
+			Object.entries(oItemXConfig).forEach(([sKey, oConfig]) => {
+				aItemXConfig.push({key: sKey, position: oConfig.position, visible: oConfig.visible});
+			});
+			aItemXConfig.sort((a, b) => a.position - b.position);
+		}
 		aItemXConfig.sort((a,b) => a.position - b.position);
 
 		aItemXConfig.forEach(({key}) => {

package/src/sap/m/p13n/SelectionPanel.js

@@ -71,7 +71,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 * @since 1.96

package/src/sap/m/p13n/SortController.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.SelectionController
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @public
 	 * @alias sap.m.p13n.SortController
 	 */

package/src/sap/m/p13n/SortPanel.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 * @since 1.96

package/src/sap/m/p13n/handler/xConfigHandler.js

@@ -132,10 +132,12 @@ sap.ui.define([
 
 								if (!oPriorAggregationConfig) {
 									const aCurrentState = await xConfigAPI.getCurrentItemState(oControl, {propertyBag: mPropertyBag, changeType: oChange.getChangeType()}, oPriorAggregationConfig, sAffectedAggregation);
-									const oStateItem = aCurrentState.find((oItem, iIndex) => {
-										return oItem.key === oChange.getContent().key;
-									});
-									oRevertData.index = aCurrentState.indexOf(oStateItem);
+									if (aCurrentState) {
+										const oStateItem = aCurrentState.find((oItem, iIndex) => {
+											return oItem.key === oChange.getContent().key;
+										});
+										oRevertData.index = aCurrentState.indexOf(oStateItem);
+									}
 								}
 
 								oRevertData.targetAggregation = oChange.getContent().targetAggregation;

package/src/sap/m/p13n/modules/DefaultProviderRegistry.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @private
 	 * @since 1.104

package/src/sap/m/p13n/modules/StateHandlerRegistry.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @private
 	 * @since 1.104

package/src/sap/m/p13n/modules/UIManager.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @private
 	 *

package/src/sap/m/p13n/modules/xConfigAPI.js

@@ -118,7 +118,7 @@ sap.ui.define([
 				const pCurrentAccum = await pAccum; //synchronize async loop
 				const sId = appComponent ? appComponent.getRootControl()?.getLocalId(modifier.getId(oItem)) : modifier.getId(oItem);
 				const vRelevant = await modifier.getProperty(oItem, "visible");
-				if (vRelevant) {
+				if (vRelevant && sId) {
 					aCurrentState.push({key: sId});
 				}
 				return pCurrentAccum;

package/src/sap/m/plugins/CellSelector.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @author SAP SE
 	 *
 	 * @public
@@ -198,15 +198,28 @@ sap.ui.define([
 				return;
 			}
 
-			var mBounds = this._bSelecting ? this._getNormalizedBounds(this._oSession.mSource, this._oSession.mTarget) : {};
-			if (isKeyCombination(oEvent, KeyCodes.SPACE, false, false)) {
-				if (!isSelectableCell(oEvent.target, this.getConfig("selectableCells"))) {
-					return;
+			/*
+			Handling CTRL + SPACE for Column Selection. Will be handled/implemented in a separate BLI
+
+			if (isKeyCombination(oEvent, KeyCodes.SPACE, false, true) && this._getSelectableCell(oEvent.target)) {
+				if (!this._inSelection(oEvent.target)) {
+					// If focus is on cell outside of selection, select focused column
+					this._oSession.mSource = this._oSession.mTarget = this.getConfig("getCellInfo", this.getControl(), oEvent.target, this._oPreviousCell);
 				}
-				this._oPreviousCell = null;
-				this._startSelection(oEvent, false);
-				oEvent.setMarked();
-			} else if (isKeyCombination(oEvent, KeyCodes.SPACE, true, false)) {
+				this._oSession.mSource = Object.assign({}, this._oSession.mSource, { rowIndex: 0 });
+				this._oSession.mTarget = Object.assign({}, this._oSession.mTarget, { rowIndex: Infinity });
+
+				const mBounds = this._getNormalizedBounds(this._oSession.mSource, this._oSession.mTarget, true);
+
+				this._bSelecting = true;
+				this._selectCells(mBounds.from, mBounds.to);
+
+				oEvent.preventDefault();
+			}
+			*/
+
+			if (isKeyCombination(oEvent, KeyCodes.SPACE, true, false)) {
+				const mBounds = this._bSelecting ? this._getNormalizedBounds(this._oSession.mSource, this._oSession.mTarget) : {};
 				const oInfo = this.getConfig("getCellInfo", this.getControl(), oEvent.target, this._oPreviousCell);
 				if (!this._inSelection(oEvent.target)) {
 					mBounds.from = mBounds.to = {};
@@ -217,20 +230,13 @@ sap.ui.define([
 
 				oEvent.setMarked();
 				oEvent.preventDefault();
-			} else if (isKeyCombination(oEvent, KeyCodes.SPACE, false, true) && this._getSelectableCell(oEvent.target)) {
-				if (!this._inSelection(oEvent.target)) {
-					// If focus is on cell outside of selection, select focused column
-					const oInfo = this.getConfig("getCellInfo", this.getControl(), oEvent.target, this._oPreviousCell);
-					mBounds.from = Object.assign({}, oInfo);
-					mBounds.to = Object.assign({}, oInfo);
+			} else if (isKeyCombination(oEvent, KeyCodes.SPACE, false, false)) {
+				if (!isSelectableCell(oEvent.target, this.getConfig("selectableCells"))) {
+					return;
 				}
-				mBounds.from.rowIndex = 0;
-				mBounds.to.rowIndex = Infinity;
-
-				this._bSelecting = true;
-				this._selectCells(mBounds.from, mBounds.to);
-
-				oEvent.preventDefault();
+				this._oPreviousCell = null;
+				this._startSelection(oEvent, false);
+				oEvent.setMarked();
 			}
 		},
 		onmousedown: function(oEvent) {
@@ -304,8 +310,7 @@ sap.ui.define([
 				if (!this._oSession.mSource || !this._oSession.mTarget) {
 					return;
 				}
-				const mBounds = this._getNormalizedBounds(this._oSession.mSource, this._oSession.mTarget);
-				this._drawSelection(mBounds);
+				this._drawSelection(this._oSession.mSource, this._oSession.mTarget);
 			}
 		}.bind(this);
 		this._fnOnMouseEnter = this._onmouseenter.bind(this);
@@ -427,7 +432,7 @@ sap.ui.define([
 			return null;
 		}
 
-		var mSelectionRange = this._getNormalizedBounds(this._oSession.mSource, this._oSession.mTarget, true);
+		var mSelectionRange = this._getNormalizedBounds(this._oSession.mSource, this._oSession.mTarget);
 		if (isNaN(mSelectionRange.from.rowIndex) || isNaN(mSelectionRange.to.rowIndex)) {
 			return null;
 		}
@@ -904,13 +909,11 @@ sap.ui.define([
 			this._oSession.cellTypes.push(mTo.type);
 		}
 
-		var mBounds = this._getNormalizedBounds(mFrom, mTo);
-
 		if (mTo.rowIndex == Infinity || mFrom.rowIndex == Infinity) {
-			this.getConfig("loadContexts", this.getControl(), mBounds.from.rowIndex, this.getRangeLimit());
+			this.getConfig("loadContexts", this.getControl(), Math.max(Math.min(mFrom, mTo), 0), this.getRangeLimit());
 		}
 
-		this._drawSelection(mBounds);
+		this._drawSelection(mFrom, mTo);
 
 		if (!deepEqual(this._oSession.mSource, mFrom) || !deepEqual(this._oSession.mTarget, mTo)) {
 			this._oSession.mSource = mFrom;
@@ -919,7 +922,10 @@ sap.ui.define([
 		}
 	};
 
-	CellSelector.prototype._drawSelection = function (mBounds) {
+	CellSelector.prototype._drawSelection = function (mFrom, mTo) {
+		const bAdjustBounds = !isFinite(mFrom.rowIndex) || !isFinite(mTo.rowIndex);
+		const mBounds = this._getNormalizedBounds(mFrom, mTo, bAdjustBounds);
+
 		if (!mBounds.from || !mBounds.to) {
 			return;
 		}
@@ -1067,16 +1073,16 @@ sap.ui.define([
 	 * <code>to</code> contains the coordinates of the lower right corner of the bounding area.
 	 * @param {Object} mFrom Source cell coordinates
 	 * @param {Object} mTo Target cell coordinates
-	 * @param {boolean} bKeepBounds
+	 * @param {boolean} bAdjustBounds bounds are adjusted to fit into limit/table boundaries (e.g. range selection)
 	 * @returns {object} Object containing coordinates for the bounding area
 	 */
-	CellSelector.prototype._getNormalizedBounds = function(mFrom, mTo, bKeepBounds) {
+	CellSelector.prototype._getNormalizedBounds = function(mFrom, mTo, bAdjustBounds) {
 		const iMaxColumns = this.getConfig("numberOfColumns", this.getControl());
 		const iMaxRows = this.getRangeLimit() == 0 ? this.getConfig("getRowCount", this.getControl()) : this.getRangeLimit();
 
 		let toRowIndex = Math.max(mFrom.rowIndex, mTo.rowIndex), toColIndex = Math.max(mFrom.colIndex, mTo.colIndex);
-		if (!bKeepBounds) {
-			toRowIndex = Math.min(iMaxRows - 1, toRowIndex);
+		if (bAdjustBounds) {
+			toRowIndex = Math.min(iMaxRows, toRowIndex);
 			toColIndex = Math.min(iMaxColumns, toColIndex);
 		}
 
@@ -1386,25 +1392,17 @@ sap.ui.define([
 				return true;
 			},
 			drawCellBorder: function(oTable, oCellRef, mPosition, mBounds) {
-				const aRefs = [oCellRef];
-				oCellRef.classList.toggle("sapMPluginsCellSelectorTop", mPosition.rowIndex == mBounds.from.rowIndex);
-				oCellRef.classList.toggle("sapMPluginsCellSelectorBottom", mPosition.rowIndex == mBounds.to.rowIndex);
+				const sTop = this.isBottomToTop(oTable) ? "sapMPluginsCellSelectorBottom" : "sapMPluginsCellSelectorTop";
+				const sBottom = this.isBottomToTop(oTable) ? "sapMPluginsCellSelectorTop" : "sapMPluginsCellSelectorBottom";
+
+				oCellRef.classList.toggle(sTop, mPosition.rowIndex == mBounds.from.rowIndex);
+				oCellRef.classList.toggle(sBottom, mPosition.rowIndex == mBounds.to.rowIndex);
 				oCellRef.classList.toggle("sapMPluginsCellSelectorRight", mPosition.colIndex == mBounds.to.colIndex);
+				oCellRef.classList.toggle("sapMPluginsCellSelectorLeft", mPosition.colIndex == mBounds.from.colIndex);
 				oCellRef.classList.toggle("sapMPluginsCellSelectorSelected", true);
 				oCellRef.setAttribute("aria-selected", "true");
 
-				// Grid Table has only border-right, so adding border-left would change the size of the column. Instead, for the left border, take the previous cell and set border-right.
-				if (mPosition.colIndex == mBounds.from.colIndex) {
-					const oPrevCellRef = this.getCellRef(oTable, {rowIndex: mPosition.rowIndex, colIndex: mPosition.colIndex - 1});
-					let sClass = "sapMPluginsCellSelectorLeft";
-					if (oPrevCellRef) {
-						oCellRef = oPrevCellRef;
-						sClass = "sapMPluginsCellSelectorRight";
-						aRefs.push(oCellRef);
-					}
-					oCellRef.classList.toggle(sClass, mPosition.colIndex == mBounds.from.colIndex);
-				}
-				return aRefs;
+				return [oCellRef];
 			},
 			loadContexts: function (oTable, iStartIndex, iLength) {
 				var oBinding = oTable.getBinding("rows");

package/src/sap/m/plugins/ColumnResizer.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 * @since 1.91

package/src/sap/m/plugins/ContextMenuSetting.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class Provides configuration options and an extended behavior for the context menu that is applied to the related control.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @public
 	 * @since 1.121
 	 * @alias sap.m.plugins.ContextMenuSetting

package/src/sap/m/plugins/CopyProvider.js

@@ -37,7 +37,7 @@ sap.ui.define(["./PluginBase", "sap/base/Log", "sap/base/strings/formatMessage",
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 * @since 1.110
@@ -624,7 +624,7 @@ sap.ui.define(["./PluginBase", "sap/base/Log", "sap/base/strings/formatMessage",
 	PluginBase.setConfigs({
 		"sap.m.Table": {
 			_oWM: new WeakMap(),
-			allowForCopySelector: ".sapMLIBFocusable,.sapMLIBSelectM,.sapMLIBSelectS",
+			allowForCopySelector: ".sapMLIBFocusable,.sapMLIBSelectM,.sapMLIBSelectS,.sapMListTblCell",
 			selectedContexts: function(oTable, bSparse) {
 				const aSelectedContexts = [];
 				const oBindingInfo = oTable.getBindingInfo("items");

package/src/sap/m/plugins/DataStateIndicator.js

@@ -19,7 +19,7 @@ sap.ui.define(["./PluginBase", "sap/ui/base/ManagedObjectObserver", "sap/ui/core
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 * @since 1.73
@@ -99,13 +99,17 @@ sap.ui.define(["./PluginBase", "sap/ui/base/ManagedObjectObserver", "sap/ui/core
 
 	DataStateIndicator.findOn = PluginBase.findOn;
 
+	DataStateIndicator.prototype.init = function() {
+		this._fnOnAggregatedDataStateChange = this._onAggregatedDataStateChange.bind(this);
+	};
+
 	DataStateIndicator.prototype.onActivate = function(oControl) {
 		this._bFiltering = false;
 		var sBindingName = this._getBindingName();
 		var oBinding = oControl.getBinding(sBindingName);
 
 		if (oBinding) {
-			oBinding.attachAggregatedDataStateChange(this._onAggregatedDataStateChange, this);
+			oBinding.attachAggregatedDataStateChange(this._fnOnAggregatedDataStateChange);
 			this._processDataState(oBinding.getDataState());
 		}
 
@@ -118,7 +122,7 @@ sap.ui.define(["./PluginBase", "sap/ui/base/ManagedObjectObserver", "sap/ui/core
 		var oBinding = oControl.getBinding(sBindingName);
 
 		if (oBinding) {
-			oBinding.detachAggregatedDataStateChange(this._onAggregatedDataStateChange, this);
+			oBinding.detachAggregatedDataStateChange(this._fnOnAggregatedDataStateChange);
 			oBinding.getDataState().getMessages().forEach(function(oMessage) {
 				oMessage.removeControlId(oControl.getId());
 			});
@@ -458,10 +462,17 @@ sap.ui.define(["./PluginBase", "sap/ui/base/ManagedObjectObserver", "sap/ui/core
 	};
 
 	DataStateIndicator.prototype._observeChanges = function(mChange) {
-		var oBinding = mChange.bindingInfo.binding;
+		const oBindingInfo = mChange.bindingInfo;
+		const oBinding = oBindingInfo.binding;
+
 		if (oBinding) {
-			var sOperation = (mChange.mutation == "ready") ? "attach" : "detach";
-			oBinding[sOperation + "AggregatedDataStateChange"](this._onAggregatedDataStateChange, this);
+			oBinding.detachAggregatedDataStateChange(this._fnOnAggregatedDataStateChange);
+			if (mChange.mutation == "ready") {
+				oBinding.attachAggregatedDataStateChange(this._fnOnAggregatedDataStateChange);
+			}
+		} else if (mChange.mutation == "prepare") {
+			oBindingInfo.events ??= {};
+			oBindingInfo.events.aggregatedDataStateChange ??= this._fnOnAggregatedDataStateChange;
 		}
 	};
 

package/src/sap/m/plugins/PasteProvider.js

@@ -28,7 +28,7 @@ sap.ui.define(["./PluginBase", "sap/ui/core/Element", "sap/ui/core/Lib", "sap/ui
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @public
 	 * @since 1.91

package/src/sap/m/plugins/PluginBase.js

@@ -20,7 +20,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 *
 	 * @private
 	 * @experimental Since 1.73. This class is experimental and provides only limited functionality. Also the API might be changed in future.