From 241b22cad711621a1695dfd11da857f13c3fffdf Mon Sep 17 00:00:00 2001 From: AAGaming Date: Fri, 4 Oct 2024 13:15:29 -0400 Subject: [PATCH] fix(DialogCheckbox): don't access getters to prevent their side effects from breaking the component --- src/components/DialogCheckbox.ts | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/components/DialogCheckbox.ts b/src/components/DialogCheckbox.ts index e5a9033..446f467 100644 --- a/src/components/DialogCheckbox.ts +++ b/src/components/DialogCheckbox.ts @@ -1,6 +1,6 @@ import { FC, ReactNode } from 'react'; -import { findModule } from '../webpack'; +import { findModuleExport } from '../webpack'; import { DialogCommonProps } from './Dialog'; import { FooterLegendProps } from './FooterLegend'; @@ -18,22 +18,15 @@ export interface DialogCheckboxProps extends DialogCommonProps, FooterLegendProp onClick?(evt: Event): void; } -export const DialogCheckbox = Object.values( - findModule((m: any) => { - if (typeof m !== 'object') return false; - for (const prop in m) { - if (m[prop]?.prototype?.GetPanelElementProps) return true; - } - return false; - }), -).find( - (m: any) => - m?.prototype?.SetChecked && - m?.prototype?.Toggle && - m?.prototype?.GetPanelElementProps && - // beta || stable as of oct 2 2024 - (m?.prototype?.render?.toString().includes('="DialogCheckbox"') || ( - m.contextType && - m.prototype?.render.toString().includes('fallback:') - )) +// Do not access KeyDown, SetChecked, Toggle here as they are getters and accessing them outside of a render breaks them globally +export const DialogCheckbox = findModuleExport(e => + e.prototype && + "GetPanelElementProps" in e?.prototype && + "SetChecked" in e?.prototype && + "Toggle" in e?.prototype && + // beta || stable as of oct 2 2024 + (e?.prototype?.render?.toString().includes('="DialogCheckbox"') || ( + e.contextType && + e.prototype?.render?.toString().includes('fallback:') + )) ) as FC;