@openui5/sap.m 1.108.2 → 1.110.0

package/src/sap/m/MultiComboBox.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -13,6 +13,7 @@ sap.ui.define([
 	'./CheckBox',
 	'./Toolbar',
 	'./library',
+	'sap/ui/core/Element',
 	'sap/ui/core/EnabledPropagator',
 	'sap/ui/core/IconPool',
 	'sap/ui/core/library',
@@ -37,9 +38,7 @@ sap.ui.define([
 	'sap/ui/core/InvisibleText',
 	"sap/ui/thirdparty/jquery",
 	// jQuery Plugin "cursorPos"
-	"sap/ui/dom/jquery/cursorPos",
-	// jQuery Plugin "control"
-	"sap/ui/dom/jquery/control"
+	"sap/ui/dom/jquery/cursorPos"
 ],
 function(
 	InputBase,
@@ -50,6 +49,7 @@ function(
 	CheckBox,
 	Toolbar,
 	library,
+	Element,
 	EnabledPropagator,
 	IconPool,
 	coreLibrary,
@@ -145,7 +145,7 @@ function(
 	 * </ul>
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @extends sap.m.ComboBoxBase
@@ -621,8 +621,7 @@ function(
 	 */
 	MultiComboBox.prototype._selectItemByKey = function(oEvent) {
 		var aVisibleItems, oParam,
-			oItem, i, bItemMatched, bKeyIsValid,
-			bPickerOpened = this.isOpen();
+			oItem, i, bItemMatched, bKeyIsValid;
 
 		if (!this.getEnabled() || !this.getEditable()) {
 			return;
@@ -634,7 +633,7 @@ function(
 			oEvent.setMarked();
 		}
 
-		aVisibleItems = this._getUnselectedItems(bPickerOpened ? "" : this.getValue());
+		aVisibleItems = this._getUnselectedItems();
 
 		for (i = 0; i < aVisibleItems.length; i++) {
 			// Empty string should be valid key for sap.ui.core.Item only
@@ -714,7 +713,7 @@ function(
 		var sInputValue = this.getValue();
 		if (sInputValue) {
 			var aSelectableItems = this._getUnselectedItemsStartingText(sInputValue);
-			if (aSelectableItems.length === 1) {
+			if (aSelectableItems.length) {
 				this._selectItemByKey(oEvent);
 			} else {
 				this._showWrongValueVisualEffect();
@@ -820,7 +819,7 @@ function(
 	 * @private
 	 */
 	MultiComboBox.prototype._handleItemTap = function(oEvent) {
-		var oTappedControl = jQuery(oEvent.target).control(0);
+		var oTappedControl = Element.closestTo(oEvent.target);
 
 		if (!oTappedControl.isA("sap.m.CheckBox") && !oTappedControl.isA("sap.m.GroupHeaderListItem")) {
 			this._bCheckBoxClicked = false;
@@ -1286,6 +1285,12 @@ function(
 		if (this.getValueState() !== ValueState.Error) {
 			this._sInitialValueState = this.getValueState();
 		}
+
+		if (this.getShowClearIcon()) {
+			this._getClearIcon().setVisible(this.shouldShowClearIcon());
+		} else if (this._oClearIcon) {
+			this._getClearIcon().setVisible(false);
+		}
 	};
 
 	/**
@@ -1379,7 +1384,14 @@ function(
 	 */
 	MultiComboBox.prototype.onBeforeOpen = function() {
 		ComboBoxBase.prototype.onBeforeOpen.apply(this, arguments);
-		var fnPickerTypeBeforeOpen = this["_onBeforeOpen" + this.getPickerType()];
+		var fnPickerTypeBeforeOpen = this["_onBeforeOpen" + this.getPickerType()],
+			oDomRef = this.getFocusDomRef();
+
+		if (oDomRef) {
+			// expose a parent/child contextual relationship to assistive technologies,
+			// notice that the "aria-controls" attribute is set when the popover opened.
+			oDomRef.setAttribute("aria-controls", this.getPicker().getId());
+		}
 
 		// add the active state to the MultiComboBox's field
 		this.addContent();
@@ -1984,7 +1996,7 @@ function(
 
 				var aVisibleItems = ListHelpers.getVisibleItems(this.getItems());
 				var oItemFirst = aVisibleItems[0];
-				var oItemCurrent = jQuery(document.activeElement).control()[0];
+				var oItemCurrent = Element.closestTo(document.activeElement);
 
 				if (oItemCurrent !== ListHelpers.getListItem(oItemFirst)) {
 					return;
@@ -2141,6 +2153,8 @@ function(
 			onAfterRendering: this._onAfterRenderingTokenizer
 		}, this);
 
+		oTokenizer.setShouldRenderTabIndex(false);
+
 		return oTokenizer;
 	};
 
@@ -2414,7 +2428,7 @@ function(
 		}
 
 		// find focused element
-		var oFocusedElement = jQuery(document.activeElement).control()[0];
+		var oFocusedElement = Element.closestTo(document.activeElement);
 
 		if (!oFocusedElement) {
 
@@ -2688,18 +2702,15 @@ function(
 	 */
 	MultiComboBox.prototype._getNextTraversalItem = function() {
 		var sValue = this.getValue();
-		var aItems = sValue ? this._getItemsStartingWithPerTerm(sValue) : [];
-		var aSelectableItems = this._getUnselectedItems();
+		var aUnselectedMatchingItems = this._getUnselectedItemsPerTerm(sValue);
 
-		if (aItems.indexOf(this._oTraversalItem) > -1 && this._oTraversalItem.getText() === this.getValue()) {
+		// if there is already a previous traversal item, return the next one
+		if (aUnselectedMatchingItems.indexOf(this._oTraversalItem) > -1 && this._oTraversalItem.getText() === this.getValue()) {
 			return this._getNextUnselectedItemOf(this._oTraversalItem);
 		}
 
-		if (aItems.length && aItems[0].getText() === this.getValue()) {
-			return this._getNextUnselectedItemOf(aItems[0]);
-		}
-
-		return aItems.length ? aItems[0] : aSelectableItems[0];
+		// if there is an unselected matching item return it
+		return aUnselectedMatchingItems[0];
 	};
 
 	/**
@@ -2709,27 +2720,13 @@ function(
 	 */
 	MultiComboBox.prototype._getPreviousTraversalItem = function() {
 		var sValue = this.getValue();
-		var aItems = sValue ? this._getItemsStartingWithPerTerm(sValue) : [];
+		var aUnselectedMatchingItems = this._getUnselectedItemsPerTerm(sValue);
 
-		if (aItems.indexOf(this._oTraversalItem) > -1 && this._oTraversalItem.getText() === this.getValue()) {
+		if (aUnselectedMatchingItems.indexOf(this._oTraversalItem) > -1 && this._oTraversalItem.getText() === this.getValue()) {
 			return this._getPreviousUnselectedItemOf(this._oTraversalItem);
 		}
 
-		if (aItems.length && aItems[aItems.length - 1].getText() === this.getValue()) {
-			return this._getPreviousUnselectedItemOf(aItems[aItems.length - 1]);
-		}
-
-		if (aItems.length) {
-			return aItems[aItems.length - 1];
-		} else {
-			var aSelectableItems = this._getUnselectedItems();
-
-			if (aSelectableItems.length > 0) {
-				return aSelectableItems[aSelectableItems.length - 1];
-			} else {
-				return null;
-			}
-		}
+		return aUnselectedMatchingItems[aUnselectedMatchingItems.length - 1];
 	};
 
 	/* =========================================================== */
@@ -2975,6 +2972,35 @@ function(
 		return aItems;
 	};
 
+	/**
+	 * Gets the unselected items, matching a certain term
+	 *
+	 * @param {string} sText The text to be used for filtering
+	 * @returns {sap.ui.core.Item[]} Array of sap.ui.core.Item instances. The current target of the <code>selectedItems</code> association.
+	 * @private
+	 */
+	 MultiComboBox.prototype._getUnselectedItemsPerTerm = function(sText) {
+		var aItems =  jQuery(ListHelpers.getSelectableItems(this.getItems())).not(this.getSelectedItems()).get();
+		var aSelectableMatchingItems = [];
+		var fnFilter = this.fnFilter ? this.fnFilter : inputsDefaultFilter;
+
+		// If the MultiComboBox is not opened, we want to skip any items that
+		// represent group headers or separators.
+		if (!this.isOpen()) {
+			aItems = aItems.filter(function (oItem) {
+				return !oItem.isA("sap.ui.core.SeparatorItem");
+			});
+		}
+
+		aItems.forEach(function(oItem) {
+			if (fnFilter(sText, oItem)) {
+				aSelectableMatchingItems.push(oItem);
+			}
+		}, this);
+
+		return aSelectableMatchingItems;
+	};
+
 	/**
 	 * Retrieves the selected item objects from the association named <code>selectedItems</code>.
 	 *

package/src/sap/m/MultiComboBoxRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(['./ComboBoxBaseRenderer','./ComboBoxTextFieldRenderer', 'sap/ui/core/Renderer', 'sap/ui/core/Core'],

package/src/sap/m/MultiEditField.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/core/XMLComposite", "./library", "sap/ui/core/Item"], function(XMLComposite, library, Item) {
@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/core/XMLComposite", "./library", "sap/ui/core/Item"], fun
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @experimental since 1.52
 	 * @since 1.52.0
 	 * @alias sap.m.MultiEditField

package/src/sap/m/MultiInput.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -10,6 +10,7 @@ sap.ui.define([
 	'./Tokenizer',
 	'./Token',
 	'./library',
+	'sap/ui/core/Element',
 	'sap/ui/core/EnabledPropagator',
 	'sap/ui/base/ManagedObject',
 	'sap/ui/base/ManagedObjectMetadata',
@@ -21,17 +22,15 @@ sap.ui.define([
 	"sap/m/inputUtils/completeTextSelected",
 	"sap/ui/events/KeyCodes",
 	'sap/ui/core/InvisibleText',
-	"sap/ui/thirdparty/jquery",
 	// jQuery Plugin "cursorPos"
-	"sap/ui/dom/jquery/cursorPos",
-	// jQuery Plugin "control"
-	"sap/ui/dom/jquery/control"
+	"sap/ui/dom/jquery/cursorPos"
 ],
 function(
 	Input,
 	Tokenizer,
 	Token,
 	library,
+	Element,
 	EnabledPropagator,
 	ManagedObject,
 	ManagedObjectMetadata,
@@ -42,8 +41,7 @@ function(
 	containsOrEquals,
 	completeTextSelected,
 	KeyCodes,
-	InvisibleText,
-	jQuery
+	InvisibleText
 ) {
 		"use strict";
 
@@ -107,7 +105,7 @@ function(
 	* @implements sap.ui.core.ISemanticFormContent
 	*
 	* @author SAP SE
-	* @version 1.108.2
+	* @version 1.110.0
 	*
 	* @constructor
 	* @public
@@ -261,6 +259,8 @@ function(
 			this.updateAggregation("tokens");
 		};
 
+		oTokenizer.setShouldRenderTabIndex(false);
+
 		this.setAggregation("tokenizer", oTokenizer);
 
 		oTokenizer.getTokensPopup()
@@ -709,7 +709,7 @@ function(
 		}
 
 		// find focused element
-		var oFocusedElement = jQuery(document.activeElement).control()[0];
+		var oFocusedElement = Element.closestTo(document.activeElement);
 
 		if (!oFocusedElement) {
 			// we cannot rule out that the focused element does not correspond to an SAPUI5 control in which case oFocusedElement
@@ -1470,7 +1470,7 @@ function(
 	MultiInput.prototype.forwardEventHandlersToSuggPopover = function (oSuggPopover) {
 		oSuggPopover.setShowSelectedPressHandler(this._handleShowSelectedPress.bind(this));
 		oSuggPopover.setOkPressHandler(this._handleConfirmation.bind(this, true));
-		oSuggPopover.setCancelPressHandler(this._handleCancelPress.bind(this));
+		oSuggPopover.setCancelPressHandler(this._revertPopupSelection.bind(this));
 	};
 
 	// Handles "Enter" key press and OK button press
@@ -1488,11 +1488,6 @@ function(
 		this.onChange(oEvent, null, oPopupInput.getValue());
 	};
 
-	MultiInput.prototype._handleCancelPress  = function (oEvent) {
-		this._getSuggestionsPopover().getInput().setDOMValue(this.getLastValue());
-		this._closeSuggestionPopup();
-	};
-
 	MultiInput.prototype._handleShowSelectedPress = function (oEvent) {
 		this._bShowListWithTokens = oEvent.getSource().getPressed();
 		this._manageListsVisibility(this._bShowListWithTokens);

package/src/sap/m/MultiInputRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(['./InputRenderer', 'sap/ui/core/Renderer', "sap/ui/core/Core"],

package/src/sap/m/NavContainer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public
@@ -1815,7 +1815,7 @@ sap.ui.define([
 	 * @return {Promise} Promise that resolves with the placeholder
 	 *
 	 * @private
-	 * @ui5-restricted SAPUI5 Distribution libraries only
+	 * @ui5-restricted SAPUI5 Distribution Layer Libraries
 	 * @since 1.91
 	 */
 	NavContainer.prototype.showPlaceholder = function(mSettings) {

package/src/sap/m/NavContainerRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/NewsContent.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/NewsContentRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/NotificationList.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -27,7 +27,7 @@ function(
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public
@@ -44,5 +44,30 @@ function(
 
 	NotificationList.prototype.onItemFocusIn = function() { };
 
+	NotificationList.prototype.setItemFocusable  = function() { };
+
+	NotificationList.prototype._startItemNavigation = function () {
+		ListBase.prototype._startItemNavigation.call(this);
+
+		if (this._oItemNavigation) {
+			this._oItemNavigation.setTableMode(false);
+		}
+	};
+
+	NotificationList.prototype.setNavigationItems = function(oItemNavigation, oNavigationRoot) {
+		var aItems = [],
+			aGroupItems = oNavigationRoot.querySelectorAll(":scope > .sapMNLGroup"),
+			aListItems = oNavigationRoot.querySelectorAll(":scope > .sapMNLI");
+
+		aGroupItems.forEach(function (oGroupItem) {
+			aItems.push(oGroupItem);
+			aItems = aItems.concat(Array.from(oGroupItem.querySelectorAll(".sapMNLI")));
+		});
+
+		aItems = aItems.concat(Array.from(aListItems));
+
+		oItemNavigation.setItemDomRefs(aItems);
+	};
+
 	return NotificationList;
 });