Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e3f30a0
fix(ui5-toolbar): fix ToolbarSelect flickering
PetyaMarkovaBogdanova Jun 17, 2025
2028937
Merge branch 'main' into fix-toolbar-flicke4r
Jul 10, 2025
7292059
fix(ui5-toolbar): fix flickering issue in toolbar
PetyaMarkovaBogdanova Jul 11, 2025
5c75b0b
Merge branch 'main' into fix-toolbar-flicke4r
Jul 28, 2025
033a6f3
fix(ui5-toolbar): fix flickering issue in toolbar
PetyaMarkovaBogdanova Jul 28, 2025
879419c
Merge branch 'main' into fix-toolbar-flicke4r
Jul 29, 2025
4bb82cd
Merge branch 'main' into fix-toolbar-flicke4r
PetyaMarkovaBogdanova Aug 4, 2025
cbd6919
Merge branch 'main' into fix-toolbar-flicke4r
PetyaMarkovaBogdanova Aug 7, 2025
bab9973
Merge branch 'main' into fix-toolbar-flicke4r
PetyaMarkovaBogdanova Aug 14, 2025
04a04ac
Merge branch 'main' into fix-toolbar-flicke4r
PetyaMarkovaBogdanova Sep 4, 2025
0687a63
Merge branch 'main' into fix-toolbar-flicke4r
PetyaMarkovaBogdanova Sep 9, 2025
229e4f8
Merge branch 'main' into fix-toolbar-flicke4r
PetyaMarkovaBogdanova Sep 9, 2025
62fe852
Merge branch 'main' into fix-toolbar-flicke4r
PetyaMarkovaBogdanova Sep 9, 2025
445177d
Merge branch 'fix-toolbar-flicke4r' of github.com:SAP/ui5-webcomponen…
PetyaMarkovaBogdanova Sep 9, 2025
39c85f2
fix(ui5-toolbar): fix flickering
didip1000 Sep 9, 2025
8f4db3a
Merge branch 'main' of github.com:SAP/ui5-webcomponents into fix-tool…
PetyaMarkovaBogdanova Sep 9, 2025
0177055
Merge branch 'fix-toolbar-flicke4r' of github.com:SAP/ui5-webcomponen…
PetyaMarkovaBogdanova Sep 9, 2025
e146203
Merge branch 'main' into fix-toolbar-flicke4r
PetyaMarkovaBogdanova Sep 10, 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
22 changes: 22 additions & 0 deletions packages/main/cypress/specs/Toolbar.cy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,28 @@ describe("Toolbar Select", () => {
});
});
});
it("Should handle toolbar-select with width larger than the toolbar", async () => {
cy.mount(
<Toolbar id="otb_d">
<ToolbarSelect style="width: 201px;" id="toolbar-select">
<ToolbarSelectOption>1</ToolbarSelectOption>
<ToolbarSelectOption selected>2</ToolbarSelectOption>
<ToolbarSelectOption>3</ToolbarSelectOption>
</ToolbarSelect>
</Toolbar>
);
cy.viewport(220, 1080); // Set a small viewport width to trigger overflow

// Add a toolbar-select element with a large width
cy.get("#otb_d").shadow().within(() => {
cy.wait(2000);
// Click the overflow button
cy.get(".ui5-tb-overflow-btn").click();
});

// Verify the toolbar-select is rendered inside the popover
cy.get("ui5-toolbar-select").should("be.visible");
});
});

describe("Toolbar Button", () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/Toolbar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ class Toolbar extends UI5Element {

let itemWidth = 0;

if (renderedItem && renderedItem.offsetWidth) {
if (renderedItem && !renderedItem.classList.contains("ui5-tb-popover-item") && renderedItem.offsetWidth && item._isRendering === false) {
const ItemCSSStyleSet = getComputedStyle(renderedItem);
itemWidth = renderedItem.offsetWidth + parsePxValue(ItemCSSStyleSet, "margin-inline-end")
+ parsePxValue(ItemCSSStyleSet, "margin-inline-start");
Expand Down
6 changes: 6 additions & 0 deletions packages/main/src/ToolbarItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ class ToolbarItem extends UI5Element {
@property({ type: Boolean })
isOverflowed: boolean = false;

_isRendering = true;

/**
* Defines if the width of the item should be ignored in calculating the whole width of the toolbar
* @protected
Expand Down Expand Up @@ -107,6 +109,10 @@ class ToolbarItem extends UI5Element {
},
};
}

onAfterRendering(): void {
this._isRendering = false;
}
}

export type {
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/ToolbarSelect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class ToolbarSelect extends ToolbarItem {

get styles() {
return {
width: this.width,
width: this.isOverflowed ? undefined : this.width,
};
}

Expand Down
5 changes: 3 additions & 2 deletions packages/main/src/themes/ToolbarSelect.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
width: 100%;
}

.ui5-tb-popover-item {
width: inherit;
:host([is-overflowed]) .ui5-tb-popover-item {
align-items: inherit;
width: 100%;
}

Loading