@jwplayer/jwplayer-react-native 1.0.1 → 1.0.3

package/ios/RNJWPlayer/RNJWPlayerViewManager.swift

@@ -172,7 +172,7 @@ class RNJWPlayerViewManager: RCTViewManager {
         }
     }
     
-    @objc func setVolume(_ reactTag: NSNumber, _ volume: Double) {
+    @objc func setVolume(_ reactTag: NSNumber, _ volume: NSNumber) {
         self.bridge.uiManager.addUIBlock { uiManager, viewRegistry in
             guard let view = viewRegistry?[reactTag] as? RNJWPlayerView else {
                 print("Invalid view returned from registry, expecting RNJWPlayerView, got: \(String(describing: viewRegistry?[reactTag]))")
@@ -180,9 +180,9 @@ class RNJWPlayerViewManager: RCTViewManager {
             }
 
             if let playerView = view.playerView {
-                playerView.player.volume = volume
+                playerView.player.volume = volume.doubleValue
             } else if let playerViewController = view.playerViewController {
-                playerViewController.player.volume = volume
+                playerViewController.player.volume = volume.doubleValue
             }
         }
     }
@@ -412,10 +412,33 @@ class RNJWPlayerViewManager: RCTViewManager {
                 return
             }
 
+            do {
+                if let playerView = view.playerView {
+                    try playerView.player.setCaptionTrack(index: index.intValue)
+                } else if let playerViewController = view.playerViewController {
+                    try playerViewController.player.setCaptionTrack(index: index.intValue)
+                }
+            } catch {
+                print("Error setting caption track: \(error)")
+            }
+        }
+    }
+
+    @objc func getCurrentCaptions(_ reactTag: NSNumber, _ resolve: @escaping RCTPromiseResolveBlock, _ reject: @escaping RCTPromiseRejectBlock) {
+        self.bridge.uiManager.addUIBlock { uiManager, viewRegistry in
+            guard let view = viewRegistry?[reactTag] as? RNJWPlayerView else {
+                let error = NSError(domain: "", code: 0, userInfo: [NSLocalizedDescriptionKey: "There is no player"])
+                reject("no_player", "Invalid view returned from registry, expecting RNJWPlayerView", error)
+                return
+            }
+
             if let playerView = view.playerView {
-                playerView.player.currentCaptionsTrack = index.intValue + 1
+                resolve(NSNumber(value: playerView.player.currentCaptionsTrack))
             } else if let playerViewController = view.playerViewController {
-                playerViewController.player.currentCaptionsTrack = index.intValue + 1
+                resolve(NSNumber(value: playerViewController.player.currentCaptionsTrack))
+            } else {
+                let error = NSError(domain: "", code: 0, userInfo: [NSLocalizedDescriptionKey: "There is no player"])
+                reject("no_player", "There is no player", error)
             }
         }
     }
@@ -457,7 +480,7 @@ class RNJWPlayerViewManager: RCTViewManager {
         }
     }
 
-    @objc func loadPlaylist(_ reactTag: NSNumber, _ playlist: [Any]) {
+    @objc func loadPlaylist(_ reactTag: NSNumber, _ playlist: Any) {
         self.bridge.uiManager.addUIBlock { uiManager, viewRegistry in
             guard let view = viewRegistry?[reactTag] as? RNJWPlayerView else {
                 print("Invalid view returned from registry, expecting RNJWPlayerView, got: \(String(describing: viewRegistry?[reactTag]))")
@@ -466,17 +489,28 @@ class RNJWPlayerViewManager: RCTViewManager {
 
             var playlistArray = [JWPlayerItem]()
 
-            for item in playlist {
-                if let playerItem = try? view.getPlayerItem(item: item as! [String: Any]) {
-                    playlistArray.append(playerItem)
+            if playlist is NSArray {
+                for item in playlist as! [Any] {
+                    // TODO Update this to better parse JWP Playlist Items:
+                    // awaiting JWP SDK exposure of JWJSONParser.playlist
+                    if let playerItem = try? view.getPlayerItem(item: item as! [String: Any]) {
+                        playlistArray.append(playerItem)
+                    }
+                }
+                
+                if let playerView = view.playerView {
+                    playerView.player.loadPlaylist(items: playlistArray)
+                } else if let playerViewController = view.playerViewController {
+                    playerViewController.player.loadPlaylist(items: playlistArray)
+                }
+            } else {
+                if let playerView = view.playerView {
+                    playerView.player.loadPlaylist(url: URL(string: playlist as! String)!)
+                } else if let playerViewController = view.playerViewController {
+                    playerViewController.player.loadPlaylist(url: URL(string: playlist as! String)!)
                 }
             }
-
-            if let playerView = view.playerView {
-                playerView.player.loadPlaylist(items: playlistArray)
-            } else if let playerViewController = view.playerViewController {
-                playerViewController.player.loadPlaylist(items: playlistArray)
-            }
+           
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwplayer/jwplayer-react-native",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "React-native Android/iOS plugin for JWPlayer SDK (https://www.jwplayer.com/)",
   "main": "index.js",
   "types": "./index.d.ts",
@@ -35,11 +35,11 @@
   "license": "MIT",
   "homepage": "https://github.com/jwplayer/jwplayer-react-native#readme",
   "devDependencies": {
-    "lodash": ">= 4.17.21",
+    "badge-maker": "^3.3.1",
     "react": ">= 18.2.0",
     "react-native": ">= 0.72.5"
   },
   "dependencies": {
-    "badge-maker": "^3.3.1"
+    "lodash.isequalwith": "^4.4.0"
   }
 }

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/jwplayer-react-native.iml" filepath="$PROJECT_DIR$/.idea/jwplayer-react-native.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

package/android/.gradle/config.properties

@@ -1,2 +0,0 @@
-#Fri Apr 19 10:10:39 PDT 2024
-java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home

package/android/.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
-  </component>
-</project>

package/android/.idea/gradle.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-        <option name="resolveExternalAnnotations" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

package/android/.idea/migrations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>

package/android/.idea/misc.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

package/android/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

package/android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Fri Apr 19 10:10:39 PDT 2024
-sdk.dir=/Users/jmilham/Library/Android/sdk

package/ios/RNJWPlayer.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

package/ios/RNJWPlayer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

package/ios/RNJWPlayer.xcodeproj/xcuserdata/jmilham.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>RNJWPlayer.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>