From e955817acfdca19ed278273cdf93a05f7e88cf73 Mon Sep 17 00:00:00 2001
From: Matchu <matchu1993@gmail.com>
Date: Fri, 23 Apr 2021 15:58:47 -0700
Subject: [PATCH] Don't navigate away after updating a pose

---
 .../WardrobePage/support/PosePickerSupport.js | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/app/WardrobePage/support/PosePickerSupport.js b/src/app/WardrobePage/support/PosePickerSupport.js
index 2fce3aa..d98598d 100644
--- a/src/app/WardrobePage/support/PosePickerSupport.js
+++ b/src/app/WardrobePage/support/PosePickerSupport.js
@@ -88,6 +88,38 @@ function PosePickerSupport({
     window.dispatchEvent(new Event("resize"));
   }, [loading, appearanceId]);
 
+  const canonicalAppearanceIdsByPose = {
+    HAPPY_MASC: data?.happyMasc?.id,
+    SAD_MASC: data?.sadMasc?.id,
+    SICK_MASC: data?.sickMasc?.id,
+    HAPPY_FEM: data?.happyFem?.id,
+    SAD_FEM: data?.sadFem?.id,
+    SICK_FEM: data?.sickFem?.id,
+    UNCONVERTED: data?.unconverted?.id,
+    UNKNOWN: data?.unknown?.id,
+  };
+  const canonicalAppearanceIds = Object.values(
+    canonicalAppearanceIdsByPose
+  ).filter((id) => id);
+
+  const providedAppearanceId = appearanceId;
+  if (!providedAppearanceId) {
+    appearanceId = canonicalAppearanceIdsByPose[pose];
+  }
+
+  // If you don't already have `appearanceId` in the outfit state, opening up
+  // PosePickerSupport adds it! That way, if you make changes that affect the
+  // canonical poses, we'll still stay navigated to this one.
+  React.useEffect(() => {
+    if (!providedAppearanceId && appearanceId) {
+      dispatchToOutfit({
+        type: "setPose",
+        pose,
+        appearanceId,
+      });
+    }
+  }, [providedAppearanceId, appearanceId]);
+
   if (loading) {
     return (
       <Box display="flex" justifyContent="center">
@@ -104,24 +136,6 @@ function PosePickerSupport({
     );
   }
 
-  const canonicalAppearanceIdsByPose = {
-    HAPPY_MASC: data.happyMasc?.id,
-    SAD_MASC: data.sadMasc?.id,
-    SICK_MASC: data.sickMasc?.id,
-    HAPPY_FEM: data.happyFem?.id,
-    SAD_FEM: data.sadFem?.id,
-    SICK_FEM: data.sickFem?.id,
-    UNCONVERTED: data.unconverted?.id,
-    UNKNOWN: data.unknown?.id,
-  };
-  const canonicalAppearanceIds = Object.values(
-    canonicalAppearanceIdsByPose
-  ).filter((id) => id);
-
-  if (!appearanceId) {
-    appearanceId = canonicalAppearanceIdsByPose[pose];
-  }
-
   const currentPetAppearance = data.petAppearances.find(
     (pa) => pa.id === appearanceId
   );