ACTUALLY FIX the friends focus workaround

2 files changed, 49 insertions, 42 deletions

diff --git a/frontend/src/plugin-loader.tsx b/frontend/src/plugin-loader.tsx
index b6df5a1f..e7fc7031 100644
--- a/frontend/src/plugin-loader.tsx
+++ b/frontend/src/plugin-loader.tsx
@@ -1,4 +1,16 @@
-import { ConfirmModal, ModalRoot, QuickAccessTab, Router, showModal, sleep, staticClasses } from 'decky-frontend-lib';
+import {
+  ConfirmModal,
+  ModalRoot,
+  Patch,
+  QuickAccessTab,
+  Router,
+  callOriginal,
+  findModuleChild,
+  replacePatch,
+  showModal,
+  sleep,
+  staticClasses,
+} from 'decky-frontend-lib';
 import { lazy } from 'react';
 import { FaPlug } from 'react-icons/fa';
 
@@ -39,6 +51,8 @@ class PluginLoader extends Logger {
   // stores a list of plugin names which requested to be reloaded
   private pluginReloadQueue: { name: string; version?: string }[] = [];
 
+  private focusWorkaroundPatch?: Patch;
+
   constructor() {
     super(PluginLoader.name);
     this.log('Initialized');
@@ -83,6 +97,38 @@ class PluginLoader extends Logger {
     initFilepickerPatches();
 
     this.updateVersion();
+
+    const self = this;
+
+    try {
+      // TODO remove all of this once Valve fixes the bug
+      const focusManager = findModuleChild((m) => {
+        if (typeof m !== 'object') return false;
+        for (let prop in m) {
+          if (m[prop]?.prototype?.TakeFocus) return m[prop];
+        }
+        return false;
+      });
+
+      this.focusWorkaroundPatch = replacePatch(focusManager.prototype, 'TakeFocus', function () {
+        // @ts-ignore
+        const classList = this.m_node?.m_element.classList;
+        if (
+          // @ts-ignore
+          (this.m_node?.m_element && classList.contains(staticClasses.TabGroupPanel)) ||
+          classList.contains('FriendsListTab') ||
+          classList.contains('FriendsTabList') ||
+          classList.contains('FriendsListAndChatsSteamDeck')
+        ) {
+          self.debug('Intercepted friends re-focus');
+          return true;
+        }
+
+        return callOriginal;
+      });
+    } catch (e) {
+      this.error('Friends focus patch failed', e);
+    }
   }
 
   public async updateVersion() {
@@ -167,6 +213,7 @@ class PluginLoader extends Logger {
     this.routerHook.removeRoute('/decky/store');
     this.routerHook.removeRoute('/decky/settings');
     deinitFilepickerPatches();
+    this.focusWorkaroundPatch?.unpatch();
   }
 
   public unloadPlugin(name: string) {
diff --git a/frontend/src/toaster.tsx b/frontend/src/toaster.tsx
index 2103da5f..8eea35bc 100644
--- a/frontend/src/toaster.tsx
+++ b/frontend/src/toaster.tsx
@@ -1,14 +1,4 @@
-import {
-  Patch,
-  ToastData,
-  afterPatch,
-  callOriginal,
-  findInReactTree,
-  findModuleChild,
-  replacePatch,
-  sleep,
-  staticClasses,
-} from 'decky-frontend-lib';
+import { Patch, ToastData, afterPatch, findInReactTree, findModuleChild, sleep } from 'decky-frontend-lib';
 import { ReactNode } from 'react';
 
 import Toast from './components/Toast';
@@ -37,35 +27,6 @@ class Toaster extends Logger {
 
   async init() {
     let instance: any;
-    const self = this;
-    const focusManager = findModuleChild((m) => {
-      if (typeof m !== 'object') return false;
-      for (let prop in m) {
-        if (m[prop]?.prototype?.TakeFocus) return m[prop];
-      }
-      return false;
-    });
-
-    const overrideFocus = function () {
-      // @ts-ignore
-      self.debug(this.m_node.m_element);
-      // @ts-ignore
-      const classList = this.m_node?.m_element.classList;
-      if (
-        // @ts-ignore
-        (this.m_node?.m_element && classList.contains(staticClasses.TabGroupPanel)) ||
-        classList.contains('FriendsListTab') ||
-        classList.contains('FriendsTabList') ||
-        classList.contains('FriendsListAndChatsSteamDeck')
-      ) {
-        self.debug('Intercepted friends re-focus');
-        return true;
-      }
-
-      return callOriginal;
-    };
-
-    const focusWorkaroundPatch = replacePatch(focusManager.prototype, 'TakeFocus', overrideFocus);
 
     while (true) {
       instance = findInReactTree(
@@ -111,7 +72,6 @@ class Toaster extends Logger {
         if (typeof m[prop]?.settings && m[prop]?.communityPreferences) return m[prop];
       }
     });
-    focusWorkaroundPatch.unpatch();
     this.log('Initialized');
     this.ready = true;
   }