@ui5/webcomponents 0.0.0-6ef02a35f → 0.0.0-7e7d9ea6f

package/src/features/InputSuggestions.js

@@ -1,11 +1,14 @@
 import { registerFeature } from "@ui5/webcomponents-base/dist/FeaturesRegistry.js";
 import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
-
+import encodeXML from "@ui5/webcomponents-base/dist/sap/base/security/encodeXML.js";
+import generateHighlightedMarkup from "@ui5/webcomponents-base/dist/util/generateHighlightedMarkup.js";
 import List from "../List.js";
 import ResponsivePopover from "../ResponsivePopover.js";
 import SuggestionItem from "../SuggestionItem.js";
 import SuggestionGroupItem from "../SuggestionGroupItem.js";
 import Button from "../Button.js";
+import Icon from "../Icon.js";
+import Popover from "../Popover.js";
 import GroupHeaderListItem from "../GroupHeaderListItem.js";
 import SuggestionListItem from "../SuggestionListItem.js";
 
@@ -40,12 +43,12 @@ class Suggestions {
 		this.fnOnSuggestionItemMouseOver = this.onItemMouseOver.bind(this);
 		this.fnOnSuggestionItemMouseOut = this.onItemMouseOut.bind(this);
 
+		this._getSuggestionPopover();
+
 		// An integer value to store the currently selected item position,
 		// that changes due to user interaction.
 		this.selectedItemIndex = null;
 
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
-
 		this.accInfo = {};
 	}
 
@@ -97,13 +100,77 @@ class Suggestions {
 	}
 
 	onEnter(event) {
+		if (this._isGroupOrInactiveItem) {
+			event.preventDefault();
+			return false;
+		}
+
 		if (this._isItemOnTarget()) {
 			this.onItemSelected(null, true /* keyboardUsed */);
 			return true;
 		}
+
 		return false;
 	}
 
+	onPageUp(event) {
+		event.preventDefault();
+
+		const isItemIndexValid = this.selectedItemIndex - 10 > -1;
+
+		if (this._hasValueState && !isItemIndexValid) {
+			this._focusValueState();
+			return true;
+		}
+
+		this._moveItemSelection(this.selectedItemIndex,
+			isItemIndexValid ? this.selectedItemIndex -= 10 : this.selectedItemIndex = 0);
+		return true;
+	}
+
+	onPageDown(event) {
+		event.preventDefault();
+
+		const items = this._getItems();
+		const lastItemIndex = items.length - 1;
+		const isItemIndexValid = this.selectedItemIndex + 10 <= lastItemIndex;
+
+		if (this._hasValueState && !items) {
+			this._focusValueState();
+			return true;
+		}
+
+		this._moveItemSelection(this.selectedItemIndex,
+			isItemIndexValid ? this.selectedItemIndex += 10 : this.selectedItemIndex = lastItemIndex);
+		return true;
+	}
+
+	onHome(event) {
+		event.preventDefault();
+
+		if (this._hasValueState) {
+			this._focusValueState();
+			return true;
+		}
+
+		this._moveItemSelection(this.selectedItemIndex, this.selectedItemIndex = 0);
+		return true;
+	}
+
+	onEnd(event) {
+		event.preventDefault();
+
+		const lastItemIndex = this._getItems().length - 1;
+
+		if (this._hasValueState && !lastItemIndex) {
+			this._focusValueState();
+			return true;
+		}
+
+		this._moveItemSelection(this.selectedItemIndex, this.selectedItemIndex = lastItemIndex);
+		return true;
+	}
+
 	onTab(event) {
 		if (this._isItemOnTarget()) {
 			this.onItemSelected(null, true);
@@ -128,17 +195,22 @@ class Suggestions {
 	}
 
 	async open() {
-		this.responsivePopover = await this._respPopover();
+		this._getComponent().open = true;
 		this._beforeOpen();
 
-		if (this._getItems().length) {
-			this.responsivePopover.showAt(this._getComponent());
-		}
+		this.responsivePopover.showAt(this._getComponent());
 	}
 
 	async close(preventFocusRestore = false) {
-		this.responsivePopover = await this._respPopover();
+		const selectedItem = this._getItems() && this._getItems()[this.selectedItemIndex];
+
+		this._getComponent().open = false;
+		this.responsivePopover = await this._getSuggestionPopover();
 		this.responsivePopover.close(false, false, preventFocusRestore);
+
+		if (selectedItem && selectedItem.focused) {
+			selectedItem.focused = false;
+		}
 	}
 
 	updateSelectedItemPosition(pos) {
@@ -172,17 +244,14 @@ class Suggestions {
 
 		// If the item is "Inactive", prevent selection with SPACE or ENTER
 		// to have consistency with the way "Inactive" items behave in the ui5-list
-		if (item.type === "Inactive") {
-			return;
-		}
-
-		if (item.group) {
+		if (item.type === "Inactive" || item.group) {
 			return;
 		}
 
 		this._getComponent().onItemSelected(this._getRealItems()[this.selectedItemIndex], keyboardUsed);
 		item.selected = false;
-		this.close();
+		item.focused = false;
+		this._getComponent().open = false;
 	}
 
 	onItemPreviewed(item) {
@@ -191,7 +260,7 @@ class Suggestions {
 
 	/* Private methods */
 	onItemPress(oEvent) {
-		this.onItemSelected(oEvent.detail.item, false /* keyboardUsed */);
+		this.onItemSelected(oEvent.detail.selectedItems[0], false /* keyboardUsed */);
 	}
 
 	_beforeOpen() {
@@ -201,8 +270,8 @@ class Suggestions {
 
 	async _attachItemsListeners() {
 		const list = await this._getList();
-		list.removeEventListener("ui5-item-press", this.fnOnSuggestionItemPress);
-		list.addEventListener("ui5-item-press", this.fnOnSuggestionItemPress);
+		list.removeEventListener("ui5-selection-change", this.fnOnSuggestionItemPress);
+		list.addEventListener("ui5-selection-change", this.fnOnSuggestionItemPress);
 		list.removeEventListener("ui5-item-focused", this.fnOnSuggestionItemFocus);
 		list.addEventListener("ui5-item-focused", this.fnOnSuggestionItemFocus);
 		list.removeEventListener("mouseover", this.fnOnSuggestionItemMouseOver);
@@ -217,12 +286,12 @@ class Suggestions {
 		}
 
 		if (!this.attachedAfterOpened) {
-			this._respPopover.addEventListener("ui5-after-open", this._onOpen.bind(this));
+			this._getSuggestionPopover.addEventListener("ui5-after-open", this._onOpen.bind(this));
 			this.attachedAfterOpened = true;
 		}
 
 		if (!this.attachedAfterClose) {
-			this._respPopover.addEventListener("ui5-after-close", this._onClose.bind(this));
+			this._getSuggestionPopover.addEventListener("ui5-after-close", this._onClose.bind(this));
 			this.attachedAfterClose = true;
 		}
 	}
@@ -243,7 +312,17 @@ class Suggestions {
 	}
 
 	_isItemOnTarget() {
-		return this.isOpened() && this.selectedItemIndex !== null;
+		return this.isOpened() && this.selectedItemIndex !== null && this.selectedItemIndex !== -1 && !this._isGroupOrInactiveItem;
+	}
+
+	get _isGroupOrInactiveItem() {
+		const items = this._getItems();
+
+		if (!items || !items[this.selectedItemIndex]) {
+			return false;
+		}
+
+		return (items[this.selectedItemIndex].group || items[this.selectedItemIndex].type === "Inactive");
 	}
 
 	isOpened() {
@@ -266,22 +345,61 @@ class Suggestions {
 		const itemsCount = this._getItems().length;
 		const previousSelectedIdx = this.selectedItemIndex;
 
-		if ((this.selectedItemIndex === null) || (++this.selectedItemIndex > itemsCount - 1)) {
-			this.selectedItemIndex = 0;
+		if (this._hasValueState && previousSelectedIdx === null && !this.component._isValueStateFocused) {
+			this._focusValueState();
+			return;
+		}
+
+		if ((previousSelectedIdx === null && !this._hasValueState) || this.component._isValueStateFocused) {
+			this._clearValueStateFocus();
+			--this.selectedItemIndex;
 		}
 
-		this._moveItemSelection(previousSelectedIdx, this.selectedItemIndex);
+		if (previousSelectedIdx !== null && previousSelectedIdx + 1 > itemsCount - 1) {
+			return;
+		}
+
+		this._moveItemSelection(previousSelectedIdx, ++this.selectedItemIndex);
 	}
 
 	_selectPreviousItem() {
-		const itemsCount = this._getItems().length;
+		const items = this._getItems();
 		const previousSelectedIdx = this.selectedItemIndex;
 
-		if ((this.selectedItemIndex === null) || (--this.selectedItemIndex < 0)) {
-			this.selectedItemIndex = itemsCount - 1;
+		if (this._hasValueState && previousSelectedIdx === 0 && !this.component._isValueStateFocused) {
+			this.component.hasSuggestionItemSelected = false;
+			this.component._isValueStateFocused = true;
+			this.selectedItemIndex = null;
+
+			items[0].focused = false;
+			items[0].selected = false;
+
+			return;
+		}
+
+		if (this.component._isValueStateFocused) {
+			this.component.focused = true;
+			this.component._isValueStateFocused = false;
+			this.selectedItemIndex = null;
+
+			return;
+		}
+
+		if (previousSelectedIdx === -1 || previousSelectedIdx === null) {
+			return;
+		}
+
+		if (previousSelectedIdx - 1 < 0) {
+			items[previousSelectedIdx].selected = false;
+			items[previousSelectedIdx].focused = false;
+
+			this.component.focused = true;
+			this.component.hasSuggestionItemSelected = false;
+			this.selectedItemIndex -= 1;
+			return;
 		}
 
-		this._moveItemSelection(previousSelectedIdx, this.selectedItemIndex);
+		this._moveItemSelection(previousSelectedIdx, --this.selectedItemIndex);
 	}
 
 	_moveItemSelection(previousIdx, nextIdx) {
@@ -289,6 +407,13 @@ class Suggestions {
 		const currentItem = items[nextIdx];
 		const previousItem = items[previousIdx];
 
+		if (!currentItem) {
+			return;
+		}
+
+		this.component.focused = false;
+		this._clearValueStateFocus();
+
 		this.accInfo = {
 			currentPos: nextIdx + 1,
 			listSize: items.length,
@@ -297,16 +422,22 @@ class Suggestions {
 
 		if (previousItem) {
 			previousItem.selected = false;
+			previousItem.focused = false;
 		}
 
 		if (currentItem) {
-			currentItem.selected = true;
+			currentItem.focused = true;
+
+			if (currentItem.type === "Active") {
+				currentItem.selected = true;
+			}
 
 			if (this.handleFocus) {
 				currentItem.focus();
 			}
 		}
 
+		this.component.hasSuggestionItemSelected = true;
 		this.onItemPreviewed(currentItem);
 
 		if (!this._isItemIntoView(currentItem)) {
@@ -318,9 +449,18 @@ class Suggestions {
 		const items = this._getItems();
 		items.forEach(item => {
 			item.selected = false;
+			item.focused = false;
 		});
 	}
 
+	_clearItemFocus() {
+		const focusedItem = this._getItems().find(item => item.focused);
+
+		if (focusedItem) {
+			focusedItem.focused = false;
+		}
+	}
+
 	_isItemIntoView(item) {
 		const rectItem = item.getDomRef().getBoundingClientRect();
 		const rectInput = this._getComponent().getDomRef().getBoundingClientRect();
@@ -337,7 +477,7 @@ class Suggestions {
 
 	async _getScrollContainer() {
 		if (!this._scrollContainer) {
-			await this._respPopover();
+			await this._getSuggestionPopover();
 			this._scrollContainer = this.responsivePopover.shadowRoot.querySelector(".ui5-popup-content");
 		}
 
@@ -345,7 +485,7 @@ class Suggestions {
 	}
 
 	_getItems() {
-		return [...this.responsivePopover.querySelector("[ui5-list]").children];
+		return !!this.responsivePopover && [...this.responsivePopover.querySelector("[ui5-list]").children];
 	}
 
 	_getComponent() {
@@ -353,7 +493,7 @@ class Suggestions {
 	}
 
 	async _getList() {
-		this.responsivePopover = await this._respPopover();
+		this.responsivePopover = await this._getSuggestionPopover();
 		return this.responsivePopover.querySelector("[ui5-list]");
 	}
 
@@ -366,7 +506,7 @@ class Suggestions {
 		return this._getComponent().getSlottedNodes(this.slotName);
 	}
 
-	async _respPopover() {
+	async _getSuggestionPopover() {
 		if (this.responsivePopover) {
 			return this.responsivePopover;
 		}
@@ -377,9 +517,8 @@ class Suggestions {
 	}
 
 	get itemSelectionAnnounce() {
-		const i18nBundle = this.i18nBundle,
-			itemPositionText = i18nBundle.getText(LIST_ITEM_POSITION, [this.accInfo.currentPos], [this.accInfo.listSize]),
-			itemSelectionText = i18nBundle.getText(LIST_ITEM_SELECTED);
+		const itemPositionText = Suggestions.i18nBundle.getText(LIST_ITEM_POSITION, this.accInfo.currentPos, this.accInfo.listSize),
+			itemSelectionText = Suggestions.i18nBundle.getText(LIST_ITEM_SELECTED);
 
 		return `${itemPositionText} ${this.accInfo.itemText} ${itemSelectionText}`;
 	}
@@ -395,31 +534,42 @@ class Suggestions {
 	}
 
 	getHighlightedText(suggestion, input) {
-		let text = suggestion.text || suggestion.textContent;
-		text = this.sanitizeText(text);
-
+		const text = suggestion.text || suggestion.textContent;
 		return this.hightlightInput(text, input);
 	}
 
 	getHighlightedDesc(suggestion, input) {
-		let text = suggestion.description;
-		text = this.sanitizeText(text);
-
+		const text = suggestion.description || "";
 		return this.hightlightInput(text, input);
 	}
 
 	hightlightInput(text, input) {
-		if (!text) {
-			return text;
-		}
-
-		const inputEscaped = input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-		const regEx = new RegExp(inputEscaped, "ig");
-		return text.replace(regEx, match => `<b>${match}</b>`);
+		return generateHighlightedMarkup(text, input);
 	}
 
 	sanitizeText(text) {
-		return text && text.replace("<", "&lt");
+		return encodeXML(text);
+	}
+
+	get _hasValueState() {
+		return this.component.hasValueStateMessage;
+	}
+
+	_focusValueState() {
+		const items = this._getItems();
+
+		this.component._isValueStateFocused = true;
+		this.component.focused = false;
+		this.component.hasSuggestionItemSelected = false;
+		this.selectedItemIndex = null;
+		this.component.value = this.component.valueBeforeAutoComplete;
+
+		items && this._scrollItemIntoView(items[0]);
+		this._deselectItems();
+	}
+
+	_clearValueStateFocus() {
+		this.component._isValueStateFocused = false;
 	}
 
 	static get dependencies() {
@@ -431,8 +581,14 @@ class Suggestions {
 			SuggestionListItem,
 			GroupHeaderListItem,
 			Button,
+			Icon,
+			Popover,
 		];
 	}
+
+	static async init() {
+		Suggestions.i18nBundle = await getI18nBundle("@ui5/webcomponents");
+	}
 }
 
 Suggestions.SCROLL_STEP = 60;

package/src/i18n/messagebundle.properties

@@ -34,6 +34,9 @@ AVATAR_GROUP_MOVE=Press ARROW keys to move.
 #XACT: ARIA announcement for the badge
 BADGE_DESCRIPTION=Badge
 
+#XACT: position (current and max. value) of a Breadcrumb item which should be announced by screenreaders
+BREADCRUMB_ITEM_POS={0} of {1}
+
 #XACT: ARIA announcement for the breadcrumbs
 BREADCRUMBS_ARIA_LABEL=Breadcrumb Trail
 
@@ -70,6 +73,9 @@ CAROUSEL_NEXT_ARROW_TEXT=Next Page
 #XFLD: Label of the container holding the colors
 COLORPALETTE_CONTAINER_LABEL=Color palette - Predefined colors
 
+#XFLD: Title of the popup holding the colors
+COLORPALETTE_POPOVER_TITLE=Color Palette
+
 #XFLD: Label of the color box
 COLORPALETTE_COLOR_LABEL=Color
 
@@ -85,6 +91,27 @@ COLOR_PALETTE_DIALOG_TITLE=Change Color
 #XTIT: Color Palette dialog title of the Color Picker
 COLOR_PALETTE_MORE_COLORS_TEXT=More Colors...
 
+#XACT: Aria information for the ColorPicker Alpha slider
+COLORPICKER_ALPHA_SLIDER=Alpha control
+
+#XACT: Aria information for the ColorPicker Hue slider
+COLORPICKER_HUE_SLIDER=Hue control
+
+#XTOL: Six symbol hexadecimal group representing CSS color hex string
+COLORPICKER_HEX=Hexadecimal
+
+#XTOL: Red color for the ColorPicker control
+COLORPICKER_RED=Red
+
+#XTOL: Green color for the ColorPicker control
+COLORPICKER_GREEN=Green
+
+#XTOL: Blue color for the ColorPicker control
+COLORPICKER_BLUE=Blue
+
+#XTOL: Alpha chanel transparency value for RGBA color mode
+COLORPICKER_ALPHA=Alpha
+
 #XACT: DatePicker 'Open Picker' icon title
 DATEPICKER_OPEN_ICON_TITLE=Open Picker
 
@@ -106,6 +133,9 @@ FILEUPLOADER_TITLE=Upload File
 
 GROUP_HEADER_TEXT=Group Header
 
+#XACT: ARIA announcement for the Select`s roledescription attribute
+SELECT_ROLE_DESCRIPTION=Select ComboBox
+
 #XTXT: MultiComboBox and ComboBox icon accessible name
 SELECT_OPTIONS=Select Options
 
@@ -136,15 +166,51 @@ LIST_ITEM_POSITION=List item {0} of {1}
 #XACT: ARIA announcement for the list item selection.
 LIST_ITEM_SELECTED=Selected
 
+#XACT: ARIA announcement for the list item selected=false state
+LIST_ITEM_NOT_SELECTED=Not Selected
+
+#XACT: ARIA announcement for the list item selected=false state
+LIST_ITEM_GROUP_HEADER=Group Header
+
 #XBUT: List Multi Selection Mode Checkbox aria-label text
 ARIA_LABEL_LIST_ITEM_CHECKBOX = Multiple Selection mode.
 
+#XBUT: List Single Selection Mode RadioButton aria-label text
+ARIA_LABEL_LIST_ITEM_RADIO_BUTTON=Item Selection.
+
+#XACT: ARIA announcement for the list which allows single selections
+ARIA_LABEL_LIST_SELECTABLE=Contains Selectable Items
+
+#XACT: ARIA announcement for the list which allows multiple selections
+ARIA_LABEL_LIST_MULTISELECTABLE=Contains Multi-Selectable Items
+
+#XACT: ARIA announcement for the list which has deletable items
+ARIA_LABEL_LIST_DELETABLE=Contains Deletable Items
+
 #XTOL: Tooltip of messgae strip close button
-MESSAGE_STRIP_CLOSE_BUTTON=Message Strip Close
+MESSAGE_STRIP_CLOSE_BUTTON=Information Bar Close
+
+#XACT: ARIA announcement for the MessageStrip's closable state
+MESSAGE_STRIP_CLOSABLE=Closable
+
+#XACT: ARIA announcement for the MessageStrip's "Error" state
+MESSAGE_STRIP_ERROR=Error Information Bar
+
+#XACT: ARIA announcement for the MessageStrip's "Warning" state
+MESSAGE_STRIP_WARNING=Warning Information Bar
+
+#XACT: ARIA announcement for the MessageStrip's "Success" state
+MESSAGE_STRIP_SUCCESS=Success Information Bar
+
+#XACT: ARIA announcement for the MessageStrip's "Information" state
+MESSAGE_STRIP_INFORMATION=Information Bar
 
 #XFLD: MultiComboBox dialog button
 MULTICOMBOBOX_DIALOG_OK_BUTTON=OK
 
+#XMSG: Text used for value state error message when an item is already selected
+VALUE_STATE_ERROR_ALREADY_SELECTED=This value is already selected.
+
 #XBUT: MultiInput aria-roledescription text
 MULTIINPUT_ROLEDESCRIPTION_TEXT=Multi Value Input
 
@@ -184,12 +250,6 @@ SEGMENTEDBUTTONITEM_ARIA_DESCRIPTION=Segmented button
 #XACT: ARIA description for slider handle
 SLIDER_ARIA_DESCRIPTION=Slider handle
 
-#XACT: ARIA announcement for the switch on
-SWITCH_ON=On
-
-#XACT: ARIA announcement for the switch off
-SWITCH_OFF=Off
-
 #XTXT Table and List "load more" row's text.
 LOAD_MORE_TEXT=More
 
@@ -217,6 +277,12 @@ TABCONTAINER_PREVIOUS_ICON_ACC_NAME=Previous
 #XACT: ACC overflow menu title in tab container
 TABCONTAINER_OVERFLOW_MENU_TITLE=Overflow Menu
 
+#XTXT Text for end overflow button in tab container
+TABCONTAINER_END_OVERFLOW=More
+
+#XBUT Text for cancel button, which closes the popover on mobile devices
+TABCONTAINER_POPOVER_CANCEL_BUTTON=Cancel
+
 #XTXT: Text for characters left
 TEXTAREA_CHARACTERS_LEFT={0} characters remaining
 
@@ -312,3 +378,15 @@ STEPINPUT_DEC_ICON_TITLE=Decrease
 
 #XTOL: tooltip for increase button of the StepInput
 STEPINPUT_INC_ICON_TITLE=Increase
+
+#XACT: Aria information for the Split Button
+SPLIT_BUTTON_DESCRIPTION=Split Button
+
+#XACT: Aria hint for the keyboard handling support of the Split Button
+SPLIT_BUTTON_KEYBOARD_HINT=Press Space or Enter to trigger default action and Alt + Arrow Down or F4 to trigger arrow action
+
+#XACT: ARIA announcement for the Menu Back button aria-label attribute
+MENU_BACK_BUTTON_ARIA_LABEL=Back
+
+#XACT: ARIA announcement for the Menu Close button aria-label attribute
+MENU_CLOSE_BUTTON_ARIA_LABEL=Decline