Merge branch 'dev' into 660-tableau-de-bord-interface

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
    */