refactor: Incorporate image_labels into ImagePlayer component

Amsterdam-Music-Lab · Sep 2, 2024 · afdb6c5 · afdb6c5
1 parent b1d64ac
commit afdb6c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/frontend/src/components/Playback/ImagePlayer.tsx b/frontend/src/components/Playback/ImagePlayer.tsx
@@ -1,10 +1,8 @@
 import { useCallback } from "react";
 import MultiPlayer from "./MultiPlayer";
+import { PlaybackArgs } from "@/types/Playback";
 
-interface ImagePlayerProps {
-    images: string[];
-    // FIXME: image_labels is never passed as a prop by any parent component
-    image_labels?: string[];
+interface ImagePlayerProps extends Pick<PlaybackArgs, "images" | "image_labels"> {
     playSection: (index: number) => void;
 }
 

diff --git a/frontend/src/components/Playback/Playback.tsx b/frontend/src/components/Playback/Playback.tsx
@@ -230,6 +230,7 @@ const Playback = ({
                     <ImagePlayer
                         {...attrs}
                         images={playbackArgs.images}
+                        image_labels={playbackArgs.image_labels}
                         disabledPlayers={playbackArgs.play_once ? hasPlayed : undefined}
                     />
                 );

diff --git a/frontend/src/types/Playback.ts b/frontend/src/types/Playback.ts
@@ -16,8 +16,6 @@ interface FrontendStyle {
     [key: string]: string | FrontendStyle;
 }
 
-type Labels = { [key: string]: string };
-
 export interface PlaybackArgs {
     view: PlaybackView;
     play_method: PlaybackMethod;
@@ -27,9 +25,10 @@ export interface PlaybackArgs {
     sections: Section[];
     play_from: number;
 
-    labels?: Labels;
+    labels?: string[];
+    image_labels?: string[];
+    images?: string[];
     style?: FrontendStyle;
-    images?: { [key: string]: string };
     mute?: boolean;
     play_once?: boolean;
     resume_play?: boolean;