From 838ed1abf8aeec86ca63bfef07953424ba9cce90 Mon Sep 17 00:00:00 2001
From: Zach Plata <plata.zach@gmail.com>
Date: Mon, 18 Jul 2022 15:52:10 -0500
Subject: [PATCH] Fix: Add check before setting Rive as state variable on Rive
 instance load

---
 src/hooks/useRive.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useRive.tsx b/src/hooks/useRive.tsx
index 7f4d9fc..6abd179 100644
--- a/src/hooks/useRive.tsx
+++ b/src/hooks/useRive.tsx
@@ -181,7 +181,13 @@ export default function useRive(
           ...riveParams,
           canvas,
         });
-        r.on(EventType.Load, () => setRive(r));
+        r.on(EventType.Load, () => {
+          // Check if the component/canvas is mounted before setting state to avoid setState
+          // on an unmounted component in some rare cases
+          if (canvasRef.current) {
+            setRive(r);
+          }
+        });
       } else if (canvas === null && canvasRef.current) {
         canvasRef.current.height = 0;
         canvasRef.current.width = 0;