Invoke simulate FeFeatureType instead of subId (#36)

SutekhVRC · Mar 5, 2023 · 69100b8 · 69100b8
1 parent 194fd9c
commit 69100b8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/src/features/Toys/Feature.tsx b/src/features/Toys/Feature.tsx
@@ -5,11 +5,9 @@ import { Disclosure } from "@headlessui/react";
 
 export function Feature({
   toyId,
-  toySubId,
   feature,
 }: {
   toyId: number;
-  toySubId: number;
   feature: FeVCToyFeature;
 }) {
   return (
@@ -35,11 +33,7 @@ export function Feature({
             </div>
           </Disclosure.Button>
           <Disclosure.Panel>
-            <FeatureForm
-              toyId={toyId}
-              toySubId={toySubId}
-              toyFeature={feature}
-            />
+            <FeatureForm toyId={toyId} toyFeature={feature} />
           </Disclosure.Panel>
         </>
       )}

diff --git a/src/features/Toys/FeatureForm.tsx b/src/features/Toys/FeatureForm.tsx
@@ -15,13 +15,11 @@ import useSimulate from "../../hooks/useSimulate";
 
 type ToyFeatureFormProps = {
   toyId: number;
-  toySubId: number;
   toyFeature: FeVCToyFeature;
 };
 
 export default function FeatureForm({
   toyId,
-  toySubId,
   toyFeature,
 }: ToyFeatureFormProps) {
   const { feature_levels: initLevels, ...initFeature } = toyFeature;
@@ -76,7 +74,7 @@ export default function FeatureForm({
   }
 
   const { simulate, simulateHandler, simulateLevel, simulateLevelHandler } =
-    useSimulate(toyId, toySubId, toyFeature.feature_index);
+    useSimulate(toyId, toyFeature.feature_index, toyFeature.feature_type);
 
   return (
     <div className="grid grid-cols-[minmax(6rem,_1fr)_1fr_minmax(6rem,_3fr)_1fr] text-sm text-justify gap-y-1 p-4">

diff --git a/src/features/Toys/index.tsx b/src/features/Toys/index.tsx
@@ -47,11 +47,7 @@ export default function Toys() {
                     key={`${toy.toy_id} ${feature.feature_type} ${feature.feature_index}`}
                   >
                     <hr className="border-1 border-zinc-800 m-1 border-opacity-75" />
-                    <Feature
-                      toyId={toy.toy_id}
-                      toySubId={toy.sub_id}
-                      feature={feature}
-                    />
+                    <Feature toyId={toy.toy_id} feature={feature} />
                   </div>
                 ))}
               </div>

diff --git a/src/hooks/useSimulate.tsx b/src/hooks/useSimulate.tsx
@@ -1,12 +1,13 @@
 import { invoke } from "@tauri-apps/api";
 import type { ChangeEvent } from "react";
 import { useEffect, useState } from "react";
+import type { FeVCFeatureType } from "../../src-tauri/bindings/FeVCFeatureType";
 import { DEBOUNCE_TIME, SIMULATE_TOY_FEATURE } from "../data/constants";
 
 export default function useSimulate(
   toyId: number,
-  toySubId: number,
-  featureIndex: number
+  featureIndex: number,
+  featureType: FeVCFeatureType
 ) {
   const [simulate, setSimulate] = useState(false);
   const [simulateLevel, setSimulateLevel] = useState(0.5);
@@ -33,8 +34,8 @@ export default function useSimulate(
   async function invokeSimulation(floatLevel: number) {
     await invoke(SIMULATE_TOY_FEATURE, {
       toyId,
-      toySubId,
       featureIndex,
+      featureType,
       floatLevel,
     });
   }