From 2f0d145e496c6056cceec0292e6fc5e7a3e306c9 Mon Sep 17 00:00:00 2001
From: Matchu <matchu1993@gmail.com>
Date: Fri, 2 Jul 2021 14:21:52 -0700
Subject: [PATCH] Move error toast out of OutfitMovieLayer

Doing this for two reasons! One is that I want the movie layer component to be a bit thinner in general - I think we might even want to move the fallback image logic out, too.

The second is that I want the onError for something else soon!
---
 src/app/components/OutfitMovieLayer.js | 14 ++++----------
 src/app/components/OutfitPreview.js    | 20 ++++++++++++++++++--
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/app/components/OutfitMovieLayer.js b/src/app/components/OutfitMovieLayer.js
index da4375d..ecb53ab 100644
--- a/src/app/components/OutfitMovieLayer.js
+++ b/src/app/components/OutfitMovieLayer.js
@@ -17,6 +17,7 @@ function OutfitMovieLayer({
   placeholderImageUrl = null,
   isPaused = false,
   onLoad = null,
+  onError = null,
   onLowFps = null,
 }) {
   const [stage, setStage] = React.useState(null);
@@ -138,15 +139,8 @@ function OutfitMovieLayer({
       })
       .catch((e) => {
         console.error(`Error loading outfit movie layer: ${libraryUrl}`, e);
-        if (!toast.isActive("use-preload-layers-movie-failed")) {
-          toast({
-            id: "use-preload-layers-movie-failed",
-            status: "warning",
-            title: "Oops, we couldn't load one of these animations.",
-            description: "We'll show a static image version instead.",
-            duration: null,
-            isClosable: true,
-          });
+        if (onError) {
+          onError(e);
         }
       });
 
@@ -156,7 +150,7 @@ function OutfitMovieLayer({
       setLibrary(null);
       setMovieClip(null);
     };
-  }, [libraryUrl, toast]);
+  }, [libraryUrl, onError]);
 
   // This effect puts the `movieClip` on the `stage`, when both are ready.
   React.useEffect(() => {
diff --git a/src/app/components/OutfitPreview.js b/src/app/components/OutfitPreview.js
index 8345f61..e224a0f 100644
--- a/src/app/components/OutfitPreview.js
+++ b/src/app/components/OutfitPreview.js
@@ -79,14 +79,27 @@ export function useOutfitPreview({
     layersHaveAnimations,
   } = usePreloadLayers(visibleLayers);
 
+  const onMovieError = React.useCallback(() => {
+    if (!toast.isActive("outfit-preview-on-movie-error")) {
+      toast({
+        id: "outfit-preview-on-movie-error",
+        status: "warning",
+        title: "Oops, we couldn't load one of these animations.",
+        description: "We'll show a static image version instead.",
+        duration: null,
+        isClosable: true,
+      });
+    }
+  }, [toast]);
+
   const onLowFps = React.useCallback(
     (fps) => {
       setIsPaused(true);
       console.warn(`[OutfitPreview] Pausing due to low FPS: ${fps}`);
 
-      if (!toast.isActive("low-fps-warning")) {
+      if (!toast.isActive("outfit-preview-on-low-fps")) {
         toast({
-          id: "low-fps-warning",
+          id: "outfit-preview-on-low-fps",
           status: "warning",
           title: "Sorry, the animation was lagging, so we paused it! 😖",
           description:
@@ -128,6 +141,7 @@ export function useOutfitPreview({
         loadingDelayMs={loadingDelayMs}
         spinnerVariant={spinnerVariant}
         onChangeHasAnimations={onChangeHasAnimations}
+        onMovieError={onMovieError}
         onLowFps={onLowFps}
         doTransitions
         isPaused={isPaused}
@@ -151,6 +165,7 @@ export function OutfitLayers({
   spinnerVariant = "overlay",
   doTransitions = false,
   isPaused = true,
+  onMovieError = null,
   onLowFps = null,
   ...props
 }) {
@@ -260,6 +275,7 @@ export function OutfitLayers({
                       width={canvasSize}
                       height={canvasSize}
                       isPaused={isPaused}
+                      onError={onMovieError}
                       onLowFps={onLowFps}
                     />
                   ) : (