From fbe570d62fbb5852fb3696addd6a789b8f8922a3 Mon Sep 17 00:00:00 2001 From: Olivier Bouillet <62574056+freeboub@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:01:39 +0200 Subject: [PATCH] Fix/allow text track selection by index (#4124) * fix(ios): ensure behavior is correct with empty text track list * fix(ios): add index to text tracks reported --- examples/basic/ios/Podfile.lock | 480 ++++++++++++++++---------------- ios/Video/RCTVideo.swift | 18 +- 2 files changed, 256 insertions(+), 242 deletions(-) diff --git a/examples/basic/ios/Podfile.lock b/examples/basic/ios/Podfile.lock index fc0fa2ad..5d670dfb 100644 --- a/examples/basic/ios/Podfile.lock +++ b/examples/basic/ios/Podfile.lock @@ -3,15 +3,15 @@ PODS: - DoubleConversion (1.1.6) - EXConstants (16.0.2): - ExpoModulesCore - - Expo (51.0.17): + - Expo (51.0.31): - ExpoModulesCore - ExpoAsset (10.0.10): - ExpoModulesCore - ExpoFileSystem (17.0.1): - ExpoModulesCore - - ExpoFont (12.0.7): + - ExpoFont (12.0.9): - ExpoModulesCore - - ExpoImage (1.12.12): + - ExpoImage (1.12.15): - ExpoModulesCore - libavif/libdav1d - SDWebImage (~> 5.19.1) @@ -20,7 +20,7 @@ PODS: - SDWebImageWebPCoder (~> 0.14.6) - ExpoKeepAwake (13.0.2): - ExpoModulesCore - - ExpoModulesCore (1.12.18): + - ExpoModulesCore (1.12.23): - DoubleConversion - glog - hermes-engine @@ -43,7 +43,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - FBLazyVector (0.74.3) + - FBLazyVector (0.74.5) - fmt (9.1.0) - glog (0.3.5) - hermes-engine (0.74.3): @@ -82,27 +82,27 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - RCTDeprecation (0.74.3) - - RCTRequired (0.74.3) - - RCTTypeSafety (0.74.3): - - FBLazyVector (= 0.74.3) - - RCTRequired (= 0.74.3) - - React-Core (= 0.74.3) - - React (0.74.3): - - React-Core (= 0.74.3) - - React-Core/DevSupport (= 0.74.3) - - React-Core/RCTWebSocket (= 0.74.3) - - React-RCTActionSheet (= 0.74.3) - - React-RCTAnimation (= 0.74.3) - - React-RCTBlob (= 0.74.3) - - React-RCTImage (= 0.74.3) - - React-RCTLinking (= 0.74.3) - - React-RCTNetwork (= 0.74.3) - - React-RCTSettings (= 0.74.3) - - React-RCTText (= 0.74.3) - - React-RCTVibration (= 0.74.3) - - React-callinvoker (0.74.3) - - React-Codegen (0.74.3): + - RCTDeprecation (0.74.5) + - RCTRequired (0.74.5) + - RCTTypeSafety (0.74.5): + - FBLazyVector (= 0.74.5) + - RCTRequired (= 0.74.5) + - React-Core (= 0.74.5) + - React (0.74.5): + - React-Core (= 0.74.5) + - React-Core/DevSupport (= 0.74.5) + - React-Core/RCTWebSocket (= 0.74.5) + - React-RCTActionSheet (= 0.74.5) + - React-RCTAnimation (= 0.74.5) + - React-RCTBlob (= 0.74.5) + - React-RCTImage (= 0.74.5) + - React-RCTLinking (= 0.74.5) + - React-RCTNetwork (= 0.74.5) + - React-RCTSettings (= 0.74.5) + - React-RCTText (= 0.74.5) + - React-RCTVibration (= 0.74.5) + - React-callinvoker (0.74.5) + - React-Codegen (0.74.5): - DoubleConversion - glog - hermes-engine @@ -122,12 +122,12 @@ PODS: - React-utils - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.74.3): + - React-Core (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - RCTDeprecation - - React-Core/Default (= 0.74.3) + - React-Core/Default (= 0.74.5) - React-cxxreact - React-featureflags - React-hermes @@ -139,7 +139,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/CoreModulesHeaders (0.74.3): + - React-Core/CoreModulesHeaders (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -156,7 +156,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/Default (0.74.3): + - React-Core/Default (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -172,13 +172,13 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/DevSupport (0.74.3): + - React-Core/DevSupport (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - RCTDeprecation - - React-Core/Default (= 0.74.3) - - React-Core/RCTWebSocket (= 0.74.3) + - React-Core/Default (= 0.74.5) + - React-Core/RCTWebSocket (= 0.74.5) - React-cxxreact - React-featureflags - React-hermes @@ -190,7 +190,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/RCTActionSheetHeaders (0.74.3): + - React-Core/RCTActionSheetHeaders (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -207,7 +207,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/RCTAnimationHeaders (0.74.3): + - React-Core/RCTAnimationHeaders (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -224,7 +224,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/RCTBlobHeaders (0.74.3): + - React-Core/RCTBlobHeaders (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -241,7 +241,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/RCTImageHeaders (0.74.3): + - React-Core/RCTImageHeaders (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -258,7 +258,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/RCTLinkingHeaders (0.74.3): + - React-Core/RCTLinkingHeaders (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -275,7 +275,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/RCTNetworkHeaders (0.74.3): + - React-Core/RCTNetworkHeaders (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -292,7 +292,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/RCTSettingsHeaders (0.74.3): + - React-Core/RCTSettingsHeaders (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -309,7 +309,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/RCTTextHeaders (0.74.3): + - React-Core/RCTTextHeaders (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -326,7 +326,7 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/RCTVibrationHeaders (0.74.3): + - React-Core/RCTVibrationHeaders (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -343,12 +343,12 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-Core/RCTWebSocket (0.74.3): + - React-Core/RCTWebSocket (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - RCTDeprecation - - React-Core/Default (= 0.74.3) + - React-Core/Default (= 0.74.5) - React-cxxreact - React-featureflags - React-hermes @@ -360,36 +360,36 @@ PODS: - React-utils - SocketRocket (= 0.7.0) - Yoga - - React-CoreModules (0.74.3): + - React-CoreModules (0.74.5): - DoubleConversion - fmt (= 9.1.0) - RCT-Folly (= 2024.01.01.00) - - RCTTypeSafety (= 0.74.3) + - RCTTypeSafety (= 0.74.5) - React-Codegen - - React-Core/CoreModulesHeaders (= 0.74.3) - - React-jsi (= 0.74.3) + - React-Core/CoreModulesHeaders (= 0.74.5) + - React-jsi (= 0.74.5) - React-jsinspector - React-NativeModulesApple - React-RCTBlob - - React-RCTImage (= 0.74.3) + - React-RCTImage (= 0.74.5) - ReactCommon - SocketRocket (= 0.7.0) - - React-cxxreact (0.74.3): + - React-cxxreact (0.74.5): - boost (= 1.83.0) - DoubleConversion - fmt (= 9.1.0) - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - - React-callinvoker (= 0.74.3) - - React-debug (= 0.74.3) - - React-jsi (= 0.74.3) + - React-callinvoker (= 0.74.5) + - React-debug (= 0.74.5) + - React-jsi (= 0.74.5) - React-jsinspector - - React-logger (= 0.74.3) - - React-perflogger (= 0.74.3) - - React-runtimeexecutor (= 0.74.3) - - React-debug (0.74.3) - - React-Fabric (0.74.3): + - React-logger (= 0.74.5) + - React-perflogger (= 0.74.5) + - React-runtimeexecutor (= 0.74.5) + - React-debug (0.74.5) + - React-Fabric (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -400,20 +400,20 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/animations (= 0.74.3) - - React-Fabric/attributedstring (= 0.74.3) - - React-Fabric/componentregistry (= 0.74.3) - - React-Fabric/componentregistrynative (= 0.74.3) - - React-Fabric/components (= 0.74.3) - - React-Fabric/core (= 0.74.3) - - React-Fabric/imagemanager (= 0.74.3) - - React-Fabric/leakchecker (= 0.74.3) - - React-Fabric/mounting (= 0.74.3) - - React-Fabric/scheduler (= 0.74.3) - - React-Fabric/telemetry (= 0.74.3) - - React-Fabric/templateprocessor (= 0.74.3) - - React-Fabric/textlayoutmanager (= 0.74.3) - - React-Fabric/uimanager (= 0.74.3) + - React-Fabric/animations (= 0.74.5) + - React-Fabric/attributedstring (= 0.74.5) + - React-Fabric/componentregistry (= 0.74.5) + - React-Fabric/componentregistrynative (= 0.74.5) + - React-Fabric/components (= 0.74.5) + - React-Fabric/core (= 0.74.5) + - React-Fabric/imagemanager (= 0.74.5) + - React-Fabric/leakchecker (= 0.74.5) + - React-Fabric/mounting (= 0.74.5) + - React-Fabric/scheduler (= 0.74.5) + - React-Fabric/telemetry (= 0.74.5) + - React-Fabric/templateprocessor (= 0.74.5) + - React-Fabric/textlayoutmanager (= 0.74.5) + - React-Fabric/uimanager (= 0.74.5) - React-graphics - React-jsi - React-jsiexecutor @@ -422,7 +422,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/animations (0.74.3): + - React-Fabric/animations (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -441,7 +441,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/attributedstring (0.74.3): + - React-Fabric/attributedstring (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -460,7 +460,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/componentregistry (0.74.3): + - React-Fabric/componentregistry (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -479,7 +479,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/componentregistrynative (0.74.3): + - React-Fabric/componentregistrynative (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -498,7 +498,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components (0.74.3): + - React-Fabric/components (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -509,17 +509,17 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/components/inputaccessory (= 0.74.3) - - React-Fabric/components/legacyviewmanagerinterop (= 0.74.3) - - React-Fabric/components/modal (= 0.74.3) - - React-Fabric/components/rncore (= 0.74.3) - - React-Fabric/components/root (= 0.74.3) - - React-Fabric/components/safeareaview (= 0.74.3) - - React-Fabric/components/scrollview (= 0.74.3) - - React-Fabric/components/text (= 0.74.3) - - React-Fabric/components/textinput (= 0.74.3) - - React-Fabric/components/unimplementedview (= 0.74.3) - - React-Fabric/components/view (= 0.74.3) + - React-Fabric/components/inputaccessory (= 0.74.5) + - React-Fabric/components/legacyviewmanagerinterop (= 0.74.5) + - React-Fabric/components/modal (= 0.74.5) + - React-Fabric/components/rncore (= 0.74.5) + - React-Fabric/components/root (= 0.74.5) + - React-Fabric/components/safeareaview (= 0.74.5) + - React-Fabric/components/scrollview (= 0.74.5) + - React-Fabric/components/text (= 0.74.5) + - React-Fabric/components/textinput (= 0.74.5) + - React-Fabric/components/unimplementedview (= 0.74.5) + - React-Fabric/components/view (= 0.74.5) - React-graphics - React-jsi - React-jsiexecutor @@ -528,7 +528,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/inputaccessory (0.74.3): + - React-Fabric/components/inputaccessory (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -547,7 +547,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/legacyviewmanagerinterop (0.74.3): + - React-Fabric/components/legacyviewmanagerinterop (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -566,7 +566,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/modal (0.74.3): + - React-Fabric/components/modal (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -585,7 +585,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/rncore (0.74.3): + - React-Fabric/components/rncore (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -604,7 +604,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/root (0.74.3): + - React-Fabric/components/root (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -623,7 +623,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/safeareaview (0.74.3): + - React-Fabric/components/safeareaview (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -642,7 +642,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/scrollview (0.74.3): + - React-Fabric/components/scrollview (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -661,7 +661,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/text (0.74.3): + - React-Fabric/components/text (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -680,7 +680,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/textinput (0.74.3): + - React-Fabric/components/textinput (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -699,7 +699,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/unimplementedview (0.74.3): + - React-Fabric/components/unimplementedview (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -718,7 +718,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/view (0.74.3): + - React-Fabric/components/view (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -738,7 +738,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-Fabric/core (0.74.3): + - React-Fabric/core (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -757,7 +757,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/imagemanager (0.74.3): + - React-Fabric/imagemanager (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -776,7 +776,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/leakchecker (0.74.3): + - React-Fabric/leakchecker (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -795,7 +795,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/mounting (0.74.3): + - React-Fabric/mounting (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -814,7 +814,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/scheduler (0.74.3): + - React-Fabric/scheduler (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -833,7 +833,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/telemetry (0.74.3): + - React-Fabric/telemetry (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -852,7 +852,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/templateprocessor (0.74.3): + - React-Fabric/templateprocessor (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -871,7 +871,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/textlayoutmanager (0.74.3): + - React-Fabric/textlayoutmanager (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -891,7 +891,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/uimanager (0.74.3): + - React-Fabric/uimanager (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog @@ -910,45 +910,45 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-FabricImage (0.74.3): + - React-FabricImage (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog - hermes-engine - RCT-Folly/Fabric (= 2024.01.01.00) - - RCTRequired (= 0.74.3) - - RCTTypeSafety (= 0.74.3) + - RCTRequired (= 0.74.5) + - RCTTypeSafety (= 0.74.5) - React-Fabric - React-graphics - React-ImageManager - React-jsi - - React-jsiexecutor (= 0.74.3) + - React-jsiexecutor (= 0.74.5) - React-logger - React-rendererdebug - React-utils - ReactCommon - Yoga - - React-featureflags (0.74.3) - - React-graphics (0.74.3): + - React-featureflags (0.74.5) + - React-graphics (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2024.01.01.00) - - React-Core/Default (= 0.74.3) + - React-Core/Default (= 0.74.5) - React-utils - - React-hermes (0.74.3): + - React-hermes (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - - React-cxxreact (= 0.74.3) + - React-cxxreact (= 0.74.5) - React-jsi - - React-jsiexecutor (= 0.74.3) + - React-jsiexecutor (= 0.74.5) - React-jsinspector - - React-perflogger (= 0.74.3) + - React-perflogger (= 0.74.5) - React-runtimeexecutor - - React-ImageManager (0.74.3): + - React-ImageManager (0.74.5): - glog - RCT-Folly/Fabric - React-Core/Default @@ -957,44 +957,44 @@ PODS: - React-graphics - React-rendererdebug - React-utils - - React-jserrorhandler (0.74.3): + - React-jserrorhandler (0.74.5): - RCT-Folly/Fabric (= 2024.01.01.00) - React-debug - React-jsi - React-Mapbuffer - - React-jsi (0.74.3): + - React-jsi (0.74.5): - boost (= 1.83.0) - DoubleConversion - fmt (= 9.1.0) - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - - React-jsiexecutor (0.74.3): + - React-jsiexecutor (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - - React-cxxreact (= 0.74.3) - - React-jsi (= 0.74.3) + - React-cxxreact (= 0.74.5) + - React-jsi (= 0.74.5) - React-jsinspector - - React-perflogger (= 0.74.3) - - React-jsinspector (0.74.3): + - React-perflogger (= 0.74.5) + - React-jsinspector (0.74.5): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - React-featureflags - React-jsi - - React-runtimeexecutor (= 0.74.3) - - React-jsitracing (0.74.3): + - React-runtimeexecutor (= 0.74.5) + - React-jsitracing (0.74.5): - React-jsi - - React-logger (0.74.3): + - React-logger (0.74.5): - glog - - React-Mapbuffer (0.74.3): + - React-Mapbuffer (0.74.5): - glog - React-debug - - react-native-video (6.4.4): + - react-native-video (6.4.5): - DoubleConversion - glog - hermes-engine @@ -1008,7 +1008,7 @@ PODS: - React-featureflags - React-graphics - React-ImageManager - - react-native-video/Video (= 6.4.4) + - react-native-video/Video (= 6.4.5) - React-NativeModulesApple - React-RCTFabric - React-rendererdebug @@ -1038,7 +1038,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-video/Video (6.4.4): + - react-native-video/Video (6.4.5): - DoubleConversion - glog - hermes-engine @@ -1059,8 +1059,8 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - React-nativeconfig (0.74.3) - - React-NativeModulesApple (0.74.3): + - React-nativeconfig (0.74.5) + - React-NativeModulesApple (0.74.5): - glog - hermes-engine - React-callinvoker @@ -1071,10 +1071,10 @@ PODS: - React-runtimeexecutor - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-perflogger (0.74.3) - - React-RCTActionSheet (0.74.3): - - React-Core/RCTActionSheetHeaders (= 0.74.3) - - React-RCTAnimation (0.74.3): + - React-perflogger (0.74.5) + - React-RCTActionSheet (0.74.5): + - React-Core/RCTActionSheetHeaders (= 0.74.5) + - React-RCTAnimation (0.74.5): - RCT-Folly (= 2024.01.01.00) - RCTTypeSafety - React-Codegen @@ -1082,7 +1082,7 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTAppDelegate (0.74.3): + - React-RCTAppDelegate (0.74.5): - RCT-Folly (= 2024.01.01.00) - RCTRequired - RCTTypeSafety @@ -1106,7 +1106,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon - - React-RCTBlob (0.74.3): + - React-RCTBlob (0.74.5): - DoubleConversion - fmt (= 9.1.0) - hermes-engine @@ -1119,7 +1119,7 @@ PODS: - React-NativeModulesApple - React-RCTNetwork - ReactCommon - - React-RCTFabric (0.74.3): + - React-RCTFabric (0.74.5): - glog - hermes-engine - RCT-Folly/Fabric (= 2024.01.01.00) @@ -1139,7 +1139,7 @@ PODS: - React-runtimescheduler - React-utils - Yoga - - React-RCTImage (0.74.3): + - React-RCTImage (0.74.5): - RCT-Folly (= 2024.01.01.00) - RCTTypeSafety - React-Codegen @@ -1148,14 +1148,14 @@ PODS: - React-NativeModulesApple - React-RCTNetwork - ReactCommon - - React-RCTLinking (0.74.3): + - React-RCTLinking (0.74.5): - React-Codegen - - React-Core/RCTLinkingHeaders (= 0.74.3) - - React-jsi (= 0.74.3) + - React-Core/RCTLinkingHeaders (= 0.74.5) + - React-jsi (= 0.74.5) - React-NativeModulesApple - ReactCommon - - ReactCommon/turbomodule/core (= 0.74.3) - - React-RCTNetwork (0.74.3): + - ReactCommon/turbomodule/core (= 0.74.5) + - React-RCTNetwork (0.74.5): - RCT-Folly (= 2024.01.01.00) - RCTTypeSafety - React-Codegen @@ -1163,7 +1163,7 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTSettings (0.74.3): + - React-RCTSettings (0.74.5): - RCT-Folly (= 2024.01.01.00) - RCTTypeSafety - React-Codegen @@ -1171,23 +1171,23 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTText (0.74.3): - - React-Core/RCTTextHeaders (= 0.74.3) + - React-RCTText (0.74.5): + - React-Core/RCTTextHeaders (= 0.74.5) - Yoga - - React-RCTVibration (0.74.3): + - React-RCTVibration (0.74.5): - RCT-Folly (= 2024.01.01.00) - React-Codegen - React-Core/RCTVibrationHeaders - React-jsi - React-NativeModulesApple - ReactCommon - - React-rendererdebug (0.74.3): + - React-rendererdebug (0.74.5): - DoubleConversion - fmt (= 9.1.0) - RCT-Folly (= 2024.01.01.00) - React-debug - - React-rncore (0.74.3) - - React-RuntimeApple (0.74.3): + - React-rncore (0.74.5) + - React-RuntimeApple (0.74.5): - hermes-engine - RCT-Folly/Fabric (= 2024.01.01.00) - React-callinvoker @@ -1205,7 +1205,7 @@ PODS: - React-runtimeexecutor - React-RuntimeHermes - React-utils - - React-RuntimeCore (0.74.3): + - React-RuntimeCore (0.74.5): - glog - hermes-engine - RCT-Folly/Fabric (= 2024.01.01.00) @@ -1218,9 +1218,9 @@ PODS: - React-runtimeexecutor - React-runtimescheduler - React-utils - - React-runtimeexecutor (0.74.3): - - React-jsi (= 0.74.3) - - React-RuntimeHermes (0.74.3): + - React-runtimeexecutor (0.74.5): + - React-jsi (= 0.74.5) + - React-RuntimeHermes (0.74.5): - hermes-engine - RCT-Folly/Fabric (= 2024.01.01.00) - React-featureflags @@ -1231,7 +1231,7 @@ PODS: - React-nativeconfig - React-RuntimeCore - React-utils - - React-runtimescheduler (0.74.3): + - React-runtimescheduler (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) @@ -1243,51 +1243,51 @@ PODS: - React-rendererdebug - React-runtimeexecutor - React-utils - - React-utils (0.74.3): + - React-utils (0.74.5): - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - React-debug - - React-jsi (= 0.74.3) - - ReactCommon (0.74.3): - - ReactCommon/turbomodule (= 0.74.3) - - ReactCommon/turbomodule (0.74.3): + - React-jsi (= 0.74.5) + - ReactCommon (0.74.5): + - ReactCommon/turbomodule (= 0.74.5) + - ReactCommon/turbomodule (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - - React-callinvoker (= 0.74.3) - - React-cxxreact (= 0.74.3) - - React-jsi (= 0.74.3) - - React-logger (= 0.74.3) - - React-perflogger (= 0.74.3) - - ReactCommon/turbomodule/bridging (= 0.74.3) - - ReactCommon/turbomodule/core (= 0.74.3) - - ReactCommon/turbomodule/bridging (0.74.3): + - React-callinvoker (= 0.74.5) + - React-cxxreact (= 0.74.5) + - React-jsi (= 0.74.5) + - React-logger (= 0.74.5) + - React-perflogger (= 0.74.5) + - ReactCommon/turbomodule/bridging (= 0.74.5) + - ReactCommon/turbomodule/core (= 0.74.5) + - ReactCommon/turbomodule/bridging (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - - React-callinvoker (= 0.74.3) - - React-cxxreact (= 0.74.3) - - React-jsi (= 0.74.3) - - React-logger (= 0.74.3) - - React-perflogger (= 0.74.3) - - ReactCommon/turbomodule/core (0.74.3): + - React-callinvoker (= 0.74.5) + - React-cxxreact (= 0.74.5) + - React-jsi (= 0.74.5) + - React-logger (= 0.74.5) + - React-perflogger (= 0.74.5) + - ReactCommon/turbomodule/core (0.74.5): - DoubleConversion - fmt (= 9.1.0) - glog - hermes-engine - RCT-Folly (= 2024.01.01.00) - - React-callinvoker (= 0.74.3) - - React-cxxreact (= 0.74.3) - - React-debug (= 0.74.3) - - React-jsi (= 0.74.3) - - React-logger (= 0.74.3) - - React-perflogger (= 0.74.3) - - React-utils (= 0.74.3) + - React-callinvoker (= 0.74.5) + - React-cxxreact (= 0.74.5) + - React-debug (= 0.74.5) + - React-jsi (= 0.74.5) + - React-logger (= 0.74.5) + - React-perflogger (= 0.74.5) + - React-utils (= 0.74.5) - RNCPicker (2.7.5): - React-Core - SDWebImage (5.19.2): @@ -1521,14 +1521,14 @@ SPEC CHECKSUMS: boost: d3f49c53809116a5d38da093a8aa78bf551aed09 DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5 EXConstants: 409690fbfd5afea964e5e9d6c4eb2c2b59222c59 - Expo: 675a5642b5860771507237259da50b921c03a9f3 + Expo: 4773e11951abd0f666f67023f0cb1d48c3e8a32b ExpoAsset: 323700f291684f110fb55f0d4022a3362ea9f875 ExpoFileSystem: 80bfe850b1f9922c16905822ecbf97acd711dc51 - ExpoFont: 43b69559cef3d773db57c7ae7edd3cb0aa0dc610 - ExpoImage: 2ccccff1219ebc765e344f3338f2430af2df4824 + ExpoFont: e7f2275c10ca8573c991e007329ad6bf98086485 + ExpoImage: f77df382153d716f332f974438a803c4527f60b0 ExpoKeepAwake: 3b8815d9dd1d419ee474df004021c69fdd316d08 - ExpoModulesCore: b2fa8cc3c12f0ba45a9ae125c0e3bcad04f3fb7b - FBLazyVector: 7e977dd099937dc5458851233141583abba49ff2 + ExpoModulesCore: e3c518e094990b3ad960edbd19c291f2a1b56b0a + FBLazyVector: ac12dc084d1c8ec4cc4d7b3cf1b0ebda6dab85af fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120 glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f hermes-engine: 1f547997900dd0752dc0cc0ae6dd16173c49e09b @@ -1536,61 +1536,61 @@ SPEC CHECKSUMS: libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47 - RCTDeprecation: 4c7eeb42be0b2e95195563c49be08d0b839d22b4 - RCTRequired: d530a0f489699c8500e944fde963102c42dcd0c2 - RCTTypeSafety: b20878506b094fa3d9007d7b9e4be0faa3562499 - React: 2f9da0177233f60fa3462d83fcccde245759f81a - React-callinvoker: d0205f0dcebf72ec27263ab41e3a5ad827ed503f - React-Codegen: 27212e14727ad7d6d9fd1b1967fbf21929e4ce29 - React-Core: 690ebbbf8f8dcfba6686ce8927731d3f025c3114 - React-CoreModules: 185da31f5eb2e6043c3d19b10c64c4661322ed6a - React-cxxreact: c53d2ac9246235351086b8c588feaf775b4ec7f7 - React-debug: 40caf8ab4c0fd3afe831912e3d4d0e7303eecc5d - React-Fabric: 51ccb4f7e45df5837e796f339d602737063c463e - React-FabricImage: 376b7a81bfe64102e7da5fc85cd1775638584c92 - React-featureflags: 0d0576ae8306801a8a660b36afcdbda04dd7cc12 - React-graphics: e0e6b8fbb1c5968c70d3584dccec42544b769b60 - React-hermes: 917b7ab4c3cb9204c2ad020d74f313830097148b - React-ImageManager: 5cebcc0136f3b309c7f5189b96e6c0ebd0ec8192 - React-jserrorhandler: 5dc7e036cba3b7d167380c02afabf818ad0b2f98 - React-jsi: 024b933267079f80c30a5cae97bf5ce521217505 - React-jsiexecutor: 45cb079c87db3f514da3acfc686387a0e01de5c5 - React-jsinspector: c9551971f1298163c93e2bfb082c2b4245618fc6 - React-jsitracing: 1aa5681c353b41573b03e0e480a5adf5fa1c56d8 - React-logger: fa92ba4d3a5d39ac450f59be2a3cec7b099f0304 - React-Mapbuffer: 70da5955150a58732e9336a0c7e71cd49e909f25 - react-native-video: f57ea9a2df4675386f57f48494853a54bdba0d9f + RCTDeprecation: 3afceddffa65aee666dafd6f0116f1d975db1584 + RCTRequired: ec1239bc9d8bf63e10fb92bd8b26171a9258e0c1 + RCTTypeSafety: f5ecbc86c5c5fa163c05acb7a1c5012e15b5f994 + React: fc9fa7258eff606f44d58c5b233a82dc9cf09018 + React-callinvoker: e3fab14d69607fb7e8e3a57e5a415aed863d3599 + React-Codegen: bd1a15f54af401efee5f439aa6fd420b10550125 + React-Core: 3a5fd9e781cecf87803e5b091496a606a3df774a + React-CoreModules: cbf4707dafab8f9f826ac0c63a07d0bf5d01e256 + React-cxxreact: 7b188556271e3c7fdf22a04819f6a6225045b9dd + React-debug: 2d6f912c0c4c91a9fde617d8425088af7315c10b + React-Fabric: 47ff62e0c7f017606585327f6016190625295c5e + React-FabricImage: 823627aa521b4ecc896334f0dbf2bc8376edbf1e + React-featureflags: 2a4555681de0d4b683d98d7e9fd7bdf9e9ce1aa2 + React-graphics: edbd2a6c018b2e2d541ab8cb886cc31babf14646 + React-hermes: a7054fbcbda3957e3c5eaad06ef9bf79998d535a + React-ImageManager: 314824c4bb6f152699724dc9eb3ce544b87048bd + React-jserrorhandler: fffe10523886a352161ef492af2063651721c8ee + React-jsi: f3ce1dd2e950b6ad12b65ea3ef89168f1b94c584 + React-jsiexecutor: b4df3a27973d82f9abf3c4bd0f88e042cda25f16 + React-jsinspector: 2ea90b8e53970a1fea1449fb8e6419e21ca79867 + React-jsitracing: c83efb63c8e9e1dff72a3c56e88ae1c530a87795 + React-logger: 257858bd55f3a4e1bc0cf07ddc8fb9faba6f8c7c + React-Mapbuffer: dce508662b995ffefd29e278a16b78217039d43d + react-native-video: c5cd8b71116762c5a4ceee7f7961587d99aae8e3 react-native-video-plugin-sample: d3a93b7ad777cad7fa2c30473de75a2635ce5feb - React-nativeconfig: 84806b820491db30175afbf027e99e8415dc63f0 - React-NativeModulesApple: 7b79212f8cf496ab554e0b7b09acbd4aa4690260 - React-perflogger: 7bb9ba49435ff66b666e7966ee10082508a203e8 - React-RCTActionSheet: a2816ae2b5c8523c2bc18a8f874a724a096e6d97 - React-RCTAnimation: e78f52d7422bac13e1213e25e9bcbf99be872e1a - React-RCTAppDelegate: 24f46de486cfa3a9f46e4b0786eaf17d92e1e0c6 - React-RCTBlob: 9f9d6599d1b00690704dadc4a4bc33a7e76938be - React-RCTFabric: 416d20a24b117a7ec7d32088fc8f359b5e558fa7 - React-RCTImage: 39dd5aee6b92213845e1e7a7c41865801dc33493 - React-RCTLinking: 35d742a982f901f9ea416d772763e2da65c2dc7d - React-RCTNetwork: b078576c0c896c71905f841716b9f9f5922111dc - React-RCTSettings: 900aab52b5b1212f247c2944d88f4defbf6146f2 - React-RCTText: a3895ab4e5df4a5fd41b6f059eed484a0c7016d1 - React-RCTVibration: ab4912e1427d8de00ef89e9e6582094c4c25dc05 - React-rendererdebug: 8ea55aebb8cba804db2a8449a2f0c80ccfe0ce5a - React-rncore: 1f725aee4e00c317e51cb4d37aca7f6a47da9a11 - React-RuntimeApple: c1833d8e82f7c5314c001d61d289849c75217944 - React-RuntimeCore: 0a5b37b50737af3505b5801376ae5788532c013e - React-runtimeexecutor: 69cab8ddf409de6d6a855a71c8af9e7290c4e55b - React-RuntimeHermes: 44847ba3e8a9394b9829d9a9abde7590624f32d0 - React-runtimescheduler: e4ad653e1d2f5ff40ba047446cacde009694f0ed - React-utils: 6f7ac39d9a0de447d4334bb25d144a28c0c5d8c9 - ReactCommon: 4a09c7d8a06e93c1e2e988a3b9f3db3d2449f2fc + React-nativeconfig: f326487bc61eba3f0e328da6efb2711533dcac46 + React-NativeModulesApple: d89733f5baed8b9249ca5a8e497d63c550097312 + React-perflogger: ed4e0c65781521e0424f2e5e40b40cc7879d737e + React-RCTActionSheet: 49d53ff03bb5688ca4606c55859053a0cd129ea5 + React-RCTAnimation: 07b4923885c52c397c4ec103924bf6e53b42c73e + React-RCTAppDelegate: 316e295076734baf9bdf1bfac7d92ab647aed930 + React-RCTBlob: 85c57b0d5e667ff8a472163ba3af0628171a64bb + React-RCTFabric: 62695e345da7c451b05a131f0c6ba80367dbd5c3 + React-RCTImage: b965c85bec820e2a9c154b1fb00a2ecdd59a9c92 + React-RCTLinking: 75f04a5f27c26c4e73a39c50df470820d219df79 + React-RCTNetwork: c1a9143f4d5778efc92da40d83969d03912ccc24 + React-RCTSettings: c6800f91c0ecd48868cd5db754b0b0a7f5ffe039 + React-RCTText: b923e24f9b7250bc4f7ab154c4168ad9f8d8fc9d + React-RCTVibration: 08c4f0c917c435b3619386c25a94ee5d64c250f0 + React-rendererdebug: fac75dc155e1202cfc187485a6e4f6e842fcc5c7 + React-rncore: 12dc32f08f195e573e9d969a348b976a3d057bbc + React-RuntimeApple: 5c7591dd19de1c7fefe8e61cf934d8f8f9fc0409 + React-RuntimeCore: ec3c8be706ca2e4607eb8c675d32512352501f9e + React-runtimeexecutor: 0e688aefc14c6bc8601f4968d8d01c3fb6446844 + React-RuntimeHermes: df243bd7c8d4ba3bd237ce6ded22031e02d37908 + React-runtimescheduler: db7189185a2e5912b0d17194302e501f801a381e + React-utils: 3f1fcffc14893afb9a7e5b7c736353873cc5fc95 + ReactCommon: f79ae672224dc1e6c2d932062176883c98eebd57 RNCPicker: 3e2c37a8328f368ce14da050cdc8231deb5fc9f9 SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a SDWebImageAVIFCoder: 00310d246aab3232ce77f1d8f0076f8c4b021d90 SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d - Yoga: eed50599a85bd9f6882a9938d118aed6a397db9c + Yoga: 1ab23c1835475da69cf14e211a560e73aab24cb0 PODFILE CHECKSUM: a73d485df51877001f2b04a5a4379cfa5a3ba8fa diff --git a/ios/Video/RCTVideo.swift b/ios/Video/RCTVideo.swift index 5acc616f..2e405c76 100644 --- a/ios/Video/RCTVideo.swift +++ b/ios/Video/RCTVideo.swift @@ -1394,6 +1394,20 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH } } + func extractJsonWithIndex(from tracks: [TextTrack]) -> [NSDictionary]? { + if tracks.isEmpty { + // No tracks, need to return nil to handle + return nil + } + // Map each enumerated pair to include the index in the json dictionary + let mappedTracks = tracks.enumerated().compactMap { index, track -> NSDictionary? in + guard let json = track.json?.mutableCopy() as? NSMutableDictionary else { return nil } + json["index"] = index // Insert the index into the json dictionary + return json + } + return mappedTracks + } + func handleReadyToPlay() { guard let _playerItem else { return } @@ -1452,7 +1466,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH "orientation": orientation, ], "audioTracks": audioTracks, - "textTracks": self._textTracks.compactMap { $0.json } ?? textTracks.map(\.json), + "textTracks": extractJsonWithIndex(from: _textTracks) ?? textTracks.map(\.json), "target": self.reactTag as Any]) } @@ -1650,7 +1664,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH if onTextTracks != nil { Task { let textTracks = await RCTVideoUtils.getTextTrackInfo(self._player) - self.onTextTracks?(["textTracks": self._textTracks.compactMap { $0.json } ?? textTracks.compactMap(\.json)]) + self.onTextTracks?(["textTracks": extractJsonWithIndex(from: _textTracks) ?? textTracks.compactMap(\.json)]) } }