@openui5/sap.ui.mdc 1.102.1 → 1.103.1

package/src/sap/ui/mdc/valuehelp/Dialog.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	"use strict";
 
 	var MDialog, MLibrary, Button, ManagedObjectModel, IconTabBar, IconTabFilter;
-	var Panel, HBox, Tokenizer, Token;
+	var Panel, HBox, Tokenizer, Token, Filter;
 
 	/**
 	 * Constructor for a new <code>Dialog</code> container.
@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element showing a dialog.
 	 * @extends sap.ui.mdc.valuehelp.base.Container
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -117,7 +117,11 @@ sap.ui.define([
 				return oContent.getId() === sCurrentContentKey;
 			});
 			if (oCurrentContent) {
+				if (oCurrentContent.setCollectiveSearchSelect) {
+					oCurrentContent.setCollectiveSearchSelect(undefined); // remove collective search from Filterbar
+				}
 				oCurrentContent.onHide();
+				this._unbindContent(oCurrentContent);
 			}
 			this._renderSelectedContent(sNextId);
 		}.bind(this));
@@ -166,6 +170,10 @@ sap.ui.define([
 			oContent.onHide();
 		}
 
+		this.getContent().forEach(function (oContent) {
+			oContent.onContainerClose();
+		});
+
 		// Reset selection to initial key for retrieveContent calls before it is opened again.
 		this.setProperty("_selectedContentKey", this._sInitialContentKey);
 
@@ -514,7 +522,7 @@ sap.ui.define([
 				VBox = aModules[2];
 				Tokenizer = aModules[3];
 				Token = aModules[4];
-				var Filter = aModules[5];
+				Filter = aModules[5];
 				var ConditionType = aModules[6];
 				var BackgroundDesign = MLibrary.BackgroundDesign;
 				var ButtonType = MLibrary.ButtonType;
@@ -523,8 +531,8 @@ sap.ui.define([
 					backgroundDesign: BackgroundDesign.Transparent,
 					expanded: true,
 					visible: {parts: ['$valueHelp>/_config/maxConditions', '$help>/content'], formatter: _isTokenizerRequired},
-					headerText: {parts: ['$i18n>valuehelp.TOKENIZERTITLE', '$valueHelp>/conditions'], formatter:
-						function(sText, aConditions) {
+					headerText: {parts: ['$valueHelp>/conditions', '$help>/_selectableContents'], formatter:
+						function(aConditions, aContent) {
 							var iCount = 0;
 							for (var i = 0; i < aConditions.length; i++) {
 								var oCondition = aConditions[i];
@@ -532,11 +540,19 @@ sap.ui.define([
 									iCount++;
 								}
 							}
-							if (iCount === 0) {
-								// in case of no items do not show a number
-								sText = this._oResourceBundle.getText("valuehelp.TOKENIZERTITLENONUMBER");
+							var sTitle;
+							if (aContent && aContent.length == 1) { // in case of single content the title will be provided by the content
+								sTitle = aContent[0].getFormattedTokenizerTitle(iCount);
+								return sTitle;
+							} else {
+								// default title
+								sTitle = this._oResourceBundle.getText("valuehelp.TOKENIZERTITLE");
+								if (iCount === 0) {
+									// in case of no items do not show a number
+									sTitle = this._oResourceBundle.getText("valuehelp.TOKENIZERTITLENONUMBER");
+								}
+								return formatMessage(sTitle, iCount);
 							}
-							return formatMessage(sText, iCount);
 						}.bind(this)
 					}
 				});
@@ -544,19 +560,9 @@ sap.ui.define([
 
 				var oHBox = new HBox(this.getId() + "-TokenBox", {fitContainer: true, width: "100%"});
 
-				var oFilter = new Filter({path:'isEmpty', operator:'NE', value1:true});
-
-				var oValueHelpModel = this.getModel("$valueHelp");
-				var oConfig = oValueHelpModel ? oValueHelpModel.getProperty("/_config") : {};
-				var oParent = this.getParent();
-				var oFormatOptions = { // TODO: is more needed?
-							maxConditions: -1, // as for tokens there should not be a limit on type side
-							valueType: oConfig.dataType,
-							operators: oConfig.operators,
-							display: oConfig.display,
-							fieldHelpID: oParent && oParent.getId() // needed to get description for Token (if not provided)
-						};
-				var oTokenTemplate = new Token(this.getId() + "-Token", {text: {path: '$valueHelp>', type: new ConditionType(oFormatOptions)}});
+				var oFormatOptions = _getConditionFormatOptions.call(this);
+				this._oConditionType = new ConditionType(oFormatOptions);
+				this._oConditionType._bVHTokenizer = true; // just help for debugging
 				this.oTokenizer = new Tokenizer(this.getId() + "-Tokenizer", {
 					width: "100%",
 					tokenDelete: function(oEvent) {
@@ -575,11 +581,11 @@ sap.ui.define([
 						}
 
 					}.bind(this),
-					tokens: {path: '/conditions', model: "$valueHelp", templateShareable: false, template: oTokenTemplate, filters: oFilter},
 					layoutData: new FlexItemData({growFactor: 1, maxWidth: "calc(100% - 2rem)"})
 				});
 				this.oTokenizer.addAriaDescribedBy( this.oTokenizer.getTokensInfoId());
 				this.oTokenizer.addStyleClass("sapMdcTokenizer");
+				_bindTokenizer.call(this, true);
 
 				this.oRemoveAllBtn = new Button(this.getId() + "-TokenRemoveAll", {
 					press: function(oEvent) {
@@ -599,6 +605,9 @@ sap.ui.define([
 
 				return this.oTokenizerPanel;
 			}.bind(this));
+		} else { // update ConditionType with current formatOptions
+			var oFormatOptions = _getConditionFormatOptions.call(this);
+			this._oConditionType.setFormatOptions(oFormatOptions);
 		}
 		return this.oTokenizerPanel;
 	};
@@ -616,23 +625,70 @@ sap.ui.define([
 		return bVisible;
 	}
 
+	function _getConditionFormatOptions() {
+
+		var oValueHelpModel = this.getModel("$valueHelp");
+		var oConfig = oValueHelpModel ? oValueHelpModel.getProperty("/_config") : {};
+		var oParent = this.getParent();
+		var oControl = this._getControl();
+		return { // TODO: is more needed?
+			maxConditions: -1, // as for tokens there should not be a limit on type side
+			valueType: oConfig.dataType,
+			operators: oConfig.operators,
+			display: oConfig.display,
+			fieldHelpID: oParent && oParent.getId(), // needed to get description for Token (if not provided)
+			control: oControl,
+			delegate: oControl && oControl.getControlDelegate && oControl.getControlDelegate(),
+			delegateName: oControl && oControl.getDelegate && oControl.getDelegate() && oControl.getDelegate().name,
+			payload: oControl && oControl.getPayload && oControl.getPayload(),
+			convertWhitespaces: true
+		};
+
+	}
+
+	function _bindTokenizer(bBind) {
+
+		if (this.oTokenizer) {
+			var oBindingInfo = this.oTokenizer.getBindingInfo("tokens");
+			if (bBind) {
+				if (!oBindingInfo) { // not bound -> create binding
+					var oFilter = new Filter({path:'isEmpty', operator:'NE', value1:true});
+					var oTokenTemplate = new Token(this.getId() + "-Token", {text: {path: '$valueHelp>', type: this._oConditionType}});
+					this.oTokenizer.bindAggregation("tokens", {path: '/conditions', model: "$valueHelp", templateShareable: false, template: oTokenTemplate, filters: oFilter});
+				}
+			} else if (oBindingInfo) { // remove binding if dialog is closed to prevent updated on tokens if conditions are updated. (Suspend would not be enough, as every single binding on token would need to be suspended too.)
+				this.oTokenizer.unbindAggregation("tokens");
+			}
+		}
+
+	}
+
 	Dialog.prototype._open = function (oDialog) {
 		if (oDialog) {
 			this._updateInitialContentKey(); // Update initial key as visibilities might change during content retrieval
+
+			var fnRenderContent = function () {
+				this._renderSelectedContent(this._sInitialContentKey, function () {
+					oDialog.open();
+					this.getContent().forEach(function (oContent) {
+						oContent.onContainerOpen();
+					});
+				}.bind(this));
+			}.bind(this);
+
 			if (_isTokenizerRequired(this.getMaxConditions(), this.getContent()) && oDialog.getContent()[0].getItems().length === 1) {
 				// Tokenizer needed but already no tokenizer
 				Promise.all([this._getTokenizerPanel()]).then(function (aControls) {
 					aControls.forEach(function (oControl) {
 						oDialog.getContent()[0].addItem(oControl);
 					});
-					this._renderSelectedContent(this._sInitialContentKey, function () {
-						oDialog.open();
-					});
+					fnRenderContent();
 				});
 			} else {
-				this._renderSelectedContent(this._sInitialContentKey, function () {
-					oDialog.open();
-				});
+				if (this.oTokenizer) { // restore tokenizer binding to enable updates if open
+					_bindTokenizer.call(this, true);
+				}
+				fnRenderContent();
 			}
 		}
 	};
@@ -655,9 +711,14 @@ sap.ui.define([
 		}
 		return Promise.all(aNecessaryPromises).then(function (aPromiseResults) {
 
+			this._bindContent(oNextContent);
 			this.setProperty("_selectedContentKey", sNextContentId);
 			this.setProperty("_selectableContents", this._getSelectableContents());
-			this._oManagedObjectModel.checkUpdate(true, true); // force Update as bindings to $help>displayContent are not updated automatically in some cases
+			this._oManagedObjectModel.checkUpdate(true, false, function (oBinding) { // force update as bindings to $help>displayContent are not updated automatically in some cases
+				if (oBinding.getPath() === "displayContent") { // do not update other bindings as this might lead to rerendering of IconTabBar ot other unwanted updates.
+					return true;
+				}
+			});
 
 			if (oGroupSelectPromise) {
 				this._updateGroupSelectModel();
@@ -681,6 +742,10 @@ sap.ui.define([
 		var oContainer = this.getAggregation("_container");
 		if (oContainer) {
 			oContainer.close();
+
+			if (this.oTokenizer) { // remove tokenizer binding to prevent updates if closed
+				_bindTokenizer.call(this, false);
+			}
 		}
 	};
 

package/src/sap/ui/mdc/valuehelp/Popover.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element showing a popover.
 	 * @extends sap.ui.mdc.valuehelp.base.Container
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -107,6 +107,10 @@ sap.ui.define([
 					afterClose: this._handleClosed.bind(this)
 				}).addStyleClass("sapMdcValueHelpPopover").addStyleClass("sapMComboBoxBasePicker").addStyleClass("sapMComboBoxBasePicker-CTX"); // to have a ComboBox popup
 
+				oPopover.isPopupAdaptationAllowed = function () {
+					return false;
+				};
+
 				oPopover.addStyleClass(this._isSingleSelect() ? "sapMdcValueHelpSingleSelect" : "sapMdcValueHelpMultiSelect");
 
 				oPopover.addDelegate({onsapshow: this._handleRequestSwitchToDialog.bind(this)});
@@ -185,6 +189,10 @@ sap.ui.define([
 			this._oCurrentContent = aContents[0];
 			var oFooterContent = aContents[1];
 
+			// to prevent a Fieldgroup leave if opening control has fieldgroups, asign the fieldgroups to content
+			var oControl = this._getControl();
+			this._oCurrentContent.setFieldGroupIds(oControl.getFieldGroupIds());
+
 			if (oFooterContent && oPopover.getFooter() != oFooterContent && oFooterContent.isA && oFooterContent.isA("sap.m.Toolbar")) {
 				oPopover.setFooter(oFooterContent);
 				return oPopover;
@@ -212,6 +220,8 @@ sap.ui.define([
 			return;
 		}
 
+		Container.prototype._open.apply(this, arguments);
+
 		var oControl = this._getControl();
 		var oTarget = oControl && oControl.getFocusElementForValueHelp ? oControl.getFocusElementForValueHelp(this.isTypeahead()) : oControl;
 
@@ -226,6 +236,7 @@ sap.ui.define([
 
 	Popover.prototype._close = function () {
 
+		Container.prototype._close.apply(this, arguments);
 		var oPopover = this.getAggregation("_container");
 		if (oPopover) {
 			oPopover.close();
@@ -241,6 +252,7 @@ sap.ui.define([
 		var oContent = this._getContent();
 
 		if (oContent) {
+			oContent.onContainerOpen();
 			oContent.onShow();
 		}
 
@@ -256,6 +268,7 @@ sap.ui.define([
 
 		if (oContent) {
 			oContent.onHide();
+			oContent.onContainerClose();
 		}
 
 		var oPopover = this.getAggregation("_container");
@@ -319,7 +332,7 @@ sap.ui.define([
 			return {
 				contentId: oContentAttributes.contentId,
 				ariaHasPopup: oContentAttributes.ariaHasPopup,
-				role: this.getUseAsValueHelp() ? "combobox" : null, // Popover is a ComboBox, but only if used as valuehelp, only typeahead has no role (see sap.m.Input)
+				role: this.isDialog() ? "combobox" : null, // Popover is a ComboBox, but only if used as valuehelp, only typeahead has no role (see sap.m.Input)
 				roleDescription: oContentAttributes.roleDescription // for multiselect-mTable it needs to be set
 			};
 		}

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

@@ -24,7 +24,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.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -160,8 +160,8 @@ sap.ui.define([
 			if (oChanges.mutation === "remove") {
 				this._unbindContent(oContent);
 
-			} else {
-				this._bindContent(oContent);
+			// } else {
+			// 	this._bindContent(oContent);
 			}
 		}
 	};
@@ -291,9 +291,15 @@ sap.ui.define([
 
 	Container.prototype._open = function (oContainer) {
 
+		var aContent = this.getContent();
+		for (var i = 0; i < aContent.length; i++) { // for Dialog overwrite to only bind shown content
+			this._bindContent(aContent[i]);
+		}
+
 	};
 
 	Container.prototype._close = function () {
+
 	};
 
 	Container.prototype._handleOpened = function () {
@@ -303,6 +309,12 @@ sap.ui.define([
 
 	Container.prototype._handleClosed = function (oEvent) {
 		this._removePromise("open");
+
+		var aContent = this.getContent();
+		for (var i = 0; i < aContent.length; i++) {
+			this._unbindContent(aContent[i]);
+		}
+
 		this.fireClosed();
 	};
 
@@ -327,7 +339,6 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	 Container.prototype.isOpen = function () {
 		var oPromise = this._retrievePromise("open");
@@ -343,7 +354,6 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	 Container.prototype.isOpening = function () {
 		var oPromise = this._retrievePromise("open");
@@ -377,7 +387,6 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.getItemForValue = function(oConfig) { // TODO only for TypeAhead container
 	};
@@ -389,9 +398,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	 Container.prototype.isValidationSupported = function() { // TODO only for TypeAhead container
+	Container.prototype.isValidationSupported = function() { // TODO only for TypeAhead container
 		return false;
 	};
 
@@ -408,7 +416,6 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.navigate = function(iStep) { // pass through to content
 		return Promise.all([this._getContainer()]).then(function (aResults) {
@@ -426,7 +433,6 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.removeFocus = function() {
 	};
@@ -440,7 +446,6 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valueHelp.base.Content
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.isTypeahead = function () {
 		var oValueHelp = this.getParent();
@@ -456,12 +461,28 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp, sap.ui.mdc.valueHelp.base.Content
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.isTypeaheadSupported = function () {
 		return false;
 	};
 
+	/**
+	 * Determines if the container is used as dialog inside the value help
+	 *
+	 * The container is also used as dialog if <code>useAsValueHelp</code> is set on content and no other dialog is set.
+	 *
+	 * <b>Note:</b> This function is used by the container and content and must not be used from outside
+	 *
+	 * @returns {boolean} True if used as dialog
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.valueHelp.base.Content
+	 */
+	Container.prototype.isDialog = function () {
+		var oValueHelp = this.getParent();
+		return oValueHelp && (oValueHelp.getDialog() === this || (this.isTypeahead() && !oValueHelp.getDialog() && this.getUseAsValueHelp()));
+	};
+
 	/**
 	 * Determines if the container provides a own scroll functionality.
 	 * If not, the <code>Content</code> needs to provide a scrolling solution like a {@link sap.m.ScrollContainer ScrollContainer}.
@@ -472,7 +493,6 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valueHelp.base.Content
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.providesScrolling = function () {
 		return false;
@@ -488,7 +508,6 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valueHelp.base.Content
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.getValueHelpDelegate = function () {
 		var oValueHelp = this.getParent();
@@ -504,9 +523,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valueHelp.base.Content
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	 Container.prototype.getValueHelpDelegatePayload = function () {
+	Container.prototype.getValueHelpDelegatePayload = function () {
 		var oValueHelp = this.getParent();
 		return oValueHelp && oValueHelp.getPayload();
 	};
@@ -521,9 +539,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valueHelp.base.Content
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	 Container.prototype.awaitValueHelpDelegate = function () {
+	Container.prototype.awaitValueHelpDelegate = function () {
 		var oValueHelp = this.getParent();
 		return oValueHelp && oValueHelp.awaitControlDelegate();
 	};
@@ -537,9 +554,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valueHelp.base.Content
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	 Container.prototype.isValueHelpDelegateInitialized = function () {
+	Container.prototype.isValueHelpDelegateInitialized = function () {
 		var oValueHelp = this.getParent();
 		return oValueHelp && oValueHelp.bDelegateInitialized;
 	};
@@ -554,7 +570,6 @@ sap.ui.define([
 	 * @returns {boolean} True if value help shall open as valuehelp
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.getUseAsValueHelp = function() {
 		return false;
@@ -566,7 +581,6 @@ sap.ui.define([
 	 * @returns {string} Name of the icon
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.getValueHelpIcon = function() {
 		// not define icon property on Container as it might be dependent Popover/Dialog or used content
@@ -580,7 +594,6 @@ sap.ui.define([
 	 * @returns {object} object with the aria-attibutes
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.getAriaAttributes = function(iMaxConditions) {
 
@@ -604,7 +617,6 @@ sap.ui.define([
 	 * @returns {boolean} If <code>true</code>, the value help should open when user clicks into the connected field control
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.shouldOpenOnClick = function() {
 		return false;
@@ -616,9 +628,8 @@ sap.ui.define([
 	 * @returns {boolean} If <code>true</code>, the value help should open when user used the arrow keys in the connected field control
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	 Container.prototype.shouldOpenOnNavigate = function() {
+	Container.prototype.shouldOpenOnNavigate = function() {
 		return false;
 	};
 
@@ -630,7 +641,6 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.isFocusInHelp = function() {
 
@@ -645,7 +655,6 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Container.prototype.isMultiSelect = function() {