@ui5/webcomponents 0.0.0-a3eca7ade → 0.0.0-a8e886a07

package/src/Popup.hbs

@@ -1,11 +1,10 @@
 <section
 	style="{{styles.root}}"
 	class="{{classes.root}}"
-	role="dialog"
+	role="{{_role}}"
 	aria-modal="{{_ariaModal}}"
 	aria-label="{{_ariaLabel}}"
 	aria-labelledby="{{_ariaLabelledBy}}"
-	dir="{{effectiveDir}}"
 	@keydown={{_onkeydown}}
 	@focusout={{_onfocusout}}
 	@mouseup={{_onmouseup}}

package/src/{Popup.js → Popup.ts}

@@ -1,11 +1,16 @@
 import { renderFinished } from "@ui5/webcomponents-base/dist/Render.js";
+import event from "@ui5/webcomponents-base/dist/decorators/event.js";
+import slot from "@ui5/webcomponents-base/dist/decorators/slot.js";
+import property from "@ui5/webcomponents-base/dist/decorators/property.js";
+import type { ClassMap, ComponentStylesData } from "@ui5/webcomponents-base/dist/types.js";
 import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
 import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
 import { isChrome } from "@ui5/webcomponents-base/dist/Device.js";
 import { getFirstFocusableElement, getLastFocusableElement } from "@ui5/webcomponents-base/dist/util/FocusableElements.js";
 import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/AriaLabelHelper.js";
+import getEffectiveScrollbarStyle from "@ui5/webcomponents-base/dist/util/getEffectiveScrollbarStyle.js";
 import { hasStyle, createStyle } from "@ui5/webcomponents-base/dist/ManagedStyles.js";
-import { isTabPrevious } from "@ui5/webcomponents-base/dist/Keys.js";
+import { isEnter, isTabPrevious } from "@ui5/webcomponents-base/dist/Keys.js";
 import { getNextZIndex, getFocusedElement, isFocusedElementWithinNode } from "@ui5/webcomponents-base/dist/util/PopupUtils.js";
 import ResizeHandler from "@ui5/webcomponents-base/dist/delegate/ResizeHandler.js";
 import MediaRange from "@ui5/webcomponents-base/dist/MediaRange.js";
@@ -18,169 +23,7 @@ import styles from "./generated/themes/Popup.css.js";
 import staticAreaStyles from "./generated/themes/PopupStaticAreaStyles.css.js";
 import globalStyles from "./generated/themes/PopupGlobal.css.js";
 
-/**
- * @public
- */
-const metadata = {
-	managedSlots: true,
-	slots: /** @lends  sap.ui.webcomponents.main.Popup.prototype */ {
-
-		/**
-		 * Defines the content of the Popup.
-		 * @type {HTMLElement[]}
-		 * @slot content
-		 * @public
-		 */
-		"default": {
-			type: HTMLElement,
-			propertyName: "content",
-		},
-	},
-	properties: /** @lends  sap.ui.webcomponents.main.Popup.prototype */ {
-		/**
-		 * Defines the ID of the HTML Element, which will get the initial focus.
-		 *
-		 * @type {string}
-		 * @defaultvalue ""
-		 * @public
-		 */
-		initialFocus: {
-			type: String,
-		},
-
-		/**
-		 * Defines if the focus should be returned to the previously focused element,
-		 * when the popup closes.
-		 * @type {boolean}
-		 * @defaultvalue false
-		 * @public
-		 * @since 1.0.0-rc.8
-		*/
-		preventFocusRestore: {
-			type: Boolean,
-		},
-
-		/**
-		 * Indicates if the element is open
-		 * @public
-		 * @type {boolean}
-		 * @defaultvalue false
-		 * @since 1.2.0
-		 */
-		open: {
-			type: Boolean,
-		},
-
-		/**
-		 * Indicates if the element is already open
-		 * @private
-		 * @type {boolean}
-		 * @defaultvalue false
-		 */
-		opened: {
-			type: Boolean,
-			noAttribute: true,
-		},
-
-		/**
-		 * Defines the accessible name of the component.
-		 *
-		 * @type {string}
-		 * @defaultvalue ""
-		 * @public
-		 * @since 1.0.0-rc.15
-		 */
-		accessibleName: {
-			type: String,
-			defaultValue: undefined,
-		},
-
-		/**
-		 * Defines the IDs of the elements that label the component.
-		 *
-		 * @type {string}
-		 * @defaultvalue ""
-		 * @public
-		 * @since 1.1.0
-		 */
-		accessibleNameRef: {
-			type: String,
-			defaultValue: "",
-		},
-
-		/**
-		 * Defines the current media query size.
-		 *
-		 * @type {string}
-		 * @private
-		 */
-		 mediaRange: {
-			type: String,
-		},
-
-		/**
-		 * @private
-		 */
-		_disableInitialFocus: {
-			type: Boolean,
-		},
-
-		_blockLayerHidden: {
-			type: Boolean,
-		},
-	},
-	events: /** @lends  sap.ui.webcomponents.main.Popup.prototype */ {
-
-		/**
-		 * Fired before the component is opened. This event can be cancelled, which will prevent the popup from opening. <b>This event does not bubble.</b>
-		 *
-		 * @public
-		 * @event sap.ui.webcomponents.main.Popup#before-open
-		 * @allowPreventDefault
-		 */
-		"before-open": {},
-
-		/**
-		 * Fired after the component is opened. <b>This event does not bubble.</b>
-		 *
-		 * @public
-		 * @event sap.ui.webcomponents.main.Popup#after-open
-		 */
-		"after-open": {},
-
-		/**
-		 * Fired before the component is closed. This event can be cancelled, which will prevent the popup from closing. <b>This event does not bubble.</b>
-		 *
-		 * @public
-		 * @event sap.ui.webcomponents.main.Popup#before-close
-		 * @allowPreventDefault
-		 * @param {boolean} escPressed Indicates that <code>ESC</code> key has triggered the event.
-		 */
-		"before-close": {
-			detail: {
-				escPressed: { type: Boolean },
-			},
-		},
-
-		/**
-		 * Fired after the component is closed. <b>This event does not bubble.</b>
-		 *
-		 * @public
-		 * @event sap.ui.webcomponents.main.Popup#after-close
-		 */
-		"after-close": {},
-
-		/**
-		 * Fired whenever the popup content area is scrolled
-		 *
-		 * @private
-		 * @event sap.ui.webcomponents.main.Popup#scroll
-		 */
-		"scroll": {},
-	},
-};
-
-const createBlockingStyle = () => {
+const createBlockingStyle = (): void => {
 	if (!hasStyle("data-ui5-popup-scroll-blocker")) {
 		createStyle(globalStyles, "data-ui5-popup-scroll-blocker");
 	}
@@ -188,7 +31,16 @@ const createBlockingStyle = () => {
 
 createBlockingStyle();
 
-const pageScrollingBlockers = new Set();
+const pageScrollingBlockers = new Set<Popup>();
+
+type PopupScrollEventDetail = {
+	scrollTop: number;
+	targetRef: HTMLElement;
+}
+
+type PopupBeforeCloseEventDetail = {
+	escPressed: boolean;
+}
 
 /**
  * @class
@@ -219,26 +71,179 @@ const pageScrollingBlockers = new Set();
  *
  * @constructor
  * @author SAP SE
- * @alias sap.ui.webcomponents.main.Popup
- * @extends sap.ui.webcomponents.base.UI5Element
+ * @alias sap.ui.webc.main.Popup
+ * @extends sap.ui.webc.base.UI5Element
+ * @public
+ */
+
+/**
+ * Fired before the component is opened. This event can be cancelled, which will prevent the popup from opening. <b>This event does not bubble.</b>
+ *
+ * @public
+ * @event sap.ui.webc.main.Popup#before-open
+ * @allowPreventDefault
+ */
+@event("before-open")
+
+/**
+ * Fired after the component is opened. <b>This event does not bubble.</b>
+ *
+ * @public
+ * @event sap.ui.webc.main.Popup#after-open
+ */
+@event("after-open")
+
+/**
+ * Fired before the component is closed. This event can be cancelled, which will prevent the popup from closing. <b>This event does not bubble.</b>
+ *
  * @public
+ * @event sap.ui.webc.main.Popup#before-close
+ * @allowPreventDefault
+ * @param {boolean} escPressed Indicates that <code>ESC</code> key has triggered the event.
  */
-class Popup extends UI5Element {
+@event("before-close", {
+	escPressed: { type: Boolean },
+})
+
+/**
+ * Fired after the component is closed. <b>This event does not bubble.</b>
+ *
+ * @public
+ * @event sap.ui.webc.main.Popup#after-close
+ */
+@event("after-close")
+
+/**
+ * Fired whenever the popup content area is scrolled
+ *
+ * @private
+ * @event sap.ui.webc.main.Popup#scroll
+ */
+@event("scroll")
+abstract class Popup extends UI5Element {
+	/**
+	 * Defines the ID of the HTML Element, which will get the initial focus.
+	 *
+	 * @type {string}
+	 * @name sap.ui.webc.main.Popup.prototype.initialFocus
+	 * @defaultvalue ""
+	 * @public
+	 */
+	@property()
+	initialFocus!: string;
+
+	/**
+	 * Defines if the focus should be returned to the previously focused element,
+	 * when the popup closes.
+	 * @type {boolean}
+	 * @name sap.ui.webc.main.Popup.prototype.preventFocusRestore
+	 * @defaultvalue false
+	 * @public
+	 * @since 1.0.0-rc.8
+	*/
+	@property({ type: Boolean })
+	preventFocusRestore!: boolean;
+
+	/**
+	 * Indicates if the element is open
+	 * @public
+	 * @type {boolean}
+	 * @name sap.ui.webc.main.Popup.prototype.open
+	 * @defaultvalue false
+	 * @since 1.2.0
+	 */
+	@property({ type: Boolean })
+	open!: boolean;
+
+	/**
+	 * Indicates if the element is already open
+	 * @private
+	 * @type {boolean}
+	 * @defaultvalue false
+	 */
+	@property({ type: Boolean, noAttribute: true })
+	opened!: boolean;
+
+	/**
+	 * Defines the accessible name of the component.
+	 *
+	 * @type {string}
+	 * @name sap.ui.webc.main.Popup.prototype.accessibleName
+	 * @defaultvalue undefined
+	 * @public
+	 * @since 1.0.0-rc.15
+	 */
+	@property({ defaultValue: undefined })
+	accessibleName?: string;
+
+	/**
+	 * Defines the IDs of the elements that label the component.
+	 *
+	 * @type {string}
+	 * @name sap.ui.webc.main.Popup.prototype.accessibleNameRef
+	 * @defaultvalue ""
+	 * @public
+	 * @since 1.1.0
+	 */
+	@property({ defaultValue: "" })
+	accessibleNameRef!: string;
+
+	/**
+	 * Defines the current media query size.
+	 *
+	 * @type {string}
+	 * @private
+	 */
+	@property()
+	mediaRange!: string;
+
+	/**
+	 * @private
+	 */
+	@property({ type: Boolean })
+	_disableInitialFocus!: boolean;
+
+	@property({ type: Boolean })
+	_blockLayerHidden!: boolean;
+
+	/**
+	 * Indicates if the element is the top modal popup
+	 *
+	 * This property is calculated automatically
+	 *
+	 * @private
+	 * @type {boolean}
+	 * @defaultvalue false
+	 */
+	@property({ type: Boolean, noAttribute: true })
+	isTopModalPopup!: boolean;
+
+	/**
+	 * Defines the content of the Popup.
+	 * @type {HTMLElement[]}
+	 * @name sap.ui.webc.main.Popup.prototype.default
+	 * @slot content
+	 * @public
+	 */
+	@slot({ type: HTMLElement, "default": true })
+	content!: Array<HTMLElement>
+
+	_resizeHandler: () => void;
+	_shouldFocusRoot?: boolean;
+	_zIndex?: number;
+	_focusedElementBeforeOpen?: HTMLElement | null;
+
 	constructor() {
 		super();
 
 		this._resizeHandler = this._resize.bind(this);
 	}
 
-	static get metadata() {
-		return metadata;
-	}
-
 	static get render() {
 		return litRender;
 	}
 
-	static get styles() {
+	static get styles(): ComponentStylesData {
 		return styles;
 	}
 
@@ -254,11 +259,11 @@ class Popup extends UI5Element {
 		return staticAreaStyles;
 	}
 
-	onEnterDOM() {
-		if (!this.isOpen()) {
-			this._blockLayerHidden = true;
-		}
+	onBeforeRendering() {
+		this._blockLayerHidden = !this.isOpen() || !this.isTopModalPopup;
+	}
 
+	onEnterDOM() {
 		ResizeHandler.register(this, this._resizeHandler);
 	}
 
@@ -276,21 +281,21 @@ class Popup extends UI5Element {
 	}
 
 	_resize() {
-		this.mediaRange = MediaRange.getCurrentRange(MediaRange.RANGESETS.RANGE_4STEPS, this.getDomRef().offsetWidth);
+		this.mediaRange = MediaRange.getCurrentRange(MediaRange.RANGESETS.RANGE_4STEPS, this.getDomRef()!.offsetWidth);
 	}
 
 	/**
 	 * Prevents the user from interacting with the content under the block layer
 	 */
-	_preventBlockLayerFocus(event) {
-		event.preventDefault();
+	_preventBlockLayerFocus(e: KeyboardEvent | MouseEvent) {
+		e.preventDefault();
 	}
 
 	/**
 	 * Temporarily removes scrollbars from the html element
 	 * @protected
 	 */
-	static blockPageScrolling(popup) {
+	static blockPageScrolling(popup: Popup) {
 		pageScrollingBlockers.add(popup);
 
 		if (pageScrollingBlockers.size !== 1) {
@@ -304,7 +309,7 @@ class Popup extends UI5Element {
 	 * Restores scrollbars on the html element, if needed
 	 * @protected
 	 */
-	static unblockPageScrolling(popup) {
+	static unblockPageScrolling(popup: Popup) {
 		pageScrollingBlockers.delete(popup);
 
 		if (pageScrollingBlockers.size !== 0) {
@@ -314,20 +319,24 @@ class Popup extends UI5Element {
 		document.documentElement.classList.remove("ui5-popup-scroll-blocker");
 	}
 
-	_scroll(e) {
-		this.fireEvent("scroll", {
-			scrollTop: e.target.scrollTop,
-			targetRef: e.target,
+	_scroll(e: Event) {
+		this.fireEvent<PopupScrollEventDetail>("scroll", {
+			scrollTop: (e.target as HTMLElement).scrollTop,
+			targetRef: e.target as HTMLElement,
 		});
 	}
 
-	_onkeydown(e) {
-		if (e.target === this._root && isTabPrevious(e)) {
+	_onkeydown(e: KeyboardEvent) {
+		const isTabOutAttempt = e.target === this._root && isTabPrevious(e);
+		// if the popup is closed, focus is already moved, so Enter keydown may result in click on the newly focused element
+		const isEnterOnClosedPopupChild = isEnter(e) && !this.isOpen();
+
+		if (isTabOutAttempt || isEnterOnClosedPopupChild) {
 			e.preventDefault();
 		}
 	}
 
-	_onfocusout(e) {
+	_onfocusout(e: FocusEvent) {
 		// relatedTarget is the element, which will get focus. If no such element exists, focus the root.
 		// This happens after the mouse is released in order to not interrupt text selection.
 		if (!e.relatedTarget) {
@@ -335,10 +344,10 @@ class Popup extends UI5Element {
 		}
 	}
 
-	_onmousedown(e) {
+	_onmousedown(e: MouseEvent) {
 		this._root.removeAttribute("tabindex");
 
-		if (this.shadowRoot.contains(e.target)) {
+		if (this.shadowRoot!.contains(e.target as HTMLElement)) {
 			this._shouldFocusRoot = true;
 		} else {
 			this._shouldFocusRoot = false;
@@ -347,6 +356,7 @@ class Popup extends UI5Element {
 
 	_onmouseup() {
 		this._root.tabIndex = -1;
+
 		if (this._shouldFocusRoot) {
 			if (isChrome()) {
 				this._root.focus();
@@ -363,7 +373,7 @@ class Popup extends UI5Element {
 		const firstFocusable = await getFirstFocusableElement(this);
 
 		if (firstFocusable) {
-			firstFocusable.focus();
+			firstFocusable.focus({ focusVisible: true } as FocusOptions);
 		} else {
 			this._root.focus();
 		}
@@ -377,7 +387,7 @@ class Popup extends UI5Element {
 		const lastFocusable = await getLastFocusableElement(this);
 
 		if (lastFocusable) {
-			lastFocusable.focus();
+			lastFocusable.focus({ focusVisible: true } as FocusOptions);
 		} else {
 			this._root.focus();
 		}
@@ -395,13 +405,15 @@ class Popup extends UI5Element {
 	 * Focuses the element denoted by <code>initialFocus</code>, if provided,
 	 * or the first focusable element otherwise.
 	 * @public
+	 * @method
+	 * @name sap.ui.webc.main.Popup#applyFocus
 	 * @async
 	 * @returns {Promise} Promise that resolves when the focus is applied
 	 */
 	async applyFocus() {
 		await this._waitForDomRef();
 
-		const element = this.getRootNode().getElementById(this.initialFocus)
+		const element = (this.getRootNode() as Document).getElementById(this.initialFocus)
 			|| document.getElementById(this.initialFocus)
 			|| await getFirstFocusableElement(this)
 			|| this._root; // in case of no focusable content focus the root
@@ -410,13 +422,15 @@ class Popup extends UI5Element {
 			if (element === this._root) {
 				element.tabIndex = -1;
 			}
-			element.focus();
+			element.focus({ focusVisible: true } as FocusOptions);
 		}
 	}
 
 	/**
 	 * Tells if the component is opened
 	 * @public
+	 * @method
+	 * @name sap.ui.webc.main.Popup#isOpen
 	 * @returns {boolean}
 	 */
 	isOpen() {
@@ -424,14 +438,14 @@ class Popup extends UI5Element {
 	}
 
 	isFocusWithin() {
-		return isFocusedElementWithinNode(this.shadowRoot.querySelector(".ui5-popup-root"));
+		return isFocusedElementWithinNode(this._root);
 	}
 
 	/**
 	 * Shows the block layer (for modal popups only) and sets the correct z-index for the purpose of popup stacking
 	 * @protected
 	 */
-	async _open(preventInitialFocus) {
+	async _open(preventInitialFocus: boolean) {
 		const prevented = !this.fireEvent("before-open", {}, true, false);
 		if (prevented) {
 			return;
@@ -445,7 +459,8 @@ class Popup extends UI5Element {
 		}
 
 		this._zIndex = getNextZIndex();
-		this.style.zIndex = this._zIndex;
+		this.style.zIndex = this._zIndex?.toString() || "";
+
 		this._focusedElementBeforeOpen = getFocusedElement();
 
 		this._show();
@@ -472,15 +487,18 @@ class Popup extends UI5Element {
 	}
 
 	/**
-	 * Hides the block layer (for modal popups only)
+	 * Closes the popup.
 	 * @public
+	 * @method
+	 * @name sap.ui.webc.main.Popup#close
+	 * @returns {void}
 	 */
 	close(escPressed = false, preventRegistryUpdate = false, preventFocusRestore = false) {
 		if (!this.opened) {
 			return;
 		}
 
-		const prevented = !this.fireEvent("before-close", { escPressed }, true, false);
+		const prevented = !this.fireEvent<PopupBeforeCloseEventDetail>("before-close", { escPressed }, true, false);
 		if (prevented) {
 			return;
 		}
@@ -522,7 +540,7 @@ class Popup extends UI5Element {
 			return;
 		}
 
-		this._focusedElementBeforeOpen.focus();
+		this._focusedElementBeforeOpen.focus({ focusVisible: true } as FocusOptions);
 		this._focusedElementBeforeOpen = null;
 	}
 
@@ -549,7 +567,7 @@ class Popup extends UI5Element {
 	 * @abstract
 	 * @returns {boolean}
 	 */
-	get isModal() {} // eslint-disable-line
+	abstract get isModal(): boolean
 
 	/**
 	 * Implement this getter with relevant logic in order to hide the block layer (f.e. based on a public property)
@@ -558,16 +576,16 @@ class Popup extends UI5Element {
 	 * @abstract
 	 * @returns {boolean}
 	 */
-	get shouldHideBackdrop() {} // eslint-disable-line
+	abstract get shouldHideBackdrop(): boolean
 
 	/**
 	 * Return the ID of an element in the shadow DOM that is going to label this popup
 	 *
 	 * @protected
 	 * @abstract
-	 * @returns {string}
+	 * @returns {string | undefined}
 	 */
-	get _ariaLabelledBy() {} // eslint-disable-line
+	abstract get _ariaLabelledBy(): string | undefined
 
 	/**
 	 * Return the value for aria-modal for this popup
@@ -576,7 +594,7 @@ class Popup extends UI5Element {
 	 * @abstract
 	 * @returns {string}
 	 */
-	get _ariaModal() {} // eslint-disable-line
+	abstract get _ariaModal(): string
 
 	/**
 	 * Ensures ariaLabel is never null or empty string
@@ -587,8 +605,16 @@ class Popup extends UI5Element {
 		return getEffectiveAriaLabelText(this);
 	}
 
-	get _root() {
-		return this.shadowRoot.querySelector(".ui5-popup-root");
+	get _root(): HTMLElement {
+		return this.shadowRoot!.querySelector(".ui5-popup-root")!;
+	}
+
+	get _role() {
+		return "dialog";
+	}
+
+	get contentDOM(): HTMLElement {
+		return this.shadowRoot!.querySelector(".ui5-popup-content")!;
 	}
 
 	get styles() {
@@ -596,15 +622,16 @@ class Popup extends UI5Element {
 			root: {},
 			content: {},
 			blockLayer: {
-				"zIndex": (this._zIndex - 1),
+				"zIndex": this._zIndex ? this._zIndex - 1 : "",
 			},
 		};
 	}
 
-	get classes() {
+	get classes(): ClassMap {
 		return {
 			root: {
 				"ui5-popup-root": true,
+				"ui5-content-native-scrollbars": getEffectiveScrollbarStyle(),
 			},
 			content: {
 				"ui5-popup-content": true,
@@ -614,3 +641,8 @@ class Popup extends UI5Element {
 }
 
 export default Popup;
+
+export type {
+	PopupScrollEventDetail,
+	PopupBeforeCloseEventDetail,
+};

package/src/ProgressIndicator.hbs

@@ -1,5 +1,4 @@
 <div class="ui5-progress-indicator-root {{classes.root}}"
-     dir="{{effectiveDir}}"
      role="progressbar"
      aria-valuemin="0"
      aria-valuenow="{{validatedValue}}"