@ui5/webcomponents 1.2.4 → 1.3.0

package/src/SliderBase.js

@@ -159,6 +159,13 @@ class SliderBase extends UI5Element {
 			max: null,
 			labelInterval: null,
 		};
+
+		this._ontouchstart = {
+			handleEvent(event) {
+				this._onmousedown(event);
+			},
+			passive: true,
+		};
 	}
 
 	static get metadata() {
@@ -255,10 +262,6 @@ class SliderBase extends UI5Element {
 		}
 	}
 
-	_ontouchstart(event) {
-		this._onmousedown(event);
-	}
-
 	/** Shows the tooltip(s) if the <code>showTooltip</code> property is set to true
 	 *
 	 * @private

package/src/SplitButton.js

@@ -302,6 +302,19 @@ class SplitButton extends UI5Element {
 		SplitButton.i18nBundle = await getI18nBundle("@ui5/webcomponents");
 	}
 
+	constructor() {
+		super();
+
+		this._textButtonPress = {
+			handleEvent(event) {
+				this._textButtonActive = true;
+				this.focused = false;
+				this._setTabIndexValue();
+			},
+			passive: true,
+		};
+	}
+
 	onBeforeRendering() {
 		this._textButtonIcon = this.textButton && this.activeIcon !== "" && (this._textButtonActive) && !this._shiftOrEscapePressed ? this.activeIcon : this.icon;
 		if (this.disabled) {
@@ -383,12 +396,6 @@ class SplitButton extends UI5Element {
 		this._setTabIndexValue();
 	}
 
-	_textButtonPress() {
-		this._textButtonActive = true;
-		this.focused = false;
-		this._setTabIndexValue();
-	}
-
 	_setTabIndexValue() {
 		const textButton = this.textButton,
 			arrowButton = this.arrowButton,

package/src/StandardListItem.hbs

@@ -33,12 +33,12 @@
 
 {{#*inline "iconBegin"}}
 	{{#if displayIconBegin}}
-		<ui5-icon part="icon" name="{{icon}}" class="ui5-li-icon"></ui5-icon>
+		<ui5-icon part="icon" name="{{icon}}" class="ui5-li-icon" accessible-role="presentation" aria-hidden="true"></ui5-icon>
 	{{/if}}
 {{/inline}}
 
 {{#*inline "iconEnd"}}
 	{{#if displayIconEnd}}
-		<ui5-icon part="icon" name="{{icon}}" class="ui5-li-icon"></ui5-icon>
+		<ui5-icon part="icon" name="{{icon}}" class="ui5-li-icon" accessible-role="presentation" aria-hidden="true"></ui5-icon>
 	{{/if}}
 {{/inline}}

package/src/Switch.hbs

@@ -16,7 +16,7 @@
 			<div class="ui5-switch-slider">
 				{{#if graphical}}
 					<span class="ui5-switch-text ui5-switch-text--on">
-						<ui5-icon name="accept" dir="ltr" class="ui5-switch-icon-on"></ui5-icon>
+						<ui5-icon name="accept" class="ui5-switch-icon-on"></ui5-icon>
 					</span>
 					<span class="ui5-switch-text ui5-switch-text--off">
 						<ui5-icon name="decline" class="ui5-switch-icon-off"></ui5-icon>

package/src/Tab.hbs

@@ -1,3 +1,7 @@
 <div id="{{_id}}" class="ui5-tab-root">
-	<slot></slot>
+	<slot name="{{this._defaultSlotName}}"></slot>
+
+	{{#each tabs}}
+	<slot name="{{this._effectiveSlotName}}"></slot>
+	{{/each}}
 </div>

package/src/Tab.js

@@ -4,6 +4,7 @@ import executeTemplate from "@ui5/webcomponents-base/dist/renderer/executeTempla
 import SemanticColor from "./types/SemanticColor.js";
 import TabContainer from "./TabContainer.js";
 import Icon from "./Icon.js";
+import Button from "./Button.js";
 import CustomListItem from "./CustomListItem.js";
 
 // Templates
@@ -21,16 +22,42 @@ import overflowCss from "./generated/themes/TabInOverflow.css.js";
  */
 const metadata = {
 	tag: "ui5-tab",
+	managedSlots: true,
+	languageAware: true,
 	slots: /** @lends sap.ui.webcomponents.main.Tab.prototype */ {
 
 		/**
-		 * Defines the tab content.
+		 * Holds the content associated with this tab.
+		 *
 		 * @type {Node[]}
-		 * @slot
 		 * @public
+		 * @slot
 		 */
 		"default": {
 			type: Node,
+			propertyName: "content",
+			invalidateOnChildChange: {
+				properties: true,
+				slots: false,
+			},
+		},
+
+		/**
+		 * Defines hierarchies with nested sub tabs.
+		 * <br><br>
+		 * <b>Note:</b> Use <code>ui5-tab</code> and <code>ui5-tab-separator</code> for the intended design.
+		 *
+		 * @type {sap.ui.webcomponents.main.ITab[]}
+		 * @public
+		 * @slot subTabs
+		 */
+		subTabs: {
+			type: HTMLElement,
+			individualSlots: true,
+			invalidateOnChildChange: {
+				properties: true,
+				slots: false,
+			},
 		},
 	},
 	properties: /** @lends sap.ui.webcomponents.main.Tab.prototype */ {
@@ -122,6 +149,14 @@ const metadata = {
 		_selected: {
 			type: Boolean,
 		},
+
+		_realTab: {
+			type: Object,
+		},
+
+		_isTopLevelTab: {
+			type: Boolean,
+		},
 	},
 	events: /** @lends sap.ui.webcomponents.main.Tab.prototype */ {
 	},
@@ -169,6 +204,7 @@ class Tab extends UI5Element {
 	static get dependencies() {
 		return [
 			Icon,
+			Button,
 			CustomListItem,
 		];
 	}
@@ -199,6 +235,31 @@ class Tab extends UI5Element {
 		return this.getAttribute("stable-dom-ref") || `${this._id}-stable-dom-ref`;
 	}
 
+	get requiresExpandButton() {
+		return this.subTabs.length > 0 && this._isTopLevelTab && this._hasOwnContent;
+	}
+
+	get isSingleClickArea() {
+		return this.subTabs.length > 0 && this._isTopLevelTab && !this._hasOwnContent;
+	}
+
+	get isOnSelectedTabPath() {
+		return this._realTab === this || this.tabs.some(subTab => subTab.isOnSelectedTabPath);
+	}
+
+	get _effectiveSlotName() {
+		return this.isOnSelectedTabPath ? this._individualSlot : "disabled-slot";
+	}
+
+	get _defaultSlotName() {
+		return this._realTab === this ? "" : "disabled-slot";
+	}
+
+	get _hasOwnContent() {
+		return this.content.some(node => (node.nodeType !== Node.COMMENT_NODE
+				&& (node.nodeType !== Node.TEXT_NODE || node.nodeValue.trim().length !== 0)));
+	}
+
 	/**
 	 * Returns the DOM reference of the tab that is placed in the header.
 	 * <b>Note:</b> If you need a DOM ref to the tab content please use the <code>getDomRef</code> method.
@@ -238,13 +299,18 @@ class Tab extends UI5Element {
 	}
 
 	get effectiveSelected() {
-		return this.selected || this._selected;
+		const subItemSelected = this.tabs.some(elem => elem.effectiveSelected);
+		return this.selected || this._selected || subItemSelected;
 	}
 
 	get effectiveHidden() {
 		return !this.effectiveSelected;
 	}
 
+	get tabs() {
+		return this.subTabs.filter(tab => !tab.isSeparator);
+	}
+
 	get ariaLabelledBy() {
 		const labels = [];
 
@@ -298,6 +364,10 @@ class Tab extends UI5Element {
 			classes.push(`ui5-tab-strip-item--${this.design.toLowerCase()}`);
 		}
 
+		if (this.isSingleClickArea) {
+			classes.push(`ui5-tab-strip-item--singleClickArea`);
+		}
+
 		return classes.join(" ");
 	}
 
@@ -322,11 +392,15 @@ class Tab extends UI5Element {
 			classes.push("ui5-tab-overflow-item--disabled");
 		}
 
+		if (this.selected) {
+			classes.push("ui5-tab-overflow-item--selectedSubTab");
+		}
+
 		return classes.join(" ");
 	}
 
 	get overflowState() {
-		return this.disabled ? "Inactive" : "Active";
+		return (this.disabled || this.isSingleClickArea) ? "Inactive" : "Active";
 	}
 }
 

package/src/TabContainer.hbs

@@ -66,18 +66,16 @@
 
 {{#*inline "contentArea"}}
 	<div class="{{classes.content}}" part="content">
-		{{#each items}}
-			{{#unless this.isSeparator}}
-				<div
-					class="ui5-tc__contentItem"
-					id="ui5-tc-contentItem-{{this._posinset}}"
-					?hidden="{{this.effectiveHidden}}"
-					role="tabpanel"
-					aria-labelledby="{{this._id}}"
-				>
-					<slot name="{{this._individualSlot}}"></slot>
-				</div>
-			{{/unless}}
-		{{/each}}
+		<div
+			class="ui5-tc__contentItem"
+			id="ui5-tc-content"
+			?hidden="{{this._selectedTab.effectiveHidden}}"
+			role="tabpanel"
+			aria-labelledby="{{this._selectedTab._id}}"
+		>
+			{{#each items}}
+				<slot name="{{this._effectiveSlotName}}"></slot>
+			{{/each}}
+		</div>
 	</div>
 {{/inline}}

package/src/TabContainer.js

@@ -239,6 +239,7 @@ const metadata = {
 		_startOverflowText: {
 			type: String,
 			noAttribute: true,
+			defaultValue: "0",
 		},
 
 		_endOverflowText: {
@@ -256,6 +257,11 @@ const metadata = {
 			type: Object,
 			multiple: true,
 		},
+
+		_overflowItems: {
+			type: Object,
+			multiple: true,
+		},
 	},
 	events: /** @lends  sap.ui.webcomponents.main.TabContainer.prototype */ {
 
@@ -290,9 +296,14 @@ const metadata = {
  * The <code>ui5-tabcontainer</code> can hold two types of entities:
  * <ul>
  * <li><code>ui5-tab</code> - contains all the information on an item (text and icon)</li>
- * <li><code>ui5-tab-separator</code> - used to separate tabs with a vertical line</li>
+ * <li><code>ui5-tab-separator</code> - used to separate tabs with a line</li>
  * </ul>
  *
+ * <h3>Hierarchies</h3>
+ * Multiple sub tabs could be placed underneath one main tab. Nesting allows deeper hierarchies with indentations
+ * to indicate the level of each nested tab. When a tab has both sub tabs and own content its click area is split
+ * to allow the user to display the content or alternatively to expand / collapse the list of sub tabs.
+ *
  * <h3>CSS Shadow Parts</h3>
  *
  * <ui5-link target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/CSS/::part">CSS Shadow Parts</ui5-link> allow developers to style elements inside the Shadow DOM.
@@ -372,29 +383,18 @@ class TabContainer extends UI5Element {
 
 	onBeforeRendering() {
 		// update selected tab
-		const tabs = this._getTabs();
-		if (tabs.length) {
-			const selectedTabs = tabs.filter(tab => tab.selected);
+		this._allItemsAndSubItems = this._getAllSubItems(this.items, []);
+		if (this._allItemsAndSubItems.length) {
+			const selectedTabs = this._allItemsAndSubItems.filter(tab => tab.selected);
 			if (selectedTabs.length) {
 				this._selectedTab = selectedTabs[0];
 			} else {
-				this._selectedTab = tabs[0];
+				this._selectedTab = this._allItemsAndSubItems[0];
 				this._selectedTab._selected = true;
 			}
 		}
 
-		// Set external properties to items
-		this.items.filter(item => !item.isSeparator).forEach((item, index, arr) => {
-			item._isInline = this.tabLayout === TabLayout.Inline;
-			item._mixedMode = this.mixedMode;
-			item._posinset = index + 1;
-			item._setsize = arr.length;
-			item._getTabContainerHeaderItemCallback = _ => {
-				return this.getDomRef().querySelector(`#${item._id}`);
-			};
-			item._itemSelectCallback = this._onItemSelect.bind(this);
-			item._getRealDomRef = () => this.getDomRef().querySelector(`*[data-ui5-stable=${item.stableDomRef}]`);
-		});
+		this._setItemsExternalProperties(this.items);
 
 		if (!this._animationRunning) {
 			this._contentCollapsed = this.collapsed;
@@ -419,15 +419,94 @@ class TabContainer extends UI5Element {
 		ResizeHandler.deregister(this._getHeader(), this._handleResize);
 	}
 
-	_onTabStripClick(event) {
+	_setItemsExternalProperties(items) {
+		items.filter(item => !item.isSeparator).forEach((item, index, arr) => {
+			item._isInline = this.tabLayout === TabLayout.Inline;
+			item._mixedMode = this.mixedMode;
+			item._posinset = index + 1;
+			item._setsize = arr.length;
+			item._getTabContainerHeaderItemCallback = _ => this.getDomRef().querySelector(`#${item._id}`);
+			item._itemSelectCallback = this._onItemSelect.bind(this);
+			item._getRealDomRef = () => this.getDomRef().querySelector(`*[data-ui5-stable=${item.stableDomRef}]`);
+			item._realTab = this._selectedTab;
+			item._isTopLevelTab = this.items.some(i => i === item);
+			walk(items, tab => {
+				tab._realTab = item._realTab;
+			});
+		});
+	}
+
+	async _onTabStripClick(event) {
 		const tab = getTab(event.target);
 		if (!tab) {
 			return;
 		}
+		event.preventDefault();
+		event.stopPropagation();
+		if (event.target.hasAttribute("ui5-button")) {
+			this._onTabExpandButtonClick(event);
+			return;
+		}
+
+		if (!tab._realTab._hasOwnContent && tab._realTab.tabs.length) {
+			this._overflowItems = [];
+			this._overflowItems = tab._realTab.subTabs;
+			this._addStyleIndent(this._overflowItems, false);
+
+			this.responsivePopover = await this._respPopover();
+			if (this.responsivePopover.opened) {
+				this.responsivePopover.close();
+			} else {
+				this._setInitialFocus(this._getSelectedInPopover());
+			}
 
+			this.responsivePopover.showAt(tab);
+			return;
+		}
 		this._onHeaderItemSelect(tab);
 	}
 
+	async _onTabExpandButtonClick(event) {
+		event.stopPropagation();
+		event.preventDefault();
+		let button = event.target;
+		let tabInstance = button.tab;
+
+		if (tabInstance) {
+			tabInstance.focus();
+		}
+
+		if ((event.type === "keydown") && !event.target._realTab.isSingleClickArea) {
+			button = event.target.querySelectorAll(".ui5-tab-expand-button")[0];
+			tabInstance = event.target._realTab;
+		}
+
+		// if clicked between the expand button and the tab
+		if (!tabInstance) {
+			this._onHeaderItemSelect(button.parentElement);
+			return;
+		}
+
+		this._overflowItems = tabInstance.subTabs;
+		this._addStyleIndent(this._overflowItems, false);
+
+		this.responsivePopover = await this._respPopover();
+		if (this.responsivePopover.opened) {
+			this.responsivePopover.close();
+		} else {
+			this._setInitialFocus(this._getSelectedInPopover());
+		}
+		this.responsivePopover.showAt(button);
+	}
+
+	_setInitialFocus(selectedInPopover) {
+		if (selectedInPopover.length) {
+			this.responsivePopover.initialFocus = selectedInPopover[0].id;
+		} else {
+			this.responsivePopover.initialFocus = this.responsivePopover.content[0].items.filter(item => item.classList.contains("ui5-tab-overflow-item"))[0].id;
+		}
+	}
+
 	_onTabStripKeyDown(event) {
 		const tab = getTab(event.target);
 		if (!tab) {
@@ -435,12 +514,24 @@ class TabContainer extends UI5Element {
 		}
 
 		if (isEnter(event)) {
-			this._onHeaderItemSelect(tab);
+			if (tab._realTab.isSingleClickArea) {
+				this._onTabStripClick(event);
+			} else {
+				this._onHeaderItemSelect(tab);
+			}
 		}
 
-		// Prevent Scrolling
 		if (isSpace(event)) {
-			event.preventDefault();
+			event.preventDefault(); // prevent scrolling
+		}
+
+		if (isDown(event)) {
+			if (tab._realTab.requiresExpandButton) {
+				this._onTabExpandButtonClick(event);
+			}
+			if (tab._realTab.isSingleClickArea) {
+				this._onTabStripClick(event);
+			}
 		}
 	}
 
@@ -451,7 +542,12 @@ class TabContainer extends UI5Element {
 		}
 
 		if (isSpace(event)) {
-			this._onHeaderItemSelect(tab);
+			event.preventDefault();
+			if (tab._realTab.isSingleClickArea) {
+				this._onTabStripClick(event);
+			} else {
+				this._onHeaderItemSelect(tab);
+			}
 		}
 	}
 
@@ -465,23 +561,40 @@ class TabContainer extends UI5Element {
 		}
 	}
 
-	_onOverflowListItemClick(event) {
+	async _onOverflowListItemClick(event) {
 		event.preventDefault(); // cancel the item selection
 		const { item } = event.detail;
 
 		this._onItemSelect(item);
-		this.responsivePopover.close();
+		await this.responsivePopover.close();
+
 		this._setItemsForStrip();
-		this.shadowRoot.querySelector(`#${item.id}`).focus();
+
+		const selectedTopLevel = this._getRootTab(this._selectedTab);
+
+		selectedTopLevel.focus();
+	}
+
+	_getAllSubItems(items, result, level = 1) {
+		items.forEach(item => {
+			if (item.hasAttribute("ui5-tab") || item.hasAttribute("ui5-tab-separator")) {
+				item._level = level;
+				result.push(item);
+				if (item.subTabs) {
+					this._getAllSubItems(item.subTabs, result, level + 1);
+				}
+			}
+		});
+		return result;
 	}
 
 	_onItemSelect(target) {
-		const selectedIndex = findIndex(this.items, item => item._id === target.id);
-		const selectedTabIndex = findIndex(this._getTabs(), item => item._id === target.id);
-		const selectedTab = this.items[selectedIndex];
+		const selectedIndex = findIndex(this._allItemsAndSubItems, item => item.__id === target.id);
+		const selectedTabIndex = findIndex(this._allItemsAndSubItems, item => item.__id === target.id);
+		const selectedTab = this._allItemsAndSubItems[selectedIndex];
 
 		// update selected items
-		this.items
+		this._allItemsAndSubItems
 			.forEach((item, index) => {
 				const selected = selectedIndex === index;
 				item.selected = selected;
@@ -565,8 +678,7 @@ class TabContainer extends UI5Element {
 
 		const overflowAttr = isEndOverflow ? "end-overflow" : "start-overflow";
 
-		this._startOverflowItems = [];
-		this._endOverflowItems = [];
+		this._overflowItems = [];
 
 		this.items.forEach(item => {
 			if (item.getTabInStripDomRef() && item.getTabInStripDomRef().hasAttribute(overflowAttr)) {
@@ -577,12 +689,14 @@ class TabContainer extends UI5Element {
 		let button;
 		if (isEndOverflow) {
 			button = this.overflowButton[0] || overflow.querySelector("[ui5-button]");
-			this._endOverflowItems = items;
+			this._overflowItems = items;
+			this._addStyleIndent(this._overflowItems, true);
 		}
 
 		if (isStartOverflow) {
 			button = this.startOverflowButton[0] || overflow.querySelector("[ui5-button]");
-			this._startOverflowItems = items;
+			this._overflowItems = items;
+			this._addStyleIndent(this._overflowItems, true);
 		}
 
 		this.responsivePopover = await this._respPopover();
@@ -594,14 +708,32 @@ class TabContainer extends UI5Element {
 		}
 	}
 
+	_getSelectedInPopover() {
+		return this.responsivePopover.content[0].items.filter(item => (item._realTab && item._realTab.selected));
+	}
+
+	_addStyleIndent(tabs, isOverflow) {
+		walk(tabs, tab => {
+			let level = tab._level;
+			if (!isOverflow) {
+				level -= 1;
+			}
+
+			if (tab._level > 1 && tab.isSeparator) {
+				level -= 1;
+			}
+
+			tab._style = {
+				"--_ui5-indentation-level": level / 2,
+			};
+		});
+	}
+
 	async _onOverflowKeyDown(event) {
 		const isEndOverflow = event.currentTarget.classList.contains("ui5-tc__overflow--end");
 		const isStartOverflow = event.currentTarget.classList.contains("ui5-tc__overflow--start");
 
-		switch (true) {
-		case isDown(event):
-		case isStartOverflow && isLeft(event):
-		case isEndOverflow && isRight(event):
+		if (isDown(event) || (isStartOverflow && isLeft(event)) || (isEndOverflow && isRight(event))) {
 			await this._onOverflowClick(event);
 		}
 	}
@@ -656,14 +788,24 @@ class TabContainer extends UI5Element {
 		}
 
 		this._itemNavigation._init();
-		this._itemNavigation.setCurrentItem(this._selectedTab);
+		this._itemNavigation.setCurrentItem(this._getRootTab(this._selectedTab));
+	}
+
+	_getRootTab(tab) {
+		while (tab.hasAttribute("ui5-tab")) {
+			if (tab.parentElement.hasAttribute("ui5-tabcontainer")) {
+				break;
+			}
+			tab = tab.parentElement;
+		}
+		return tab;
 	}
 
 	_updateEndOverflow(itemsDomRefs) {
 		// show end overflow
 		this._getEndOverflow().removeAttribute("hidden");
-
-		const selectedTabDomRef = this._selectedTab.getTabInStripDomRef();
+		const selectedTab = this._getRootTab(this._selectedTab);
+		const selectedTabDomRef = selectedTab.getTabInStripDomRef();
 		const containerWidth = this._getTabStrip().offsetWidth;
 
 		const selectedItemIndexAndWidth = this._getSelectedItemIndexAndWidth(itemsDomRefs, selectedTabDomRef);
@@ -679,7 +821,8 @@ class TabContainer extends UI5Element {
 
 	_updateStartAndEndOverflow(itemsDomRefs) {
 		let containerWidth = this._getTabStrip().offsetWidth;
-		const selectedTabDomRef = this._selectedTab.getTabInStripDomRef();
+		const selectedTab = this._getRootTab(this._selectedTab);
+		const selectedTabDomRef = selectedTab.getTabInStripDomRef();
 		const selectedItemIndexAndWidth = this._getSelectedItemIndexAndWidth(itemsDomRefs, selectedTabDomRef);
 		const hasStartOverflow = this._hasStartOverflow(containerWidth, itemsDomRefs, selectedItemIndexAndWidth);
 		const hasEndOverflow = this._hasEndOverflow(containerWidth, itemsDomRefs, selectedItemIndexAndWidth);
@@ -1087,6 +1230,15 @@ const findIndex = (arr, predicate) => {
 	return -1;
 };
 
+const walk = (tabs, callback) => {
+	[...tabs].forEach(tab => {
+		callback(tab);
+		if (tab.subTabs) {
+			walk(tab.subTabs, callback);
+		}
+	});
+};
+
 TabContainer.define();
 
 export default TabContainer;

package/src/TabContainerPopover.hbs

@@ -8,15 +8,9 @@
 	class="ui5-tab-container-responsive-popover"
 >
 	<ui5-list mode="SingleSelect" separators="None" @ui5-item-click="{{_onOverflowListItemClick}}">
-		{{#if _endOverflowItems.length}}
-			{{#each _endOverflowItems}}
-				{{this.overflowPresentation}}
-			{{/each}}
-		{{else}}
-			{{#each _startOverflowItems}}
-				{{this.overflowPresentation}}
-			{{/each}}
-		{{/if}}
+		{{#each _overflowItems}}
+			{{overflowPresentation}}
+		{{/each}}
 	</ui5-list>
 	<div slot="footer" class="ui5-responsive-popover-footer">
 		<ui5-button
@@ -24,4 +18,4 @@
 			@click="{{_closeRespPopover}}"
 		>{{popoverCancelButtonText}}</ui5-button>
 	</div>
-</ui5-responsive-popover>
+</ui5-responsive-popover>