From e8917936d61c7a212aef13cdb0fdd40f67079874 Mon Sep 17 00:00:00 2001 From: Matchu Date: Sat, 1 Aug 2020 14:30:10 -0700 Subject: [PATCH] can actually see body ID in pet compatibility form --- .../ItemSupportAppearanceLayerModal.js | 39 +++++++++++++++---- src/app/components/useOutfitAppearance.js | 4 ++ 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/app/WardrobePage/support/ItemSupportAppearanceLayerModal.js b/src/app/WardrobePage/support/ItemSupportAppearanceLayerModal.js index 632e823..70efab3 100644 --- a/src/app/WardrobePage/support/ItemSupportAppearanceLayerModal.js +++ b/src/app/WardrobePage/support/ItemSupportAppearanceLayerModal.js @@ -11,10 +11,12 @@ import { ModalBody, ModalCloseButton, ModalContent, + ModalFooter, ModalHeader, ModalOverlay, Radio, RadioGroup, + Spinner, } from "@chakra-ui/core"; import { ExternalLinkIcon } from "@chakra-ui/icons"; @@ -37,7 +39,7 @@ function ItemSupportAppearanceLayerModal({ Layer {itemLayer.id}: {item.name} - + ID: {itemLayer.id} @@ -88,6 +90,9 @@ function ItemSupportAppearanceLayerModal({ outfitState={outfitState} /> + + + @@ -99,6 +104,7 @@ function ItemSupportAppearanceLayerPetCompatibility({ itemLayer, outfitState, }) { + const [bodyId, setBodyId] = React.useState(itemLayer.bodyId); const [selectedBiology, setSelectedBiology] = React.useState({ speciesId: outfitState.speciesId, colorId: outfitState.colorId, @@ -106,9 +112,13 @@ function ItemSupportAppearanceLayerPetCompatibility({ isValid: true, }); const [visibleBiology, setVisibleBiology] = React.useState(selectedBiology); - console.log(selectedBiology, visibleBiology); - const { loading, error, visibleLayers } = useOutfitAppearance({ + const { + loading, + error, + visibleLayers, + bodyId: appearanceBodyId, + } = useOutfitAppearance({ speciesId: visibleBiology.speciesId, colorId: visibleBiology.colorId, pose: visibleBiology.pose, @@ -117,13 +127,21 @@ function ItemSupportAppearanceLayerPetCompatibility({ const biologyLayers = visibleLayers.filter((l) => l.source === "pet"); + // When the appearance body ID changes, select it as the new body ID. (This + // is an effect because it happens after the appearance finishes loading!) + React.useEffect(() => { + if (bodyId !== "0") { + setBodyId(appearanceBodyId); + } + }, [bodyId, appearanceBodyId]); + return ( Pet compatibility console.log(e)} + value={bodyId} + onChange={(newBodyId) => setBodyId(newBodyId)} marginBottom="4" > @@ -132,10 +150,16 @@ function ItemSupportAppearanceLayerPetCompatibility({ (Body ID: 0) - + Fits all pets with the same body as:{" "} - (Body ID: 100) + (Body ID:{" "} + {appearanceBodyId == null ? ( + + ) : ( + appearanceBodyId + )} + ) @@ -157,7 +181,6 @@ function ItemSupportAppearanceLayerPetCompatibility({ speciesId={selectedBiology.speciesId} colorId={selectedBiology.colorId} idealPose={outfitState.pose} - isDisabled={itemLayer.bodyId === "0"} size="sm" showPlaceholders onChange={(species, color, isValid, pose) => { diff --git a/src/app/components/useOutfitAppearance.js b/src/app/components/useOutfitAppearance.js index 0d2af3d..1cbf1e7 100644 --- a/src/app/components/useOutfitAppearance.js +++ b/src/app/components/useOutfitAppearance.js @@ -77,10 +77,13 @@ export default function useOutfitAppearance(outfitState) { [data1, itemAppearances] ); + const bodyId = data1?.petAppearance?.bodyId; + return { loading: loading1 || loading2, error: error1 || error2, visibleLayers, + bodyId, }; } @@ -134,6 +137,7 @@ export const itemAppearanceFragment = gql` export const petAppearanceFragment = gql` fragment PetAppearanceForOutfitPreview on PetAppearance { id + bodyId layers { id svgUrl