Skip to content

chore(ui5-tabcontainer): test skip items rearrange (Do not merge!) #11351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+1,017 −934
Draft

chore(ui5-tabcontainer): test skip items rearrange (Do not merge!) #11351

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49675ed
chore(ui5-tabcontainer): test skip items rearrange
TeodorTaushanov Apr 16, 2025
be5b976
chore: test page
TeodorTaushanov Apr 17, 2025
7ee958e
Merge remote-tracking branch 'origin/main' into tc_test_rearrange
TeodorTaushanov Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion packages/main/src/TabContainer.ts
View file
Original file line number Diff line number Diff line change
@@ -314,6 +314,9 @@ class TabContainer extends UI5Element {
@property({ type: Number, noAttribute: true })
_width?: number;

skipRearrangeCount: number = 0;
isOverflowClick: boolean = false;

/**
* Defines the tabs.
*
@@ -410,7 +413,11 @@ class TabContainer extends UI5Element {
return;
}

this._setItemsForStrip();
if (this.skipRearrangeCount === 0) {
this._setItemsForStrip();
} else {
this.skipRearrangeCount--;
}

if (!this.shadowRoot!.contains(document.activeElement)) {
const focusStart = this._getRootTab(this._selectedTab);
@@ -735,6 +742,7 @@ class TabContainer extends UI5Element {
}

if (!tab.realTabReference.hasOwnContent && tab.realTabReference.tabs.length) {
this.isOverflowClick = false;
await this._togglePopover(tab);

return;
@@ -771,6 +779,7 @@ class TabContainer extends UI5Element {
return;
}

this.isOverflowClick = false;
await this._togglePopover(opener, true);
}

@@ -855,13 +864,18 @@ class TabContainer extends UI5Element {

_onHeaderItemSelect(tab: HTMLElement) {
if (!tab.hasAttribute("disabled")) {
this.skipRearrangeCount = 2;
this._onItemSelect(tab.id);
}
}

async _onOverflowListItemClick(e: CustomEvent<ListItemClickEventDetail>) {
e.preventDefault(); // cancel the item selection

if (!this.isOverflowClick) {
this.skipRearrangeCount = 2;
}

this._onItemSelect(e.detail.item.id.slice(0, -3)); // strip "-li" from end of id
this._closePopover();
await renderFinished();
@@ -952,6 +966,7 @@ class TabContainer extends UI5Element {
opener = this.startOverflowButton[0] || this._getStartOverflowBtnDOM();
}

this.isOverflowClick = true;
await this._togglePopover(opener, true);
}

@@ -1343,6 +1358,7 @@ class TabContainer extends UI5Element {
const newItemsFlat = this._flatten(items);

if (!arraysAreEqual(this._popoverItemsFlat, newItemsFlat)) {
this.skipRearrangeCount = 1;
this._popoverItemsFlat = newItemsFlat;
}
}
1,866 changes: 933 additions & 933 deletions packages/main/test/pages/TabContainer.html
View file

Large diffs are not rendered by default.

67 changes: 67 additions & 0 deletions packages/main/test/pages/TabContainer1.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<title>Tab Container</title>

<script data-ui5-config type="application/json">
{
"theme": "sap_fiori_3",
"language": "EN"
}
</script>
<script src="%VITE_BUNDLE_PATH%" type="module"></script>
<link rel="stylesheet" type="text/css" href="./styles/TabContainer.css">
</head>

<body class="tabcontainer1auto">
<header class="header">
<h1 class="header-title">ui5-tabcontainer</h1>
</header>
<section>
<h2>Text only Start And End Overflow</h2>
<ui5-tabcontainer id="tabContainerStartAndEndOverflow" overflow-mode="StartAndEnd" collapsed>
<ui5-tab text="One"></ui5-tab>
<ui5-tab text="Two"></ui5-tab>
<ui5-tab text="Three"></ui5-tab>
<ui5-tab text="Four"></ui5-tab>
<ui5-tab text="Five"></ui5-tab>
<ui5-tab text="Six"></ui5-tab>
<ui5-tab text="Seven"></ui5-tab>
<ui5-tab text="Eight"></ui5-tab>
<ui5-tab text="Nine"></ui5-tab>
<ui5-tab text="Ten"></ui5-tab>
<ui5-tab text="Eleven"></ui5-tab>
<ui5-tab text="Twelve"></ui5-tab>
<ui5-tab text="Thirteen"></ui5-tab>
<ui5-tab text="Fourteen"></ui5-tab>
<ui5-tab text="Fifteen"></ui5-tab>
<ui5-tab text="Sixteen" design="Positive"></ui5-tab>
<ui5-tab text="Seventeen" design="Negative"></ui5-tab>
<ui5-tab text="Eighteen" design="Critical"></ui5-tab>
<ui5-tab text="Nineteen">
<ui5-tab slot="items" text="Nineteen 1">
<ui5-tab slot="items" text="Nineteen 1.1"></ui5-tab>
<ui5-tab slot="items" text="Nineteen 1.2"></ui5-tab>
<ui5-tab slot="items" text="Nineteen 1.3"></ui5-tab>
<ui5-tab slot="items" text="Nineteen 1.4"></ui5-tab>
<ui5-tab slot="items" text="Nineteen 1.5"></ui5-tab>
</ui5-tab>
</ui5-tab>
<ui5-tab text="Twenty" selected></ui5-tab>
<ui5-tab text="Twenty One"></ui5-tab>
<ui5-tab text="Twenty Two"></ui5-tab>
<ui5-tab text="Twenty Three"></ui5-tab>
<ui5-tab text="Twenty Four"></ui5-tab>
<ui5-tab text="Twenty Five"></ui5-tab>
<ui5-tab text="Twenty Six"></ui5-tab>
<ui5-tab text="Twenty Seven"></ui5-tab>
<ui5-tab text="Twenty Eight"></ui5-tab>
<ui5-tab text="Twenty Nine"></ui5-tab>
<ui5-tab text="Thirty"></ui5-tab>
</ui5-tabcontainer>
</section>
</body>
</html>