@jwplayer/jwplayer-react-native 1.0.2 → 1.0.3

package/android/src/main/java/com/jwplayer/rnjwplayer/RNJWPlayerView.java

@@ -2,6 +2,7 @@ package com.jwplayer.rnjwplayer;
 
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -18,16 +19,20 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
-import android.view.Choreographer;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 
 import com.facebook.react.ReactActivity;
 import com.facebook.react.bridge.Arguments;
@@ -35,15 +40,17 @@ import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
-import com.jwplayer.pub.api.JsonHelper;
 import com.jwplayer.pub.api.JWPlayer;
+import com.jwplayer.pub.api.JsonHelper;
 import com.jwplayer.pub.api.UiGroup;
+import com.jwplayer.pub.api.background.MediaService;
 import com.jwplayer.pub.api.background.MediaServiceController;
 import com.jwplayer.pub.api.configuration.PlayerConfig;
 import com.jwplayer.pub.api.configuration.UiConfig;
@@ -110,9 +117,12 @@ import com.jwplayer.pub.api.fullscreen.delegates.DeviceOrientationDelegate;
 import com.jwplayer.pub.api.fullscreen.delegates.DialogLayoutDelegate;
 import com.jwplayer.pub.api.fullscreen.delegates.SystemUiDelegate;
 import com.jwplayer.pub.api.license.LicenseUtil;
+import com.jwplayer.pub.api.media.captions.Caption;
 import com.jwplayer.pub.api.media.playlists.PlaylistItem;
 import com.jwplayer.ui.views.CueMarkerSeekbar;
 
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -120,8 +130,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import org.json.JSONObject;
-
 public class RNJWPlayerView extends RelativeLayout implements
         VideoPlayerEvents.OnFullscreenListener,
         VideoPlayerEvents.OnReadyListener,
@@ -179,7 +187,7 @@ public class RNJWPlayerView extends RelativeLayout implements
 
         AudioManager.OnAudioFocusChangeListener,
 
-        LifecycleEventListener {
+        LifecycleEventListener, LifecycleOwner {
     public RNJWPlayer mPlayerView = null;
     public JWPlayer mPlayer = null;
 
@@ -230,7 +238,13 @@ public class RNJWPlayerView extends RelativeLayout implements
 
     private void doBindService() {
         if (mMediaServiceController != null) {
-            mMediaServiceController.bindService();
+            if (!isBackgroundAudioServiceRunning()) {
+                // This may not be your expected behavior, but is necessary to avoid crashing
+                // Do not use multiple player instances with background audio enabled
+
+                // don't rebind me if the service is already active with a player.
+                mMediaServiceController.bindService();
+            }
         }
     }
 
@@ -265,10 +279,23 @@ public class RNJWPlayerView extends RelativeLayout implements
         return superContext;
     }
 
+    private boolean isBackgroundAudioServiceRunning() {
+        ActivityManager manager = (ActivityManager) mAppContext.getSystemService(Context.ACTIVITY_SERVICE);
+        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (MediaService.class.getName().equals(service.service.getClassName())) {
+                Log.w(TAG, "MediaService is already running with another player loaded. To avoid crashing, this player, "
+                        + mPlayerView.getTag() + "  will not be loaded into the background service.");
+                return true;
+            }
+        }
+        return false;
+    }
+
     public RNJWPlayerView(ThemedReactContext reactContext, ReactApplicationContext appContext) {
         super(getNonBuggyContext(reactContext, appContext));
         mAppContext = appContext;
 
+        registry.setCurrentState(Lifecycle.State.CREATED);
         mThemedReactContext = reactContext;
 
         mActivity = (ReactActivity) getActivity();
@@ -276,11 +303,25 @@ public class RNJWPlayerView extends RelativeLayout implements
             mWindow = mActivity.getWindow();
         }
 
+        if (mActivity != null) {
+            mActivity.getLifecycle().addObserver(lifecycleObserver);
+        }
+
         mRootView = mActivity.findViewById(android.R.id.content);
 
         getReactContext().addLifecycleEventListener(this);
     }
 
+    private LifecycleObserver lifecycleObserver = new LifecycleEventObserver() {
+        @Override
+        public void onStateChanged(@NonNull LifecycleOwner source, @NonNull Lifecycle.Event event) {
+            if (event.getTargetState() == Lifecycle.State.DESTROYED) {
+                return; // no op: handled elsewhere
+            }
+            registry.setCurrentState(event.getTargetState());
+        }
+    };
+
     public ReactApplicationContext getAppContext() {
         return mAppContext;
     }
@@ -303,12 +344,41 @@ public class RNJWPlayerView extends RelativeLayout implements
         return mThemedReactContext.getReactApplicationContext().getCurrentActivity();
     }
 
+    // The registry for lifecycle events. Required by player object. Main use case if for garbage collection / teardown
+    private final LifecycleRegistry registry = new LifecycleRegistry(this);
+
+    @NonNull
+    @Override
+    public Lifecycle getLifecycle() {
+        return registry;
+    }
+
+    // // closest to `ondestroy` for a view without listening to the activity event
+    // // The activity event can be deceptive in React-Native
+    // @Override
+    // protected void onDetachedFromWindow() {
+    //     super.onDetachedFromWindow();
+    //     registry.setCurrentState(Lifecycle.State.DESTROYED);
+    // }
+
     public void destroyPlayer() {
         if (mPlayer != null) {
             unRegisterReceiver();
-            mPlayer.deregisterActivityForPip();
+
+            // If we are casting we need to break the cast session as there is no simple
+            // way to reconnect to an existing session if the player that created it is dead
+            
+            // If this doesn't match your use case, using a single player object and load content
+            // into it rather than creating a new player for every piece of content. 
             mPlayer.stop();
 
+            // send signal to JW SDK player is destroyed
+            registry.setCurrentState(Lifecycle.State.DESTROYED);
+
+            // Stop listening to activities lifecycle
+            mActivity.getLifecycle().removeObserver(lifecycleObserver);
+            mPlayer.deregisterActivityForPip();
+
             mPlayer.removeListeners(this,
                     // VideoPlayerEvents
                     EventType.READY,
@@ -456,6 +526,7 @@ public class RNJWPlayerView extends RelativeLayout implements
 
     /**
      * Helper to build the a generic `ExtensibleFullscreenHandler` with small tweaks to play nice with Modals
+     *
      * @return {@link ExtensibleFullscreenHandler}
      */
     private ExtensibleFullscreenHandler createModalFullscreenHandler() {
@@ -622,6 +693,9 @@ public class RNJWPlayerView extends RelativeLayout implements
             mPlayerViewContainer.post(new Runnable() {
                 @Override
                 public void run() {
+                    // View may not have been removed properly (especially if returning from PiP)
+                    mPlayerViewContainer.removeView(mPlayerView);
+                    
                     mPlayerViewContainer.addView(mPlayerView, new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
                             ViewGroup.LayoutParams.MATCH_PARENT));
@@ -714,6 +788,11 @@ public class RNJWPlayerView extends RelativeLayout implements
                         mPlayer.setForceControlsVisibility(true);
                         mPlayer.setForceControlsVisibility(false);
 
+                        // If player was in fullscreen when going into PiP, we need to force it back out
+                        if (mPlayer.getFullscreen()) {
+                            mPlayer.setFullscreen(false, true);
+                        }
+
                         // Strip player view
                         rootView.removeView(mPlayerView);
 
@@ -966,6 +1045,11 @@ public class RNJWPlayerView extends RelativeLayout implements
                 LinearLayout.LayoutParams.MATCH_PARENT));
         addView(mPlayerView);
 
+        // Ensure we have a valid state before applying to the player
+        registry.setCurrentState(Lifecycle.State.STARTED);
+
+        mPlayer = mPlayerView.getPlayer(this);
+
         if (prop.hasKey("controls")) { // Hack for controls hiding not working right away
             mPlayerView.getPlayer().setControls(prop.getBoolean("controls"));
         }
@@ -992,8 +1076,6 @@ public class RNJWPlayerView extends RelativeLayout implements
             mPlayerView.exitFullScreenOnPortrait = exitFullScreenOnPortrait;
         }
 
-        mPlayer = mPlayerView.getPlayer();
-
         if (isJwConfig) {
             mPlayer.setup(jwConfig);
         } else {
@@ -1015,7 +1097,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         // Legacy
         // This isn't the ideal way to do this on Android. All drawables/colors/themes shoudld
         // be targed using styling. See `https://docs.jwplayer.com/players/docs/android-styling-guide`
-        // for more information on how best to override the JWP styles using XML. If you are unsure of a 
+        // for more information on how best to override the JWP styles using XML. If you are unsure of a
         // color/drawable/theme, open an `Ask` issue.
         if (mColors != null) {
             if (mColors.hasKey("backgroundColor")) {
@@ -1072,8 +1154,6 @@ public class RNJWPlayerView extends RelativeLayout implements
 
         if (backgroundAudioEnabled) {
             audioManager = (AudioManager) simpleContext.getSystemService(Context.AUDIO_SERVICE);
-            // Throws a fatal error if using a playlistURL instead of manually created playlist
-            // Related to SDK-11346
             mMediaServiceController = new MediaServiceController.Builder((AppCompatActivity) mActivity, mPlayer)
                     .build();
         }
@@ -1331,7 +1411,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         event.putString("message", "onPlayerAdWarning");
         event.putInt("code", adWarningEvent.getCode());
         event.putInt("adErrorCode", adWarningEvent.getAdErrorCode());
-        event.putString("error", adWarningEvent.getMessage());
+        event.putString("warning", adWarningEvent.getMessage());
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topPlayerAdWarning", event);
     }
 
@@ -1437,6 +1517,38 @@ public class RNJWPlayerView extends RelativeLayout implements
 
     }
 
+    // Captions Events
+
+    @Override
+    public void onCaptionsChanged(CaptionsChangedEvent captionsChangedEvent) {
+        WritableMap event = Arguments.createMap();
+        event.putString("message", "onCaptionsChanged");
+        event.putInt("index", captionsChangedEvent.getCurrentTrack());
+        getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topCaptionsChanged", event);
+    }
+
+    @Override
+    public void onCaptionsList(CaptionsListEvent captionsListEvent) {
+        WritableMap event = Arguments.createMap();
+        List<Caption> captionTrackList = captionsListEvent.getCaptions();
+        WritableArray captionTracks = Arguments.createArray();
+        if (captionTrackList != null) {
+            for(int i = 0; i < captionTrackList.size(); i++) {
+                WritableMap captionTrack = Arguments.createMap();
+                Caption track = captionTrackList.get(i);
+                captionTrack.putString("file", track.getFile());
+                captionTrack.putString("label", track.getLabel());
+                captionTrack.putBoolean("default", track.isDefault());
+                captionTracks.pushMap(captionTrack);
+            }
+        }
+        event.putString("message", "onCaptionsList");
+        event.putInt("index", captionsListEvent.getCurrentCaptionIndex());
+        event.putArray("tracks", captionTracks);
+        getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topCaptionsList", event);
+
+    }
+
     // Player Events
 
     @Override
@@ -1485,6 +1597,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         if (ex != null) {
             event.putString("error", ex.toString());
             event.putString("description", errorEvent.getMessage());
+            event.putInt("errorCode", errorEvent.getErrorCode());
         }
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topPlayerError", event);
 
@@ -1635,6 +1748,8 @@ public class RNJWPlayerView extends RelativeLayout implements
     public void onSetupError(SetupErrorEvent setupErrorEvent) {
         WritableMap event = Arguments.createMap();
         event.putString("message", "onSetupError");
+        event.putString("errorMessage", setupErrorEvent.getMessage());
+        event.putInt("errorCode", setupErrorEvent.getCode());
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topSetupPlayerError", event);
 
         updateWakeLock(false);
@@ -1649,16 +1764,6 @@ public class RNJWPlayerView extends RelativeLayout implements
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topTime", event);
     }
 
-    @Override
-    public void onCaptionsChanged(CaptionsChangedEvent captionsChangedEvent) {
-
-    }
-
-    @Override
-    public void onCaptionsList(CaptionsListEvent captionsListEvent) {
-
-    }
-
     @Override
     public void onMeta(MetaEvent metaEvent) {
 
@@ -1678,6 +1783,17 @@ public class RNJWPlayerView extends RelativeLayout implements
 
     // Casting events
 
+    private boolean mIsCastActive = false;
+
+    /**
+     * Get if this player-view is currently casting
+     *
+     * @return true if casting
+     */
+    public boolean getIsCastActive() {
+        return mIsCastActive;
+    }
+
     @Override
     public void onCast(CastEvent castEvent) {
         WritableMap event = Arguments.createMap();
@@ -1686,6 +1802,7 @@ public class RNJWPlayerView extends RelativeLayout implements
         event.putBoolean("active", castEvent.isActive());
         event.putBoolean("available", castEvent.isAvailable());
         getReactContext().getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "topCasting", event);
+        mIsCastActive = castEvent.isActive();
         // stop/start the background audio service if it's running and we're casting
         if (castEvent.isActive()) {
             doUnbindService();

package/android/src/main/java/com/jwplayer/rnjwplayer/RNJWPlayerViewManager.java

@@ -155,6 +155,14 @@ public class RNJWPlayerViewManager extends SimpleViewManager<RNJWPlayerView> {
                     MapBuilder.of(
                             "phasedRegistrationNames",
                             MapBuilder.of("bubbled", "onAudioTracks")))
+            .put("topCaptionsChanged",
+                    MapBuilder.of(
+                            "phasedRegistrationNames",
+                            MapBuilder.of("bubbled", "onCaptionsChanged")))
+            .put("topCaptionsList",
+                    MapBuilder.of(
+                            "phasedRegistrationNames",
+                            MapBuilder.of("bubbled", "onCaptionsList")))
             .put("topCasting",
                     MapBuilder.of(
                             "phasedRegistrationNames",

package/android/src/main/java/com/jwplayer/rnjwplayer/Util.java

@@ -2,17 +2,21 @@ package com.jwplayer.rnjwplayer;
 
 import static androidx.media3.common.util.Util.toByteArray;
 
+import android.util.Log;
 import android.util.Patterns;
 import android.webkit.URLUtil;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.jwplayer.pub.api.JsonHelper;
 import com.jwplayer.pub.api.media.ads.AdBreak;
 import com.jwplayer.pub.api.media.captions.Caption;
 import com.jwplayer.pub.api.media.captions.CaptionType;
 import com.jwplayer.pub.api.media.playlists.MediaSource;
 import com.jwplayer.pub.api.media.playlists.PlaylistItem;
 
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -20,8 +24,8 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Locale;
+import java.util.Map;
 
 public class Util {
 
@@ -62,7 +66,7 @@ public class Util {
         }
     }
 
-    public static boolean isValidURL(String url){
+    public static boolean isValidURL(String url) {
         return URLUtil.isValidUrl(url) && Patterns.WEB_URL.matcher(url).matches();
     }
 
@@ -75,14 +79,28 @@ public class Util {
         while (playlistItems.size() > j) {
             ReadableMap playlistItem = playlistItems.getMap(j);
 
-            PlaylistItem newPlayListItem = getPlaylistItem((playlistItem));
-            playlist.add(newPlayListItem);
+            JSONObject obj;
+            PlaylistItem item = null;
+            // Try since legacy config may or may not conform to this standard
+            try {
+                obj = MapUtil.toJSONObject(playlistItem);
+                item = JsonHelper.parsePlaylistItemJson(obj);
+            } catch (Exception ex) {
+                Log.e("createPlaylist", ex.toString());
+            }
+            if (item != null) {
+                playlist.add(item);
+            } else {
+                // Try to use the legacy format
+                PlaylistItem newPlayListItem = getPlaylistItem((playlistItem));
+                playlist.add(newPlayListItem);
+            }
             j++;
         }
         return playlist;
     }
 
-    public static PlaylistItem getPlaylistItem (ReadableMap playlistItem) {
+    public static PlaylistItem getPlaylistItem(ReadableMap playlistItem) {
         PlaylistItem.Builder itemBuilder = new PlaylistItem.Builder();
 
         if (playlistItem.hasKey("file")) {
@@ -194,11 +212,12 @@ public class Util {
 
     /**
      * Internal helper for parsing a caption type from a known string
+     *
      * @param type one of "CAPTIONS", "CHAPTERS", "THUMBNAILS"
      * @return the correct Enum CaptionType
      */
-    public static CaptionType getCaptionType(String type){
-        for (CaptionType captionType: CaptionType.values()) {
+    public static CaptionType getCaptionType(String type) {
+        for (CaptionType captionType : CaptionType.values()) {
             if (captionType.name().equals(type)) {
                 return CaptionType.valueOf(type);
             }

package/badges/version.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20" role="img" aria-label="version: 1.0.2"><title>version: 1.0.2</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="90" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="51" height="20" fill="#555"/><rect x="51" width="39" height="20" fill="#007ec6"/><rect width="90" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">version</text><text x="265" y="140" transform="scale(.1)" fill="#fff" textLength="410">version</text><text aria-hidden="true" x="695" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="290">1.0.2</text><text x="695" y="140" transform="scale(.1)" fill="#fff" textLength="290">1.0.2</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20" role="img" aria-label="version: 1.0.3"><title>version: 1.0.3</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="90" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="51" height="20" fill="#555"/><rect x="51" width="39" height="20" fill="#007ec6"/><rect width="90" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">version</text><text x="265" y="140" transform="scale(.1)" fill="#fff" textLength="410">version</text><text aria-hidden="true" x="695" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="290">1.0.3</text><text x="695" y="140" transform="scale(.1)" fill="#fff" textLength="290">1.0.3</text></g></svg>

package/index.d.ts

@@ -26,7 +26,13 @@ declare module "@jwplayer/jwplayer-react-native" {
     advertising?: JwAdvertisingConfig;
     playbackRates?: number[];
     playbackRateControls?: boolean;
+    // Non-Json Parsing props
     license: string;
+    playerInModal?: boolean;
+    fullScreenOnLandscape?: boolean;
+    landscapeOnFullScreen?: boolean;
+    portraitOnExitFullScreen?: boolean;
+    exitFullScreenOnPortrait?: boolean;
   }
 
   type JwThumbnailPreview = 101 | 102 | 103;
@@ -477,6 +483,15 @@ declare module "@jwplayer/jwplayer-react-native" {
     rate: number;
     at: number;
   }
+  interface PlayerSetupErrorProps {
+    errorMessage?: string;
+    errorCode?: number;
+  }
+  interface PlayerErrorProps {
+    error?: string;
+    errorCode?: number;
+    description?: string; // Android Only
+  }
   interface TimeEventProps {
     position: number;
     duration: number;
@@ -498,15 +513,26 @@ declare module "@jwplayer/jwplayer-react-native" {
     error: string;
   }
   interface PlayerWarningEventProps {
-    code: string;
-    warning: string;
+    code?: number;
+    warning?: string;
+    adErrorCode?: number; // Android only
   }
   interface AdEventProps {
     client?: string;
     reason?: string;
     type: number;
   }
-  type NativeError = (event: BaseEvent<PlayerErrorEventProps>) => void;
+  // Overloaded type to be used in multiple error events
+  interface CaptionsChangedEventProps {
+    index?: number;
+  }
+  interface CaptionsListEventProps {
+    index: number;
+    file?: string;
+    label: string;
+    default: string;
+  }
+  type NativeError = (event: BaseEvent<PlayerErrorEventProps> | BaseEvent<PlayerSetupErrorProps> | BaseEvent<PlayerErrorProps>) => void;
   type NativeWarning = (event: BaseEvent<PlayerWarningEventProps>) => void;
   interface PropsType {
     config: Config | JwConfig;
@@ -526,9 +552,9 @@ declare module "@jwplayer/jwplayer-react-native" {
     onRateChanged?: (event?: BaseEvent<RateChangedEventProps>) => void;
     onSetupPlayerError?: NativeError;
     onPlayerError?: NativeError;
-    onPlayerWarning?: NativeWarning;
-    onPlayerAdError?: NativeError;
-    onPlayerAdWarning?: NativeWarning;
+    onPlayerWarning?: NativeWarning; 
+    onPlayerAdError?: NativeError; 
+    onPlayerAdWarning?: NativeWarning; 
     onAdEvent?: (event: BaseEvent<AdEventProps>) => void;
     onAdTime?: (event: BaseEvent<TimeEventProps>) => void;
     onBuffer?: () => void;
@@ -540,6 +566,8 @@ declare module "@jwplayer/jwplayer-react-native" {
     onControlBarVisible?: (event: BaseEvent<ControlBarVisibleEventProps>) => void;
     onPlaylistComplete?: () => void;
     onPlaylistItem?: (event: BaseEvent<PlaylistItemEventProps>) => void;
+    onCaptionsChanged?: (event: BaseEvent<CaptionsChangedEventProps>) => void;
+    onCaptionsList?: (event: BaseEvent<CaptionsListEventProps>) => void;
     onAudioTracks?: () => void;
     shouldComponentUpdate?: (nextProps: any, nextState: any) => boolean;
   }
@@ -558,7 +586,7 @@ declare module "@jwplayer/jwplayer-react-native" {
     setControls(show: boolean): void;
     setLockScreenControls(show: boolean): void;
     seekTo(time: number): void;
-    loadPlaylist(playlistItems: PlaylistItem[]): void;
+    loadPlaylist(playlistItems: PlaylistItem[] | JwPlaylistItem[] | string): void;
     setFullscreen(fullScreen: boolean): void;
     position(): Promise<number>;
     setUpCastController(): void;
@@ -571,6 +599,7 @@ declare module "@jwplayer/jwplayer-react-native" {
     getCurrentAudioTrack(): Promise<number | null>;
     setCurrentAudioTrack(index: number): void;
     setCurrentCaptions(index: number): void;
+    getCurrentCaptions(): Promise<number | null>; 
     setVisibility(visibility: boolean, controls: JWControlType[]): void;
   }
 }

package/index.js

@@ -370,6 +370,9 @@ export default class JWPlayer extends Component {
 		getCurrentAudioTrack: PropTypes.func,
 		setCurrentAudioTrack: PropTypes.func,
 		setCurrentCaptions: PropTypes.func,
+		getCurrentCaptions: PropTypes.func,
+		onCaptionsChanged: PropTypes.func,
+		onCaptionsList: PropTypes.func,
 		onAudioTracks: PropTypes.func,
 	};
 
@@ -688,6 +691,21 @@ export default class JWPlayer extends Component {
 			);
 		}
 	}
+	
+	async getCurrentCaptions() {
+		if (RNJWPlayerManager) {
+			try {
+				var currentCaptionTrack =
+					await RNJWPlayerManager.getCurrentCaptions(
+						this.getRNJWPlayerBridgeHandle()
+					);
+				return currentCaptionTrack;
+			} catch (e) {
+				console.error(e);
+				return null;
+			}
+		}
+	}
 
 	getRNJWPlayerBridgeHandle() {
 		return findNodeHandle(this[this.ref_key]);