From 32d2a856d49965ae438ad0323f492495d7e6c227 Mon Sep 17 00:00:00 2001
From: Zerebos <me@zerebos.com>
Date: Fri, 15 Mar 2024 23:52:29 -0400
Subject: [PATCH] Fix for more functional components

---
 renderer/src/styles/ui/addonlist.css | 2 +-
 renderer/src/ui/errorboundary.jsx    | 2 +-
 renderer/src/ui/modals.js            | 2 +-
 renderer/src/ui/modals/stack.jsx     | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/renderer/src/styles/ui/addonlist.css b/renderer/src/styles/ui/addonlist.css
index 77a548e9..a6fef53a 100644
--- a/renderer/src/styles/ui/addonlist.css
+++ b/renderer/src/styles/ui/addonlist.css
@@ -237,7 +237,7 @@
 }
 
 .bd-addon-modal {
-    min-height: unset;
+    min-height: 0;
 }
 
 .bd-addon-modal-settings {
diff --git a/renderer/src/ui/errorboundary.jsx b/renderer/src/ui/errorboundary.jsx
index f60e746d..4587411e 100644
--- a/renderer/src/ui/errorboundary.jsx
+++ b/renderer/src/ui/errorboundary.jsx
@@ -15,7 +15,7 @@ export default class ErrorBoundary extends React.Component {
     }
 
     render() {
-      if (this.state.hasError) return <div onClick={() => IPC.openDevTools()} className="react-error">There was an unexpected Error. Click to open console for more details.</div>;  
+      if (this.state.hasError && !this.props.hideError) return <div onClick={() => IPC.openDevTools()} className="react-error">There was an unexpected Error. Click to open console for more details.</div>;  
       return this.props.children; 
     }
 }
diff --git a/renderer/src/ui/modals.js b/renderer/src/ui/modals.js
index 5d712766..e86d7f0a 100644
--- a/renderer/src/ui/modals.js
+++ b/renderer/src/ui/modals.js
@@ -280,7 +280,7 @@ export default class Modals {
     static makeStack() {
         const div = DOMManager.parseHTML(`<div id="bd-modal-container">`);
         DOMManager.bdBody.append(div);
-        ReactDOM.render(<ModalStack />, div);
+        ReactDOM.render(<ErrorBoundary hideError={true}><ModalStack /></ErrorBoundary>, div);
         this.hasInitialized = true;
     }
     
diff --git a/renderer/src/ui/modals/stack.jsx b/renderer/src/ui/modals/stack.jsx
index 79886e87..28613e5a 100644
--- a/renderer/src/ui/modals/stack.jsx
+++ b/renderer/src/ui/modals/stack.jsx
@@ -7,8 +7,8 @@ import Backdrop from "./backdrop";
 const {Fragment, useState, useCallback, useEffect} = React;
 
 
-const Transitions = WebpackModules.getModule(m => m?.defaultProps?.transitionAppear);
-// const Transitions = WebpackModules.getByProps("TransitionGroup").TransitionGroup;
+const Transitions = WebpackModules.getModule(m => m?.defaultProps?.transitionAppear || m?.TransitionGroup?.defaultProps);
+const TransitionGroup = Transitions.TransitionGroup ?? Transitions;
 
 class ModalLayer extends React.Component {
     constructor(props) {
@@ -69,8 +69,8 @@ export default function ModalStack() {
         };
     }, [addModal]);
 
-    return <Transitions component={Fragment}>
+    return <TransitionGroup component={Fragment}>
             <Backdrop isVisible={!!modals.length} onClick={() => removeModal(modals[modals.length - 1].modalKey)} />
             {modals.length && <ModalLayer key={modals[modals.length - 1].modalKey} {...modals[modals.length - 1]} onClose={() => removeModal(modals[modals.length - 1].modalKey)} />}
-        </Transitions>;
+        </TransitionGroup>;
 }
\ No newline at end of file