@decky/ui 4.10.2 → 4.10.4

package/dist/components/Modal.d.ts

@@ -42,7 +42,7 @@ export interface ConfirmModalProps extends ModalRootProps {
     bMiddleDisabled?: boolean;
 }
 export declare const ConfirmModal: FC<ConfirmModalProps>;
-export declare const ModalRoot: FC<ModalRootProps>;
+export declare const ModalRoot: any;
 interface SimpleModalProps {
     active?: boolean;
     children: ReactNode;

package/dist/components/Modal.js

@@ -9,17 +9,18 @@ export const showModal = (modal, parent, props = {
         bHideActions: props.bHideActionIcons,
     });
 };
-export const ConfirmModal = findModuleExport((e) => !e?.prototype?.OK && e?.prototype?.Cancel && e?.prototype?.render);
-export const ModalRoot = Object.values(findModule((m) => {
-    if (typeof m !== 'object')
-        return false;
-    for (let prop in m) {
-        if (m[prop]?.m_mapModalManager && Object.values(m)?.find((x) => x?.type)) {
-            return true;
+export const ConfirmModal = findModuleExport((e) => e?.toString()?.includes('bUpdateDisabled') && e?.toString()?.includes('closeModal') && e?.toString()?.includes('onGamepadCancel'));
+export const ModalRoot = findModuleExport((e) => typeof e === 'function' && e.toString().includes('Either closeModal or onCancel should be passed to GenericDialog. Classes: ')) ||
+    Object.values(findModule((m) => {
+        if (typeof m !== 'object')
+            return false;
+        for (let prop in m) {
+            if (m[prop]?.m_mapModalManager && Object.values(m)?.find((x) => x?.type)) {
+                return true;
+            }
         }
-    }
-    return false;
-}) || {})?.find((x) => x?.type?.toString?.()?.includes('((function(){'));
+        return false;
+    }) || {})?.find((x) => x?.type?.toString?.()?.includes('((function(){'));
 const [ModalModule, _ModalPosition] = findModuleDetailsByExport((e) => e?.toString().includes('.ModalPosition'), 5);
 const ModalModuleProps = ModalModule ? Object.values(ModalModule) : [];
 export const SimpleModal = ModalModuleProps.find((prop) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decky/ui",
-  "version": "4.10.2",
+  "version": "4.10.4",
   "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/Modal.ts

@@ -83,22 +83,26 @@ export interface ConfirmModalProps extends ModalRootProps {
 }
 
 export const ConfirmModal = findModuleExport(
-  (e: Export) => !e?.prototype?.OK && e?.prototype?.Cancel && e?.prototype?.render,
+  (e: Export) => e?.toString()?.includes('bUpdateDisabled') && e?.toString()?.includes('closeModal') && e?.toString()?.includes('onGamepadCancel'),
 ) as FC<ConfirmModalProps>;
 
-export const ModalRoot = Object.values(
-  findModule((m: any) => {
-    if (typeof m !== 'object') return false;
-
-    for (let prop in m) {
-      if (m[prop]?.m_mapModalManager && Object.values(m)?.find((x: any) => x?.type)) {
-        return true;
+export const ModalRoot = 
+  // new
+  findModuleExport((e: Export) => typeof e === 'function' && e.toString().includes('Either closeModal or onCancel should be passed to GenericDialog. Classes: ')) || 
+  // old
+  Object.values(
+    findModule((m: any) => {
+      if (typeof m !== 'object') return false;
+
+      for (let prop in m) {
+        if (m[prop]?.m_mapModalManager && Object.values(m)?.find((x: any) => x?.type)) {
+          return true;
+        }
       }
-    }
 
-    return false;
-  }) || {},
-)?.find((x: any) => x?.type?.toString?.()?.includes('((function(){')) as FC<ModalRootProps>;
+      return false;
+    }) || {},
+  )?.find((x: any) => x?.type?.toString?.()?.includes('((function(){')) as FC<ModalRootProps>;
 
 interface SimpleModalProps {
   active?: boolean;