react-native-theoplayer 2.3.0 → 2.4.0

package/lib/typescript/api/source/SourceDescription.d.ts

@@ -204,6 +204,12 @@ export interface TextTrackDescription {
  * @public
  */
 export interface BaseSource {
+    /**
+     * The cross-origin setting of the source.
+     *
+     * @defaultValue `''`
+     */
+    crossOrigin?: CrossOriginSetting;
     /**
      * The URL of a time server used by the player to synchronise the time in DASH sources.
      *

package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts

@@ -25,9 +25,10 @@ export declare class WebMediaSession {
     private onAdbreakBegin;
     private onAdbreakEnd;
     private isLive;
-    private isAd;
+    private isInAd;
     private isInBackground;
     private isTrickplayEnabled;
     private isPlayPauseEnabled;
+    private isBackgroundAudioEnabled;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/api/source/SourceDescription.ts

@@ -223,6 +223,14 @@ export interface TextTrackDescription {
  * @public
  */
 export interface BaseSource {
+
+  /**
+   * The cross-origin setting of the source.
+   *
+   * @defaultValue `''`
+   */
+  crossOrigin?: CrossOriginSetting;
+
   /**
    * The URL of a time server used by the player to synchronise the time in DASH sources.
    *

package/src/internal/THEOplayerView.tsx

@@ -254,7 +254,12 @@ export class THEOplayerView extends PureComponent<React.PropsWithChildren<THEOpl
 
   private _onTextTrackEvent = (event: NativeSyntheticEvent<NativeTextTrackEvent>) => {
     const nativeEvent = event.nativeEvent;
-    this._facade.dispatchEvent(new DefaultTextTrackEvent(toTextTrackEventType(nativeEvent.type), nativeEvent.trackUid, nativeEvent.cue));
+    const cue = nativeEvent.cue;
+    if (cue) {
+      cue.startTime = decodeNanInf(cue.startTime);
+      cue.endTime = decodeNanInf(cue.endTime);
+    }
+    this._facade.dispatchEvent(new DefaultTextTrackEvent(toTextTrackEventType(nativeEvent.type), nativeEvent.trackUid, cue));
   };
 
   private _onMediaTrackListEvent = (event: NativeSyntheticEvent<NativeMediaTrackListEvent>) => {

package/src/internal/THEOplayerView.web.tsx

@@ -15,21 +15,18 @@ export function THEOplayerView(props: React.PropsWithChildren<THEOplayerViewProp
     // Create player inside container.
     if (container.current) {
       const chromeless = config?.chromeless === true || config?.chromeless === undefined;
+      const updatedConfig = {...config, allowNativeFullscreen: true};
       if (chromeless) {
-        player.current = new THEOplayer.ChromelessPlayer(container.current, config);
+        player.current = new THEOplayer.ChromelessPlayer(container.current, updatedConfig);
       } else {
         player.current = new THEOplayer.Player(container.current, {
-          ...config,
+          ...updatedConfig,
           ui: {
             fluid: true,
-          },
-          allowNativeFullscreen: true,
+          }
         } as THEOplayer.PlayerConfiguration);
       }
 
-      // Prepare the player to ChromelessPlayer.autoplay on platforms where autoplay is restricted without user action.
-      player.current.prepareWithUserAction();
-
       // Adapt native player to react-native player.
       adapter.current = new THEOplayerWebAdapter(player.current, config);
 

package/src/internal/adapter/THEOplayerAdapter.ts

@@ -372,7 +372,7 @@ export class THEOplayerAdapter extends DefaultEventDispatcher<PlayerEventMap> im
   set selectedTextTrack(trackUid: number | undefined) {
     this._state.selectedTextTrack = trackUid;
     this.textTracks.forEach((track) => {
-      if (track.uid == trackUid) {
+      if (track.uid === trackUid) {
         track.mode = TextTrackMode.showing;
       } else if (track.mode === TextTrackMode.showing) {
         track.mode = TextTrackMode.disabled;

package/src/internal/adapter/web/TrackUtils.ts

@@ -7,13 +7,14 @@ import type {
   TextTracksList as NativeTextTrackList,
 } from 'theoplayer';
 import type { MediaTrack, TextTrack, TextTrackCue } from 'react-native-theoplayer';
+import { decodeNanInf } from '../../utils/TypeUtils';
 
 export function fromNativeCue(cue: NativeTextTrackCue): TextTrackCue {
   return {
     id: cue.id,
     uid: cue.uid,
-    startTime: 1e3 * cue.startTime,
-    endTime: 1e3 * cue.endTime,
+    startTime: decodeNanInf(1e3 * cue.startTime),
+    endTime: decodeNanInf(1e3 * cue.endTime),
     content: cue.content,
   } as TextTrackCue;
 }

package/src/internal/adapter/web/WebMediaSession.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 import type { ChromelessPlayer } from 'theoplayer';
 import type { THEOplayerWebAdapter } from '../THEOplayerWebAdapter';
-import { PresentationMode } from 'react-native-theoplayer';
 
 interface WebMediaSessionConfig {
   skipTime: number;
@@ -151,43 +150,29 @@ export class WebMediaSession {
     return !isFinite(this._player.duration);
   }
 
-  private isAd(): boolean {
-    return this._player.ads?.playing == true;
+  private isInAd(): boolean {
+    return this._player.ads?.playing === true;
   }
 
   private isInBackground(): boolean {
     return document.visibilityState !== 'visible';
   }
 
+  // By default, only show trick-play buttons if:
+  // - backgroundAudio is enabled, or the player is in foreground;
+  // - and, the current asset is neither a live stream, nor an ad.
   private isTrickplayEnabled(): boolean {
-    // By default, no trickplay for live
-    if (this.isLive()) {
-      return false;
-    }
-
-    // In PiP mode, disable trick-play for ads.
-    if (this._webAdapter.presentationMode === PresentationMode.pip) {
-      return !this.isAd();
-    }
-    // During background playback
-    if (this.isInBackground()) {
-      // Disable trick-play for ads.
-      return !(this.isAd() || this.isLive());
-    }
-    return true;
+    return (this.isBackgroundAudioEnabled() || !this.isInBackground()) && !this.isLive() && !this.isInAd();
   }
 
+  // By default, only show a play/pause button if:
+  // - backgroundAudio is enabled, or the player is in foreground;
+  // - and, the current asset is not an ad.
   private isPlayPauseEnabled(): boolean {
-    // In PiP mode
-    if (this._webAdapter.presentationMode === PresentationMode.pip) {
-      // Disable play/pause for ads
-      return !this.isAd();
-    }
-    // During background playback
-    if (this.isInBackground()) {
-      // Disable play/pause for ads & live content.
-      return !(this.isAd() || this.isLive());
-    }
-    return true;
+    return (this.isBackgroundAudioEnabled() || !this.isInBackground()) && !this.isInAd();
+  }
+
+  private isBackgroundAudioEnabled(): boolean {
+    return this._webAdapter.backgroundAudioConfiguration.enabled === true;
   }
 }

package/src/internal/adapter/web/WebPresentationModeManager.ts

@@ -63,7 +63,7 @@ export class WebPresentationModeManager {
       }
     }
     // listen for pip updates on element
-    if (this._element != null) {
+    if (this._element !== undefined) {
       this._element.onenterpictureinpicture = () => {
         this.updatePresentationMode();
       };