@openui5/sap.ui.mdc 1.111.0 → 1.112.0

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

@@ -50,7 +50,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.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -270,24 +270,13 @@ sap.ui.define([
 					};
 					oDialog.addStyleClass("sapMdcValueHelp");
 					oDialog.addStyleClass("sapMdcValueHelpTitle");
-					oDialog.addStyleClass("sapMdcValueHelpTitleShadow");
 
-					var oVBox = new VBox(this.getId() + "-Content", { fitContainer: true});
-					oVBox.addStyleClass("sapMdcValueHelpPanel");
-					oDialog.addContent(oVBox);
+					var oContentArea = new VBox(this.getId() + "-Content", { fitContainer: true});
+					oContentArea.addStyleClass("sapMdcValueHelpPanel");
+					oDialog.addContent(oContentArea);
 
-					var aPromises = [];
-					aPromises.push(this._getIconTabBar(oDialog));
+					return oDialog;
 
-					if (_isTokenizerRequired(this.getMaxConditions(), this.getContent())) {
-						aPromises.push(this._getTokenizerPanel());
-					}
-					return Promise.all(aPromises).then(function (aControls) {
-						aControls.forEach(function (oControl) {
-							oVBox.addItem(oControl);
-						});
-						return oDialog;
-					});
 				}.bind(this));
 			}.bind(this));
 		}
@@ -295,6 +284,47 @@ sap.ui.define([
 		return oDialog;
 	};
 
+	Dialog.prototype._placeContent = function (oDialog) {
+
+		var oContentArea = oDialog.getContent()[0];
+		var aSelectableContents = this.getProperty("_selectableContents");
+
+		if (!aSelectableContents.length) { // no content assigned to dialog
+			return Promise.resolve(oDialog);
+		}
+
+		var bMultiContentMode = aSelectableContents.length > 1;
+
+		var aContentPromises = [];
+		if (bMultiContentMode) { // Multiple contents are displayed using an IconTabBar
+			aContentPromises.push(this._getIconTabBar(oDialog));
+		} else {
+			if (!this._oStandaloneTab) {
+				this._oStandaloneTab = new DialogTab(this.getId() + "-Standalone-DT", {content: {path: "/_selectableContents/0/displayContent", model: "$help"}, layoutData: new sap.m.FlexItemData({growFactor: 1, minHeight: "0"})});
+			}
+			aContentPromises.push(this._oStandaloneTab);
+		}
+
+		if (_isTokenizerRequired(this.getMaxConditions(), this.getContent())) {
+			aContentPromises.push(this._getTokenizerPanel());
+		}
+
+		return Promise.all(aContentPromises).then(function (aControls) {
+			oContentArea.removeAllItems();
+			aControls.forEach(function (oControl) {
+				oContentArea.addItem(oControl);
+			});
+
+			if (bMultiContentMode) {
+				oDialog.addStyleClass("sapMdcValueHelpTitleShadow"); // make the Header border invisible
+			} else {
+				oDialog.removeStyleClass("sapMdcValueHelpTitleShadow"); // make the Header border visible
+			}
+
+			return oDialog;
+		});
+	};
+
 	Dialog.prototype._handleSelect = function (oEvent) {
 		Container.prototype._handleSelect.apply(this, arguments);
 
@@ -450,7 +480,7 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	Dialog.prototype._getIconTabBar = function (oDialog) {
+	Dialog.prototype._getIconTabBar = function () {
 		if (!this._oIconTabBar) {
 			return this._retrievePromise("IconTabBar", function (){
 				return loadModules([
@@ -467,32 +497,10 @@ sap.ui.define([
 							headerMode: IconTabHeaderMode.Inline,
 							select: this._onTabBarSelect.bind(this),
 							layoutData: new FlexItemData({growFactor: 1}),
-							selectedKey: "{path: '$help>/_selectedContentKey', mode: 'OneWay'}",
-							visible: {parts : ['$help>/_selectableContents'], formatter:
-								function(aContent) {
-									if (aContent && aContent.length == 1) {
-										oDialog.removeStyleClass("sapMdcValueHelpTitleShadow"); // make the Header border visible
-									} else {
-										oDialog.addStyleClass("sapMdcValueHelpTitleShadow"); // make the Header border invisible
-									}
-									return true;
-								}
-							}
+							selectedKey: "{path: '$help>/_selectedContentKey', mode: 'OneWay'}"
 						});
 						// this._oIconTabBar.setModel(this._oManagedObjectModel, "$help");
 						this._oIconTabBar.addStyleClass("sapUiNoContentPadding");
-						var oIconTabHeader = this._oIconTabBar._getIconTabHeader();
-						oIconTabHeader.bindProperty("visible", {parts : ['$help>/_selectableContents'], formatter:
-							function(aContent) {
-								if (aContent && aContent.length === 1) {
-									return false;
-								} else {
-									return true;
-								}
-							}
-						});
-
-
 						var oITF = new IconTabFilter(this.getId() + "-ITF", {
 							key: {path: "$help>id"},
 							content: new DialogTab(this.getId() + "-DT", {content: {path: "$help>displayContent"}}),
@@ -587,7 +595,7 @@ sap.ui.define([
 					var oFormatOptions = _getConditionFormatOptions.call(this);
 					this._oConditionType = new ConditionType(oFormatOptions);
 					this._oConditionType._bVHTokenizer = true; // just help for debugging
-					this.oTokenizer = new MultiInput(this.getId() + "-Tokenizer", {
+					this.oTokenMultiInput = new MultiInput(this.getId() + "-Tokenizer", {
 						width: "100%",
 						showValueHelp: false,
 						editable: true,
@@ -614,16 +622,16 @@ sap.ui.define([
 					// Overwrite the setValueVisible to make the input part not visible (transparent).
 					// Problem: you can still enter a value into the $input dom ref and this will be shown when you remove all tokens. this can be solved inside the afterRender handler.
 					// ACC issue: the screenreader is still reading this control as input field and that the user can enter a value - which is not correct.
-					this.oTokenizer._setValueVisible = function (bVisible) {
+					this.oTokenMultiInput._setValueVisible = function (bVisible) {
 						this.$("inner").css("opacity", "0");
 					};
 
-					var org = this.oTokenizer.onAfterRendering;
-					this.oTokenizer.onAfterRendering = function() {
-						org.apply(this.oTokenizer, arguments);
+					var org = this.oTokenMultiInput.onAfterRendering;
+					this.oTokenMultiInput.onAfterRendering = function() {
+						org.apply(this.oTokenMultiInput, arguments);
 
-						this.oTokenizer._setValueVisible();  // make the input always invisible
-						this.oTokenizer.setValue(""); // set the value to empty string
+						this.oTokenMultiInput._setValueVisible();  // make the input always invisible
+						this.oTokenMultiInput.setValue(""); // set the value to empty string
 					}.bind(this);
 
 					_bindTokenizer.call(this, true);
@@ -641,7 +649,7 @@ sap.ui.define([
 					});
 					this.oRemoveAllBtn.addStyleClass("sapUiTinyMarginBegin");
 
-					oHBox.addItem(this.oTokenizer);
+					oHBox.addItem(this.oTokenMultiInput);
 					oHBox.addItem(this.oRemoveAllBtn);
 					this.oTokenizerPanel.addContent(oHBox);
 
@@ -691,17 +699,17 @@ sap.ui.define([
 
 	function _bindTokenizer(bBind) {
 
-		if (this.oTokenizer) {
-			var oBindingInfo = this.oTokenizer.getBindingInfo("tokens");
+		if (this.oTokenMultiInput) {
+			var oBindingInfo = this.oTokenMultiInput.getBindingInfo("tokens");
 			if (bBind) {
 				if (!oBindingInfo) { // not bound -> create binding
 					var oFilter = new Filter({path:'isEmpty', operator:'NE', value1:true});
 					this._oConditionType.setFormatOptions(_getConditionFormatOptions.call(this)); // as config might be changed
 					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});
+					this.oTokenMultiInput.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");
+				this.oTokenMultiInput.unbindAggregation("tokens");
 			}
 		}
 
@@ -742,7 +750,7 @@ sap.ui.define([
 					fnRenderContent();
 				});
 			} else {
-				if (this.oTokenizer) { // restore tokenizer binding to enable updates if open
+				if (this.oTokenMultiInput) { // restore tokenizer binding to enable updates if open
 					_bindTokenizer.call(this, true);
 				}
 				fnRenderContent();
@@ -759,7 +767,7 @@ sap.ui.define([
 			throw new Error("sap.ui.mdc.ValueHelp: No content found.");
 		}
 
-		var aNecessaryPromises = [oNextContent.getContent()];
+		var aNecessaryPromises = [oNextContent.getContent()]; // Content.getContent() initializes displayContent asynchonously
 		var sSelectedContentGroup = oNextContent.getGroup && oNextContent.getGroup();
 		var oGroupSelectPromise;
 		if (sSelectedContentGroup && _isValidContentGroup.call(this, sSelectedContentGroup)) {
@@ -777,7 +785,7 @@ sap.ui.define([
 			this.setProperty("_selectedContentKey", sNextContentId);
 			this.setProperty("_selectableContents", this._getSelectableContents());
 			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.
+				if (oBinding.getPath().indexOf("displayContent") >= 0) { // do not update other bindings as this might lead to rerendering of IconTabBar ot other unwanted updates.
 					return true;
 				}
 			});
@@ -805,7 +813,7 @@ sap.ui.define([
 		if (oContainer) {
 			oContainer.close();
 
-			if (this.oTokenizer) { // remove tokenizer binding to prevent updates if closed
+			if (this.oTokenMultiInput) { // remove tokenizer binding to prevent updates if closed
 				_bindTokenizer.call(this, false);
 			}
 		}
@@ -847,13 +855,14 @@ sap.ui.define([
 			"oButtonOK",
 			"oButtonCancel",
 			"oTokenizerPanel",
-			"oTokenizer",
+			"oTokenMultiInput",
 			"_oIconTabBar",
 			"_oGroupSelect",
 			"_oGroupSelectModel",
 			"_sInitialContentKey",
 			"_mAlreadyShownContents",
-			"oInvisibleMessage"
+			"oInvisibleMessage",
+			"_oStandaloneTab"
 		]);
 
 		Container.prototype.exit.apply(this, arguments);

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

@@ -31,7 +31,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.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -61,6 +61,18 @@ sap.ui.define([
 				opensOnClick: {
 					type: "boolean",
 					defaultValue: false
+				},
+				/**
+				 * Controls the possibility to open this popover container by focussing a connected control
+				 *
+				 * <b>Note:</b> By default, a typeahead is only shown to provide suggestions when users enter input in a connected control.
+				 * This property enables scenarios, where popovers need to be shown earlier (e. g. recommendations or recently entered values)
+				 * Please also see {@link sap.ui.mdc.ValueHelpDelegate.showTypahead showTypahead}
+	 			 * @since 1.112.0
+				 */
+				opensOnFocus: {
+					type: "boolean",
+					defaultValue: false
 				}
 			},
 			defaultAggregation: "content"
@@ -390,6 +402,12 @@ sap.ui.define([
 
 	};
 
+	Popover.prototype.shouldOpenOnFocus = function() {
+
+		return this.getOpensOnFocus();
+
+	};
+
 	Popover.prototype.shouldOpenOnClick = function() {
 
 		var oContent = this._getContent();

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.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -620,6 +620,17 @@ sap.ui.define([
 		return oContainer && oContainer.getScrollDelegate && oContainer.getScrollDelegate();
 	};
 
+	/**
+	 * Determines if the value help should be opened when the user focuses the connected control.
+	 *
+	 * @returns {boolean} If <code>true</code>, the value help should open when user focuses the connected field control
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.ValueHelp
+	 */
+	Container.prototype.shouldOpenOnFocus = function() {
+		return false;
+	};
+
 	/**
 	 * Determines if the value help should be opened when the user clicks into the connected control.
 	 *

package/src/sap/ui/mdc/valuehelp/base/Content.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.
 	 * @extends sap.ui.core.Element
-	 * @version 1.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

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.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/valuehelp/base/FilterableListContent.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.mdc.valuehelp.base.ListContent
-	 * @version 1.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/valuehelp/base/ListContent.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.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -22,7 +22,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.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -25,7 +25,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.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -26,7 +26,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 fix values.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -277,7 +277,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.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

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.111.0
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -223,14 +223,12 @@ sap.ui.define([
 		var oItem = oEvent.getParameter("listItem");
 		var oItemContext = this._getListItemBindingContext(oItem);
 		var oValues = this._getItemFromContext(oItemContext);
-		var bIsSingleSelect = this._isSingleSelect();
-		var bSelected = bIsSingleSelect ? true : !oItem.getSelected();
-		var sSelectType = SelectType.Set;
+		var oTable = this._getTable();
+		var bSingleSelectMaster = oTable.getMode() === ListMode.SingleSelectMaster; // Only in this mode the item will already have the desired selection state.
+		var bSelected = bSingleSelectMaster ? oItem.getSelected() : !oItem.getSelected();
+		oItem.setSelected(bSelected);
+		var sSelectType = bSelected ? SelectType.Add : SelectType.Remove;
 
-		if (!bIsSingleSelect) {
-			oItem.setSelected(bSelected);
-			sSelectType = bSelected ? SelectType.Add : SelectType.Remove;
-		}
 		var oCondition = this._createCondition(oValues.key, oValues.description, oValues.payload);
 		this._fireSelect({type: sSelectType, conditions: [oCondition]});
 		if (this.isTypeahead()) {