@ui5/webcomponents 0.0.0-185851a98 → 0.0.0-1929d08ff

package/dist/List.js

@@ -1,10 +1,19 @@
 import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
 import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
+import ResizeHandler from "@ui5/webcomponents-base/dist/delegate/ResizeHandler.js";
 import ItemNavigation from "@ui5/webcomponents-base/dist/delegate/ItemNavigation.js";
+import { isIE } from "@ui5/webcomponents-base/dist/Device.js";
+import { renderFinished } from "@ui5/webcomponents-base/dist/Render.js";
 import { getLastTabbableElement } from "@ui5/webcomponents-base/dist/util/TabbableElements.js";
-import { isTabNext } from "@ui5/webcomponents-base/dist/Keys.js";
+import { isTabNext, isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
+import Integer from "@ui5/webcomponents-base/dist/types/Integer.js";
 import NavigationMode from "@ui5/webcomponents-base/dist/types/NavigationMode.js";
+import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/AriaLabelHelper.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import debounce from "@ui5/webcomponents-base/dist/util/debounce.js";
+import isElementInView from "@ui5/webcomponents-base/dist/util/isElementInView.js";
 import ListMode from "./types/ListMode.js";
+import ListGrowingMode from "./types/ListGrowingMode.js";
 import ListSeparators from "./types/ListSeparators.js";
 import BusyIndicator from "./BusyIndicator.js";
 
@@ -14,19 +23,28 @@ import ListTemplate from "./generated/templates/ListTemplate.lit.js";
 // Styles
 import listCss from "./generated/themes/List.css.js";
 
-const BUSYINDICATOR_HEIGHT = 48; // px
+// Texts
+import {
+	LOAD_MORE_TEXT, ARIA_LABEL_LIST_SELECTABLE,
+	ARIA_LABEL_LIST_MULTISELECTABLE,
+	ARIA_LABEL_LIST_DELETABLE,
+} from "./generated/i18n/i18n-defaults.js";
+
 const INFINITE_SCROLL_DEBOUNCE_RATE = 250; // ms
 
+const PAGE_UP_DOWN_SIZE = 10;
+
 /**
  * @public
  */
 const metadata = {
 	tag: "ui5-list",
 	managedSlots: true,
+	fastNavigation: true,
 	slots: /** @lends sap.ui.webcomponents.main.List.prototype */ {
 
 		/**
-		 * Defines the <code>ui5-li</code> header.
+		 * Defines the component header.
 		 * <br><br>
 		 * <b>Note:</b> When <code>header</code> is set, the
 		 * <code>headerText</code> property is ignored.
@@ -40,12 +58,12 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the items of the <code>ui5-list</code>.
+		 * Defines the items of the component.
 		 * <br><br>
 		 * <b>Note:</b> Use <code>ui5-li</code>, <code>ui5-li-custom</code>, and <code>ui5-li-groupheader</code> for the intended design.
 		 *
-		 * @type {HTMLElement[]}
-		 * @slot
+		 * @type {sap.ui.webcomponents.main.IListItem[]}
+		 * @slot items
 		 * @public
 		 */
 		"default": {
@@ -56,7 +74,7 @@ const metadata = {
 	properties: /** @lends  sap.ui.webcomponents.main.List.prototype */ {
 
 		/**
-		 * Defines the <code>ui5-list</code> header text.
+		 * Defines the component header text.
 		 * <br><br>
 		 * <b>Note:</b> If <code>header</code> is set this property is ignored.
 		 *
@@ -80,21 +98,21 @@ const metadata = {
 		},
 
 		/**
-		 * Determines whether the list items are indented.
+		 * Determines whether the component is indented.
 		 *
 		 * @type {boolean}
 		 * @defaultvalue false
 		 * @public
 		 */
-		inset: {
+		indent: {
 			type: Boolean,
 		},
 
 		/**
-		 * Defines the mode of the <code>ui5-list</code>.
+		 * Defines the mode of the component.
 		 * <br><br>
-		 * <b>Note:</b> Avalaible options are <code>None</code>, <code>SingleSelect</code>,
-		 * <code>MultiSelect</code>, and <code>Delete</code>.
+		 * <b>Note:</b> Available options are <code>None</code>, <code>SingleSelect</code>, <code>SingleSelectBegin</code>,
+		 * <code>SingleSelectEnd</code>, <code>MultiSelect</code>, and <code>Delete</code>.
 		 *
 		 * @type {ListMode}
 		 * @defaultvalue "None"
@@ -106,7 +124,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the text that is displayed when the <code>ui5-list</code> contains no items.
+		 * Defines the text that is displayed when the component contains no items.
 		 *
 		 * @type {string}
 		 * @defaultvalue ""
@@ -137,22 +155,34 @@ const metadata = {
 		},
 
 		/**
-		 * Defines if the component would fire the <code>loadMore</code> event
-		 * when the user scrolls to the bottom of the list, and helps achieving an "infinite scroll" effect
-		 * by adding new items each time.
+		 * Defines whether the component will have growing capability either by pressing a <code>More</code> button,
+		 * or via user scroll. In both cases <code>load-more</code> event is fired.
+		 * <br><br>
 		 *
-		 * @type {boolean}
-		 * @defaultvalue false
+		 * Available options:
+		 * <br><br>
+		 * <code>Button</code> - Shows a <code>More</code> button at the bottom of the list,
+		 * pressing of which triggers the <code>load-more</code> event.
+		 * <br>
+		 * <code>Scroll</code> - The <code>load-more</code> event is triggered when the user scrolls to the bottom of the list;
+		 * <br>
+		 * <code>None</code> (default) - The growing is off.
+		 * <br><br>
+		 *
+		 * <b>Restrictions:</b> <code>growing="Scroll"</code> is not supported for Internet Explorer,
+		 * on IE the component will fallback to <code>growing="Button"</code>.
+		 * @type {ListGrowingMode}
+		 * @defaultvalue "None"
+		 * @since 1.0.0-rc.13
 		 * @public
-		 * @since 1.0.0-rc.6
 		 */
-		infiniteScroll: {
-			type: Boolean,
+		growing: {
+			type: ListGrowingMode,
+			defaultValue: ListGrowingMode.None,
 		},
 
 		/**
-		 * Defines if the component would display a loading indicator at the bottom of the list.
-		 * It's especially useful, when combined with <code>infiniteScroll</code>.
+		 * Defines if the component would display a loading indicator over the list.
 		 *
 		 * @type {boolean}
 		 * @defaultvalue false
@@ -162,6 +192,72 @@ const metadata = {
 		busy: {
 			type: Boolean,
 		},
+
+		/**
+		 * Defines the delay in milliseconds, after which the busy indicator will show up for this component.
+		 *
+		 * @type {Integer}
+		 * @defaultValue 1000
+		 * @public
+		 */
+		busyDelay: {
+			type: Integer,
+			defaultValue: 1000,
+		},
+
+		/**
+		 * Defines the accessible name of the component.
+		 *
+		 * @type {string}
+		 * @defaultvalue ""
+		 * @public
+		 * @since 1.0.0-rc.15
+		 */
+		accessibleName: {
+			type: String,
+		},
+
+		/**
+		 * Defines the IDs of the elements that label the input.
+		 *
+		 * @type {string}
+		 * @defaultvalue ""
+		 * @public
+		 * @since 1.0.0-rc.15
+		 */
+		accessibleNameRef: {
+			type: String,
+			defaultValue: "",
+		},
+
+		/**
+		 * Defines the accessible role of the component.
+		 * <br><br>
+		 * @public
+		 * @type {string}
+		 * @defaultvalue "list"
+		 * @since 1.0.0-rc.15
+		 */
+		accessibleRole: {
+			type: String,
+			defaultValue: "list",
+		},
+
+		/**
+		 * Defines if the entire list is in view port.
+		 * @private
+		 */
+		_inViewport: {
+			type: Boolean,
+		},
+
+		/**
+		 * Defines the active state of the <code>More</code> button.
+		 * @private
+		 */
+		_loadMoreActive: {
+			type: Boolean,
+		},
 	},
 	events: /** @lends  sap.ui.webcomponents.main.List.prototype */ {
 
@@ -169,11 +265,45 @@ const metadata = {
 		 * Fired when an item is activated, unless the item's <code>type</code> property
 		 * is set to <code>Inactive</code>.
 		 *
-		 * @event
-		 * @param {HTMLElement} item the clicked item.
+		 * @event sap.ui.webcomponents.main.List#item-click
+		 * @allowPreventDefault
+		 * @param {HTMLElement} item The clicked item.
 		 * @public
 		 */
-		itemClick: {
+		"item-click": {
+			detail: {
+				item: { type: HTMLElement },
+			},
+		},
+
+		/**
+		 * Fired when the <code>Close</code> button of any item is clicked
+		 * <br><br>
+		 * <b>Note:</b> This event is applicable to <code>ui5-li-notification</code> items only,
+		 * not to be confused with <code>item-delete</code>.
+		 *
+		 * @event sap.ui.webcomponents.main.List#item-close
+		 * @param {HTMLElement} item the item about to be closed.
+		 * @public
+		 * @since 1.0.0-rc.8
+		 */
+		"item-close": {
+			detail: {
+				item: { type: HTMLElement },
+			},
+		},
+
+		/**
+		 * Fired when the <code>Toggle</code> button of any item is clicked.
+		 * <br><br>
+		 * <b>Note:</b> This event is applicable to <code>ui5-li-notification-group</code> items only.
+		 *
+		 * @event sap.ui.webcomponents.main.List#item-toggle
+		 * @param {HTMLElement} item the toggled item.
+		 * @public
+		 * @since 1.0.0-rc.8
+		 */
+		"item-toggle": {
 			detail: {
 				item: { type: HTMLElement },
 			},
@@ -183,12 +313,13 @@ const metadata = {
 		 * Fired when the Delete button of any item is pressed.
 		 * <br><br>
 		 * <b>Note:</b> A Delete button is displayed on each item,
-		 * when the <code>ui5-list</code> <code>mode</code> property is set to <code>Delete</code>.
-		 * @event
+		 * when the component <code>mode</code> property is set to <code>Delete</code>.
+		 *
+		 * @event sap.ui.webcomponents.main.List#item-delete
 		 * @param {HTMLElement} item the deleted item.
 		 * @public
 		 */
-		itemDelete: {
+		"item-delete": {
 			detail: {
 				item: { type: HTMLElement },
 			},
@@ -196,14 +327,14 @@ const metadata = {
 
 		/**
 		 * Fired when selection is changed by user interaction
-		 * in <code>SingleSelect</code> and <code>MultiSelect</code> modes.
+		 * in <code>SingleSelect</code>, <code>SingleSelectBegin</code>, <code>SingleSelectEnd</code> and <code>MultiSelect</code> modes.
 		 *
-		 * @event
+		 * @event sap.ui.webcomponents.main.List#selection-change
 		 * @param {Array} selectedItems An array of the selected items.
 		 * @param {Array} previouslySelectedItems An array of the previously selected items.
 		 * @public
 		 */
-		selectionChange: {
+		"selection-change": {
 			detail: {
 				selectedItems: { type: Array },
 				previouslySelectedItems: { type: Array },
@@ -214,29 +345,29 @@ const metadata = {
 		/**
 		 * Fired when the user scrolls to the bottom of the list.
 		 * <br><br>
-		 * <b>Note:</b> The event is fired when the <code>infiniteScroll</code> property is enabled.
+		 * <b>Note:</b> The event is fired when the <code>growing='Scroll'</code> property is enabled.
 		 *
-		 * @event
+		 * @event sap.ui.webcomponents.main.List#load-more
 		 * @public
 		 * @since 1.0.0-rc.6
 		 */
-		loadMore: {},
+		"load-more": {},
 	},
 };
 
 /**
  * @class
  *
- * <h3 class="comment-api-title"> Overview </h3>
+ * <h3 class="comment-api-title">Overview</h3>
  *
  * The <code>ui5-list</code> component allows displaying a list of items, advanced keyboard
  * handling support for navigating between items, and predefined modes to improve the development efficiency.
  * <br><br>
- * The <code>ui5-list</code> is а container for the available list items:
+ * The <code>ui5-list</code> is a container for the available list items:
  * <ul>
  * <li><code>ui5-li</code></li>
  * <li><code>ui5-li-custom</code></li>
- * <li><code>ui5-li-group-header</code></li>
+ * <li><code>ui5-li-groupheader</code></li>
  * </ul>
  * <br><br>
  * To benefit from the built-in selection mechanism, you can use the available
@@ -245,6 +376,34 @@ const metadata = {
  * <br><br>
  * Additionally, the <code>ui5-list</code> provides header, footer, and customization for the list item separators.
  *
+ * <br><br>
+ * <h3>Keyboard Handling</h3>
+ *
+ * <h4>Basic Navigation</h4>
+ * The <code>ui5-list</code> provides advanced keyboard handling.
+ * When a list is focused the user can use the following keyboard
+ * shortcuts in order to perform a navigation:
+ * <br>
+ *
+ * <ul>
+ * <li>[UP/DOWN] - Navigates up and down the items</li>
+ * <li>[HOME] - Navigates to first item</li>
+ * <li>[END] - Navigates to the last item</li>
+ * </ul>
+ *
+ * The user can use the following keyboard shortcuts to perform actions (such as select, delete),
+ * when the <code>mode</code> property is in use:
+ * <ul>
+ * <li>[SPACE] - Select an item (if <code>type</code> is 'Active') when <code>mode</code> is selection</li>
+ * <li>[DELETE] - Delete an item if <code>mode</code> property is <code>Delete</code></li>
+ * </ul>
+ *
+ * <h4>Fast Navigation</h4>
+ * This component provides a build in fast navigation group which can be used via <code>F6 / Shift + F6</code> or <code> Ctrl + Alt(Option) + Down /  Ctrl + Alt(Option) + Up</code>.
+ * In order to use this functionality, you need to import the following module:
+ * <code>import "@ui5/webcomponents-base/dist/features/F6Navigation.js"</code>
+ * <br><br>
+ *
  * <h3>ES6 Module Import</h3>
  *
  * <code>import "@ui5/webcomponents/dist/List.js";</code>
@@ -253,7 +412,7 @@ const metadata = {
  * <br>
  * <code>import "@ui5/webcomponents/dist/CustomListItem.js";</code> (for <code>ui5-li-custom</code>)
  * <br>
- * <code>import "@ui5/webcomponents/dist/GroupHeaderListItem.js";</code> (for <code>ui5-li-group-header</code>)
+ * <code>import "@ui5/webcomponents/dist/GroupHeaderListItem.js";</code> (for <code>ui5-li-groupheader</code>)
  *
  * @constructor
  * @author SAP SE
@@ -280,6 +439,14 @@ class List extends UI5Element {
 		return listCss;
 	}
 
+	static async onDefine() {
+		List.i18nBundle = await getI18nBundle("@ui5/webcomponents");
+	}
+
+	static get dependencies() {
+		return [BusyIndicator];
+	}
+
 	constructor() {
 		super();
 		this.initItemNavigation();
@@ -292,11 +459,56 @@ class List extends UI5Element {
 
 		this._previouslySelectedItem = null;
 
+		// Indicates that the List has already subscribed for resize.
+		this.resizeListenerAttached = false;
+
+		// Indicates if the IntersectionObserver started observing the List
+		this.listEndObserved = false;
+
 		this.addEventListener("ui5-_press", this.onItemPress.bind(this));
+		this.addEventListener("ui5-close", this.onItemClose.bind(this));
+		this.addEventListener("ui5-toggle", this.onItemToggle.bind(this));
 		this.addEventListener("ui5-_focused", this.onItemFocused.bind(this));
-		this.addEventListener("ui5-_forwardAfter", this.onForwardAfter.bind(this));
-		this.addEventListener("ui5-_forwardBefore", this.onForwardBefore.bind(this));
-		this.addEventListener("ui5-_selectionRequested", this.onSelectionRequested.bind(this));
+		this.addEventListener("ui5-_forward-after", this.onForwardAfter.bind(this));
+		this.addEventListener("ui5-_forward-before", this.onForwardBefore.bind(this));
+		this.addEventListener("ui5-_selection-requested", this.onSelectionRequested.bind(this));
+		this.addEventListener("ui5-_focus-requested", this.focusUploadCollectionItem.bind(this));
+
+		this._handleResize = this.checkListInViewport.bind(this);
+
+		// Indicates the List bottom most part has been detected by the IntersectionObserver
+		// for the first time.
+		this.initialIntersection = true;
+	}
+
+	onExitDOM() {
+		this.unobserveListEnd();
+		this.resizeListenerAttached = false;
+		ResizeHandler.deregister(this.getDomRef(), this._handleResize);
+	}
+
+	onBeforeRendering() {
+		this.prepareListItems();
+	}
+
+	onAfterRendering() {
+		if (this.growsOnScroll) {
+			this.observeListEnd();
+		} else if (this.listEndObserved) {
+			this.unobserveListEnd();
+		}
+
+		if (this.grows) {
+			this.checkListInViewport();
+			this.attachForResize();
+		}
+	}
+
+	attachForResize() {
+		if (!this.resizeListenerAttached) {
+			this.resizeListenerAttached = true;
+			ResizeHandler.register(this.getDomRef(), this._handleResize);
+		}
 	}
 
 	get shouldRenderH1() {
@@ -307,12 +519,33 @@ class List extends UI5Element {
 		return `${this._id}-header`;
 	}
 
+	get modeLabelID() {
+		return `${this._id}-modeLabel`;
+	}
+
+	get listEndDOM() {
+		return this.shadowRoot.querySelector(".ui5-list-end-marker");
+	}
+
+	get hasData() {
+		return this.getSlottedNodes("items").length !== 0;
+	}
+
 	get showNoDataText() {
-		return this.items.length === 0 && this.noDataText;
+		return !this.hasData && this.noDataText;
+	}
+
+	get isDelete() {
+		return this.mode === ListMode.Delete;
 	}
 
-	get showBusy() {
-		return this.busy || this.infiniteScroll;
+	get isSingleSelect() {
+		return [
+			ListMode.SingleSelect,
+			ListMode.SingleSelectBegin,
+			ListMode.SingleSelectEnd,
+			ListMode.SingleSelectAuto,
+		].includes(this.mode);
 	}
 
 	get isMultiSelect() {
@@ -320,19 +553,83 @@ class List extends UI5Element {
 	}
 
 	get ariaLabelledBy() {
-		return this.shouldRenderH1 ? this.headerID : undefined;
+		if (this.accessibleNameRef || this.accessibleName) {
+			return undefined;
+		}
+		const ids = [];
+
+		if (this.isMultiSelect || this.isSingleSelect || this.isDelete) {
+			ids.push(this.modeLabelID);
+		}
+
+		if (this.shouldRenderH1) {
+			ids.push(this.headerID);
+		}
+
+		return ids.length ? ids.join(" ") : undefined;
 	}
 
-	onBeforeRendering() {
-		this.prepareListItems();
+	get ariaLabelTxt() {
+		return getEffectiveAriaLabelText(this);
+	}
+
+	get ariaLabelModeText() {
+		if (this.isMultiSelect) {
+			return List.i18nBundle.getText(ARIA_LABEL_LIST_MULTISELECTABLE);
+		}
+		if (this.isSingleSelect) {
+			return List.i18nBundle.getText(ARIA_LABEL_LIST_SELECTABLE);
+		}
+		if (this.isDelete) {
+			return List.i18nBundle.getText(ARIA_LABEL_LIST_DELETABLE);
+		}
+
+		return undefined;
+	}
+
+	get grows() {
+		return this.growing !== ListGrowingMode.None;
+	}
+
+	get growsOnScroll() {
+		return this.growing === ListGrowingMode.Scroll && !isIE();
+	}
+
+	get growsWithButton() {
+		if (isIE()) {
+			// On IE fallback to "More" button, even if growing of type "Scroll" is set.
+			return this.grows;
+		}
+
+		return this.growing === ListGrowingMode.Button;
+	}
+
+	get _growingButtonText() {
+		return List.i18nBundle.getText(LOAD_MORE_TEXT);
+	}
+
+	get busyIndPosition() {
+		if (isIE() || !this.grows) {
+			return "absolute";
+		}
+
+		return this._inViewport ? "absolute" : "sticky";
+	}
+
+	get styles() {
+		return {
+			busyInd: {
+				position: this.busyIndPosition,
+			},
+		};
 	}
 
 	initItemNavigation() {
 		this._itemNavigation = new ItemNavigation(this, {
+			skipItemsSize: PAGE_UP_DOWN_SIZE, // PAGE_UP and PAGE_DOWN will skip trough 10 items
 			navigationMode: NavigationMode.Vertical,
+			getItemsCallback: () => this.getEnabledItems(),
 		});
-
-		this._itemNavigation.getItemsCallback = () => this.getSlottedNodes("items");
 	}
 
 	prepareListItems() {
@@ -350,6 +647,34 @@ class List extends UI5Element {
 		this._previouslySelectedItem = null;
 	}
 
+	async observeListEnd() {
+		if (!this.listEndObserved) {
+			await renderFinished();
+			this.getIntersectionObserver().observe(this.listEndDOM);
+			this.listEndObserved = true;
+		}
+	}
+
+	unobserveListEnd() {
+		if (this.growingIntersectionObserver) {
+			this.growingIntersectionObserver.disconnect();
+			this.growingIntersectionObserver = null;
+			this.listEndObserved = false;
+		}
+	}
+
+	onInteresection(entries) {
+		if (this.initialIntersection) {
+			this.initialIntersection = false;
+			return;
+		}
+		entries.forEach(entry => {
+			if (entry.isIntersecting) {
+				debounce(this.loadMore.bind(this), INFINITE_SCROLL_DEBOUNCE_RATE);
+			}
+		});
+	}
+
 	/*
 	* ITEM SELECTION BASED ON THE CURRENT MODE
 	*/
@@ -363,7 +688,7 @@ class List extends UI5Element {
 		}
 
 		if (selectionChange) {
-			this.fireEvent("selectionChange", {
+			this.fireEvent("selection-change", {
 				selectedItems: this.getSelectedItems(),
 				previouslySelectedItems,
 				selectionComponentPressed: event.detail.selectionComponentPressed,
@@ -391,13 +716,17 @@ class List extends UI5Element {
 		return this.handleSingleSelect(item);
 	}
 
+	handleSingleSelectAuto(item) {
+		return this.handleSingleSelect(item);
+	}
+
 	handleMultiSelect(item, selected) {
 		item.selected = selected;
 		return true;
 	}
 
 	handleDelete(item) {
-		this.fireEvent("itemDelete", { item });
+		this.fireEvent("item-delete", { item });
 	}
 
 	deselectSelectedItems() {
@@ -408,18 +737,8 @@ class List extends UI5Element {
 		return this.getSlottedNodes("items").filter(item => item.selected);
 	}
 
-	getFirstSelectedItem() {
-		const slottedItems = this.getSlottedNodes("items");
-		let firstSelectedItem = null;
-
-		for (let i = 0; i < slottedItems.length; i++) {
-			if (slottedItems[i].selected) {
-				firstSelectedItem = slottedItems[i];
-				break;
-			}
-		}
-
-		return firstSelectedItem;
+	getEnabledItems() {
+		return this.getSlottedNodes("items").filter(item => !item.disabled);
 	}
 
 	_onkeydown(event) {
@@ -428,6 +747,50 @@ class List extends UI5Element {
 		}
 	}
 
+	_onLoadMoreKeydown(event) {
+		if (isSpace(event)) {
+			event.preventDefault();
+			this._loadMoreActive = true;
+		}
+
+		if (isEnter(event)) {
+			this._onLoadMoreClick();
+			this._loadMoreActive = true;
+		}
+
+		if (isTabNext(event)) {
+			this.setPreviouslyFocusedItem(event.target);
+			this.focusAfterElement();
+		}
+	}
+
+	_onLoadMoreKeyup(event) {
+		if (isSpace(event)) {
+			this._onLoadMoreClick();
+		}
+		this._loadMoreActive = false;
+	}
+
+	_onLoadMoreMousedown() {
+		this._loadMoreActive = true;
+	}
+
+	_onLoadMoreMouseup() {
+		this._loadMoreActive = false;
+	}
+
+	_onLoadMoreClick() {
+		this.loadMore();
+	}
+
+	checkListInViewport() {
+		this._inViewport = isElementInView(this.getDomRef());
+	}
+
+	loadMore() {
+		this.fireEvent("load-more");
+	}
+
 	/*
 	* KEYBOARD SUPPORT
 	*/
@@ -447,7 +810,7 @@ class List extends UI5Element {
 		}
 
 		if (lastTabbableEl === target) {
-			if (this.getFirstSelectedItem()) {
+			if (this.getFirstItem(x => x.selected && !x.disabled)) {
 				this.focusFirstSelectedItem();
 			} else if (this.getPreviouslyFocusedItem()) {
 				this.focusPreviouslyFocusedItem();
@@ -460,13 +823,6 @@ class List extends UI5Element {
 		}
 	}
 
-	_onScroll(event) {
-		if (!this.infiniteScroll) {
-			return;
-		}
-		this.debounce(this.loadMore.bind(this, event.target), INFINITE_SCROLL_DEBOUNCE_RATE);
-	}
-
 	_onfocusin(event) {
 		// If the focusin event does not origin from one of the 'triggers' - ignore it.
 		if (!this.isForwardElement(this.getNormalizedTarget(event.target))) {
@@ -477,7 +833,7 @@ class List extends UI5Element {
 		// The focus arrives in the List for the first time.
 		// If there is selected item - focus it or focus the first item.
 		if (!this.getPreviouslyFocusedItem()) {
-			if (this.getFirstSelectedItem()) {
+			if (this.getFirstItem(x => x.selected && !x.disabled)) {
 				this.focusFirstSelectedItem();
 			} else {
 				this.focusFirstItem();
@@ -490,11 +846,13 @@ class List extends UI5Element {
 		// The focus returns to the List,
 		// focus the first selected item or the previously focused element.
 		if (!this.getForwardingFocus()) {
-			if (this.getFirstSelectedItem()) {
+			if (this.getFirstItem(x => x.selected && !x.disabled)) {
 				this.focusFirstSelectedItem();
 			} else {
 				this.focusPreviouslyFocusedItem();
 			}
+
+			event.stopImmediatePropagation();
 		}
 
 		this.setForwardingFocus(false);
@@ -502,26 +860,40 @@ class List extends UI5Element {
 
 	isForwardElement(node) {
 		const nodeId = node.id;
+		const afterElement = this.getAfterElement();
+		const beforeElement = this.getBeforeElement();
 
-		if (this._id === nodeId || this.getBeforeElement().id === nodeId) {
+		if (this._id === nodeId || (beforeElement && beforeElement.id === nodeId)) {
 			return true;
 		}
 
-		return this.getAfterElement().id === nodeId;
+		return afterElement && afterElement.id === nodeId;
 	}
 
 	onItemFocused(event) {
 		const target = event.target;
 
-		this._itemNavigation.update(target);
-		this.fireEvent("itemFocused", { item: target });
+		this._itemNavigation.setCurrentItem(target);
+		this.fireEvent("item-focused", { item: target });
+
+		if (this.mode === ListMode.SingleSelectAuto) {
+			this.onSelectionRequested({
+				detail: {
+					item: target,
+					selectionComponentPressed: false,
+					selected: true,
+					key: event.detail.key,
+				},
+			});
+		}
 	}
 
 	onItemPress(event) {
 		const pressedItem = event.detail.item;
 
-		this.fireEvent("itemPress", { item: pressedItem });
-		this.fireEvent("itemClick", { item: pressedItem });
+		if (!this.fireEvent("item-click", { item: pressedItem }, true)) {
+			return;
+		}
 
 		if (!this._selectionRequested && this.mode !== ListMode.Delete) {
 			this._selectionRequested = true;
@@ -538,14 +910,27 @@ class List extends UI5Element {
 		this._selectionRequested = false;
 	}
 
+	// This is applicable to NoficationListItem
+	onItemClose(event) {
+		this.fireEvent("item-close", { item: event.detail.item });
+	}
+
+	onItemToggle(event) {
+		this.fireEvent("item-toggle", { item: event.detail.item });
+	}
+
 	onForwardBefore(event) {
 		this.setPreviouslyFocusedItem(event.target);
 		this.focusBeforeElement();
+		event.stopImmediatePropagation();
 	}
 
 	onForwardAfter(event) {
 		this.setPreviouslyFocusedItem(event.target);
-		this.focusAfterElement();
+
+		if (!this.growsWithButton) {
+			this.focusAfterElement();
+		}
 	}
 
 	focusBeforeElement() {
@@ -559,7 +944,8 @@ class List extends UI5Element {
 	}
 
 	focusFirstItem() {
-		const firstItem = this.getFirstItem();
+		// only enabled items are focusable
+		const firstItem = this.getFirstItem(x => !x.disabled);
 
 		if (firstItem) {
 			firstItem.focus();
@@ -575,13 +961,31 @@ class List extends UI5Element {
 	}
 
 	focusFirstSelectedItem() {
-		const firstSelectedItem = this.getFirstSelectedItem();
+		// only enabled items are focusable
+		const firstSelectedItem = this.getFirstItem(x => x.selected && !x.disabled);
 
 		if (firstSelectedItem) {
 			firstSelectedItem.focus();
 		}
 	}
 
+	/**
+	 * Focuses a list item and sets its tabindex to "0" via the ItemNavigation
+	 * @protected
+	 * @param item
+	 */
+	focusItem(item) {
+		this._itemNavigation.setCurrentItem(item);
+		item.focus();
+	}
+
+	focusUploadCollectionItem(event) {
+		setTimeout(() => {
+			this.setPreviouslyFocusedItem(event.target);
+			this.focusPreviouslyFocusedItem();
+		}, 0);
+	}
+
 	setForwardingFocus(forwardingFocus) {
 		this._forwardingFocus = forwardingFocus;
 	}
@@ -598,9 +1002,22 @@ class List extends UI5Element {
 		return this._previouslyFocusedItem;
 	}
 
-	getFirstItem() {
+	getFirstItem(filter) {
 		const slottedItems = this.getSlottedNodes("items");
-		return !!slottedItems.length && slottedItems[0];
+		let firstItem = null;
+
+		if (!filter) {
+			return !!slottedItems.length && slottedItems[0];
+		}
+
+		for (let i = 0; i < slottedItems.length; i++) {
+			if (filter(slottedItems[i])) {
+				firstItem = slottedItems[i];
+				break;
+			}
+		}
+
+		return firstItem;
 	}
 
 	getAfterElement() {
@@ -631,32 +1048,16 @@ class List extends UI5Element {
 		return focused;
 	}
 
-	loadMore(el) {
-		const scrollTop = el.scrollTop;
-		const height = el.offsetHeight;
-		const scrollHeight = el.scrollHeight;
-
-		if (this.previousScrollPosition > scrollTop) { // skip scrolling upwards
-			this.previousScrollPosition = scrollTop;
-			return;
-		}
-		this.previousScrollPosition = scrollTop;
-
-		if (scrollHeight - BUSYINDICATOR_HEIGHT <= height + scrollTop) {
-			this.fireEvent("loadMore");
+	getIntersectionObserver() {
+		if (!this.growingIntersectionObserver) {
+			this.growingIntersectionObserver = new IntersectionObserver(this.onInteresection.bind(this), {
+				root: null,
+				rootMargin: "0px",
+				threshold: 1.0,
+			});
 		}
-	}
 
-	debounce(fn, delay) {
-		clearTimeout(this.debounceInterval);
-		this.debounceInterval = setTimeout(() => {
-			this.debounceInterval = null;
-			fn();
-		}, delay);
-	}
-
-	static async onDefine() {
-		await BusyIndicator.define();
+		return this.growingIntersectionObserver;
 	}
 }