diff --git a/src/app/form/orientation-form-view/orientation-form-view.component.ts b/src/app/form/orientation-form-view/orientation-form-view.component.ts index d7c05db6fd2b1668e18602dfbd6504b2a0670cd8..a9c5a5cffddd0c79d89c3816a2d452c1e93fa650 100644 --- a/src/app/form/orientation-form-view/orientation-form-view.component.ts +++ b/src/app/form/orientation-form-view/orientation-form-view.component.ts @@ -162,10 +162,6 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked public validatePage(event: boolean): void { this.isPageValid = event; - const mainHeader = document.querySelector('#pageTitle'); - if (mainHeader) { - (mainHeader as HTMLElement)?.focus(); - } } public setFailedOrientation(): void { @@ -263,6 +259,7 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked this.updateHiddenNavButtons(); this.updateFullScreen(); this.updateLastStep(); + this.focusOnTop(); } public prevPage(): void { @@ -278,6 +275,7 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked this.updateHiddenNavButtons(); this.updateFullScreen(); this.updateLastStep(); + this.focusOnTop(); } private goToNextStep(): void { @@ -437,6 +435,13 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked this.filters = []; } + private focusOnTop(): void { + const mainHeader = document.querySelector('#pageTitle'); + if (mainHeader) { + (mainHeader as HTMLElement)?.focus(); + } + } + /** * Indicators */