@openui5/sap.ui.mdc 1.124.7 → 1.124.9

package/src/sap/ui/mdc/valuehelp/base/Container.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 * @constructor
 	 * @abstract
 	 * @public
@@ -206,8 +206,6 @@ sap.ui.define([
 			const oContent = oChanges.child;
 			if (oChanges.mutation === "remove") {
 				this.unbindContentFromContainer(oContent);
-				// } else {
-				// 	this.bindContentToContainer(oContent);
 			}
 		}
 	};
@@ -954,6 +952,32 @@ sap.ui.define([
 
 	};
 
+	Container.prototype.clone = function(sIdSuffix, aLocalIds) {
+
+		// detach event handler before cloning to not have it twice on the clone
+		// attach it after clone again
+		const aContent = this.getContent();
+
+		for (let i = 0; i < aContent.length; i++) {
+			if (aContent[i]._bContentBound) {
+				aContent[i]._bRebindContent = true;
+				this.unbindContentFromContainer(aContent[i]);
+			}
+		}
+
+		const oClone = Element.prototype.clone.apply(this, arguments);
+
+		for (let i = 0; i < aContent.length; i++) { // for Dialog overwrite to only bind shown content
+			if (aContent[i]._bRebindContent) {
+				this.bindContentToContainer(aContent[i]);
+				delete aContent[i]._bRebindContent;
+			}
+		}
+
+		return oClone;
+
+	};
+
 	Container.prototype.exit = function() {
 		this._oObserver.disconnect();
 		this._oObserver = undefined;

package/src/sap/ui/mdc/valuehelp/base/Content.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 * @constructor
 	 * @abstract
 	 * @public

package/src/sap/ui/mdc/valuehelp/base/DefineConditionPanel.js

@@ -121,7 +121,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.valuehelp.base.DefineConditionPanel

package/src/sap/ui/mdc/valuehelp/base/DialogTab.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.content.Dialog</code> element.
 	 * @extends sap.ui.core.Control
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/valuehelp/base/FilterableListContent.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 * @constructor
 	 * @abstract
 	 * @public
@@ -396,29 +396,15 @@ sap.ui.define([
 				if (oChanges.mutation === "insert") {
 					this._updateBasicSearchField();
 					this._assignCollectiveSearchSelect();
-
-					if (oChanges.name !== "_defaultFilterBar" || !this.getFilterBar()) { // DefaultFilterBar only used if no other FilterBar assigned
-						oFilterBar.attachSearch(this._handleSearch, this);
-					}
-					if (oChanges.name === "filterBar") {
-						oDefaultFilterBar = this.getAggregation("_defaultFilterBar");
-						if (oDefaultFilterBar) {
-							oDefaultFilterBar.detachSearch(this._handleSearch, this);
-						}
-					}
 				} else { // remove case
 					const oExistingBasicSearchField = oFilterBar.getBasicSearchField();
 					if (oExistingBasicSearchField && oExistingBasicSearchField._bCreatedByValueHelp) {
 						oFilterBar.setBasicSearchField(); // remove to reuse on other FilterBar
 					}
 
-					oFilterBar.detachSearch(this._handleSearch, this);
-
 					if (oChanges.name === "filterBar") {
 						oDefaultFilterBar = this.getAggregation("_defaultFilterBar");
-						if (oDefaultFilterBar) {
-							oDefaultFilterBar.attachSearch(this._handleSearch, this);
-						} else {
+						if (!oDefaultFilterBar) {
 							this._createDefaultFilterBar();
 						}
 					}
@@ -564,13 +550,19 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc.valuehelp.base.Container
 	 */
 	FilterableListContent.prototype.onBeforeShow = function(bInitial) {
+		const oFilterBar = this.getActiveFilterBar();
+
+		if (oFilterBar && !oFilterBar._bAttached) {
+			oFilterBar.attachSearch(this._handleSearch, this); // event only needed if shown
+			oFilterBar._bAttached = true;
+		}
+
 		if (bInitial) {
 			this._updateBasicSearchField();
 			const oDelegate = this.getValueHelpDelegate();
 			return Promise.resolve(oDelegate && oDelegate.getFilterConditions(this.getValueHelpInstance(), this)).then((oConditions) => {
 				this._oInitialFilterConditions = oConditions;
 
-				const oFilterBar = this.getActiveFilterBar();
 				if (oFilterBar) { // apply initial conditions to filterbar if existing
 					let sSearchPath = "$search";
 					/**
@@ -590,11 +582,23 @@ sap.ui.define([
 						return StateUtil.applyExternalState(oFilterBar, oStateDiff);
 					});
 
+					oFilterBar.cleanUpAllFilterFieldsInErrorState();
+
 					return pHandleConditions.then(() => oFilterBar.awaitPendingModification());
 				}
 			});
 		}
-		return undefined;
+		return Promise.resolve();
+	};
+
+	FilterableListContent.prototype.onHide = function() {
+		ListContent.prototype.onHide.apply(this, arguments);
+
+		const oFilterBar = this.getActiveFilterBar();
+		if (oFilterBar?._bAttached) {
+			oFilterBar.detachSearch(this._handleSearch, this); // if hidden, event not needed
+			oFilterBar._bAttached = false;
+		}
 	};
 
 	/**
@@ -673,6 +677,28 @@ sap.ui.define([
 		});
 	};
 
+	FilterableListContent.prototype.clone = function(sIdSuffix, aLocalIds) {
+
+		// detach event handler before cloning to not have it twice on the clone
+		// attach it after clone again
+		const oFilterBar = this.getActiveFilterBar();
+		const bAttached = oFilterBar?._bAttached;
+		if (bAttached) {
+			oFilterBar.detachSearch(this._handleSearch, this);
+			oFilterBar._bAttached = false;
+		}
+
+		const oClone = ListContent.prototype.clone.apply(this, arguments);
+
+		if (bAttached) {
+			oFilterBar.attachSearch(this._handleSearch, this);
+			oFilterBar._bAttached = true;
+		}
+
+		return oClone;
+
+	};
+
 	function _addSearchConditionToConditionMap(oConditions, sSearchPath, sFilterValue) {
 		oConditions[sSearchPath] = sFilterValue ? [Condition.createCondition(OperatorName.Contains, [sFilterValue], undefined, undefined, ConditionValidated.NotValidated)] : [];
 		return;

package/src/sap/ui/mdc/valuehelp/base/ListContent.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 * @constructor
 	 * @abstract
 	 * @public

package/src/sap/ui/mdc/valuehelp/content/Bool.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element to provide a value help for boolean fields.
 	 * @extends sap.ui.mdc.valuehelp.content.FixedList
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/valuehelp/content/Conditions.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element showing a condition panel.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 * @constructor
 	 * @public
 	 * @since 1.95.0

package/src/sap/ui/mdc/valuehelp/content/FixedList.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element showing a list with fixed values.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 * @constructor
 	 * @public
 	 * @since 1.95.0

package/src/sap/ui/mdc/valuehelp/content/FixedListItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 *
 	 * @public
 	 * @since 1.114.0

package/src/sap/ui/mdc/valuehelp/content/MDCTable.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element using a {@link sap.ui.mdc.Table}.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -126,8 +126,7 @@ sap.ui.define([
 		if (oChanges.name === "table") { // outer table
 			const oTable = oChanges.child;
 			if (oChanges.mutation === "remove") {
-				this._oTable.detachEvent('_bindingChange', this._handleUpdateFinishedThrottled, this);
-				this._oTable.detachEvent('selectionChange', this._handleSelectionChange, this);
+				_detachTableEvents.call(this, this._oTable);
 				this._oTable = null;
 				this.resetListBinding();
 			} else {
@@ -148,11 +147,6 @@ sap.ui.define([
 						}
 					}
 				});
-
-				this._oTable.initialized().then(() => {
-					this._oTable.attachEvent('_bindingChange', this._handleUpdateFinishedThrottled, this);
-					this._oTable.attachEvent('selectionChange', this._handleSelectionChange, this);
-				});
 			}
 			return;
 		}
@@ -329,6 +323,9 @@ sap.ui.define([
 		return Promise.resolve(FilterableListContent.prototype.onBeforeShow.apply(this, arguments)).then(() => {
 			const oTable = this.getTable();
 			if (oTable) {
+				this._oTable.initialized().then(() => {
+					_attachTableEvents.call(this, this._oTable);
+				});
 				const bTableBound = oTable.isTableBound();
 				const bOverlay = bTableBound && oTable._oTable.getShowOverlay();
 				if (this._bRebindTable || bOverlay) {
@@ -345,6 +342,14 @@ sap.ui.define([
 		});
 	};
 
+	MDCTable.prototype.onHide = function() {
+		FilterableListContent.prototype.onHide.apply(this, arguments);
+
+		if (this._oTable) {
+			_detachTableEvents.call(this, this._oTable);
+		}
+	};
+
 	MDCTable.prototype.getScrollDelegate = function() {
 		if (!this.isTypeahead() && this._oScrollContainer) {
 			return this._oScrollContainer.getScrollDelegate();
@@ -375,6 +380,45 @@ sap.ui.define([
 
 	};
 
+	MDCTable.prototype.clone = function(sIdSuffix, aLocalIds) {
+
+		// detach event handler before cloning to not have it twice on the clone
+		// attach it after clone again
+		const bAttached = this._oTable?._bAttached;
+		if (bAttached) {
+			_detachTableEvents.call(this, this._oTable);
+		}
+
+		const oClone = FilterableListContent.prototype.clone.apply(this, arguments);
+
+		if (bAttached) {
+			_attachTableEvents.call(this, this._oTable);
+		}
+
+		return oClone;
+
+	};
+
+	function _attachTableEvents(oTable) {
+
+		if (!oTable._bAttached) {
+			oTable.attachEvent('_bindingChange', this._handleUpdateFinishedThrottled, this);
+			oTable.attachEvent('selectionChange', this._handleSelectionChange, this);
+			oTable._bAttached = true;
+		}
+
+	}
+
+	function _detachTableEvents(oTable) {
+
+		if (oTable._bAttached) {
+			oTable.detachEvent('_bindingChange', this._handleUpdateFinishedThrottled, this);
+			oTable.detachEvent('selectionChange', this._handleSelectionChange, this);
+			oTable._bAttached = false;
+		}
+
+	}
+
 	MDCTable.prototype.exit = function name(params) {
 		Common.cleanup(this, [
 			"_oContentLayout",

package/src/sap/ui/mdc/valuehelp/content/MTable.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element using a {@link sap.m.Table}.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.124.7
+	 * @version 1.124.9
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -150,8 +150,12 @@ sap.ui.define([
 	}
 
 	MTable.prototype.onBeforeShow = function(bInitial) {
-		if (bInitial) {
-			return Promise.resolve(FilterableListContent.prototype.onBeforeShow.apply(this, arguments)).then(() => {
+
+		return Promise.resolve(FilterableListContent.prototype.onBeforeShow.apply(this, arguments)).then(() => {
+			const oTable = this._getTable();
+			_attachTableEvents.call(this, oTable);
+
+			if (bInitial) {
 				const oListBinding = this.getListBinding();
 				const oListBindingInfo = this.getListBindingInfo();
 				const bBindingSuspended = oListBinding && oListBinding.isSuspended();
@@ -160,12 +164,15 @@ sap.ui.define([
 				if ((bBindingSuspended || bBindingWillBeSuspended) && (!this.isTypeahead() || Device.system.phone)) { // in dialog or phone case do not resume suspended table on opening
 					return undefined;
 				}
+
+				const oTable = this._getTable();
+				_attachTableEvents.call(this, oTable);
+
 				return this.applyFilters();
-			});
-		}
-		return undefined;
-	};
+			}
+		});
 
+	};
 
 	MTable.prototype.applyFilters = function() {
 
@@ -337,6 +344,7 @@ sap.ui.define([
 			if (oTable.hasStyleClass("sapMComboBoxList")) {
 				oTable.removeStyleClass("sapMComboBoxList");
 			}
+			_detachTableEvents.call(this, oTable);
 		}
 
 		this._iNavigateIndex = -1; // initialize after closing
@@ -966,10 +974,7 @@ sap.ui.define([
 
 			if (oChanges.mutation === "remove") {
 				this._oObserver.unobserve(oTable);
-				oTable.removeDelegate(this._oTableDelegate);
-				this._oTable.detachItemPress(this._handleItemPress, this);
-				this._oTable.detachSelectionChange(this._handleSelectionChange, this);
-				this._oTable.detachUpdateFinished(this._handleUpdateFinished, this);
+				_detachTableEvents.call(this, oTable);
 				this._oTable = null;
 				this._removePromise("footer");
 				this.resetListBinding();
@@ -977,15 +982,6 @@ sap.ui.define([
 				this._oTable = oTable;
 				this._oTable.addStyleClass("sapMdcValueHelpMTable");
 				_adjustTable.call(this);
-				this._oTable.attachItemPress(this._handleItemPress, this);
-				this._oTable.attachSelectionChange(this._handleSelectionChange, this);
-				this._oTable.attachUpdateFinished(this._handleUpdateFinished, this);
-				this._oTableDelegate = this._oTableDelegate || {
-					onsapprevious: this._handleTableEvent,
-					onsapnext: this._handleTableEvent,
-					cellClick: this._handleTableEvent
-				};
-				oTable.addDelegate(this._oTableDelegate, true, this);
 
 				if (!this.resolveListBinding()) {
 					this._oObserver.observe(oChanges.child, { bindings: ["items"] });
@@ -1080,5 +1076,54 @@ sap.ui.define([
 		_updateSelection.call(this);
 	};
 
+	MTable.prototype.clone = function(sIdSuffix, aLocalIds) {
+
+		// detach event handler before cloning to not have it twice on the clone
+		// attach it after clone again
+		const oTable = this._getTable();
+		const bAttached = oTable?._bAttached;
+		if (bAttached) {
+			_detachTableEvents.call(this, oTable);
+		}
+
+		const oClone = FilterableListContent.prototype.clone.apply(this, arguments);
+
+		if (bAttached) {
+			_attachTableEvents.call(this, oTable);
+		}
+
+		return oClone;
+
+	};
+
+	function _attachTableEvents(oTable) {
+
+		if (!oTable._bAttached) {
+			oTable.attachItemPress(this._handleItemPress, this);
+			oTable.attachSelectionChange(this._handleSelectionChange, this);
+			oTable.attachUpdateFinished(this._handleUpdateFinished, this);
+			this._oTableDelegate = this._oTableDelegate || {
+				onsapprevious: this._handleTableEvent,
+				onsapnext: this._handleTableEvent,
+				cellClick: this._handleTableEvent
+			};
+			oTable.addDelegate(this._oTableDelegate, true, this);
+			oTable._bAttached = true;
+		}
+
+	}
+
+	function _detachTableEvents(oTable) {
+
+		if (oTable._bAttached) {
+			oTable.removeDelegate(this._oTableDelegate);
+			this._oTable.detachItemPress(this._handleItemPress, this);
+			this._oTable.detachSelectionChange(this._handleSelectionChange, this);
+			this._oTable.detachUpdateFinished(this._handleUpdateFinished, this);
+			oTable._bAttached = false;
+		}
+
+	}
+
 	return MTable;
 });