@ui5/webcomponents 1.2.2 → 1.3.0

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>

package/src/TabInOverflow.hbs

@@ -6,16 +6,23 @@
 	aria-disabled="{{this.effectiveDisabled}}"
 	aria-selected="{{this.effectiveSelected}}"
 	aria-labelledby="{{this.ariaLabelledBy}}"
+	._realTab="{{this}}"
+	style="{{this._style}}"
 >
-	<div class="ui5-tab-overflow-itemContent">
-		{{#if this.icon}}
-			<ui5-icon name="{{this.icon}}"></ui5-icon>
-		{{/if}}
+	<div class="ui5-tab-overflow-itemContent-wrapper">
+		<div class="ui5-tab-overflow-itemContent">
+			{{#if this.icon}}
+				<ui5-icon name="{{this.icon}}"></ui5-icon>
+			{{/if}}
 
-		{{this.text}}
+			{{this.text}}
 
-		{{#if this.additionalText}}
-			({{this.additionalText}})
-		{{/if}}
+			{{#if this.additionalText}}
+				({{this.additionalText}})
+			{{/if}}
+		</div>
 	</div>
 </ui5-li-custom>
+{{#each subTabs}}
+	{{overflowPresentation}}
+{{/each}}

package/src/TabInStrip.hbs

@@ -4,12 +4,13 @@
 	role="tab"
 	aria-posinset="{{this._posinset}}"
 	aria-setsize="{{this._setsize}}"
-	aria-controls="ui5-tc-contentItem-{{this._posinset}}"
+	aria-controls="ui5-tc-content"
 	aria-selected="{{this.effectiveSelected}}"
 	aria-disabled="{{this.effectiveDisabled}}"
 	?disabled="{{this.effectiveDisabled}}"
 	aria-labelledby="{{this.ariaLabelledBy}}"
 	data-ui5-stable="{{this.stableDomRef}}"
+	._realTab="{{this}}"
 >
 	{{#if this.icon}}
 		<div class="ui5-tab-strip-item-icon-outer">
@@ -26,10 +27,26 @@
 			<span class="ui5-tab-strip-itemText" id="{{this._id}}-text">
 				<span class="{{this.headerSemanticIconClasses}}"></span>
 				{{this.displayText}}
+			{{#if this.isSingleClickArea}}
+			<span class="ui5-tab-single-click-icon">
+				<ui5-icon name="slim-arrow-down"></ui5-icon>
+			</span>
+			{{/if}}
 			</span>
 		{{/if}}
+
 	</div>
-</div>
+	{{#if this.requiresExpandButton}}
+		<div class="ui5-tab-expand-button" @click="{{_onTabExpandButtonClick}}">
+			<ui5-button
+				.tab={{this}}
+				icon="slim-arrow-down"
+				design="Transparent"
+				tabindex="-1"
+				aria-haspopup="true">
+			</ui5-button>
+		</div>
+	{{/if}}
 
 {{#*inline additionalText}}
 	{{#if this.additionalText}}

package/src/TabSeparatorInOverflow.hbs

@@ -4,5 +4,6 @@
 	role="separator"
 	class="{{classes}}"
 	disabled
+	style="{{this._style}}"
 >
 </ui5-li-custom>

package/src/Table.hbs

@@ -1,9 +1,11 @@
-<div class="ui5-table-root">
+<div class="ui5-table-root" @focusin="{{_onfocusin}}">
+	<div id="{{_id}}-before" tabindex="0" class="ui5-table-focusarea"></div>
+
 	{{#if busy}}
 		{{> busyRow}}
 	{{/if}}
 
-	<table border="0" cellspacing="0" cellpadding="0" @keydown="{{_onkeydown}}" role="table">
+	<table border="0" cellspacing="0" cellpadding="0" @keydown="{{_onkeydown}}" role="table" aria-label="{{tableAriaLabelText}}">
 		<thead>
 			<tr
 				id="{{_columnHeader.id}}"
@@ -12,6 +14,7 @@
 				aria-label="{{ariaLabelText}}"
 				tabindex="{{_columnHeader._tabIndex}}"
 				@click="{{_onColumnHeaderClick}}"
+				@focusin="{{_onColumnHeaderFocused}}"
 				@keydown="{{_onColumnHeaderKeydown}}"
 			>
 				{{#if isMultiSelect}}
@@ -59,6 +62,8 @@
 			{{/if}}
 		</tbody>
 	</table>
+
+	<div id="{{_id}}-after" tabindex="0" class="ui5-table-focusarea"></div>
 </div>
 
 {{#*inline "moreRow"}}