From c2b0fad298512aa8778c677275bd497bd8f7b00e Mon Sep 17 00:00:00 2001
From: AAGaming <aagaming@riseup.net>
Date: Sat, 3 Feb 2024 00:31:29 -0500
Subject: [PATCH] fix(finds): make modal and scroll components work on latest
 betaa

THEY INCREASED THE MINIFIER PRESET AAAAAAAAAAAAAAAAAAAAAAAAAA
---
 src/deck-components/Modal.tsx  | 35 +++++++++++++++++++++++++---------
 src/deck-components/Scroll.tsx | 26 ++++++++++++++++---------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/deck-components/Modal.tsx b/src/deck-components/Modal.tsx
index 54fcd3d..2b3053d 100755
--- a/src/deck-components/Modal.tsx
+++ b/src/deck-components/Modal.tsx
@@ -155,15 +155,32 @@ export const ModalRoot = (Object.values(
     }
   })) as FC<ModalRootProps>;
 
-interface SimpleModalProps{
-  active?: boolean,
-  children: ReactNode
+interface SimpleModalProps {
+  active?: boolean;
+  children: ReactNode;
 }
 
-const ModalModule = findModule((mod) => {
-  if (typeof mod !== 'object' || !mod.__esModule) return undefined;
-  if (mod.SimpleModal && mod.ModalPosition) return mod;
-})
+const ModalModule = findModule((mod: any) => {
+  if (typeof mod !== 'object') return false;
+  for (let prop in mod) {
+    if (Object.keys(mod).length > 4 && mod[prop]?.toString().includes('.ModalPosition,fallback:')) return true;
+  }
+  return false;
+});
+// findModule((mod) => {
+// if (typeof mod !== 'object' || !mod.__esModule) return undefined;
+// if (mod.SimpleModal && mod.ModalPosition) return mod;
+// })
 
-export const SimpleModal = ModalModule.SimpleModal as FC<SimpleModalProps>
-export const ModalPosition = ModalModule.ModalPosition as FC<SimpleModalProps>
\ No newline at end of file
+const ModalModuleProps = ModalModule ? Object.values(ModalModule) : [];
+
+
+// export const SimpleModal = ModalModule.SimpleModal as FC<SimpleModalProps>;
+// export const ModalPosition = ModalModule.ModalPosition as FC<SimpleModalProps>;
+
+export const SimpleModal = ModalModuleProps.find(prop => {
+  const string = prop?.toString()
+  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>;
diff --git a/src/deck-components/Scroll.tsx b/src/deck-components/Scroll.tsx
index 6c2e0e1..21f7222 100644
--- a/src/deck-components/Scroll.tsx
+++ b/src/deck-components/Scroll.tsx
@@ -1,14 +1,22 @@
-import { FC, ReactNode } from "react";
-import { findModuleChild, findModule } from "../webpack";
+import { FC, ReactNode } from 'react';
+
+import { findModule, findModuleChild } from '../webpack';
 
 const ScrollingModule = findModule((mod) => {
-  if (typeof mod !== 'object' || !mod.__esModule) return undefined;
-  if (mod.ScrollPanel) return mod;
+  if (typeof mod !== 'object') return false;
+  for (let prop in mod) {
+    if (mod[prop]?.render?.toString?.().includes("{case\"x\":")) return true;
+  }
+  return false;
 });
 
-export const ScrollPanel: FC<{ children?: ReactNode; }> = ScrollingModule.ScrollPanel;
+const ScrollingModuleProps = ScrollingModule ? Object.values(ScrollingModule) : [];
 
-export const ScrollPanelGroup: FC<{ children?: ReactNode; }> = findModuleChild((mod) => {
-  if (typeof mod !== 'object' || !mod.__esModule) return undefined;
-  return mod.ScrollPanelGroup;
-})
\ No newline at end of file
+export const ScrollPanel = ScrollingModuleProps.find((prop: any) => prop?.render?.toString?.().includes("{case\"x\":")) as FC<{ children?: ReactNode }>;
+
+export const ScrollPanelGroup: FC<{ children?: ReactNode }> = findModuleChild((mod) => {
+  if (typeof mod !== 'object') return undefined;
+  for (let prop in mod) {
+    if (mod[prop]?.render?.toString().includes(".FocusVisibleChild()),[])")) return mod[prop];
+  }
+});
\ No newline at end of file