chore(release): 3.18.8 [CI SKIP]

fix(modals): fix ModalRoot again

CHANGELOG.md

@@ -1,3 +1,38 @@
+## [3.18.8](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.18.7...v3.18.8) (2023-01-16)
+
+
+### Bug Fixes
+
+* **Navigation:** fix timing issue in decky-loader ([58b69f0](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/58b69f0d6c43356c4f0ed183802d5bf7fb80e978))
+
+## [3.18.7](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.18.6...v3.18.7) (2023-01-16)
+
+
+### Bug Fixes
+
+* un-break navigation on stable ([2e66e5a](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/2e66e5a555f44009d24e332eca82453ba930baf7))
+
+## [3.18.6](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.18.5...v3.18.6) (2023-01-13)
+
+
+### Bug Fixes
+
+* **Router:** fix Navigation for the millionth time ([aac2d52](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/aac2d520a68b1074ba1ae988d6c92f7881a296d7))
+
+## [3.18.5](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.18.4...v3.18.5) (2022-12-21)
+
+
+### Bug Fixes
+
+* fixed prop interfaces ([#70](https://github.com/SteamDeckHomebrew/decky-frontend-lib/issues/70)) ([0b50f2c](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/0b50f2cf0baa76fc00aa0a41a8435d7a512bff19))
+
+## [3.18.4](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.18.3...v3.18.4) (2022-12-16)
+
+
+### Bug Fixes
+
+* **modals:** fix ModalRoot again ([fd94842](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/fd94842647e51dd9a104e170e0c5ee2bebce12d6))
+
 ## [3.18.3](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.18.2...v3.18.3) (2022-12-12)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "decky-frontend-lib",
-  "version": "3.18.3",
+  "version": "3.18.8",
   "description": "A library for building decky plugins",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/deck-components/Modal.tsx

@@ -38,7 +38,7 @@ const showModalRaw:
       unknown1?: unknown,
       hideActions?: { bHideActions?: boolean },
       modalManager?: unknown,
-    ) => Promise<ShowModalResult>)
+    ) => ShowModalResult)
   | void = findModuleChild((m) => {
   if (typeof m !== 'object') return undefined;
   for (let prop in m) {
@@ -52,16 +52,15 @@ const showModalRaw:
   }
 });
 
-const oldShowModalRaw:
-  | ((modal: ReactNode, parent?: EventTarget, props?: ShowModalProps) => Promise<ShowModalResult>)
-  | void = findModuleChild((m) => {
-  if (typeof m !== 'object') return undefined;
-  for (let prop in m) {
-    if (typeof m[prop] === 'function' && m[prop].toString().includes('bHideMainWindowForPopouts:!0')) {
-      return m[prop];
+const oldShowModalRaw: ((modal: ReactNode, parent?: EventTarget, props?: ShowModalProps) => ShowModalResult) | void =
+  findModuleChild((m) => {
+    if (typeof m !== 'object') return undefined;
+    for (let prop in m) {
+      if (typeof m[prop] === 'function' && m[prop].toString().includes('bHideMainWindowForPopouts:!0')) {
+        return m[prop];
+      }
     }
-  }
-});
+  });
 
 export const showModal = (
   modal: ReactNode,
@@ -70,7 +69,7 @@ export const showModal = (
     strTitle: 'Decky Dialog',
     bHideMainWindowForPopouts: false,
   },
-): Promise<ShowModalResult> => {
+): ShowModalResult => {
   if (showModalRaw) {
     return showModalRaw(modal, parent || findSP(), props.strTitle, props, undefined, {
       bHideActions: props.bHideActionIcons,
@@ -118,13 +117,13 @@ export const ConfirmModal = findModuleChild((m) => {
   }
 }) as FC<ConfirmModalProps>;
 
-// new
+// new as of december 2022 on beta
 export const ModalRoot = (Object.values(
   findModule((m: any) => {
     if (typeof m !== 'object') return false;
 
     for (let prop in m) {
-      if (m[prop]?.toString()?.includes('"ModalManager","DialogWrapper"')) {
+      if (m[prop]?.m_mapModalManager) {
         return true;
       }
     }
@@ -132,6 +131,20 @@ export const ModalRoot = (Object.values(
     return false;
   }) || {},
 )?.find((x: any) => x?.type?.toString()?.includes('((function(){')) ||
+  // before december 2022 beta
+  Object.values(
+    findModule((m: any) => {
+      if (typeof m !== 'object') return false;
+
+      for (let prop in m) {
+        if (m[prop]?.toString()?.includes('"ModalManager","DialogWrapper"')) {
+          return true;
+        }
+      }
+
+      return false;
+    }) || {},
+  )?.find((x: any) => x?.type?.toString()?.includes('((function(){')) ||
   // old
   findModuleChild((m) => {
     if (typeof m !== 'object') return undefined;

src/deck-components/Panel.tsx

@@ -1,10 +1,11 @@
-import { FC } from 'react';
+import { FC, ReactNode } from 'react';
 
 import { findModuleChild } from '../webpack';
 
 export interface PanelSectionProps {
   title?: string;
   spinner?: boolean;
+  children?: ReactNode
 }
 
 const [panelSection, mod] = findModuleChild((mod: any) => {
@@ -18,6 +19,10 @@ const [panelSection, mod] = findModuleChild((mod: any) => {
 
 export const PanelSection = panelSection as FC<PanelSectionProps>;
 
+export interface PanelSectionRowProps {
+  children?: ReactNode
+}
+
 export const PanelSectionRow = Object.values(mod).filter(
   (exp: any) => !exp?.toString()?.includes('.PanelSection'),
-)[0] as FC;
+)[0] as FC<PanelSectionRowProps>;

src/deck-components/Router.tsx

@@ -1,3 +1,4 @@
+import { sleep } from '../utils';
 import { Module, findModuleChild } from '../webpack';
 
 export enum SideMenu {
@@ -125,32 +126,65 @@ export interface Navigation {
   CloseSideMenus(): void;
 }
 
-export const Navigation = {
-  Navigate: Router.Navigate.bind(Router),
-  NavigateBack: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateBack.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance,
-  ),
-  NavigateToAppProperties: Router.NavigateToAppProperties.bind(Router),
-  NavigateToExternalWeb: Router.NavigateToExternalWeb.bind(Router),
-  NavigateToInvites: Router.NavigateToInvites.bind(Router),
-  NavigateToChat: Router.NavigateToChat.bind(Router),
-  NavigateToLibraryTab: Router.NavigateToLibraryTab.bind(Router),
-  NavigateToLayoutPreview: Router.NavigateToLayoutPreview.bind(Router),
-  NavigateToSteamWeb: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateToSteamWeb.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance,
-  ),
-  NavigateToWebRoute: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateToWebRoute.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance,
-  ),
-  OpenSideMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenSideMenu.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
-  ),
-  OpenQuickAccessMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenQuickAccessMenu.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
-  ),
-  OpenMainMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenMainMenu.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
-  ),
-  CloseSideMenus: Router.CloseSideMenus.bind(Router),
-  OpenPowerMenu: Router.OpenPowerMenu.bind(Router),
-} as Navigation;
+export let Navigation = {} as Navigation;
+
+try {
+  (async () => {
+    // With how much Valve is changing these, you really shouldn't use them directly, instead see Navigation
+    let InternalNavigators: any;
+    function initInternalNavigators() {
+      try {
+        InternalNavigators = findModuleChild((m: any) => {
+          if (typeof m !== 'object') return undefined;
+          for (let prop in m) {
+            if (m[prop]?.GetNavigator) {
+              return m[prop];
+            }
+          }
+        })?.GetNavigator();
+      } catch (e) {
+        console.error('[DFL:Router]: Failed to init internal navigators, trying again');
+      }
+    }
+    initInternalNavigators();
+    while (!InternalNavigators?.AppProperties) {
+      console.log('[DFL:Router]: Trying to init internal navigators again');
+      await sleep(100);
+      initInternalNavigators();
+    }
+    console.log("got navigators", InternalNavigators)
+    const newNavigation = {
+      Navigate: Router.Navigate.bind(Router),
+      NavigateBack: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateBack.bind(
+        Router.WindowStore.GamepadUIMainWindowInstance,
+      ),
+      NavigateToAppProperties: InternalNavigators?.AppProperties || Router.NavigateToAppProperties.bind(Router),
+      NavigateToExternalWeb: Router.NavigateToExternalWeb.bind(Router),
+      NavigateToInvites: InternalNavigators?.Invites || Router.NavigateToInvites.bind(Router),
+      NavigateToChat: Router.NavigateToChat.bind(Router),
+      NavigateToLibraryTab: InternalNavigators?.LibraryTab || Router.NavigateToLibraryTab.bind(Router),
+      NavigateToLayoutPreview: Router.NavigateToLayoutPreview.bind(Router),
+      NavigateToSteamWeb: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateToSteamWeb.bind(
+        Router.WindowStore.GamepadUIMainWindowInstance,
+      ),
+      NavigateToWebRoute: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateToWebRoute.bind(
+        Router.WindowStore.GamepadUIMainWindowInstance,
+      ),
+      OpenSideMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenSideMenu.bind(
+        Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
+      ),
+      OpenQuickAccessMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenQuickAccessMenu.bind(
+        Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
+      ),
+      OpenMainMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenMainMenu.bind(
+        Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
+      ),
+      CloseSideMenus: Router.CloseSideMenus.bind(Router),
+      OpenPowerMenu: Router.OpenPowerMenu.bind(Router),
+    } as Navigation;
+
+    Object.assign(Navigation, newNavigation);
+  })();
+} catch (e) {
+  console.error('[DFL:Router]: Error initializing Navigation interface', e);
+}