diff --git a/libs/core/src/lib/dynamic-page/dynamic-page-header/header/dynamic-page-header.component.ts b/libs/core/src/lib/dynamic-page/dynamic-page-header/header/dynamic-page-header.component.ts index 6fd52b39349..4298c3a3b13 100644 --- a/libs/core/src/lib/dynamic-page/dynamic-page-header/header/dynamic-page-header.component.ts +++ b/libs/core/src/lib/dynamic-page/dynamic-page-header/header/dynamic-page-header.component.ts @@ -50,9 +50,6 @@ export const ActionSquashBreakpointPx = 1280; imports: [NgIf, NgTemplateOutlet, IgnoreClickOnSelectionDirective] }) export class DynamicPageHeaderComponent implements OnInit, AfterViewInit, OnDestroy, DynamicPageHeader { - /** @hidden */ - _collapsed = false; - /** Title property for dynamic page */ @Input() title: string; @@ -99,6 +96,9 @@ export class DynamicPageHeaderComponent implements OnInit, AfterViewInit, OnDest @ContentChild(DynamicPageTitleContentComponent) _contentToolbar: DynamicPageTitleContentComponent; + /** @hidden */ + _collapsed = false; + /** @hidden */ _actionsSquashed = false; diff --git a/libs/core/src/lib/dynamic-page/dynamic-page-header/subheader/dynamic-page-subheader.component.html b/libs/core/src/lib/dynamic-page/dynamic-page-header/subheader/dynamic-page-subheader.component.html index 67d66175bd1..f2d00a9fd76 100644 --- a/libs/core/src/lib/dynamic-page/dynamic-page-header/subheader/dynamic-page-subheader.component.html +++ b/libs/core/src/lib/dynamic-page/dynamic-page-header/subheader/dynamic-page-subheader.component.html @@ -17,8 +17,8 @@ fd-button class="fd-dynamic-page__collapse-button" aria-haspopup="true" - [ariaLabel]="collapsed ? expandLabel : collapseLabel" - [attr.title]="collapsed ? expandLabel : collapseLabel" + [ariaLabel]="_toggleButtonAriaLabel" + [attr.title]="_toggleButtonAriaLabel" [attr.aria-expanded]="!collapsed" [attr.aria-controls]="id" (click)="toggleCollapse()" @@ -29,8 +29,8 @@