diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.html b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.html index ee09d8ab9e..29c511a8d8 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.html +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.html @@ -10,6 +10,7 @@ tabindex="0" class="adf-breadcrumb-dropdown-trigger" (click)="open()" + [attr.aria-label]="'BREADCRUMB.ARIA-LABEL.DROPDOWN' | translate" >
folder @@ -25,13 +26,13 @@ #dropdown *ngIf="hasPreviousNodes()" class="adf-breadcrumb-dropdown-path" - tabindex="0" + tabindex="-1" > {{ node.name | translate }} @@ -54,7 +55,7 @@
+ aria-current="location"> {{ item.name | translate }}
diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss index a0b0a229f4..e7b4d78478 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss @@ -147,11 +147,5 @@ white-space: nowrap; } } - - &-path-option { - &.mat-option { - background-color: mat-color($background, card); - } - } } } diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.spec.ts b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.spec.ts index 42c6096cca..bd490d9b5e 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.spec.ts +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.spec.ts @@ -51,6 +51,7 @@ describe('Breadcrumb', () => { it('should prevent default click behavior', () => { const event = jasmine.createSpyObj('event', ['preventDefault']); + event.type = 'click'; component.onRoutePathClick(null, event); expect(event.preventDefault).toHaveBeenCalled(); }); diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts index e7f7134934..86a1535650 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts @@ -131,6 +131,7 @@ export class BreadcrumbComponent implements OnInit, OnChanges, OnDestroy { open(): void { if (this.dropdown) { this.dropdown.open(); + this.dropdown.focus(); } } @@ -178,7 +179,7 @@ export class BreadcrumbComponent implements OnInit, OnChanges, OnDestroy { } onRoutePathClick(route: PathElementEntity, event?: Event): void { - if (event) { + if (event && event.type === 'click') { event.preventDefault(); } diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.html b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.html index a4da0cee57..34fd9187eb 100644 --- a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.html +++ b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.html @@ -1,9 +1,12 @@ - + diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss index 55364f638c..5c8a2d3005 100644 --- a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss +++ b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss @@ -37,6 +37,7 @@ width: 25px; &:focus { + color: mat-color($primary); outline: none; } } diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts index aab5f4dec0..16090601c3 100644 --- a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts +++ b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts @@ -54,6 +54,7 @@ export class DropdownBreadcrumbComponent extends BreadcrumbComponent implements open(): void { if (this.dropdown) { this.dropdown.open(); + this.dropdown.focus(); } } diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss index 0db713f0c6..f578573795 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss @@ -74,6 +74,10 @@ color: mat-color($foreground, base, 0.65); } } + + &:focus .mat-icon { + color: mat-color($primary); + } } .adf-dropdown-breadcrumb-item-chevron { diff --git a/lib/content-services/src/lib/i18n/en.json b/lib/content-services/src/lib/i18n/en.json index 0152d3f7a7..b01bb576a9 100644 --- a/lib/content-services/src/lib/i18n/en.json +++ b/lib/content-services/src/lib/i18n/en.json @@ -387,7 +387,7 @@ "BREADCRUMB": { "ARIA-LABEL": { "BREADCRUMB": "Breadcrumb", - "CURRENT_PAGE": "Page" + "DROPDOWN": "Dropdown" } }, "NAME_COLUMN_LINK": {