@decky/ui 4.7.1 → 4.7.3

package/dist/components/DialogCheckbox.js

@@ -7,8 +7,8 @@ export const DialogCheckbox = Object.values(findModule((m) => {
             return true;
     }
     return false;
-})).find((m) => m.contextType &&
-    m.prototype?.render.toString().includes('fallback:') &&
-    m?.prototype?.SetChecked &&
+})).find((m) => m?.prototype?.SetChecked &&
     m?.prototype?.Toggle &&
-    m?.prototype?.GetPanelElementProps);
+    m?.prototype?.GetPanelElementProps &&
+    (m?.prototype?.render?.toString().includes('="DialogCheckbox"') || (m.contextType &&
+        m.prototype?.render.toString().includes('fallback:'))));

package/dist/components/Modal.js

@@ -1,5 +1,5 @@
 import { findSP } from '../utils';
-import { findModule, findModuleByExport, findModuleExport } from '../webpack';
+import { findModule, findModuleDetailsByExport, findModuleExport } from '../webpack';
 const showModalRaw = findModuleExport((e) => typeof e === 'function' && e.toString().includes('props.bDisableBackgroundDismiss') && !e?.prototype?.Cancel);
 export const showModal = (modal, parent, props = {
     strTitle: 'Decky Dialog',
@@ -20,10 +20,10 @@ export const ModalRoot = Object.values(findModule((m) => {
     }
     return false;
 }) || {})?.find((x) => x?.type?.toString()?.includes('((function(){'));
-const ModalModule = findModuleByExport((e) => e?.toString().includes('.ModalPosition,fallback:'), 5);
+const [ModalModule, _ModalPosition] = findModuleDetailsByExport((e) => e?.toString().includes('.ModalPosition'), 5);
 const ModalModuleProps = ModalModule ? Object.values(ModalModule) : [];
 export const SimpleModal = ModalModuleProps.find((prop) => {
     const string = prop?.toString();
     return string?.includes('.ShowPortalModal()') && string?.includes('.OnElementReadyCallbacks.Register(');
 });
-export const ModalPosition = ModalModuleProps.find((prop) => prop?.toString().includes('.ModalPosition,fallback:'));
+export const ModalPosition = _ModalPosition;

package/dist/components/SliderField.js

@@ -1,2 +1,2 @@
 import { CommonUIModule } from '../webpack';
-export const SliderField = Object.values(CommonUIModule).find((mod) => mod?.toString()?.includes('SliderField,fallback'));
+export const SliderField = Object.values(CommonUIModule).find((mod) => mod?.toString()?.includes('SliderField,fallback') || mod?.toString()?.includes("SliderField\","));

package/dist/components/ToggleField.js

@@ -1,2 +1,2 @@
 import { CommonUIModule } from '../webpack';
-export const ToggleField = Object.values(CommonUIModule).find((mod) => mod?.render?.toString()?.includes('ToggleField,fallback'));
+export const ToggleField = Object.values(CommonUIModule).find((mod) => mod?.render?.toString()?.includes('ToggleField,fallback') || mod?.render?.toString()?.includes("ToggleField\","));

package/dist/utils/index.js

@@ -13,13 +13,13 @@ export function findSP() {
     if (document.title == 'SP')
         return window;
     const navTrees = getGamepadNavigationTrees();
-    return navTrees?.find((x) => x.m_ID == 'root_1_').Root.Element.ownerDocument.defaultView;
+    return navTrees?.find((x) => x.m_ID == 'root_1_')?.Root?.Element?.ownerDocument?.defaultView;
 }
 export function getFocusNavController() {
     return window.GamepadNavTree?.m_context?.m_controller || window.FocusNavController;
 }
 export function getGamepadNavigationTrees() {
     const focusNav = getFocusNavController();
-    const context = focusNav.m_ActiveContext || focusNav.m_LastActiveContext;
+    const context = focusNav?.m_ActiveContext || focusNav?.m_LastActiveContext;
     return context?.m_rgGamepadNavigationTrees;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decky/ui",
-  "version": "4.7.1",
+  "version": "4.7.3",
   "description": "A library for interacting with the Steam frontend in Decky plugins and elsewhere.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/components/DialogCheckbox.ts

@@ -28,9 +28,12 @@ export const DialogCheckbox = Object.values(
   }),
 ).find(
   (m: any) =>
-    m.contextType &&
-    m.prototype?.render.toString().includes('fallback:') &&
     m?.prototype?.SetChecked &&
     m?.prototype?.Toggle &&
-    m?.prototype?.GetPanelElementProps,
+    m?.prototype?.GetPanelElementProps &&
+    // beta || stable as of oct 2 2024
+    (m?.prototype?.render?.toString().includes('="DialogCheckbox"') || (
+      m.contextType &&
+      m.prototype?.render.toString().includes('fallback:')
+    ))
 ) as FC<DialogCheckboxProps>;

package/src/components/Modal.ts

@@ -1,7 +1,7 @@
 import { FC, ReactNode } from 'react';
 
 import { findSP } from '../utils';
-import { Export, findModule, findModuleByExport, findModuleExport } from '../webpack';
+import { Export, findModule, findModuleDetailsByExport, findModuleExport } from '../webpack';
 
 // All of the popout options + strTitle are related. Proper usage is not yet known...
 export interface ShowModalProps {
@@ -105,7 +105,7 @@ interface SimpleModalProps {
   children: ReactNode;
 }
 
-const ModalModule = findModuleByExport((e: Export) => e?.toString().includes('.ModalPosition,fallback:'), 5);
+const [ModalModule, _ModalPosition] = findModuleDetailsByExport((e: Export) => e?.toString().includes('.ModalPosition'), 5)
 
 const ModalModuleProps = ModalModule ? Object.values(ModalModule) : [];
 
@@ -114,6 +114,4 @@ export const SimpleModal = ModalModuleProps.find((prop) => {
   return string?.includes('.ShowPortalModal()') && string?.includes('.OnElementReadyCallbacks.Register(');
 }) as FC<SimpleModalProps>;
 
-export const ModalPosition = ModalModuleProps.find((prop) =>
-  prop?.toString().includes('.ModalPosition,fallback:'),
-) as FC<SimpleModalProps>;
+export const ModalPosition = _ModalPosition as FC<SimpleModalProps>;

package/src/components/SliderField.ts

@@ -29,5 +29,6 @@ export interface SliderFieldProps extends ItemProps {
 }
 
 export const SliderField = Object.values(CommonUIModule).find((mod: any) =>
-  mod?.toString()?.includes('SliderField,fallback'),
+  // stable || beta as of oct 2 2024
+  mod?.toString()?.includes('SliderField,fallback') || mod?.toString()?.includes("SliderField\",")
 ) as FC<SliderFieldProps>;

package/src/components/ToggleField.ts

@@ -11,5 +11,6 @@ export interface ToggleFieldProps extends ItemProps {
 }
 
 export const ToggleField = Object.values(CommonUIModule).find((mod: any) =>
-  mod?.render?.toString()?.includes('ToggleField,fallback'),
+  // stable || beta as of oct 2 2024
+  mod?.render?.toString()?.includes('ToggleField,fallback') || mod?.render?.toString()?.includes("ToggleField\",")
 ) as FC<ToggleFieldProps>;

package/src/utils/index.ts

@@ -25,7 +25,7 @@ export function findSP(): Window {
   if (document.title == 'SP') return window;
   // new (SP as popup)
   const navTrees = getGamepadNavigationTrees();
-  return navTrees?.find((x: any) => x.m_ID == 'root_1_').Root.Element.ownerDocument.defaultView;
+  return navTrees?.find((x: any) => x.m_ID == 'root_1_')?.Root?.Element?.ownerDocument?.defaultView;
 }
 
 /**
@@ -40,6 +40,6 @@ export function getFocusNavController(): any {
  */
 export function getGamepadNavigationTrees(): any {
   const focusNav = getFocusNavController();
-  const context = focusNav.m_ActiveContext || focusNav.m_LastActiveContext;
+  const context = focusNav?.m_ActiveContext || focusNav?.m_LastActiveContext;
   return context?.m_rgGamepadNavigationTrees;
 }