validate a trait is selected

M3-org · Oct 31, 2023 · d77fc8b · d77fc8b
1 parent c02df68
commit d77fc8b
Showing 1 changed file with 27 additions and 23 deletions.
diff --git a/src/components/Selector.jsx b/src/components/Selector.jsx
@@ -175,30 +175,34 @@ export default function Selector({confirmDialog, uploadVRMURL, templateInfo, ani
   },[selectedOptions])
 
   const loadCustom = (url) => {
-
-    const option = {
-      item:{
-        id:"custom_" + currentTraitName,
-        name:"Custom " + currentTraitName,
-        directory:url
-      },
-      trait:templateInfo.traits.find((t) => t.name === currentTraitName)
-    }
-    effectManager.setTransitionEffect('switch_item');
-    loadOptions([option], false, false, false).then((loadedData)=>{
-      URL.revokeObjectURL(url);
-      let newAvatar = {};
-      loadedData.map((data)=>{
-        newAvatar = {...newAvatar, ...itemAssign(data)}
+    if (currentTraitName){
+      const option = {
+        item:{
+          id:"custom_" + currentTraitName,
+          name:"Custom " + currentTraitName,
+          directory:url
+        },
+        trait:templateInfo.traits.find((t) => t.name === currentTraitName)
+      }
+      effectManager.setTransitionEffect('switch_item');
+      loadOptions([option], false, false, false).then((loadedData)=>{
+        URL.revokeObjectURL(url);
+        let newAvatar = {};
+        loadedData.map((data)=>{
+          newAvatar = {...newAvatar, ...itemAssign(data)}
+        })
+        const finalAvatar = {...avatar, ...newAvatar}
+        setTimeout(() => {
+          if (Object.keys(finalAvatar).length > 0) {
+            cullHiddenMeshes(finalAvatar)
+          }
+        }, effectManager.transitionTime);
+        setAvatar(finalAvatar)
       })
-      const finalAvatar = {...avatar, ...newAvatar}
-      setTimeout(() => {
-        if (Object.keys(finalAvatar).length > 0) {
-          cullHiddenMeshes(finalAvatar)
-        }
-      }, effectManager.transitionTime);
-      setAvatar(finalAvatar)
-    })
+    }
+    else{
+      console.log("Please select a trait first");
+    }
   }
 
   const uploadTrait = async() =>{