From 756c072244e53cff6a7d0e3714d3384d750871d7 Mon Sep 17 00:00:00 2001
From: Vincent Fretin <vincent.fretin@gmail.com>
Date: Sat, 24 Dec 2022 12:30:13 +0100
Subject: [PATCH] Fix regression opening textures modal introduced with the
 React upgrade in #647

---
 src/components/modals/ModalTextures.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/modals/ModalTextures.js b/src/components/modals/ModalTextures.js
index ee88f72a..ce6a0bdc 100644
--- a/src/components/modals/ModalTextures.js
+++ b/src/components/modals/ModalTextures.js
@@ -71,17 +71,17 @@ export default class ModalTextures extends React.Component {
     this.generateFromAssets();
   }
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps) {
     if (this.state.isOpen && !AFRAME.INSPECTOR.assetsLoader.hasLoaded) {
       AFRAME.INSPECTOR.assetsLoader.load();
     }
+    if (this.state.isOpen && this.state.isOpen !== prevProps.isOpen) {
+      this.generateFromAssets();
+    }
   }
 
   static getDerivedStateFromProps(props, state) {
     if (state.isOpen !== props.isOpen) {
-      if (props.isOpen) {
-        this.generateFromAssets();
-      }
       return { isOpen: props.isOpen };
     }
     return null;