fix(Sound Player): An errant reset function was being called to often…

…, causing sounds to be chopped off. This fixes that problem.
Thorium-Sim · May 16, 2020 · c03ea39 · c03ea39
1 parent 0bced7f
commit c03ea39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/src/components/client/reset.ts b/src/components/client/reset.ts
@@ -19,6 +19,9 @@ const ResetCache: React.FC<{
 }> = ({clientId, reset, station}) => {
   const client = useApolloClient();
   const {playSound, removeAllSounds} = useSounds();
+  const excludeStation =
+    (station?.name && excludedStations.includes(station?.name)) ||
+    station?.cards.find(c => excludedStations.indexOf(c.component) > -1);
 
   React.useEffect(() => {
     const cacheSub = client
@@ -32,11 +35,7 @@ const ResetCache: React.FC<{
         next: () => {
           // Reset all of the sounds that are currently playing
           removeAllSounds();
-          if (
-            (station?.name && excludedStations.includes(station?.name)) ||
-            station?.cards.find(c => excludedStations.indexOf(c.component) > -1)
-          )
-            return;
+          if (excludeStation) return;
           playSound({url: "/sciences.ogg"});
           reset?.();
           publish("widgetClose");
@@ -48,7 +47,7 @@ const ResetCache: React.FC<{
     return () => {
       cacheSub.unsubscribe();
     };
-  }, [client, clientId, playSound, removeAllSounds, reset, station]);
+  }, [client, clientId, excludeStation, playSound, removeAllSounds, reset]);
 
   return null;
 };

diff --git a/src/components/client/soundPlayer.tsx b/src/components/client/soundPlayer.tsx
@@ -34,25 +34,11 @@ const SoundPlayer: React.FC<{
     };
   }, [client, playSound, removeAllSounds, simulator.id]);
 
-  if (invisible)
-    return (
-      <Reset
-        clientId={clientId}
-        station={{name: "Sound", cards: []}}
-        reset={() => {
-          removeAllSounds();
-        }}
-      />
-    );
+  const station = React.useMemo(() => ({name: "Sound", cards: []}), []);
+  if (invisible) return <Reset clientId={clientId} station={station} />;
   return (
     <div className="keyboard-holder">
-      <Reset
-        clientId={clientId}
-        station={{name: "Sound", cards: []}}
-        reset={() => {
-          removeAllSounds();
-        }}
-      />
+      <Reset clientId={clientId} station={station} />
       <FormattedMessage id="sound-player" defaultMessage="Sound Player" />
       <ClientLighting simulator={simulator} clientId={clientId} />
     </div>