From da81760fe3d530cd7c47248b0adaa02baddfc1e7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 13 May 2026 12:13:09 +0000 Subject: [PATCH 1/3] fix(ui5-toolbar): fix padding variable swap, item spacing, and ToolbarItem display Agent-Logs-Url: https://github.com/UI5/webcomponents/sessions/4fddc2f7-637b-475b-aa77-cb4a38583e71 Co-authored-by: PetyaMarkovaBogdanova <15124079+PetyaMarkovaBogdanova@users.noreply.github.com> --- packages/main/src/themes/Toolbar.css | 2 +- packages/main/src/themes/ToolbarItem.css | 1 - packages/main/src/themes/base/Toolbar-parameters.css | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/main/src/themes/Toolbar.css b/packages/main/src/themes/Toolbar.css index 9c87f08558af..4a2baf62e5d8 100644 --- a/packages/main/src/themes/Toolbar.css +++ b/packages/main/src/themes/Toolbar.css @@ -6,7 +6,7 @@ justify-content: flex-end; box-sizing: border-box; border-bottom: var(--sapGroup_TitleBorderWidth) solid var(--sapGroup_TitleBorderColor); - padding: 0 var(--_ui5-toolbar-padding-left) 0 var(--_ui5-toolbar-padding-right); + padding: 0 var(--_ui5-toolbar-padding-right) 0 var(--_ui5-toolbar-padding-left); background-color: var(--sapToolbar_Background); } diff --git a/packages/main/src/themes/ToolbarItem.css b/packages/main/src/themes/ToolbarItem.css index 20a03d10a16a..842b5078684d 100644 --- a/packages/main/src/themes/ToolbarItem.css +++ b/packages/main/src/themes/ToolbarItem.css @@ -1,5 +1,4 @@ :host { - display: inline-block; height: 100%; } diff --git a/packages/main/src/themes/base/Toolbar-parameters.css b/packages/main/src/themes/base/Toolbar-parameters.css index efc3929228d6..56530da40f46 100644 --- a/packages/main/src/themes/base/Toolbar-parameters.css +++ b/packages/main/src/themes/base/Toolbar-parameters.css @@ -2,5 +2,5 @@ --_ui5-toolbar-padding-left: 0.5rem; --_ui5-toolbar-padding-right: 0.5rem; --_ui5-toolbar-item-margin-left: 0; - --_ui5-toolbar-item-margin-right: 0.25rem; + --_ui5-toolbar-item-margin-right: 0.5rem; } \ No newline at end of file From 3528216b1f45edaff3292fdafe3af7b33082a348 Mon Sep 17 00:00:00 2001 From: PetyaMarkovaBogdanova Date: Fri, 29 May 2026 18:50:29 +0300 Subject: [PATCH 2/3] fix(ui5-toolbar): fixed failing test --- packages/main/src/Toolbar.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/main/src/Toolbar.ts b/packages/main/src/Toolbar.ts index 5fff5e3880d0..e631640780dc 100644 --- a/packages/main/src/Toolbar.ts +++ b/packages/main/src/Toolbar.ts @@ -302,7 +302,7 @@ class Toolbar extends UI5Element { this.detachListeners(); this.attachListeners(); if (getActiveElement() === this.overflowButtonDOM?.getFocusDomRef() && this.hideOverflowButton) { - const lastItem = this.interactiveItems.at(-1); + const lastItem = this.standardItems.filter(item => item.isInteractive).at(-1); lastItem?.focus(); } this.prePopulateAlwaysOverflowItems(); From 964d7a2261dd86c3c51997a26c942cb38db53b17 Mon Sep 17 00:00:00 2001 From: PetyaMarkovaBogdanova Date: Tue, 2 Jun 2026 11:33:43 +0300 Subject: [PATCH 3/3] fix(ui5-toolbar): fixed failing test --- packages/main/cypress/specs/Toolbar.cy.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/main/cypress/specs/Toolbar.cy.tsx b/packages/main/cypress/specs/Toolbar.cy.tsx index be5b32156db1..620c050e1855 100644 --- a/packages/main/cypress/specs/Toolbar.cy.tsx +++ b/packages/main/cypress/specs/Toolbar.cy.tsx @@ -483,10 +483,8 @@ describe("Toolbar general interaction", () => { cy.viewport(800, 1080); // Verify the focus shifts to the last interactive element outside the overflow popover - cy.get("[ui5-toolbar]") - .shadow() - .find(".ui5-tb-item") - .eq(3) + cy.get("[ui5-toolbar-button]") + .last() .should("be.focused"); });