@ui5/webcomponents 0.0.0-39bd3067f → 0.0.0-4180fe799

package/dist/ListItem.js

@@ -1,14 +1,20 @@
-import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
-import "@ui5/webcomponents-icons/dist/icons/decline.js";
-import "@ui5/webcomponents-icons/dist/icons/edit.js";
-import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import { isSpace, isEnter, isDelete } from "@ui5/webcomponents-base/dist/Keys.js";
+import "@ui5/webcomponents-icons/dist/decline.js";
+import "@ui5/webcomponents-icons/dist/edit.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
 import ListItemType from "./types/ListItemType.js";
 import ListMode from "./types/ListMode.js";
 import ListItemBase from "./ListItemBase.js";
-import "./RadioButton.js";
-import "./CheckBox.js";
-import "./Button.js";
-import { DELETE } from "./generated/i18n/i18n-defaults.js";
+import RadioButton from "./RadioButton.js";
+import CheckBox from "./CheckBox.js";
+import Button from "./Button.js";
+import {
+	DELETE,
+	ARIA_LABEL_LIST_ITEM_CHECKBOX,
+	ARIA_LABEL_LIST_ITEM_RADIO_BUTTON,
+	LIST_ITEM_SELECTED,
+	LIST_ITEM_NOT_SELECTED,
+} from "./generated/i18n/i18n-defaults.js";
 
 // Styles
 import styles from "./generated/themes/ListItem.css.js";
@@ -17,6 +23,7 @@ import styles from "./generated/themes/ListItem.css.js";
  * @public
  */
 const metadata = {
+	languageAware: true,
 	properties: /** @lends  sap.ui.webcomponents.main.ListItem.prototype */ {
 
 		/**
@@ -45,6 +52,17 @@ const metadata = {
 			type: Boolean,
 		},
 
+		/**
+		 * Defines the tooltip of the component.
+		 * @type {string}
+		 * @defaultvalue ""
+		 * @private
+		 * @since 1.0.0-rc.15
+		 */
+		title: {
+			type: String,
+		},
+
 		/**
 		 * Indicates if the list item is actionable, e.g has hover and pressed effects.
 		 *
@@ -55,23 +73,36 @@ const metadata = {
 			type: Boolean,
 		},
 
+		/**
+		 * Used to define the role of the list item.
+		 *
+		 * @private
+		 * @type {String}
+		 * @defaultvalue "listitem"
+		 * @since 1.0.0-rc.9
+		 *
+		 */
+		role: {
+			type: String,
+			defaultValue: "listitem",
+		},
+
 		_mode: {
 			type: ListMode,
 			defaultValue: ListMode.None,
-			noAttribute: true,
 		},
 	},
-	events: {
+	events: /** @lends sap.ui.webcomponents.main.ListItem.prototype */ {
 		/**
 		 * Fired when the user clicks on the detail button when type is <code>Detail</code>.
 		 *
-		 * @event
+		 * @event sap.ui.webcomponents.main.ListItem#detail-click
 		 * @public
 		 */
-		detailClick: {},
+		"detail-click": {},
 		_press: {},
 		_focused: {},
-		_focusForward: {},
+		"_selection-requested": {},
 	},
 };
 
@@ -92,11 +123,19 @@ class ListItem extends ListItemBase {
 	}
 
 	static get styles() {
-		return [styles, ListItemBase.styles];
+		return [ListItemBase.styles, styles];
+	}
+
+	static get dependencies() {
+		return [
+			Button,
+			RadioButton,
+			CheckBox,
+		];
 	}
 
-	constructor(props) {
-		super(props);
+	constructor() {
+		super();
 
 		this.deactivateByKey = event => {
 			if (isEnter(event)) {
@@ -109,8 +148,6 @@ class ListItem extends ListItemBase {
 				this.active = false;
 			}
 		};
-
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
 	}
 
 	onBeforeRendering(...params) {
@@ -155,6 +192,10 @@ class ListItem extends ListItemBase {
 		if (isSpace(event)) {
 			this.fireItemPress(event);
 		}
+
+		if (this.modeDelete && isDelete(event)) {
+			this.onDelete();
+		}
 	}
 
 	_onmousedown(event) {
@@ -192,7 +233,7 @@ class ListItem extends ListItemBase {
 	}
 
 	/*
-	 * Called when selection components in Single (ui5-radiobutton)
+	 * Called when selection components in Single (ui5-radio-button)
 	 * and Multi (ui5-checkbox) selection modes are used.
 	 */
 	onMultiSelectionComponentPress(event) {
@@ -200,7 +241,7 @@ class ListItem extends ListItemBase {
 			return;
 		}
 
-		this.fireEvent("_selectionRequested", { item: this, selected: event.target.checked, selectionComponentPressed: true });
+		this.fireEvent("_selection-requested", { item: this, selected: event.target.checked, selectionComponentPressed: true });
 	}
 
 	onSingleSelectionComponentPress(event) {
@@ -208,7 +249,7 @@ class ListItem extends ListItemBase {
 			return;
 		}
 
-		this.fireEvent("_selectionRequested", { item: this, selected: !event.target.selected, selectionComponentPressed: true });
+		this.fireEvent("_selection-requested", { item: this, selected: !event.target.selected, selectionComponentPressed: true });
 	}
 
 	activate() {
@@ -218,11 +259,11 @@ class ListItem extends ListItemBase {
 	}
 
 	onDelete(event) {
-		this.fireEvent("_selectionRequested", { item: this, selectionComponentPressed: false });
+		this.fireEvent("_selection-requested", { item: this, selectionComponentPressed: false });
 	}
 
 	onDetailClick(event) {
-		this.fireEvent("detailClick", { item: this, selected: this.selected });
+		this.fireEvent("detail-click", { item: this, selected: this.selected });
 	}
 
 	fireItemPress(event) {
@@ -263,26 +304,67 @@ class ListItem extends ListItemBase {
 		return this._mode === ListMode.Delete;
 	}
 
+	/**
+	 * Used in UploadCollectionItem
+	 */
+	get renderDeleteButton() {
+		return this.modeDelete;
+	}
+
+	get disableDeleteButton() {
+		return false;
+	}
+	/**
+	 * End
+	 */
+
 	get typeDetail() {
 		return this.type === ListItemType.Detail;
 	}
 
+	get typeActive() {
+		return this.type === ListItemType.Active;
+	}
+
 	get ariaSelected() {
-		if (this.modeMultiSelect) {
+		if (this.modeMultiSelect || this.modeSingleSelect) {
 			return this.selected;
 		}
 
 		return undefined;
 	}
 
+	get ariaSelectedText() {
+		let ariaSelectedText;
+
+		// Selected state needs to be supported separately since now the role mapping is list -> listitem[]
+		// to avoid the issue of nesting interactive elements, ex. (option -> radio/checkbox);
+		// The text is added to aria-describedby because as part of the aria-labelledby
+		// the whole content of the item is readout when the aria-labelledby value is changed.
+		if (this.ariaSelected !== undefined) {
+			ariaSelectedText = this.ariaSelected ? ListItem.i18nBundle.getText(LIST_ITEM_SELECTED) : ListItem.i18nBundle.getText(LIST_ITEM_NOT_SELECTED);
+		}
+
+		return ariaSelectedText;
+	}
+
 	get deleteText() {
-		return this.i18nBundle.getText(DELETE);
+		return ListItem.i18nBundle.getText(DELETE);
+	}
+
+	get _accInfo() {
+		return {
+			role: this.role,
+			ariaExpanded: undefined,
+			ariaLevel: undefined,
+			ariaLabel: ListItem.i18nBundle.getText(ARIA_LABEL_LIST_ITEM_CHECKBOX),
+			ariaLabelRadioButton: ListItem.i18nBundle.getText(ARIA_LABEL_LIST_ITEM_RADIO_BUTTON),
+			ariaSelectedText: this.ariaSelectedText,
+		};
 	}
 
 	static async onDefine() {
-		await Promise.all([
-			fetchI18nBundle("@ui5/webcomponents"),
-		]);
+		ListItem.i18nBundle = await getI18nBundle("@ui5/webcomponents");
 	}
 }
 

package/dist/ListItemBase.js

@@ -1,7 +1,7 @@
+import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
 import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
 import { getTabbableElements } from "@ui5/webcomponents-base/dist/util/TabbableElements.js";
 import { isTabNext, isTabPrevious } from "@ui5/webcomponents-base/dist/Keys.js";
-import { getRTL } from "@ui5/webcomponents-base/dist/config/RTL.js";
 
 // Styles
 import styles from "./generated/themes/ListItemBase.css.js";
@@ -36,6 +36,19 @@ const metadata = {
 			noAttribute: true,
 		},
 
+		/**
+		 * Defines whether <code>ui5-li</code> is in disabled state.
+		 * <br><br>
+		 * <b>Note:</b> A disabled <code>ui5-li</code> is noninteractive.
+		 * @type {boolean}
+		 * @defaultvalue false
+		 * @protected
+		 * @since 1.0.0-rc.12
+		 */
+		disabled: {
+			type: Boolean,
+		},
+
 		/**
 		 * Indicates if the element is on focus
 		 * @private
@@ -44,9 +57,10 @@ const metadata = {
 			type: Boolean,
 		},
 	},
-	events: {
+	events: /** @lends  sap.ui.webcomponents.main.ListItemBase.prototype */  {
 		_focused: {},
-		_focusForward: {},
+		"_forward-after": {},
+		"_forward-before": {},
 	},
 };
 
@@ -66,11 +80,19 @@ class ListItemBase extends UI5Element {
 		return metadata;
 	}
 
+	static get render() {
+		return litRender;
+	}
+
 	static get styles() {
 		return styles;
 	}
 
 	_onfocusin(event) {
+		if (event.isMarked === "button" || event.isMarked === "link") {
+			return;
+		}
+
 		this.focused = true;
 		this.fireEvent("_focused", event);
 	}
@@ -89,11 +111,13 @@ class ListItemBase extends UI5Element {
 		}
 	}
 
+	_onkeyup() {}
+
 	_handleTabNext(event) {
 		const target = event.target;
 
 		if (this.shouldForwardTabAfter(target)) {
-			this.fireEvent("_forwardAfter", { item: target });
+			this.fireEvent("_forward-after", { item: target });
 		}
 	}
 
@@ -103,7 +127,7 @@ class ListItemBase extends UI5Element {
 		if (this.shouldForwardTabBefore(target)) {
 			const eventData = event;
 			eventData.item = target;
-			this.fireEvent("_forwardBefore", eventData);
+			this.fireEvent("_forward-before", eventData);
 		}
 	}
 
@@ -132,13 +156,23 @@ class ListItemBase extends UI5Element {
 		return {
 			main: {
 				"ui5-li-root": true,
-				"ui5-li--focusable": true,
+				"ui5-li--focusable": !this.disabled,
 			},
 		};
 	}
 
-	get rtl() {
-		return getRTL() ? "rtl" : undefined;
+	get ariaDisabled() {
+		return this.disabled ? "true" : undefined;
+	}
+
+	get tabIndex() {
+		if (this.disabled) {
+			return -1;
+		}
+		if (this.selected) {
+			return 0;
+		}
+		return this._tabIndex;
 	}
 }
 

package/dist/MessageStrip.js

@@ -1,15 +1,15 @@
 import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
 import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
-import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
-import { isEnter, isSpace } from "@ui5/webcomponents-base/src/Keys.js";
-import "@ui5/webcomponents-icons/dist/icons/decline.js";
-import "@ui5/webcomponents-icons/dist/icons/message-information.js";
-import "@ui5/webcomponents-icons/dist/icons/message-success.js";
-import "@ui5/webcomponents-icons/dist/icons/message-error.js";
-import "@ui5/webcomponents-icons/dist/icons/message-warning.js";
-import MessageStripType from "./types/MessageStripType.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import "@ui5/webcomponents-icons/dist/decline.js";
+import "@ui5/webcomponents-icons/dist/information.js";
+import "@ui5/webcomponents-icons/dist/sys-enter-2.js";
+import "@ui5/webcomponents-icons/dist/error.js";
+import "@ui5/webcomponents-icons/dist/alert.js";
+import MessageStripDesign from "./types/MessageStripDesign.js";
 import MessageStripTemplate from "./generated/templates/MessageStripTemplate.lit.js";
 import Icon from "./Icon.js";
+import Button from "./Button.js";
 import { MESSAGE_STRIP_CLOSE_BUTTON } from "./generated/i18n/i18n-defaults.js";
 
 // Styles
@@ -19,22 +19,25 @@ import messageStripCss from "./generated/themes/MessageStrip.css.js";
  * @public
  */
 const metadata = {
-	tag: "ui5-messagestrip",
+	tag: "ui5-message-strip",
+	altTag: "ui5-messagestrip",
+	languageAware: true,
 	properties: /** @lends sap.ui.webcomponents.main.MessageStrip.prototype */ {
 
 		/**
-		 * Defines the <code>ui5-messagestrip</code> type.
+		 * Defines the component type.
 		 * <br><br>
 		 * <b>Note:</b> Available options are <code>"Information"</code>, <code>"Positive"</code>, <code>"Negative"</code>,
 		 * and <code>"Warning"</code>.
 		 *
-		 * @type {MessageStripType}
+		 * @type {MessageStripDesign}
 		 * @defaultvalue "Information"
 		 * @public
+		 * @since 1.0.0-rc.15
 		 */
-		type: {
-			type: MessageStripType,
-			defaultValue: MessageStripType.Information,
+		design: {
+			type: MessageStripDesign,
+			defaultValue: MessageStripDesign.Information,
 		},
 
 		/**
@@ -44,29 +47,29 @@ const metadata = {
 		 * @type {boolean}
 		 * @defaultvalue false
 		 * @public
+		 * @since 1.0.0-rc.15
 		 */
-		noIcon: {
+		hideIcon: {
 			type: Boolean,
 		},
 
 		/**
-		 * Defines whether the MessageStrip renders close icon.
+		 * Defines whether the MessageStrip renders close button.
 		 *
 		 * @type {boolean}
 		 * @defaultvalue false
 		 * @public
 		 */
-		noCloseButton: {
+		hideCloseButton: {
 			type: Boolean,
 		},
 	},
 	managedSlots: true,
 	slots: /** @lends sap.ui.webcomponents.main.MessageStrip.prototype */ {
 		/**
-		 * Defines the text of the <code>ui5-messagestrip</code>.
+		 * Defines the text of the component.
 		 * <br><br>
-		 * <b>Note:</b> Аlthough this slot accepts HTML Elements,
-		 * it is strongly recommended that you only use text in order to preserve the intended design.
+		 * <b>Note:</b> Although this slot accepts HTML Elements, it is strongly recommended that you only use text in order to preserve the intended design.
 		 *
 		 * @type {Node[]}
 		 * @slot
@@ -77,16 +80,16 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the content to be displayed as graphical element within the <code>ui5-messagestrip</code>.
+		 * Defines the content to be displayed as graphical element within the component.
 		 * <br><br>
-		 * <b>Note:</b> If no icon is given, the default icon for the <code>ui5-messagestrip</code> type will be used.
+		 * <b>Note:</b> If no icon is given, the default icon for the component type will be used.
 		 * The SAP-icons font provides numerous options.
 		 * <br><br>
 		 *
 		 * See all the available icons in the <ui5-link target="_blank" href="https://openui5.hana.ondemand.com/test-resources/sap/m/demokit/iconExplorer/webapp/index.html" class="api-table-content-cell-link">Icon Explorer</ui5-link>.
 		 *
-		 * @type {HTMLElement}
-         * @slot
+		 * @type {sap.ui.webcomponents.main.IIcon}
+		 * @slot
 		 * @public
 		 */
 		"icon": {
@@ -111,13 +114,13 @@ const metadata = {
  *
  * <h3 class="comment-api-title">Overview</h3>
  *
- * The <code>ui5-messagestrip</code> component enables the embedding of app-related messages.
- * It displays 4 types of messages, each with corresponding semantic color and icon: Information, Positive, Warning and Negative.
+ * The <code>ui5-message-strip</code> component enables the embedding of app-related messages.
+ * It displays 4 designs of messages, each with corresponding semantic color and icon: Information, Positive, Warning and Negative.
  * Each message can have a Close button, so that it can be removed from the UI, if needed.
  *
  * <h3>Usage</h3>
  *
- * For the <code>ui5-messagestrip</code> component, you can define whether it displays
+ * For the <code>ui5-message-strip</code> component, you can define whether it displays
  * an icon in the beginning and a close button. Moreover, its size and background
  * can be controlled with CSS.
  *
@@ -129,7 +132,7 @@ const metadata = {
  * @author SAP SE
  * @alias sap.ui.webcomponents.main.MessageStrip
  * @extends UI5Element
- * @tagname ui5-messagestrip
+ * @tagname ui5-message-strip
  * @public
  * @since 0.9.0
  */
@@ -152,73 +155,56 @@ class MessageStrip extends UI5Element {
 
 	constructor() {
 		super();
-
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
 	}
 
 	_closeClick() {
 		this.fireEvent("close", {});
 	}
 
-	_closeKeyDown(event) {
-		if (isEnter(event)) {
-			this.fireEvent("close");
-		}
-
-		if (isSpace(event)) {
-			event.preventDefault();
-		}
-	}
-
-	_closeKeyUp(event) {
-		if (isSpace(event)) {
-			this.fireEvent("close");
-		}
+	static get dependencies() {
+		return [
+			Icon,
+			Button,
+		];
 	}
 
 	static async onDefine() {
-		await fetchI18nBundle("@ui5/webcomponents");
-
-		await Icon.define();
+		MessageStrip.i18nBundle = await getI18nBundle("@ui5/webcomponents");
 	}
 
-	static typeClassesMappings() {
+	static designClassesMappings() {
 		return {
-			"Information": "ui5-messagestrip--info",
-			"Positive": "ui5-messagestrip--positive",
-			"Negative": "ui5-messagestrip--negative",
-			"Warning": "ui5-messagestrip--warning",
+			"Information": "ui5-message-strip-root--info",
+			"Positive": "ui5-message-strip-root--positive",
+			"Negative": "ui5-message-strip-root--negative",
+			"Warning": "ui5-message-strip-root--warning",
 		};
 	}
 
 	static iconMappings() {
 		return {
-			"Information": "message-information",
-			"Positive": "message-success",
-			"Negative": "message-error",
-			"Warning": "message-warning",
+			"Information": "information",
+			"Positive": "sys-enter-2",
+			"Negative": "error",
+			"Warning": "alert",
 		};
 	}
 
 	get hiddenText() {
-		return `Message Strip ${this.type} ${this.noCloseButton ? "" : "closable"}`;
+		return `Message Strip ${this.design} ${this.hideCloseButton ? "" : "closable"}`;
 	}
 
 	get _closeButtonText() {
-		return this.i18nBundle.getText(MESSAGE_STRIP_CLOSE_BUTTON);
+		return MessageStrip.i18nBundle.getText(MESSAGE_STRIP_CLOSE_BUTTON);
 	}
 
 	get classes() {
 		return {
-			label: {
-				"ui5-messagestrip-text": true,
-				"ui5-messagestripNoCloseButton": this.noCloseButton,
-			},
-			main: {
-				"ui5-messagestrip-root": true,
-				"ui5-messagestrip-icon--hidden": this.noIcon,
-				"ui5-messagestrip-close-icon--hidden": this.noCloseButton,
-				[this.typeClasses]: true,
+			root: {
+				"ui5-message-strip-root": true,
+				"ui5-message-strip-root-hide-icon": this.hideIcon,
+				"ui5-message-strip-root-hide-close-button": this.hideCloseButton,
+				[this.designClasses]: true,
 			},
 		};
 	}
@@ -228,11 +214,11 @@ class MessageStrip extends UI5Element {
 	}
 
 	get standardIconName() {
-		return MessageStrip.iconMappings()[this.type];
+		return MessageStrip.iconMappings()[this.design];
 	}
 
-	get typeClasses() {
-		return MessageStrip.typeClassesMappings()[this.type];
+	get designClasses() {
+		return MessageStrip.designClassesMappings()[this.design];
 	}
 }