From 4b5daac5f35ae02251748d6b46619a3e7cdf8937 Mon Sep 17 00:00:00 2001 From: Konstantin Gogov Date: Fri, 12 Jan 2024 17:17:53 +0200 Subject: [PATCH 1/2] fix(ui5-breadcrumbs): remove char separators from accessibility announcement --- packages/main/src/Breadcrumbs.hbs | 2 ++ packages/main/src/themes/Breadcrumbs.css | 44 ++++++++++++------------ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/packages/main/src/Breadcrumbs.hbs b/packages/main/src/Breadcrumbs.hbs index a49d7acc387f..b0aeb121457f 100644 --- a/packages/main/src/Breadcrumbs.hbs +++ b/packages/main/src/Breadcrumbs.hbs @@ -26,6 +26,8 @@ data-ui5-stable="{{this.stableDomRef}}"> {{this.innerText}} + + {{/each}} diff --git a/packages/main/src/themes/Breadcrumbs.css b/packages/main/src/themes/Breadcrumbs.css index 443532fccc6c..d56a78193d72 100644 --- a/packages/main/src/themes/Breadcrumbs.css +++ b/packages/main/src/themes/Breadcrumbs.css @@ -73,40 +73,40 @@ right: 0; } -/* links separator */ -li:not(.ui5-breadcrumbs-current-location)::after { - content: "/"; /* default separator is "Slash" */ - padding: 0 .25rem; - cursor: auto; - color: var(--sapContent_LabelColor); - display: inline-block; - font-family: "72override",var(--sapFontFamily); - font-size: var(--sapFontSize); -} - .ui5-breadcrumbs-popover-footer { display: flex; justify-content: flex-end; width: 100%; } -/* separator styles */ -:host([separator-style="BackSlash"]) li:not(.ui5-breadcrumbs-current-location)::after { - content: "\\"; +/* links separator */ +.ui5-breadcrumbs-separator::after { + content: "/"; /* default separator is "Slash" */ + padding: 0 .25rem; + cursor: auto; + color: var(--sapContent_LabelColor); + display: inline-block; + font-family: "72override", var(--sapFontFamily); + font-size: var(--sapFontSize); } -:host([separator-style="DoubleBackSlash"]) li:not(.ui5-breadcrumbs-current-location)::after { - content: "\\\\"; +/* separator styles */ +:host([separator-style="DoubleSlash"]) .ui5-breadcrumbs-separator::after { + content: "//"; } -:host([separator-style="DoubleGreaterThan"]) li:not(.ui5-breadcrumbs-current-location)::after { - content: ">>"; +:host([separator-style="BackSlash"]) .ui5-breadcrumbs-separator::after { + content: "\\"; } -:host([separator-style="DoubleSlash"]) li:not(.ui5-breadcrumbs-current-location)::after { - content: "//"; +:host([separator-style="DoubleBackSlash"]) .ui5-breadcrumbs-separator::after { + content: "\\\\"; } -:host([separator-style="GreaterThan"]) li:not(.ui5-breadcrumbs-current-location)::after { - content: ">"; +:host([separator-style="GreaterThan"]) .ui5-breadcrumbs-separator::after { + content: ">"; } + +:host([separator-style="DoubleGreaterThan"]) .ui5-breadcrumbs-separator::after { + content: ">>"; +} \ No newline at end of file From 2190c2a5ef619094e76543225554cd2986604f4d Mon Sep 17 00:00:00 2001 From: Konstantin Gogov Date: Wed, 17 Jan 2024 10:06:56 +0200 Subject: [PATCH 2/2] chore: adjust edge case for failing test --- packages/main/test/pages/Breadcrumbs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/main/test/pages/Breadcrumbs.html b/packages/main/test/pages/Breadcrumbs.html index 29b24121c990..796c6dbaeaec 100644 --- a/packages/main/test/pages/Breadcrumbs.html +++ b/packages/main/test/pages/Breadcrumbs.html @@ -125,7 +125,7 @@

Breadcrumbs with overflowing links

Link4 Link5 Link6 - aa + aaaa Location