@decky/ui 4.10.3 → 4.10.5

package/dist/components/Dialog.js

@@ -11,7 +11,10 @@ const MappedDialogDivs = new Map(Object.values(CommonDialogDivs).map((m) => {
         return [null, null];
     }
 }));
-export const DialogHeader = MappedDialogDivs.get('DialogHeader');
+export const DialogHeader = (MappedDialogDivs.get('DialogHeader') || Object.values(CommonUIModule).find((component) => {
+    const str = component?.render?.toString?.();
+    return str?.includes("role:\"heading\"") && str.includes(")(\"DialogHeader\",");
+}));
 export const DialogSubHeader = MappedDialogDivs.get('DialogSubHeader');
 export const DialogFooter = MappedDialogDivs.get('DialogFooter');
 export const DialogLabel = MappedDialogDivs.get('DialogLabel');

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

@@ -10,16 +10,17 @@ export const showModal = (modal, parent, props = {
     });
 };
 export const ConfirmModal = findModuleExport((e) => e?.toString()?.includes('bUpdateDisabled') && e?.toString()?.includes('closeModal') && e?.toString()?.includes('onGamepadCancel'));
-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 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.3",
+  "version": "4.10.5",
   "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/Dialog.ts

@@ -1,6 +1,6 @@
 import { CSSProperties, FC, ReactNode, RefAttributes } from 'react';
 
-import { CommonUIModule } from '../webpack';
+import { CommonUIModule, Module } from '../webpack';
 import { FooterLegendProps } from './FooterLegend';
 
 export interface DialogCommonProps extends RefAttributes<HTMLDivElement> {
@@ -68,7 +68,12 @@ const MappedDialogDivs = new Map(
   }),
 );
 
-export const DialogHeader = MappedDialogDivs.get('DialogHeader') as FC<DialogCommonProps>;
+// Old | New
+export const DialogHeader = (MappedDialogDivs.get('DialogHeader') || Object.values(CommonUIModule).find((component: Module) => {
+  const str = component?.render?.toString?.();
+  return str?.includes("role:\"heading\"") && str.includes(")(\"DialogHeader\",");
+})) as FC<DialogCommonProps>;
+
 export const DialogSubHeader = MappedDialogDivs.get('DialogSubHeader') as FC<DialogCommonProps>;
 export const DialogFooter = MappedDialogDivs.get('DialogFooter') as FC<DialogCommonProps>;
 export const DialogLabel = MappedDialogDivs.get('DialogLabel') as FC<DialogCommonProps>;

package/src/components/Modal.ts

@@ -86,19 +86,23 @@ export const ConfirmModal = findModuleExport(
   (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;