fix: Switching services via keyboard does not switch focus (#2004)

1 files changed, 11 insertions, 5 deletions

diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 16defb327..2a4b0511c 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -620,6 +620,8 @@ export default class ServicesStore extends Store {
       s.isActive = false;
     }
     this.allDisplayed[nextIndex].isActive = true;
+
+    this._focusActiveService();
   }
 
   @action _setActivePrev() {
@@ -633,6 +635,8 @@ export default class ServicesStore extends Store {
       s.isActive = false;
     }
     this.allDisplayed[prevIndex].isActive = true;
+
+    this._focusActiveService();
   }
 
   @action _setUnreadMessageCount({ serviceId, count }) {
@@ -682,11 +686,13 @@ export default class ServicesStore extends Store {
         this._focusService({ serviceId: service.id });
         if (this.stores.settings.app.splitMode && !focusEvent) {
           setTimeout(() => {
-            document.querySelector('.services__webview-wrapper.is-active').scrollIntoView({
-              behavior: 'smooth',
-              block: 'end',
-              inline: 'nearest',
-            });
+            document
+              .querySelector('.services__webview-wrapper.is-active')
+              .scrollIntoView({
+                behavior: 'smooth',
+                block: 'end',
+                inline: 'nearest',
+              });
           }, 10);
         }
       } else {