From 2fd16f441d37db5307402de348d6091ecb0c2b68 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 29 May 2021 10:58:24 -0700
Subject: [PATCH] Fix component stack depth crashes due to looping setState

---
 resources/scripts/hoc/asModal.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/scripts/hoc/asModal.tsx b/resources/scripts/hoc/asModal.tsx
index 397c9a3e3..876037a69 100644
--- a/resources/scripts/hoc/asModal.tsx
+++ b/resources/scripts/hoc/asModal.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import PortaledModal, { ModalProps } from '@/components/elements/Modal';
 import ModalContext, { ModalContextValues } from '@/context/ModalContext';
+import isEqual from 'react-fast-compare';
 
 export interface AsModalProps {
     visible: boolean;
@@ -47,13 +48,13 @@ function asModal<P extends {}> (modalProps?: SettableModalProps | ((props: P) =>
             /**
              * @this {React.PureComponent<P & AsModalProps, State>}
              */
-            componentDidUpdate (prevProps: Readonly<P & AsModalProps>) {
+            componentDidUpdate (prevProps: Readonly<P & AsModalProps>, prevState: Readonly<State>) {
                 if (prevProps.visible && !this.props.visible) {
                     this.setState({ visible: false, showSpinnerOverlay: false });
                 } else if (!prevProps.visible && this.props.visible) {
                     this.setState({ render: true, visible: true });
                 }
-                if (!this.state.render) {
+                if (!this.state.render && !isEqual(prevState.propOverrides, this.state.propOverrides)) {
                     this.setState({ propOverrides: {} });
                 }
             }