expo-video 2.1.1 → 2.1.3

package/CHANGELOG.md

@@ -10,6 +10,14 @@
 
 ### 💡 Others
 
+## 2.1.3 — 2025-04-21
+
+_This version does not introduce any user-facing changes._
+
+## 2.1.2 — 2025-04-14
+
+_This version does not introduce any user-facing changes._
+
 ## 2.1.1 — 2025-04-09
 
 _This version does not introduce any user-facing changes._
@@ -32,6 +40,7 @@ _This version does not introduce any user-facing changes._
 - [iOS] Fix the Now Playing notification disappearing after the video is paused. ([#35273](https://github.com/expo/expo/pull/35273) by [@behenate](https://github.com/behenate))
 - [iOS] Fix a race condition in setting the targets for the Now Playing controls causing the controls to sometimes not work. ([#35274](https://github.com/expo/expo/pull/35274) by [@behenate](https://github.com/behenate))
 - [iOS] Fix disabling the Now Playing controls for multiple players at the same time causing the notification to break. ([#35275](https://github.com/expo/expo/pull/35275) by [@behenate](https://github.com/behenate))
+- [Android] Fix touch events not being emitted for `VideoView`. ([#35479](https://github.com/expo/expo/pull/35479) by [@behenate](https://github.com/behenate))
 
 ### 💡 Others
 

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '2.1.1'
+version = '2.1.3'
 
 android {
   namespace "expo.modules.video"
   defaultConfig {
     versionCode 1
-    versionName '2.1.1'
+    versionName '2.1.3'
   }
 }
 

package/android/src/main/java/expo/modules/video/VideoManager.kt

@@ -34,7 +34,7 @@ object VideoManager {
   }
 
   fun registerVideoView(videoView: VideoView) {
-    videoViews[videoView.id] = videoView
+    videoViews[videoView.videoViewId] = videoView
   }
 
   fun getVideoView(id: String): VideoView {
@@ -42,7 +42,7 @@ object VideoManager {
   }
 
   fun unregisterVideoView(videoView: VideoView) {
-    videoViews.remove(videoView.id)
+    videoViews.remove(videoView.videoViewId)
   }
 
   fun registerVideoPlayer(videoPlayer: VideoPlayer) {

package/android/src/main/java/expo/modules/video/VideoView.kt

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.util.Rational
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
@@ -14,6 +15,10 @@ import android.widget.ImageButton
 import androidx.fragment.app.FragmentActivity
 import androidx.media3.common.Tracks
 import androidx.media3.ui.PlayerView
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -24,12 +29,13 @@ import expo.modules.video.player.VideoPlayerListener
 import expo.modules.video.utils.applyAutoEnterPiP
 import expo.modules.video.utils.applyRectHint
 import expo.modules.video.utils.calculateRectHint
+import expo.modules.video.utils.dispatchMotionEvent
 import java.util.UUID
 
 // https://developer.android.com/guide/topics/media/media3/getting-started/migration-guide#improvements_in_media3
 @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
 class VideoView(context: Context, appContext: AppContext) : ExpoView(context, appContext), VideoPlayerListener {
-  val id: String = UUID.randomUUID().toString()
+  val videoViewId: String = UUID.randomUUID().toString()
   val playerView: PlayerView = PlayerView(context.applicationContext)
   val onPictureInPictureStart by EventDispatcher<Unit>()
   val onPictureInPictureStop by EventDispatcher<Unit>()
@@ -50,9 +56,11 @@ class VideoView(context: Context, appContext: AppContext) : ExpoView(context, ap
   private val currentActivity = appContext.throwingActivity
   private val decorView = currentActivity.window.decorView
   private val rootView = decorView.findViewById<ViewGroup>(android.R.id.content)
+  private val touchEventCoalescingKeyHelper = TouchEventCoalescingKeyHelper()
 
   private val rootViewChildrenOriginalVisibility: ArrayList<Int> = arrayListOf()
   private var pictureInPictureHelperTag: String? = null
+  private var reactNativeEventDispatcher: EventDispatcher? = null
 
   // We need to keep track of the target surface view visibility, but only apply it when `useExoShutter` is false.
   var shouldHideSurfaceView: Boolean = true
@@ -138,6 +146,8 @@ class VideoView(context: Context, appContext: AppContext) : ExpoView(context, ap
         ViewGroup.LayoutParams.MATCH_PARENT
       )
     )
+
+    reactNativeEventDispatcher = UIManagerHelper.getEventDispatcher(appContext.reactContext as ReactContext, id)
   }
 
   fun applySurfaceViewVisibility() {
@@ -150,7 +160,7 @@ class VideoView(context: Context, appContext: AppContext) : ExpoView(context, ap
 
   fun enterFullscreen() {
     val intent = Intent(context, FullscreenPlayerActivity::class.java)
-    intent.putExtra(VideoManager.INTENT_PLAYER_KEY, id)
+    intent.putExtra(VideoManager.INTENT_PLAYER_KEY, videoViewId)
     // Set before starting the activity to avoid entering PiP unintentionally
     isInFullscreen = true
     currentActivity.startActivity(intent)
@@ -301,6 +311,34 @@ class VideoView(context: Context, appContext: AppContext) : ExpoView(context, ap
     applyAutoEnterPiP(currentActivity, false)
   }
 
+  // After adding the `PlayerView` to the hierarchy the touch events stop being emitted to the JS side.
+  // The only workaround I have found is to dispatch the touch events manually using the `EventDispatcher`.
+  // The behavior is different when the native controls are enabled and disabled.
+  override fun onTouchEvent(event: MotionEvent?): Boolean {
+    if (!useNativeControls) {
+      event?.eventTime?.let {
+        touchEventCoalescingKeyHelper.addCoalescingKey(it)
+        reactNativeEventDispatcher?.dispatchMotionEvent(this@VideoView, event, touchEventCoalescingKeyHelper)
+      }
+    }
+    if (event?.actionMasked == MotionEvent.ACTION_UP) {
+      performClick()
+    }
+    // Mark the event as handled
+    return true
+  }
+
+  override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+    if (useNativeControls) {
+      event?.eventTime?.let {
+        touchEventCoalescingKeyHelper.addCoalescingKey(it)
+        reactNativeEventDispatcher?.dispatchMotionEvent(this@VideoView, MotionEvent.obtainNoHistory(event), touchEventCoalescingKeyHelper)
+      }
+    }
+    // Return false to receive all other events before the target `onTouchEvent`
+    return false
+  }
+
   companion object {
     fun isPictureInPictureSupported(currentActivity: Activity): Boolean {
       return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && currentActivity.packageManager.hasSystemFeature(

package/android/src/main/java/expo/modules/video/utils/EventDispatcherUtils.kt

@@ -0,0 +1,43 @@
+package expo.modules.video.utils
+
+import android.util.Log
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.uimanager.events.TouchEvent
+import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper
+import com.facebook.react.uimanager.events.TouchEventType
+
+internal fun EventDispatcher.dispatchMotionEvent(view: View, event: MotionEvent?, touchEventCoalescingKeyHelper: TouchEventCoalescingKeyHelper) {
+  if (event == null) {
+    return
+  }
+
+  try {
+    val event = TouchEvent.obtain(
+      UIManagerHelper.getSurfaceId(view),
+      view.id,
+      event.toTouchEventType(),
+      event,
+      event.eventTime,
+      event.x,
+      event.y,
+      touchEventCoalescingKeyHelper
+    )
+    dispatchEvent(event)
+  } catch (e: RuntimeException) {
+    // We are not expecting any issues, but we want to prevent crashes in case the dispatch fails for any reason.
+    Log.e("EventDispatcherUtils", "Error dispatching touch event", e)
+  }
+}
+
+private fun MotionEvent.toTouchEventType(): TouchEventType {
+  return when (this.actionMasked) {
+    MotionEvent.ACTION_DOWN -> TouchEventType.START
+    MotionEvent.ACTION_UP -> TouchEventType.END
+    MotionEvent.ACTION_MOVE -> TouchEventType.MOVE
+    MotionEvent.ACTION_CANCEL -> TouchEventType.CANCEL
+    else -> TouchEventType.CANCEL
+  }
+}

package/build/VideoPlayer.js

@@ -30,12 +30,14 @@ export function useVideoPlayer(source, setup) {
 }
 function parseSource(source) {
     if (typeof source === 'number') {
+        // TODO(@kitten): This seems to not handle the `null` case. Is this correct?
         return { uri: resolveAssetSource(source).uri };
     }
     else if (typeof source === 'string') {
         return { uri: source };
     }
     if (typeof source?.assetId === 'number' && !source.uri) {
+        // TODO(@kitten): This seems to not handle the `null` case. Is this correct?
         return { ...source, uri: resolveAssetSource(source.assetId).uri };
     }
     return source;

package/build/VideoPlayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"VideoPlayer.js","sourceRoot":"","sources":["../src/VideoPlayer.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAEtD,4HAA4H;AAC5H,MAAM,OAAO,GAAG,iBAAiB,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC;AAChE,iBAAiB,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,GAAG,UAAU,MAAmB;IAC7E,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAmB;IACnD,OAAO,IAAI,iBAAiB,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAC5B,MAAmB,EACnB,KAAqC;IAErC,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAEzC,OAAO,wBAAwB,CAAC,GAAG,EAAE;QACnC,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC/D,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC;QAChB,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,WAAW,CAAC,MAAmB;IACtC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,EAAE,GAAG,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC;IACjD,CAAC;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QACtC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,OAAO,MAAM,EAAE,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACvD,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;IACpE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { useReleasingSharedObject } from 'expo-modules-core';\n\nimport NativeVideoModule from './NativeVideoModule';\nimport { VideoSource, VideoPlayer } from './VideoPlayer.types';\nimport resolveAssetSource from './resolveAssetSource';\n\n// TODO: Temporary solution until we develop a way of overriding prototypes that won't break the lazy loading of the module.\nconst replace = NativeVideoModule.VideoPlayer.prototype.replace;\nNativeVideoModule.VideoPlayer.prototype.replace = function (source: VideoSource) {\n  return replace.call(this, parseSource(source));\n};\n\n/**\n * Creates a direct instance of `VideoPlayer` that doesn't release automatically.\n *\n * > **info** For most use cases you should use the [`useVideoPlayer`](#usevideoplayer) hook instead. See the [Using the VideoPlayer Directly](#using-the-videoplayer-directly) section for more details.\n * @param source\n */\nexport function createVideoPlayer(source: VideoSource): VideoPlayer {\n  return new NativeVideoModule.VideoPlayer(parseSource(source));\n}\n\n/**\n * Creates a `VideoPlayer`, which will be automatically cleaned up when the component is unmounted.\n * @param source - A video source that is used to initialize the player.\n * @param setup - A function that allows setting up the player. It will run after the player is created.\n */\nexport function useVideoPlayer(\n  source: VideoSource,\n  setup?: (player: VideoPlayer) => void\n): VideoPlayer {\n  const parsedSource = parseSource(source);\n\n  return useReleasingSharedObject(() => {\n    const player = new NativeVideoModule.VideoPlayer(parsedSource);\n    setup?.(player);\n    return player;\n  }, [JSON.stringify(parsedSource)]);\n}\n\nfunction parseSource(source: VideoSource): VideoSource {\n  if (typeof source === 'number') {\n    return { uri: resolveAssetSource(source).uri };\n  } else if (typeof source === 'string') {\n    return { uri: source };\n  }\n\n  if (typeof source?.assetId === 'number' && !source.uri) {\n    return { ...source, uri: resolveAssetSource(source.assetId).uri };\n  }\n  return source;\n}\n"]}
+{"version":3,"file":"VideoPlayer.js","sourceRoot":"","sources":["../src/VideoPlayer.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAEtD,4HAA4H;AAC5H,MAAM,OAAO,GAAG,iBAAiB,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC;AAChE,iBAAiB,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,GAAG,UAAU,MAAmB;IAC7E,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAmB;IACnD,OAAO,IAAI,iBAAiB,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAC5B,MAAmB,EACnB,KAAqC;IAErC,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAEzC,OAAO,wBAAwB,CAAC,GAAG,EAAE;QACnC,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC/D,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC;QAChB,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,WAAW,CAAC,MAAmB;IACtC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,4EAA4E;QAC5E,OAAO,EAAE,GAAG,EAAE,kBAAkB,CAAC,MAAM,CAAE,CAAC,GAAG,EAAE,CAAC;IAClD,CAAC;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QACtC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,OAAO,MAAM,EAAE,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACvD,4EAA4E;QAC5E,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAE,CAAC,GAAG,EAAE,CAAC;IACrE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { useReleasingSharedObject } from 'expo-modules-core';\n\nimport NativeVideoModule from './NativeVideoModule';\nimport { VideoSource, VideoPlayer } from './VideoPlayer.types';\nimport resolveAssetSource from './resolveAssetSource';\n\n// TODO: Temporary solution until we develop a way of overriding prototypes that won't break the lazy loading of the module.\nconst replace = NativeVideoModule.VideoPlayer.prototype.replace;\nNativeVideoModule.VideoPlayer.prototype.replace = function (source: VideoSource) {\n  return replace.call(this, parseSource(source));\n};\n\n/**\n * Creates a direct instance of `VideoPlayer` that doesn't release automatically.\n *\n * > **info** For most use cases you should use the [`useVideoPlayer`](#usevideoplayer) hook instead. See the [Using the VideoPlayer Directly](#using-the-videoplayer-directly) section for more details.\n * @param source\n */\nexport function createVideoPlayer(source: VideoSource): VideoPlayer {\n  return new NativeVideoModule.VideoPlayer(parseSource(source));\n}\n\n/**\n * Creates a `VideoPlayer`, which will be automatically cleaned up when the component is unmounted.\n * @param source - A video source that is used to initialize the player.\n * @param setup - A function that allows setting up the player. It will run after the player is created.\n */\nexport function useVideoPlayer(\n  source: VideoSource,\n  setup?: (player: VideoPlayer) => void\n): VideoPlayer {\n  const parsedSource = parseSource(source);\n\n  return useReleasingSharedObject(() => {\n    const player = new NativeVideoModule.VideoPlayer(parsedSource);\n    setup?.(player);\n    return player;\n  }, [JSON.stringify(parsedSource)]);\n}\n\nfunction parseSource(source: VideoSource): VideoSource {\n  if (typeof source === 'number') {\n    // TODO(@kitten): This seems to not handle the `null` case. Is this correct?\n    return { uri: resolveAssetSource(source)!.uri };\n  } else if (typeof source === 'string') {\n    return { uri: source };\n  }\n\n  if (typeof source?.assetId === 'number' && !source.uri) {\n    // TODO(@kitten): This seems to not handle the `null` case. Is this correct?\n    return { ...source, uri: resolveAssetSource(source.assetId)!.uri };\n  }\n  return source;\n}\n"]}

package/expo-module.config.json

@@ -8,7 +8,7 @@
     "publication": {
       "groupId": "host.exp.exponent",
       "artifactId": "expo.modules.video",
-      "version": "2.1.1",
+      "version": "2.1.3",
       "repository": "local-maven-repo"
     }
   }

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3-sources.jar.md5

@@ -0,0 +1 @@
+6912f84f2796567d794831d2129d410b

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3-sources.jar.sha1

@@ -0,0 +1 @@
+54c0b6dc1b81376beb3a618b931c7b6c1ae29c1f

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3-sources.jar.sha256

@@ -0,0 +1 @@
+ca2000adb022f981431094a4ad014e103116a126cafd5bd41e706422d4b179be

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3-sources.jar.sha512

@@ -0,0 +1 @@
+2509696ec25ef84f5e3a22a88bf18519e48dea98395b4f5acc0b6564d97b9192702b610b8d9aced47ee1cd1140312eff1a4153e98abf994f9a1b5780b925812f

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.aar.md5

@@ -0,0 +1 @@
+4b064331dc548a7085c669f7dac121b8

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.aar.sha1

@@ -0,0 +1 @@
+50c1aaa6681cb1d3d5516f2e01caa09293c49d8e

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.aar.sha256

@@ -0,0 +1 @@
+293bca0ed8757b38175410f8416a93a57c121db0618d7ab3fdede1b679698ffb

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.aar.sha512

@@ -0,0 +1 @@
+0fe5243d22365ebf9b162dd1fbbfc2926d8ec52f47f87e78b5624cf5b866ab844bb5abe4d91da9ced3ed2baa795ad55d6a48ddf346557912439684a0f245bb03

package/local-maven-repo/host/exp/exponent/expo.modules.video/{2.1.1/expo.modules.video-2.1.1.module → 2.1.3/expo.modules.video-2.1.3.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "host.exp.exponent",
     "module": "expo.modules.video",
-    "version": "2.1.1",
+    "version": "2.1.3",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.video-2.1.1.aar",
-          "url": "expo.modules.video-2.1.1.aar",
-          "size": 371162,
-          "sha512": "c0defe8fc70309f03e4ab03ae098707df32266d9ed60476008fda07faf89b3e943f0fe7364e9f582d59cd44081601e2cb8382aaf1e1769a1b59e85a83854bc59",
-          "sha256": "0ddf26351b4674406935f588548be46988e8911349703708e92f449212bd9b14",
-          "sha1": "1b834babead335028e712e57b9581d6e2a2d3549",
-          "md5": "16c628c4b68988e85b75207f8ada66e1"
+          "name": "expo.modules.video-2.1.3.aar",
+          "url": "expo.modules.video-2.1.3.aar",
+          "size": 373538,
+          "sha512": "0fe5243d22365ebf9b162dd1fbbfc2926d8ec52f47f87e78b5624cf5b866ab844bb5abe4d91da9ced3ed2baa795ad55d6a48ddf346557912439684a0f245bb03",
+          "sha256": "293bca0ed8757b38175410f8416a93a57c121db0618d7ab3fdede1b679698ffb",
+          "sha1": "50c1aaa6681cb1d3d5516f2e01caa09293c49d8e",
+          "md5": "4b064331dc548a7085c669f7dac121b8"
         }
       ]
     },
@@ -113,13 +113,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.video-2.1.1.aar",
-          "url": "expo.modules.video-2.1.1.aar",
-          "size": 371162,
-          "sha512": "c0defe8fc70309f03e4ab03ae098707df32266d9ed60476008fda07faf89b3e943f0fe7364e9f582d59cd44081601e2cb8382aaf1e1769a1b59e85a83854bc59",
-          "sha256": "0ddf26351b4674406935f588548be46988e8911349703708e92f449212bd9b14",
-          "sha1": "1b834babead335028e712e57b9581d6e2a2d3549",
-          "md5": "16c628c4b68988e85b75207f8ada66e1"
+          "name": "expo.modules.video-2.1.3.aar",
+          "url": "expo.modules.video-2.1.3.aar",
+          "size": 373538,
+          "sha512": "0fe5243d22365ebf9b162dd1fbbfc2926d8ec52f47f87e78b5624cf5b866ab844bb5abe4d91da9ced3ed2baa795ad55d6a48ddf346557912439684a0f245bb03",
+          "sha256": "293bca0ed8757b38175410f8416a93a57c121db0618d7ab3fdede1b679698ffb",
+          "sha1": "50c1aaa6681cb1d3d5516f2e01caa09293c49d8e",
+          "md5": "4b064331dc548a7085c669f7dac121b8"
         }
       ]
     },
@@ -133,13 +133,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.video-2.1.1-sources.jar",
-          "url": "expo.modules.video-2.1.1-sources.jar",
-          "size": 48605,
-          "sha512": "825cb0b1997d6a96c6d31a7e6d43357e66198539d8b77d6d67b11c59fc6da3afa58e2d7df82807ff6be1c02e893219f9506a419eb595758041cdd90ee285e491",
-          "sha256": "744a72e25f0078fd4c4fcbe9e7837ba941dfa2782fa5796581616c007f8d73ff",
-          "sha1": "f8bf392a47dfa5fdbd07b46893df64e03be92c9e",
-          "md5": "d1f1e7f4ef4473ee718c60316fca9e2b"
+          "name": "expo.modules.video-2.1.3-sources.jar",
+          "url": "expo.modules.video-2.1.3-sources.jar",
+          "size": 49755,
+          "sha512": "2509696ec25ef84f5e3a22a88bf18519e48dea98395b4f5acc0b6564d97b9192702b610b8d9aced47ee1cd1140312eff1a4153e98abf994f9a1b5780b925812f",
+          "sha256": "ca2000adb022f981431094a4ad014e103116a126cafd5bd41e706422d4b179be",
+          "sha1": "54c0b6dc1b81376beb3a618b931c7b6c1ae29c1f",
+          "md5": "6912f84f2796567d794831d2129d410b"
         }
       ]
     }

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.module.md5

@@ -0,0 +1 @@
+3f1bf87d9a27f8e5c1bb769fe7075396

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.module.sha1

@@ -0,0 +1 @@
+f54e6355c0c9a4adfce93c4466eae58bdd492962

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.module.sha256

@@ -0,0 +1 @@
+37bb9e0125f0d518e1e2388f31c1699ff3b64ac65e42e686422c08c8d8913ebb

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.module.sha512

@@ -0,0 +1 @@
+13d97ced262f06c3387a22117acb3fac8b37ecdabf3ee5114e222416581ebbb6a530bccaf0a2c189d6f5ebcb998d737b39ed76617a12bb2a332e6d8f4ec0c8e7

package/local-maven-repo/host/exp/exponent/expo.modules.video/{2.1.1/expo.modules.video-2.1.1.pom → 2.1.3/expo.modules.video-2.1.3.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.video</artifactId>
-  <version>2.1.1</version>
+  <version>2.1.3</version>
   <packaging>aar</packaging>
   <name>expo.modules.video</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.pom.md5

@@ -0,0 +1 @@
+cd4b573acbf07f5bb99b3074dada2afb

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.pom.sha1

@@ -0,0 +1 @@
+df7e49aad154fa77fb882912bec8e6aa9ff6018c

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.pom.sha256

@@ -0,0 +1 @@
+7f1afeb663fea378d066d31585217402fa9f12dcda29f7efd9782ab0a49842ef

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.3/expo.modules.video-2.1.3.pom.sha512

@@ -0,0 +1 @@
+bbe2a4b87630569da7b413394b147cce08e8ec8f69c7d95d73edea79278b303997144d4a9dcc96362aaf203e0aa1aaec53ad33ebe9f818df1c52bb902ad74737

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.video</artifactId>
   <versioning>
-    <latest>2.1.1</latest>
-    <release>2.1.1</release>
+    <latest>2.1.3</latest>
+    <release>2.1.3</release>
     <versions>
-      <version>2.1.1</version>
+      <version>2.1.3</version>
     </versions>
-    <lastUpdated>20250409202814</lastUpdated>
+    <lastUpdated>20250421213312</lastUpdated>
   </versioning>
 </metadata>

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.md5

@@ -1 +1 @@
-abbf85d7931b32ffe8cf3c6a3e68d3f2
+852c77ac4e6adb5d770fb976d4d627c3

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.sha1

@@ -1 +1 @@
-b61d15075a26208eab23dc5a3cf5a06ee0d8d1cf
+d89a79b8fd7f7459b98c6b77c75d70836ebfddfc

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.sha256

@@ -1 +1 @@
-9bfcae4d1104aee2a6e9611398477c9dd5d6c7e782058afba24506818927e7b8
+9af0b3271a3472c47264630ead2d1a8a7cca0da33d498dc87e06ea1fdf6affb9

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.sha512

@@ -1 +1 @@
-8d31c0d057ea43b744e5792de22c6ad9e9a58a13bff5f715854bfb88d0df4742d7e198589904f44b9918621a34a4d76aa3ed49f361c0800bdac3047c4f231928
+18943f0a542f164b0a7756d214847d8f9e16586c39a1c5c0d6574b24cbb5c5e7b2cc008f3bcb942fc58b73b26c0a5a0094e71debeb8cc53a234d68f37d7623b8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-video",
   "title": "Expo Video",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "A cross-platform, performant video component for React Native and Expo with Web support",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -31,12 +31,12 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "expo-module-scripts": "^4.1.1"
+    "expo-module-scripts": "^4.1.2"
   },
   "peerDependencies": {
     "expo": "*",
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "1914bb35d23af23078da37e70988261844436505"
+  "gitHead": "f1394f21ff2719a9a3037d7511db170704e5c492"
 }

package/src/VideoPlayer.tsx

@@ -40,13 +40,15 @@ export function useVideoPlayer(
 
 function parseSource(source: VideoSource): VideoSource {
   if (typeof source === 'number') {
-    return { uri: resolveAssetSource(source).uri };
+    // TODO(@kitten): This seems to not handle the `null` case. Is this correct?
+    return { uri: resolveAssetSource(source)!.uri };
   } else if (typeof source === 'string') {
     return { uri: source };
   }
 
   if (typeof source?.assetId === 'number' && !source.uri) {
-    return { ...source, uri: resolveAssetSource(source.assetId).uri };
+    // TODO(@kitten): This seems to not handle the `null` case. Is this correct?
+    return { ...source, uri: resolveAssetSource(source.assetId)!.uri };
   }
   return source;
 }

package/src/ts-declarations/react-native-assets.d.ts

@@ -0,0 +1 @@
+/// <reference path="../../../expo-asset/src/ts-declarations/react-native-assets.d.ts" />

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1-sources.jar.md5

@@ -1 +0,0 @@
-d1f1e7f4ef4473ee718c60316fca9e2b

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1-sources.jar.sha1

@@ -1 +0,0 @@
-f8bf392a47dfa5fdbd07b46893df64e03be92c9e

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1-sources.jar.sha256

@@ -1 +0,0 @@
-744a72e25f0078fd4c4fcbe9e7837ba941dfa2782fa5796581616c007f8d73ff

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1-sources.jar.sha512

@@ -1 +0,0 @@
-825cb0b1997d6a96c6d31a7e6d43357e66198539d8b77d6d67b11c59fc6da3afa58e2d7df82807ff6be1c02e893219f9506a419eb595758041cdd90ee285e491

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.aar.md5

@@ -1 +0,0 @@
-16c628c4b68988e85b75207f8ada66e1

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.aar.sha1

@@ -1 +0,0 @@
-1b834babead335028e712e57b9581d6e2a2d3549

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.aar.sha256

@@ -1 +0,0 @@
-0ddf26351b4674406935f588548be46988e8911349703708e92f449212bd9b14

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.aar.sha512

@@ -1 +0,0 @@
-c0defe8fc70309f03e4ab03ae098707df32266d9ed60476008fda07faf89b3e943f0fe7364e9f582d59cd44081601e2cb8382aaf1e1769a1b59e85a83854bc59

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.module.md5

@@ -1 +0,0 @@
-95410eee59d62652389f976d4b00db76

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.module.sha1

@@ -1 +0,0 @@
-d24f91f94267766be2019023a0a70c078ff555e5

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.module.sha256

@@ -1 +0,0 @@
-cf60af111fd5f3f56e742d8358d14972ebccbe7f98c964dc19323611b19f6695

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.module.sha512

@@ -1 +0,0 @@
-7252bf75b382fddaabcda8929d974a621d6ef7ccc0be1ff2d8bd8dca752168ccc382bbcf9cbac192969851049603874c77a484443693bf94b9078411cb1df27e

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.pom.md5

@@ -1 +0,0 @@
-89b3940621d7e71138febe21815b423e

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.pom.sha1

@@ -1 +0,0 @@
-4ab857d50d57e420a276dfe9765e9e39fc32c17c

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.pom.sha256

@@ -1 +0,0 @@
-91d3880bdbcf52db3faa93264f9ced99b580125b58db46a6f763508529072b9e

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.1.1/expo.modules.video-2.1.1.pom.sha512

@@ -1 +0,0 @@
-573b02be17b27eeb87714ae9d899a20984cabcb030ae9ed0fc58db3b7631cf6d7d547bde328903eaf58acc1bad354d4859a149e9a07f696b40a3442043821174