@ui5/webcomponents 1.0.0-rc.8 → 1.0.2

package/src/FileUploader.js

@@ -2,21 +2,28 @@ import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
 import ValueState from "@ui5/webcomponents-base/dist/types/ValueState.js";
 import { getFeature } from "@ui5/webcomponents-base/dist/FeaturesRegistry.js";
 import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
-import {
-	fetchI18nBundle,
-	getI18nBundle,
-} from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import { isEnter, isSpace } from "@ui5/webcomponents-base/dist/Keys.js";
 import {
 	FILEUPLOAD_BROWSE,
 	FILEUPLOADER_TITLE,
+	VALUE_STATE_SUCCESS,
+	VALUE_STATE_INFORMATION,
+	VALUE_STATE_ERROR,
+	VALUE_STATE_WARNING,
 } from "./generated/i18n/i18n-defaults.js";
+
 import Input from "./Input.js";
+import Popover from "./Popover.js";
 
 // Template
 import FileUploaderTemplate from "./generated/templates/FileUploaderTemplate.lit.js";
+import FileUploaderPopoverTemplate from "./generated/templates/FileUploaderPopoverTemplate.lit.js";
 
 // Styles
 import FileUploaderCss from "./generated/themes/FileUploader.css.js";
+import ResponsivePopoverCommonCss from "./generated/themes/ResponsivePopoverCommon.css.js";
+import ValueStateMessageCss from "./generated/themes/ValueStateMessage.css.js";
 
 /**
  * @public
@@ -26,7 +33,9 @@ const metadata = {
 	languageAware: true,
 	properties: /** @lends sap.ui.webcomponents.main.FileUploader.prototype */ {
 		/**
-		 * Comma-separated list of file types that the <code>ui5-file-uploader</code> should accept.
+		 * Comma-separated list of file types that the component should accept.
+		 * <br><br>
+		 * <b>Note:</b> Please make sure you are adding the <code>.</code> in front on the file type, e.g. <code>.png</code> in case you want to accept png's only.
 		 * @type {string}
 		 * @defaultvalue ""
 		 * @public
@@ -36,7 +45,7 @@ const metadata = {
 		},
 
 		/**
-		 * If set to "true", the input field of <code>ui5-file-uploader</code> will not be rendered. Only the default slot that is passed will be rendered.
+		 * If set to "true", the input field of component will not be rendered. Only the default slot that is passed will be rendered.
 		 * @type {boolean}
 		 * @defaultvalue false
 		 * @public
@@ -46,9 +55,9 @@ const metadata = {
 		},
 
 		/**
-		 * Defines whether <code>ui5-file-uploader</code> is in disabled state.
+		 * Defines whether the component is in disabled state.
 		 * <br><br>
-		 * <b>Note:</b> A disabled <code>ui5-file-uploader</code> is completely noninteractive.
+		 * <b>Note:</b> A disabled component is completely noninteractive.
 		 *
 		 * @type {boolean}
 		 * @defaultvalue false
@@ -69,7 +78,7 @@ const metadata = {
 		},
 
 		/**
-		 * Determines the name with which the <code>ui5-file-uploader</code> will be submitted in an HTML form.
+		 * Determines the name with which the component will be submitted in an HTML form.
 		 *
 		 * <br><br>
 		 * <b>Important:</b> For the <code>name</code> property to have effect, you must add the following import to your project:
@@ -77,7 +86,7 @@ const metadata = {
 		 *
 		 * <br><br>
 		 * <b>Note:</b> When set, a native <code>input</code> HTML element
-		 * will be created inside the <code>ui5-file-uploader</code> so that it can be submitted as
+		 * will be created inside the component so that it can be submitted as
 		 * part of an HTML form. Do not use this property unless you need to submit a form.
 		 *
 		 * @type {string}
@@ -89,7 +98,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines a short hint intended to aid the user with data entry when the <code>ui5-file-uploader</code> has no value.
+		 * Defines a short hint intended to aid the user with data entry when the component has no value.
 		 * @type {string}
 		 * @defaultvalue ""
 		 * @public
@@ -109,7 +118,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines the value state of the <code>ui5-file-uploader</code>.
+		 * Defines the value state of the component.
 		 * <br><br>
 		 * Available options are:
 		 * <ul>
@@ -128,20 +137,55 @@ const metadata = {
 			type: ValueState,
 			defaultValue: ValueState.None,
 		},
+
+		/**
+		 * @private
+		 */
+		focused: {
+			type: Boolean,
+		},
 	},
 	managedSlots: true,
 	slots: /** @lends sap.ui.webcomponents.main.FileUploader.prototype */ {
 		/**
-		 * By default the <code>ui5-file-uploader</code> contains a single input field. With this slot you can pass any content that you wish to add. See the samples for more information.
+		 * By default the component contains a single input field. With this slot you can pass any content that you wish to add. See the samples for more information.
 		 *
 		 * @type {HTMLElement[]}
-		 * @slot
+		 * @slot content
 		 * @public
 		 */
 		"default": {
 			propertyName: "content",
 			type: HTMLElement,
 		},
+
+		/**
+		 * Defines the value state message that will be displayed as pop up under the component.
+		 * <br><br>
+		 *
+		 * <b>Note:</b> If not specified, a default text (in the respective language) will be displayed.
+		 * <br>
+		 * <b>Note:</b> The <code>valueStateMessage</code> would be displayed,
+		 * when the component is in <code>Information</code>, <code>Warning</code> or <code>Error</code> value state.
+		 * @type {HTMLElement[]}
+		 * @since 1.0.0-rc.9
+		 * @slot
+		 * @public
+		 */
+		valueStateMessage: {
+			type: HTMLElement,
+		},
+
+		/**
+		 * The slot is used to render native <code>input</code> HTML element within Light DOM to enable form submit,
+		 * when <code>name</code> property is set.
+		 * @type {HTMLElement[]}
+		 * @slot
+		 * @private
+		 */
+		formSupport: {
+			type: HTMLElement,
+		},
 	},
 	events: /** @lends sap.ui.webcomponents.main.FileUploader.prototype */ {
 		/**
@@ -178,7 +222,7 @@ const metadata = {
  * For the <code>ui5-file-uploader</code>
  * <h3>ES6 Module Import</h3>
  *
- * <code>import @ui5/webcomponents/dist/FileUploader.js";</code>
+ * <code>import "@ui5/webcomponents/dist/FileUploader.js";</code>
  *
  * @constructor
  * @since 1.0.0-rc.6
@@ -209,13 +253,17 @@ class FileUploader extends UI5Element {
 		return FileUploaderTemplate;
 	}
 
+	static get staticAreaTemplate() {
+		return FileUploaderPopoverTemplate;
+	}
+
+	static get staticAreaStyles() {
+		return [ResponsivePopoverCommonCss, ValueStateMessageCss];
+	}
+
 	constructor() {
 		super();
-		if (this._canUseNativeFormSupport) {
-			this._internals = this.attachInternals();
-		}
-
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
+		this._internals = this.attachInternals && this.attachInternals();
 	}
 
 	_onmouseover() {
@@ -230,6 +278,34 @@ class FileUploader extends UI5Element {
 		});
 	}
 
+	_onclick(event) {
+		if (event.isMarked === "button") {
+			this._input.click(event);
+		}
+	}
+
+	_onkeydown(event) {
+		if (isEnter(event)) {
+			this._input.click(event);
+			event.preventDefault();
+		}
+	}
+
+	_onkeyup(event) {
+		if (isSpace(event)) {
+			this._input.click(event);
+			event.preventDefault();
+		}
+	}
+
+	_onfocusin() {
+		this.focused = true;
+	}
+
+	_onfocusout() {
+		this.focused = false;
+	}
+
 	/**
 	 * FileList of all selected files.
 	 * @readonly
@@ -252,6 +328,8 @@ class FileUploader extends UI5Element {
 		if (!this.value) {
 			this._input.value = "";
 		}
+
+		this.toggleValueStatePopover(this.shouldOpenValueStateMessagePopover);
 	}
 
 	_enableFormSupport() {
@@ -266,7 +344,7 @@ class FileUploader extends UI5Element {
 					(element, nativeInput) => {
 						nativeInput.disabled = element.disabled;
 					},
-					this._onChange.bind(this)
+					this._onChange.bind(this),
 				);
 			}
 		} else if (this.name) {
@@ -297,8 +375,37 @@ class FileUploader extends UI5Element {
 		this._internals.setFormValue(formData);
 	}
 
+	toggleValueStatePopover(open) {
+		if (open) {
+			this.openValueStatePopover();
+		} else {
+			this.closeValueStatePopover();
+		}
+	}
+
+	async openValueStatePopover() {
+		const popover = await this._getPopover();
+
+		if (popover) {
+			popover.showAt(this);
+		}
+	}
+
+	async closeValueStatePopover() {
+		const popover = await this._getPopover();
+
+		if (popover) {
+			popover.close();
+		}
+	}
+
+	async _getPopover() {
+		const staticAreaItem = await this.getStaticAreaItemDomRef();
+		return staticAreaItem.querySelector(".ui5-valuestatemessage-popover");
+	}
+
 	/**
-	 * in case when ui5-file-uploader is not placed in the DOM, return empty FileList, like native input would do
+	 * in case when the component is not placed in the DOM, return empty FileList, like native input would do
 	 * @private
 	 */
 	static get _emptyFilesList() {
@@ -310,15 +417,15 @@ class FileUploader extends UI5Element {
 	}
 
 	get browseText() {
-		return this.i18nBundle.getText(FILEUPLOAD_BROWSE);
+		return FileUploader.i18nBundle.getText(FILEUPLOAD_BROWSE);
 	}
 
 	get titleText() {
-		return this.i18nBundle.getText(FILEUPLOADER_TITLE);
+		return FileUploader.i18nBundle.getText(FILEUPLOADER_TITLE);
 	}
 
 	get _canUseNativeFormSupport() {
-		return !!this.attachInternals;
+		return this._internals && this._internals.setFormValue;
 	}
 
 	get _keepInputInShadowDOM() {
@@ -338,11 +445,83 @@ class FileUploader extends UI5Element {
 		return "file";
 	}
 
+	get valueStateTextMappings() {
+		return {
+			"Success": FileUploader.i18nBundle.getText(VALUE_STATE_SUCCESS),
+			"Information": FileUploader.i18nBundle.getText(VALUE_STATE_INFORMATION),
+			"Error": FileUploader.i18nBundle.getText(VALUE_STATE_ERROR),
+			"Warning": FileUploader.i18nBundle.getText(VALUE_STATE_WARNING),
+		};
+	}
+
+	get valueStateText() {
+		return this.valueStateTextMappings[this.valueState];
+	}
+
+	get hasValueState() {
+		return this.valueState !== ValueState.None;
+	}
+
+	get hasValueStateText() {
+		return this.hasValueState && this.valueState !== ValueState.Success;
+	}
+
+	get valueStateMessageText() {
+		return this.getSlottedNodes("valueStateMessage").map(el => el.cloneNode(true));
+	}
+
+	get shouldDisplayDefaultValueStateMessage() {
+		return !this.valueStateMessage.length && this.hasValueStateText;
+	}
+
+	get shouldOpenValueStateMessagePopover() {
+		return this.focused && this.hasValueStateText && !this.hideInput;
+	}
+
+	/**
+	 * This method is relevant for sap_horizon theme only
+	 */
+	get _valueStateMessageInputIcon() {
+		const iconPerValueState = {
+			Error: "error",
+			Warning: "alert",
+			Success: "sys-enter-2",
+			Information: "information",
+		};
+
+		return this.valueState !== ValueState.None ? iconPerValueState[this.valueState] : "";
+	}
+
+	get classes() {
+		return {
+			popoverValueState: {
+				"ui5-valuestatemessage-root": true,
+				"ui5-valuestatemessage--success": this.valueState === ValueState.Success,
+				"ui5-valuestatemessage--error": this.valueState === ValueState.Error,
+				"ui5-valuestatemessage--warning": this.valueState === ValueState.Warning,
+				"ui5-valuestatemessage--information": this.valueState === ValueState.Information,
+			},
+		};
+	}
+
+	get styles() {
+		return {
+			popoverHeader: {
+				"width": `${this.ui5Input ? this.ui5Input.offsetWidth : 0}px`,
+			},
+		};
+	}
+
+	get ui5Input() {
+		return this.shadowRoot.querySelector(".ui5-file-uploader-input");
+	}
+
+	static get dependencies() {
+		return [Input, Popover];
+	}
+
 	static async onDefine() {
-		await Promise.all([
-			Input.define(),
-			fetchI18nBundle("@ui5/webcomponents"),
-		]);
+		FileUploader.i18nBundle = await getI18nBundle("@ui5/webcomponents");
 	}
 }
 

package/src/FileUploaderPopover.hbs

@@ -0,0 +1,25 @@
+<ui5-popover
+	skip-registry-update
+	_disable-initial-focus
+	prevent-focus-restore
+	no-padding
+	hide-arrow
+	class="ui5-valuestatemessage-popover"
+	placement-type="Bottom"
+	horizontal-align="Left"
+>
+	<div slot="header" class="{{classes.popoverValueState}}" style="{{styles.popoverHeader}}">
+		<ui5-icon class="ui5-input-value-state-message-icon" name="{{_valueStateMessageInputIcon}}"></ui5-icon>
+		{{> valueStateMessage}}
+	</div>
+</ui5-popover>
+
+{{#*inline "valueStateMessage"}}
+	{{#if shouldDisplayDefaultValueStateMessage}}
+		{{valueStateText}}
+	{{else}}
+		{{#each valueStateMessageText}}
+			{{this}}
+		{{/each}}
+	{{/if}}
+{{/inline}}

package/src/GroupHeaderListItem.hbs

@@ -1,14 +1,14 @@
 <li
+	part="native-li"
 	tabindex="{{_tabIndex}}"
 	class="ui5-ghli-root {{classes.main}}"
 	@focusin="{{_onfocusin}}"
 	@focusout="{{_onfocusout}}"
 	@keydown="{{_onkeydown}}"
-	role="option"
-	style="list-style-type: none;"
+	aria-label="{{ariaLabelText}}"
+	aria-roledescription="{{groupHeaderText}}"
+	role="group"
 >
-	<span class="ui5-hidden-text">{{groupHeaderText}}</span>
-
 	<div id="{{_id}}-content" class="ui5-li-content">
 		<span class="ui5-ghli-title"><slot></slot></span>
 	</div>

package/src/GroupHeaderListItem.js

@@ -1,4 +1,4 @@
-import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
 import ListItemBase from "./ListItemBase.js";
 
 import { GROUP_HEADER_TEXT } from "./generated/i18n/i18n-defaults.js";
@@ -16,12 +16,24 @@ const metadata = {
 	tag: "ui5-li-groupheader",
 	languageAware: true,
 	properties: /** @lends  sap.ui.webcomponents.main.GroupHeaderListItem.prototype */ {
+		/**
+		 * Defines the text alternative of the component.
+		 * Note: If not provided a default text alternative will be set, if present.
+		 *
+		 * @type {string}
+		 * @defaultvalue ""
+		 * @public
+		 * @since 1.0.0-rc.15
+		 */
+		accessibleName: {
+			type: String,
+		},
 	},
 	slots: /** @lends sap.ui.webcomponents.main.GroupHeaderListItem.prototype */ {
 		/**
-		 * Defines the text of the <code>ui5-li-groupheader</code>.
+		 * Defines the text of the component.
 		 * <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
@@ -37,13 +49,14 @@ const metadata = {
 
 /**
  * @class
- * The <code>ui5-li-group-header</code> is a special list item, used only to separate other list items into logical groups.
+ * The <code>ui5-li-groupheader</code> is a special list item, used only to separate other list items into logical groups.
  *
  * @constructor
  * @author SAP SE
  * @alias sap.ui.webcomponents.main.GroupHeaderListItem
  * @extends ListItemBase
  * @tagname ui5-li-groupheader
+ * @implements sap.ui.webcomponents.main.IListItem
  * @public
  */
 class GroupHeaderListItem extends ListItemBase {
@@ -59,24 +72,20 @@ class GroupHeaderListItem extends ListItemBase {
 		return [ListItemBase.styles, groupheaderListItemCss];
 	}
 
-	constructor() {
-		super();
-
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
-	}
-
 	get group() {
 		return true;
 	}
 
 	get groupHeaderText() {
-		return this.i18nBundle.getText(GROUP_HEADER_TEXT);
+		return GroupHeaderListItem.i18nBundle.getText(GROUP_HEADER_TEXT);
+	}
+
+	get ariaLabelText() {
+		return [this.textContent, this.accessibleName].filter(Boolean).join(" ");
 	}
 
 	static async onDefine() {
-		await Promise.all([
-			fetchI18nBundle("@ui5/webcomponents"),
-		]);
+		GroupHeaderListItem.i18nBundle = await getI18nBundle("@ui5/webcomponents");
 	}
 }
 

package/src/Icon.hbs

@@ -3,10 +3,11 @@
 	tabindex="{{tabIndex}}"
 	dir="{{_dir}}"
 	viewBox="0 0 512 512"
-	role="{{role}}"
+	role="{{effectiveAccessibleRole}}"
 	focusable="false"
 	preserveAspectRatio="xMidYMid meet"
-	aria-label="{{accessibleNameText}}"
+	aria-label="{{effectiveAccessibleName}}"
+	aria-hidden={{effectiveAriaHidden}}
 	xmlns="http://www.w3.org/2000/svg"
 	@focusin={{_onfocusin}}
 	@focusout={{_onfocusout}}
@@ -15,10 +16,10 @@
 	@click={{_onclick}}
 >
 	{{#if hasIconTooltip}}
-		<title id="{{_id}}-tooltip">{{accessibleNameText}}</title>
+		<title id="{{_id}}-tooltip">{{effectiveAccessibleName}}</title>
 	{{/if}}
 
 	<g role="presentation">
-		<path transform="translate(0, 512) scale(1, -1)" d="{{pathData}}"/>
+		<path d="{{pathData}}"/>
 	</g>
 </svg>