@applicaster/quick-brick-player 12.0.0-alpha.7257632022 → 12.0.0-alpha.7725319213

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "12.0.0-alpha.7257632022",
+  "version": "12.0.0-alpha.7725319213",
   "description": "Quick Brick Player",
   "main": "./src/index.ts",
   "types": "index.d.ts",
@@ -38,9 +38,9 @@
   "dependencies": {
     "@applicaster/quick-brick-mobile-transport-controls": "12.0.0-rc.11",
     "@applicaster/quick-brick-tv-transport-controls": "11.0.0-rc.133",
-    "@applicaster/zapp-react-native-tvos-app": "12.0.0-alpha.7257632022",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.7257632022",
-    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.7257632022",
+    "@applicaster/zapp-react-native-tvos-app": "12.0.0-alpha.7725319213",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.7725319213",
+    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.7725319213",
     "keymirror": "^0.1.1",
     "react-native-web-linear-gradient": "1.1.2",
     "shaka-player": "4.3.5",

package/src/Player/index.tsx

@@ -36,6 +36,10 @@ import { AudioPlayerWrapper } from "./AudioLayer/AudioPlayerWrapper";
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
 import { getAllAccessibilityProps } from "@applicaster/zapp-react-native-utils/configurationUtils";
 import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
+import {
+  getTargetScreenDataFromEntry
+} from "@applicaster/zapp-react-native-utils/reactHooks/screen/useTargetScreenData";
+import { isAppleTV } from "@applicaster/zapp-react-native-ui-components/Helpers/Platform";
 
 const RNPlayerManager = {
   QuickBrickPlayerPlugin: isApplePlatform()
@@ -755,7 +759,6 @@ export default class VideoPlayer extends React.Component<
   render() {
     const {
       castAction,
-      controls,
       docked,
       entry,
       fullscreen,
@@ -812,16 +815,32 @@ export default class VideoPlayer extends React.Component<
     const liveCatchUpEnabled =
       this.props.pluginConfiguration?.liveCatchUpEnabled;
 
-    const hideNativeControls = isTV()
-      ? { controls: !this.getPlayNextData() }
-      : {};
+    // TODO: Get screen data more reliable way useCurrentScreenData
+    const screenData = getTargetScreenDataFromEntry(this.props.playableItem);
+
+    const isInlineTV = screenData?.ui_components?.length > 0 && isTV();
 
-    const platformSpecificProps = isApplePlatform()
+    let platformSpecificProps: any = isApplePlatform()
       ? {
-          ...hideNativeControls,
-          resizeMode: nativeResizeMode,
-        }
-      : {};
+        resizeMode: nativeResizeMode,
+      } : {};
+
+    const supportsNativeControls = !!this.props.controller?.supportsNativeControls?.();
+
+    const controls = isAppleTV()
+      ? supportsNativeControls && isInlineTV && !this.getPlayNextData()
+      : supportsNativeControls && !this.getPlayNextData();
+
+    platformSpecificProps = {
+      ...platformSpecificProps,
+      controls
+    };
+
+    console.log("Anton Player render2 ", {
+      platformSpecificProps,
+      isNotInlineTv: !isInlineTV,
+      hasNoPlayNextData: !this.getPlayNextData()
+    });
 
     const pictureInPictureEnabled =
       this.props.pluginConfiguration?.pictureInPictureEnabled;
@@ -830,7 +849,6 @@ export default class VideoPlayer extends React.Component<
       entry, // Must be passed first in list
       ...platformSpecificProps,
       audioTrackId,
-      controls,
       docked,
       enableAutoAudioTrackSelection,
       fullscreen, // TODO: Check fullscreen params not crash
@@ -958,6 +976,8 @@ export default class VideoPlayer extends React.Component<
       ? styles.playerContainerTransparent
       : styles.playerContainerBlack;
 
+    console.log("Anton Player render", {screenData, props: this.props, nativeProps});
+
     const isInline = () => {
       if (isTV()) {
         return inline;
@@ -1087,6 +1107,7 @@ export default class VideoPlayer extends React.Component<
                       listener={this.props.listener}
                       style={getStyle(playerDimensions)}
                       pluginConfiguration={this.getPluginConfiguration()}
+                      controller={this.props.controller}
                     >
                       {this.childrenWithPlayNext()}
                     </this.props.PlayerComponent>
@@ -1123,6 +1144,7 @@ export default class VideoPlayer extends React.Component<
             listener={this.props.listener}
             style={this.takeParentStyle}
             pluginConfiguration={this.getPluginConfiguration()}
+            controller={this.props.controller}
           >
             {this.childrenWithPlayNext()}
           </this.props.PlayerComponent>