From 4d2bf41efbfb7bc940273d558bf5f05293e69552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 4 Nov 2022 16:49:31 +0100
Subject: [PATCH] AppChrome: Fixes kiosk mode toggling (#58240)

---
 .../components/AppChrome/AppChromeService.test.tsx     | 10 ++++++++++
 .../app/core/components/AppChrome/AppChromeService.tsx |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 public/app/core/components/AppChrome/AppChromeService.test.tsx

diff --git a/public/app/core/components/AppChrome/AppChromeService.test.tsx b/public/app/core/components/AppChrome/AppChromeService.test.tsx
new file mode 100644
index 00000000000..ea04bddf3bc
--- /dev/null
+++ b/public/app/core/components/AppChrome/AppChromeService.test.tsx
@@ -0,0 +1,10 @@
+import { AppChromeService } from './AppChromeService';
+
+describe('AppChromeService', () => {
+  it('onToggleKioskMode should set chromeless to true when searchbar is hidden', () => {
+    const chromeService = new AppChromeService();
+    chromeService.onToggleSearchBar();
+    chromeService.onToggleKioskMode();
+    expect(chromeService.state.getValue().chromeless).toBe(true);
+  });
+});
diff --git a/public/app/core/components/AppChrome/AppChromeService.tsx b/public/app/core/components/AppChrome/AppChromeService.tsx
index 92d05a19b2a..54efe9e132b 100644
--- a/public/app/core/components/AppChrome/AppChromeService.tsx
+++ b/public/app/core/components/AppChrome/AppChromeService.tsx
@@ -57,11 +57,11 @@ export class AppChromeService {
       this.routeChangeHandled = true;
     }
 
+    Object.assign(newState, update);
+
     // KioskMode overrides chromeless state
     newState.chromeless = newState.kioskMode === KioskMode.Full || this.currentRoute?.chromeless;
 
-    Object.assign(newState, update);
-
     if (!isShallowEqual(current, newState)) {
       this.state.next(newState);
     }