@openui5/sap.ui.integration 1.93.3 → 1.96.1

package/src/sap/ui/integration/{designtime/editor → editor}/fields/IntegerField.js

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/integration/designtime/editor/fields/BaseField",
+	"sap/ui/integration/editor/fields/BaseField",
 	"sap/m/Input"
 ], function (
 	BaseField, Input
@@ -13,16 +13,16 @@ sap.ui.define([
 
 	/**
 	 * @class
-	 * @extends sap.ui.integration.designtime.editor.fields.BaseField
-	 * @alias sap.ui.integration.designtime.editor.fields.IntegerField
+	 * @extends sap.ui.integration.editor.fields.BaseField
+	 * @alias sap.ui.integration.editor.fields.IntegerField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted
 	 */
-	var IntegerField = BaseField.extend("sap.ui.integration.designtime.editor.fields.IntegerField", {
+	var IntegerField = BaseField.extend("sap.ui.integration.editor.fields.IntegerField", {
 		metadata: {
 			library: "sap.ui.integration"
 		},
@@ -40,11 +40,6 @@ sap.ui.define([
 						type: 'sap.ui.model.type.Integer',
 						formatOptions: oFormatter
 					},
-					change: function (oEvent) {
-						var oSource = oEvent.getSource();
-						oSource.getBinding("value").setValue(oSource.getValue());
-						oSource.getBinding("value").checkUpdate();
-					},
 					editable: oConfig.editable,
 					type: "Number"
 				}

package/src/sap/ui/integration/{designtime/editor → editor}/fields/ListField.js

@@ -4,13 +4,14 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/integration/designtime/editor/fields/BaseField",
+	"sap/ui/integration/editor/fields/BaseField",
 	"sap/m/Input",
 	"sap/m/Text",
 	"sap/m/MultiComboBox",
 	"sap/ui/core/ListItem",
 	"sap/base/util/each",
 	"sap/base/util/restricted/_debounce",
+	"sap/base/util/restricted/_isEqual",
 	"sap/base/util/ObjectPath",
 	"sap/base/util/includes",
 	"sap/ui/core/SeparatorItem",
@@ -18,7 +19,7 @@ sap.ui.define([
 	"sap/ui/model/Sorter",
 	"sap/base/util/deepClone"
 ], function (
-	BaseField, Input, Text, MultiComboBox, ListItem, each, _debounce, ObjectPath, includes, SeparatorItem, Core, Sorter, deepClone
+	BaseField, Input, Text, MultiComboBox, ListItem, each, _debounce, _isEqual, ObjectPath, includes, SeparatorItem, Core, Sorter, deepClone
 ) {
 	"use strict";
 	var sDefaultSeperator = "#";
@@ -26,16 +27,16 @@ sap.ui.define([
 
 	/**
 	 * @class
-	 * @extends sap.ui.integration.designtime.editor.fields.BaseField
-	 * @alias sap.ui.integration.designtime.editor.fields.ListField
+	 * @extends sap.ui.integration.editor.fields.BaseField
+	 * @alias sap.ui.integration.editor.fields.ListField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted
 	 */
-	var ListField = BaseField.extend("sap.ui.integration.designtime.editor.fields.ListField", {
+	var ListField = BaseField.extend("sap.ui.integration.editor.fields.ListField", {
 		metadata: {
 			library: "sap.ui.integration"
 		},
@@ -43,6 +44,9 @@ sap.ui.define([
 	});
 
 	ListField.prototype.initVisualization = function (oConfig) {
+		if (oResourceBundle && oResourceBundle.sLocale !== Core.getConfiguration().getLanguage()) {
+			oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration");
+		}
 		var that = this;
 		var oVisualization = oConfig.visualization;
 		if (!oVisualization) {
@@ -117,6 +121,8 @@ sap.ui.define([
 		if (oControl instanceof MultiComboBox) {
 			var oConfig = this.getConfiguration();
 			this.prepareFieldsInKey(oConfig);
+			//workaround for DIGITALWORKPLACE-5156, set the min-height of the popover
+			oControl.onAfterOpen = this.onAfterOpen;
 			if (this.isFilterBackend()) {
 				this.onInput = _debounce(this.onInput, 500);
 				//if need to filter backend by input value, need to hook the onInput function which only support filter locally.
@@ -127,7 +133,7 @@ sap.ui.define([
 				oControl.attachSelectionFinish(this.onSelectionFinish);
 				var oModel = this.getModel();
 				//merge the previous selected items with new items got from request
-				oModel.attachPropertyChange(this.mergeSelectedItems, this);
+				oModel.attachPropertyChange(this.onPropertyChange, this);
 			} else {
 				//listen to the selectionChange event of MultiComboBox
 				oControl.attachSelectionChange(this.onSelectionChange);
@@ -165,7 +171,7 @@ sap.ui.define([
 		return sItemKey;
 	};
 
-	ListField.prototype.mergeSelectedItems = function(oEvent) {
+	ListField.prototype.onPropertyChange = function(oEvent) {
 		var oConfig = this.getConfiguration();
 		if (!oConfig.valueItems) {
 			oConfig.valueItems = [];
@@ -185,33 +191,17 @@ sap.ui.define([
 			var aPath = sPath.split("/");
 			//get new items
 			var oResult = ObjectPath.get(aPath, oData);
-			if (Array.isArray(oResult)) {
-				//get keys of previous selected items
-				var aSelectedItemKeys = oConfig.valueItems.map(function (oSelectedItem) {
-					return this.getKeyFromItem(oSelectedItem);
-				}.bind(this));
-				//get the items which are in selectedItems list
-				var oItemsNotInSelectedItemsList = oResult.filter(function (item) {
-					var sItemKey = this.getKeyFromItem(item);
-					return !includes(aSelectedItemKeys, sItemKey);
-				}.bind(this));
-				//get the items which are selected and not in selectedItems list, for example, the selected items defined in manifest value
-				var oSelectedItemsMissedInSelectedItemsList = oItemsNotInSelectedItemsList.filter(function (item) {
-					return item.Selected === oResourceBundle.getText("CARDEDITOR_ITEM_SELECTED");
-				});
-				//add the selected items which are not in selectedItems list into selectedItems list
-				oConfig.valueItems = oConfig.valueItems.concat(oSelectedItemsMissedInSelectedItemsList);
-				//get the items which are not selected
-				var oNotSelectedItems = oItemsNotInSelectedItemsList.filter(function (item) {
-					return item.Selected !== oResourceBundle.getText("CARDEDITOR_ITEM_SELECTED");
-				});
-				//concat the filtered items to the selectedItems list as new data
-				oResult = oConfig.valueItems.concat(oNotSelectedItems);
-			} else {
-				oResult = oConfig.valueItems;
-			}
+			oResult = this.mergeSelectedItems(oConfig, oResult);
 			ObjectPath.set(aPath, oResult, oData);
-		} else if (Array.isArray(oData)) {
+		} else {
+			oData = this.mergeSelectedItems(oConfig, oData);
+		}
+		oValueModel.setData(oData);
+		this.setSuggestValue();
+	};
+
+	ListField.prototype.mergeSelectedItems = function(oConfig, oData) {
+		if (Array.isArray(oData)) {
 			//get keys of previous selected items
 			var aSelectedItemKeys = oConfig.valueItems.map(function (oSelectedItem) {
 				return this.getKeyFromItem(oSelectedItem);
@@ -223,21 +213,31 @@ sap.ui.define([
 			}.bind(this));
 			//get the items which are selected and not in selectedItems list, for example, the selected items defined in manifest value
 			var oSelectedItemsMissedInSelectedItemsList = oItemsNotInSelectedItemsList.filter(function (item) {
-				return item.Selected === oResourceBundle.getText("CARDEDITOR_ITEM_SELECTED");
+				return item.Selected === oResourceBundle.getText("EDITOR_ITEM_SELECTED");
 			});
 			//add the selected items which are not in selectedItems list into selectedItems list
 			oConfig.valueItems = oConfig.valueItems.concat(oSelectedItemsMissedInSelectedItemsList);
 			//get the items which are not selected
 			var oNotSelectedItems = oItemsNotInSelectedItemsList.filter(function (item) {
-				return item.Selected !== oResourceBundle.getText("CARDEDITOR_ITEM_SELECTED");
+				return item.Selected !== oResourceBundle.getText("EDITOR_ITEM_SELECTED");
 			});
 			//concat the filtered items to the selectedItems list as new data
 			oData = oConfig.valueItems.concat(oNotSelectedItems);
+			var oControl = this.getAggregation("_field");
+			if (oControl.isOpen()) {
+				aSelectedItemKeys = oConfig.valueItems.map(function (oSelectedItem) {
+					return this.getKeyFromItem(oSelectedItem);
+				}.bind(this));
+				var aSelectedKeysInControl = oControl.getSelectedKeys();
+				// if the selected items not match, update the control
+				if (!_isEqual(aSelectedItemKeys, aSelectedKeysInControl)) {
+					oControl.setSelectedKeys(aSelectedItemKeys);
+				}
+			}
 		} else {
 			oData = oConfig.valueItems;
 		}
-		oValueModel.setData(oData);
-		this.setSuggestValue();
+		return oData;
 	};
 
 	ListField.prototype.setSuggestValue = function() {
@@ -296,14 +296,14 @@ sap.ui.define([
 			var oNewItems = [];
 			oItems.forEach(function (oItem) {
 				//clone the current item since sometimes the item is readonly
-				var oNewItem = deepClone(oItem, 10);
+				var oNewItem = deepClone(oItem, 500);
 				var sItemKey = oField.getKeyFromItem(oNewItem);
 				if (sItemKey === sChangedItemKey) {
 					if (bIsSelected) {
-						oNewItem.Selected = oResourceBundle.getText("CARDEDITOR_ITEM_SELECTED");
+						oNewItem.Selected = oResourceBundle.getText("EDITOR_ITEM_SELECTED");
 						oConfig.valueItems = oConfig.valueItems.concat([oNewItem]);
 					} else {
-						oNewItem.Selected = oResourceBundle.getText("CARDEDITOR_ITEM_UNSELECTED");
+						oNewItem.Selected = oResourceBundle.getText("EDITOR_ITEM_UNSELECTED");
 						oConfig.valueItems = oConfig.valueItems.filter(function (oSelectedItem) {
 							var sItemKey = oField.getKeyFromItem(oSelectedItem);
 							return sItemKey !== sChangedItemKey;
@@ -345,9 +345,9 @@ sap.ui.define([
 					var sItemKey = oField.getKeyFromItem(oResult[n]);
 					if (sItemKey === sChangedItemKey) {
 						if (bIsSelected) {
-							oResult[n].Selected = oResourceBundle.getText("CARDEDITOR_ITEM_SELECTED");
+							oResult[n].Selected = oResourceBundle.getText("EDITOR_ITEM_SELECTED");
 						} else {
-							oResult[n].Selected = oResourceBundle.getText("CARDEDITOR_ITEM_UNSELECTED");
+							oResult[n].Selected = oResourceBundle.getText("EDITOR_ITEM_UNSELECTED");
 						}
 					}
 				}
@@ -358,9 +358,9 @@ sap.ui.define([
 				var sItemKey = oField.getKeyFromItem(oData[n]);
 				if (sItemKey === sChangedItemKey) {
 					if (bIsSelected) {
-						oData[n].Selected = oResourceBundle.getText("CARDEDITOR_ITEM_SELECTED");
+						oData[n].Selected = oResourceBundle.getText("EDITOR_ITEM_SELECTED");
 					} else {
-						oData[n].Selected = oResourceBundle.getText("CARDEDITOR_ITEM_UNSELECTED");
+						oData[n].Selected = oResourceBundle.getText("EDITOR_ITEM_UNSELECTED");
 					}
 				}
 			}
@@ -421,5 +421,15 @@ sap.ui.define([
 		oEvent.srcControl._getSuggestionsPopover()._sTypedInValue = sTerm;
 	};
 
+	ListField.prototype.onAfterOpen = function () {
+		MultiComboBox.prototype.onAfterOpen.apply(this, arguments);
+		var oPopover = this.getPicker();
+		if (oPopover._oCalcedPos === "Bottom" && !oPopover.hasStyleClass("sapUiIntegrationEditorPopupHeight")) {
+			oPopover.addStyleClass("sapUiIntegrationEditorPopupHeight");
+		} else if (oPopover._oCalcedPos !== "Bottom" &&  oPopover.hasStyleClass("sapUiIntegrationEditorPopupHeight")) {
+			oPopover.removeStyleClass("sapUiIntegrationEditorPopupHeight");
+		}
+	};
+
 	return ListField;
 });

package/src/sap/ui/integration/{designtime/editor → editor}/fields/NumberField.js

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/integration/designtime/editor/fields/BaseField",
+	"sap/ui/integration/editor/fields/BaseField",
 	"sap/m/Input"
 ], function (
 	BaseField, Input
@@ -13,16 +13,16 @@ sap.ui.define([
 
 	/**
 	 * @class
-	 * @extends sap.ui.integration.designtime.editor.fields.BaseField
-	 * @alias sap.ui.integration.designtime.editor.fields.NumberField
+	 * @extends sap.ui.integration.editor.fields.BaseField
+	 * @alias sap.ui.integration.editor.fields.NumberField
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted
 	 */
-	var NumberField = BaseField.extend("sap.ui.integration.designtime.editor.fields.NumberField", {
+	var NumberField = BaseField.extend("sap.ui.integration.editor.fields.NumberField", {
 		metadata: {
 			library: "sap.ui.integration"
 		},
@@ -40,11 +40,6 @@ sap.ui.define([
 						type: 'sap.ui.model.type.Float',
 						formatOptions: oFormatter
 					},
-					change: function (oEvent) {
-						var oSource = oEvent.getSource();
-						oSource.getBinding("value").setValue(oSource.getValue());
-						oSource.getBinding("value").checkUpdate();
-					},
 					editable: oConfig.editable,
 					type: "Number"
 				}