From f92e492923d0ebf25cb077fbed45f86843b15aca Mon Sep 17 00:00:00 2001
From: Krzysztof Moch <krzysmoch.programs@gmail.com>
Date: Thu, 15 May 2025 09:45:42 +0200
Subject: [PATCH] chore: code cleanup

---
 .../core/player/OnAudioFocusChangedListener.kt    |  6 +++---
 .../core/recivers/AudioBecomingNoisyReceiver.kt   |  2 +-
 .../HybridVideoViewViewManager.kt                 | 14 +++++++-------
 packages/react-native-video/package.json          |  2 +-
 .../react-native-video/src/core/hooks/useEvent.ts | 15 +++++++++++++--
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/packages/react-native-video/android/src/main/java/com/video/core/player/OnAudioFocusChangedListener.kt b/packages/react-native-video/android/src/main/java/com/video/core/player/OnAudioFocusChangedListener.kt
index 0677e240..f9246624 100644
--- a/packages/react-native-video/android/src/main/java/com/video/core/player/OnAudioFocusChangedListener.kt
+++ b/packages/react-native-video/android/src/main/java/com/video/core/player/OnAudioFocusChangedListener.kt
@@ -11,9 +11,9 @@ class OnAudioFocusChangedListener : AudioManager.OnAudioFocusChangeListener {
 
   override fun onAudioFocusChange(focusChange: Int) {
     when (focusChange) {
-      AudioManager.AUDIOFOCUS_GAIN -> eventEmitter?.onAudioFocusChange(true)
-      AudioManager.AUDIOFOCUS_LOSS -> eventEmitter?.onAudioFocusChange(false)
-      AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> eventEmitter?.onAudioFocusChange(false)
+      AudioManager.AUDIOFOCUS_GAIN -> eventEmitter?.onAudioFocusChange?.invoke(true)
+      AudioManager.AUDIOFOCUS_LOSS -> eventEmitter?.onAudioFocusChange?.invoke(false)
+      AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> eventEmitter?.onAudioFocusChange?.invoke(false)
     }
   }
 
diff --git a/packages/react-native-video/android/src/main/java/com/video/core/recivers/AudioBecomingNoisyReceiver.kt b/packages/react-native-video/android/src/main/java/com/video/core/recivers/AudioBecomingNoisyReceiver.kt
index 704550c0..bfb68e40 100644
--- a/packages/react-native-video/android/src/main/java/com/video/core/recivers/AudioBecomingNoisyReceiver.kt
+++ b/packages/react-native-video/android/src/main/java/com/video/core/recivers/AudioBecomingNoisyReceiver.kt
@@ -15,7 +15,7 @@ class AudioBecomingNoisyReceiver() : BroadcastReceiver() {
 
   override fun onReceive(context: Context?, intent: Intent?) {
     if (intent?.action == AudioManager.ACTION_AUDIO_BECOMING_NOISY) {
-      eventEmitter?.onAudioBecomingNoisy()
+      eventEmitter?.onAudioBecomingNoisy?.invoke()
     }
   }
 
diff --git a/packages/react-native-video/android/src/main/java/com/video/hybrids/videoviewviewmanager/HybridVideoViewViewManager.kt b/packages/react-native-video/android/src/main/java/com/video/hybrids/videoviewviewmanager/HybridVideoViewViewManager.kt
index 5ffc73a8..82925614 100644
--- a/packages/react-native-video/android/src/main/java/com/video/hybrids/videoviewviewmanager/HybridVideoViewViewManager.kt
+++ b/packages/react-native-video/android/src/main/java/com/video/hybrids/videoviewviewmanager/HybridVideoViewViewManager.kt
@@ -51,7 +51,7 @@ class HybridVideoViewViewManager(nitroId: Int): HybridVideoViewViewManagerSpec()
   }
 
   override var autoEnterPictureInPicture: Boolean
-    get() = videoView.get()?.autoEnterPictureInPicture == true
+    get() = videoView.get()?.autoEnterPictureInPicture
     set(value) {
       videoView.get()?.autoEnterPictureInPicture = value
     }
@@ -69,32 +69,32 @@ class HybridVideoViewViewManager(nitroId: Int): HybridVideoViewViewManagerSpec()
     }
 
   // View callbacks
-  override var onPictureInPictureChange: ((Boolean) -> Unit)?
+  override var onPictureInPictureChange: ((Boolean) -> Unit)? = null
     set(value) {
       field = value
       videoView.get()?.events?.onPictureInPictureChange = value
     }
-  override var onFullscreenChange: ((Boolean) -> Unit)?
+  override var onFullscreenChange: ((Boolean) -> Unit)? = null
     set(value) {
       field = value
       videoView.get()?.events?.onFullscreenChange = value
     }
-  override var willEnterFullscreen: (() -> Unit)?
+  override var willEnterFullscreen: (() -> Unit)? = null
     set(value) {
       field = value
       videoView.get()?.events?.willEnterFullscreen = value
     }
-  override var willExitFullscreen: (() -> Unit)?
+  override var willExitFullscreen: (() -> Unit)? = null
     set(value) {
       field = value
       videoView.get()?.events?.willExitFullscreen = value
     }
-  override var willEnterPictureInPicture: (() -> Unit)?
+  override var willEnterPictureInPicture: (() -> Unit)? = null
     set(value) {
       field = value
       videoView.get()?.events?.willEnterPictureInPicture = value
     }
-  override var willExitPictureInPicture: (() -> Unit)?
+  override var willExitPictureInPicture: (() -> Unit)? = null
     set(value) {
       field = value
       videoView.get()?.events?.willExitPictureInPicture = value
diff --git a/packages/react-native-video/package.json b/packages/react-native-video/package.json
index 1af4d68a..c194e772 100644
--- a/packages/react-native-video/package.json
+++ b/packages/react-native-video/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-video",
-  "version": "7.0.0-dev.6",
+  "version": "7.0.0-dev.7",
   "description": "<Video /> Component for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
diff --git a/packages/react-native-video/src/core/hooks/useEvent.ts b/packages/react-native-video/src/core/hooks/useEvent.ts
index 2f9fb147..5bb260b3 100644
--- a/packages/react-native-video/src/core/hooks/useEvent.ts
+++ b/packages/react-native-video/src/core/hooks/useEvent.ts
@@ -2,12 +2,23 @@ import { useEffect } from 'react';
 import { VideoPlayer } from '../VideoPlayer';
 import { type VideoPlayerEvents } from '../types/Events';
 
-type Events = keyof VideoPlayerEvents & 'onError';
+// Omit undefined from events
+type NonUndefined<T> = T extends undefined ? never : T;
+
+// Valid events names
+type Events = keyof VideoPlayerEvents | 'onError';
+
+// Valid events params
+type EventsParams<T extends Events> = T extends keyof VideoPlayerEvents
+  ? // (Native) Events from VideoPlayerEvents
+    Parameters<VideoPlayerEvents[T]>
+  : // (JS) Events from Video Player
+    Parameters<NonUndefined<VideoPlayer[T]>>;
 
 export const useEvent = <T extends Events>(
   player: VideoPlayer,
   event: T,
-  callback: (...args: Parameters<VideoPlayerEvents[T]>) => void
+  callback: (...args: EventsParams<T>) => void
 ) => {
   useEffect(() => {
     // @ts-expect-error we narrow the type of the event