From 3cb0385fbfc4e434490da58a1a6887f7b0df5b50 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <antoine@transloadit.com>
Date: Tue, 4 Jun 2024 11:46:33 +0200
Subject: [PATCH] @uppy/audio: remove unused component props (#5209)

---
 packages/@uppy/audio/src/Audio.tsx              | 8 +++-----
 packages/@uppy/audio/src/AudioSourceSelect.tsx  | 2 +-
 packages/@uppy/audio/src/RecordingScreen.tsx    | 2 +-
 packages/@uppy/webcam/src/VideoSourceSelect.tsx | 2 +-
 packages/@uppy/webcam/src/Webcam.tsx            | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/@uppy/audio/src/Audio.tsx b/packages/@uppy/audio/src/Audio.tsx
index e420c438c..1186deaa4 100644
--- a/packages/@uppy/audio/src/Audio.tsx
+++ b/packages/@uppy/audio/src/Audio.tsx
@@ -23,10 +23,11 @@ export interface AudioOptions extends UIPluginOptions {
 interface AudioState {
   audioReady: boolean
   recordingLengthSeconds: number
+  recordedAudio: string | null | undefined
   hasAudio: boolean
   cameraError: null
   audioSources: MediaDeviceInfo[]
-  currentDeviceId?: null | string | MediaStreamTrack
+  currentDeviceId: string | MediaStreamTrack | null | undefined
   isRecording: boolean
   showAudioSourceDropdown: boolean
   [id: string]: unknown
@@ -130,7 +131,7 @@ export default class Audio<M extends Meta, B extends Body> extends UIPlugin<
         .then((stream) => {
           this.#stream = stream
 
-          let currentDeviceId = null
+          let currentDeviceId: AudioState['currentDeviceId'] = null
           const tracks = stream.getAudioTracks()
 
           if (!options?.deviceId) {
@@ -368,9 +369,6 @@ export default class Audio<M extends Meta, B extends Body> extends UIPlugin<
       <RecordingScreen
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...audioState}
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore TODO: remove unused
-        audioActive={this.#audioActive}
         onChangeSource={this.#changeSource}
         onStartRecording={this.#startRecording}
         onStopRecording={this.#stopRecording}
diff --git a/packages/@uppy/audio/src/AudioSourceSelect.tsx b/packages/@uppy/audio/src/AudioSourceSelect.tsx
index 81456e136..09ca09ce1 100644
--- a/packages/@uppy/audio/src/AudioSourceSelect.tsx
+++ b/packages/@uppy/audio/src/AudioSourceSelect.tsx
@@ -1,7 +1,7 @@
 import { h } from 'preact'
 
 export interface AudioSourceSelectProps {
-  currentDeviceId: string
+  currentDeviceId: string | MediaStreamTrack | null | undefined
   audioSources: MediaDeviceInfo[]
   onChangeSource: (value: string) => void
 }
diff --git a/packages/@uppy/audio/src/RecordingScreen.tsx b/packages/@uppy/audio/src/RecordingScreen.tsx
index 84698fec8..4e1513b8a 100644
--- a/packages/@uppy/audio/src/RecordingScreen.tsx
+++ b/packages/@uppy/audio/src/RecordingScreen.tsx
@@ -13,7 +13,7 @@ import DiscardButton from './DiscardButton.tsx'
 
 interface RecordingScreenProps extends AudioSourceSelectProps {
   stream: MediaStream | null | undefined
-  recordedAudio: string
+  recordedAudio: string | null | undefined
   recording: boolean
   supportsRecording: boolean
   showAudioSourceDropdown: boolean | undefined
diff --git a/packages/@uppy/webcam/src/VideoSourceSelect.tsx b/packages/@uppy/webcam/src/VideoSourceSelect.tsx
index add08e486..03ae32019 100644
--- a/packages/@uppy/webcam/src/VideoSourceSelect.tsx
+++ b/packages/@uppy/webcam/src/VideoSourceSelect.tsx
@@ -1,7 +1,7 @@
 import { h, type ComponentChild } from 'preact'
 
 export interface VideoSourceSelectProps {
-  currentDeviceId: string | null
+  currentDeviceId: string | MediaStreamTrack | null | undefined
   videoSources: MediaDeviceInfo[]
   onChangeVideoSource: (deviceId: string) => void
 }
diff --git a/packages/@uppy/webcam/src/Webcam.tsx b/packages/@uppy/webcam/src/Webcam.tsx
index 82578016e..b86e9c265 100644
--- a/packages/@uppy/webcam/src/Webcam.tsx
+++ b/packages/@uppy/webcam/src/Webcam.tsx
@@ -80,7 +80,7 @@ interface WebcamState {
   cameraError: null
   recordingLengthSeconds: number
   videoSources: MediaDeviceInfo[]
-  currentDeviceId: null | string
+  currentDeviceId: string | MediaStreamTrack | null | undefined
   isRecording: boolean
   [key: string]: unknown
 }