From 431f257b1b5a14889dcf550d31f3d5d3dc0b151b Mon Sep 17 00:00:00 2001
From: kurilova <kurilova@google.com>
Date: Fri, 28 Mar 2025 06:11:28 +0000
Subject: [PATCH] Focus tab when general settings are saved

---
 .../app/pages/general-settings/general-settings.component.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/ui/src/app/pages/general-settings/general-settings.component.ts b/modules/ui/src/app/pages/general-settings/general-settings.component.ts
index cc2878592..bfae00747 100644
--- a/modules/ui/src/app/pages/general-settings/general-settings.component.ts
+++ b/modules/ui/src/app/pages/general-settings/general-settings.component.ts
@@ -53,6 +53,7 @@ import { MatCheckbox } from '@angular/material/checkbox';
 import { TestRunService } from '../../services/test-run.service';
 import { Router } from '@angular/router';
 import { Routes } from '../../model/routes';
+import { FocusManagerService } from '../../services/focus-manager.service';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 declare const gtag: Function;
@@ -92,6 +93,7 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
   );
   private settingsStore = inject(GeneralSettingsStore);
   private readonly loaderService = inject(LoaderService);
+  private readonly focusManagerService = inject(FocusManagerService);
 
   private isSettingsDisable = false;
   get settingsDisable(): boolean {
@@ -191,6 +193,9 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
       this.createSystemConfig();
       this.settingForm.markAsPristine();
       this.analyticsForm.markAsPristine();
+      this.focusManagerService.focusFirstElementInContainer(
+        window.document.querySelector('app-settings')
+      );
     }
   }