@openui5/sap.ui.mdc 1.130.1 → 1.131.1

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.130.1
+	 * @version 1.131.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.valuehelp.base.DefineConditionPanel
@@ -822,8 +822,8 @@ sap.ui.define([
 		let oCondition;
 
 		// if type of operator changed -> remove binding and create it new later on
-		if (sKey && sOldKey) {
-			const oOperator = FilterOperatorUtil.getOperator(sKey);
+		if (sOldKey) {
+			const oOperator = sKey && FilterOperatorUtil.getOperator(sKey);
 			const oOperatorOld = FilterOperatorUtil.getOperator(sOldKey);
 			const oGrid = oField.getParent();
 			let oValue0Field;
@@ -832,15 +832,15 @@ sap.ui.define([
 
 			// find fields and initialize error state
 			oValue0Field = oGrid.getContent()[iIndex + 2];
-			if (oValue0Field && oValue0Field.hasOwnProperty("_iValueIndex") && oValue0Field._iValueIndex === 0) {
-				if (oValue0Field instanceof Field && !oValue0Field.isInvalidInput()) { // TODO: better was to find out parsing error // TODO: handle custom controls
+			if (oValue0Field?.hasOwnProperty("_iValueIndex") && oValue0Field._iValueIndex === 0) {
+				if (oValue0Field instanceof Field && !oValue0Field.isInvalidInput()) { // TODO: better way to find out parsing error // TODO: handle custom controls
 					// if Field is in parsing error state, don't remove error
 					oValue0Field.setValueState(ValueState.None);
 					oValue0Field.setValueStateText();
 				}
 				oValue1Field = oGrid.getContent()[iIndex + 3]; // second field only exists if first field exist
-				if (oValue1Field && oValue1Field.hasOwnProperty("_iValueIndex") && oValue1Field._iValueIndex === 1) {
-					if (oValue1Field instanceof Field && !oValue1Field.isInvalidInput()) { // TODO: better was to find out parsing error // TODO: handle custom controls
+				if (oValue1Field?.hasOwnProperty("_iValueIndex") && oValue1Field._iValueIndex === 1) {
+					if (oValue1Field instanceof Field && !oValue1Field.isInvalidInput()) { // TODO: better way to find out parsing error // TODO: handle custom controls
 						// if Field is in parsing error state, don't remove error
 						oValue1Field.setValueState(ValueState.None);
 						oValue1Field.setValueStateText();
@@ -852,36 +852,29 @@ sap.ui.define([
 				oValue0Field = undefined;
 			}
 
-			if (_operatorSupportsValueHelp(sKey)) {
+			let sValueHelp;
+			if (sKey && _operatorSupportsValueHelp(sKey)) {
 				// enable the ValueHelp for the used value fields
-				const sValueHelp = this._getValueHelp();
-				oValue0Field && oValue0Field.setValueHelp && oValue0Field.setValueHelp(sValueHelp);
-				oValue1Field && oValue1Field.setValueHelp && oValue1Field.setValueHelp(sValueHelp);
-			} else {
-				// remove the ValueHelp for the used value fields
-				oValue0Field && oValue0Field.setValueHelp && oValue0Field.setValueHelp();
-				oValue1Field && oValue1Field.setValueHelp && oValue1Field.setValueHelp();
+				sValueHelp = this._getValueHelp();
 			}
+			oValue0Field?.setValueHelp?.(sValueHelp);
+			oValue1Field?.setValueHelp?.(sValueHelp);
 
-			if (oOperator.createControl || oOperatorOld.createControl) {
+			if (oOperator?.createControl || oOperatorOld?.createControl) {
 				// custom control used -> needs to be created new
-				if (oValue0Field) {
-					oValue0Field.destroy();
-				}
-				if (oValue1Field) {
-					oValue1Field.destroy();
-				}
+				oValue0Field?.destroy();
+				oValue1Field?.destroy();
 			} else {
-				if (oValue0Field && oOperator.valueTypes[0] !== oOperatorOld.valueTypes[0]) {
+				if (oValue0Field && oOperator?.valueTypes[0] !== oOperatorOld?.valueTypes[0]) {
 					oValue0Field.unbindProperty("value");
 				}
-				if (oValue1Field && oOperator.valueTypes[1] !== oOperatorOld.valueTypes[1] && oOperatorOld.valueTypes[1]) { // 2nd Field only exist if there was a valueType defined
+				if (oValue1Field && oOperator?.valueTypes[1] !== oOperatorOld?.valueTypes[1] && oOperatorOld?.valueTypes[1]) { // 2nd Field only exist if there was a valueType defined
 					oValue1Field.unbindProperty("value");
 				}
 			}
 		}
 
-		if (!sKey) { // TODO: remove? Because cannot longer happen as Field don't allow empty input because of used data type constraints
+		if (!sKey) { // happens if conditions cleared via Binding
 			// key must not be empty
 			oCondition = oField.getBindingContext("$this").getObject();
 			if (oCondition) { // condition might be deleted before Field instance is deleted
@@ -1106,15 +1099,18 @@ sap.ui.define([
 
 		const sFixedListId = this._sOperatorHelpId + "-pop-fl";
 		const oFixedList = Element.getElementById(sFixedListId);
+		const oBindingInfo = oFixedList.getBindingInfo("items");
+		let oTemplate = oBindingInfo?.template;
 
-		let oTemplate;
-		if (bHasMultipleGroups) {
-			oTemplate = new FixedListItem({ key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}", groupKey: "{om>groupId}", groupText: "{om>groupText}" });
-		} else {
-			oTemplate = new FixedListItem({ key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}" });
+		if (!oTemplate || oFixedList.getGroupable() !== bHasMultipleGroups) {
+			if (bHasMultipleGroups) {
+				oTemplate = new FixedListItem({ key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}", groupKey: "{om>groupId}", groupText: "{om>groupText}" });
+			} else {
+				oTemplate = new FixedListItem({ key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}" });
+			}
+			oFixedList.bindAggregation("items", { path: 'om>/', templateShareable: false, template: oTemplate });
+			oFixedList.setGroupable(bHasMultipleGroups);
 		}
-		oFixedList.bindAggregation("items", { path: 'om>/', templateShareable: false, template: oTemplate });
-		oFixedList.setGroupable(bHasMultipleGroups);
 
 		for (const sOperator of aOperators) {
 			const oOperator = FilterOperatorUtil.getOperator(sOperator);
@@ -1149,6 +1145,8 @@ sap.ui.define([
 			});
 		}
 
+		oFixedList.destroyItems(); // to destroy old bindings and internal items and let them create new.
+		this.oOperatorModel.setData(); // to make sure taht model data changed
 		this.oOperatorModel.setData(aOperatorsData);
 	}
 

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.130.1
+	 * @version 1.131.1
 	 * @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.130.1
+	 * @version 1.131.1
 	 * @constructor
 	 * @abstract
 	 * @public

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.130.1
+	 * @version 1.131.1
 	 * @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.130.1
+	 * @version 1.131.1
 	 * @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.130.1
+	 * @version 1.131.1
 	 * @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.130.1
+	 * @version 1.131.1
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -658,6 +658,11 @@ sap.ui.define([
 		_updateSelection.call(this);
 	};
 
+	FixedList.prototype.destroyItems = function () {
+		const oList = _getList.call(this);
+		oList?.destroyItems(); // directly destroy all internal items and it's bindings to prevent step-by-step removement from ManagedObjectModel
+		return this.destroyAggregation("items");
+	};
 
 	return FixedList;
 });

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.130.1
+	 * @version 1.131.1
 	 *
 	 * @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.130.1
+	 * @version 1.131.1
 	 * @constructor
 	 * @public
 	 * @since 1.95.0

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

@@ -53,7 +53,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.130.1
+	 * @version 1.131.1
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -844,10 +844,23 @@ sap.ui.define([
 
 	MTable.prototype.isNavigationEnabled = function(iStep) {
 
-		if (iStep === 1 || (iStep === -1 && (this.isSingleSelect() || !this.getParent().isOpen()))) { // prevent arrow-up navigation to end on multi-selection or
-			return true;
+		if (iStep === 1 || iStep === -1) {
+			if (iStep === 1 || (iStep === -1 && (this.isSingleSelect() || !this.getParent().isOpen()))) { // prevent arrow-up navigation to end on multi-selection on opened table
+				return true;
+			} else {
+				return false;
+			}
+		} else if (this.isSingleSelect()) { // prevent Home/End navigation to end on multi-selection on opened and closed table
+			const oListBinding = this.getListBinding();
+			const oBindingInfo = this.getListBindingInfo();
+			if ((oListBinding?.isLengthFinal() || oBindingInfo.length) && !oListBinding?.isSuspended()) { // if all relevant items known, allow Home/End...
+				// TODO: what if ListBinding pending?
+				return true;
+			} else {
+				return false;
+			}
 		} else {
-			return false; // TODO: check if everything already loaded?
+			return false;
 		}
 
 	};