@applicaster/zapp-react-native-ui-components 13.0.0-alpha.3592223128 → 13.0.0-alpha.4120155420

package/Components/Cell/TvOSCellComponent.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import * as R from "ramda";
 import { View, StyleSheet } from "react-native";
 
-import { Focusable } from "@applicaster/zapp-react-native-ui-components/Components/Focusable";
+import { Focusable } from "@applicaster/zapp-react-native-ui-components/Components/Focusable/FocusableTvOS";
 import { FocusableCell } from "@applicaster/zapp-react-native-ui-components/Components/FocusableCell";
 import { getItemType } from "@applicaster/zapp-react-native-utils/navigationUtils";
 import { SCREEN_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/itemTypes";

package/Components/FocusableScrollView/index.tsx

@@ -11,6 +11,13 @@ import {
   useInitialFocus,
 } from "@applicaster/zapp-react-native-utils/focusManager";
 
+export type FocusableScrollViewRenderItem = (info: {
+  item: ZappUIComponent;
+  index: number;
+  focused: boolean;
+  parentFocus: ParentFocus;
+}) => React.ReactElement;
+
 export type Props = ScrollViewProps & {
   id?: number | string;
   horizontal?: boolean;
@@ -32,12 +39,7 @@ export type Props = ScrollViewProps & {
   initialFocusDirection?: FocusManager.Android.FocusNavigationDirections;
   onAllComponentsLoaded?: () => void;
   omitPropsPropagation?: Array<keyof FlatListProps<any>>;
-  renderItem: (info: {
-    item: ZappUIComponent;
-    index: number;
-    focused: boolean;
-    parentFocus: ParentFocus;
-  }) => React.ReactElement;
+  renderItem: FocusableScrollViewRenderItem;
 } & ParentFocus;
 
 type State = boolean[];
@@ -73,7 +75,7 @@ const extendScrollViewRef = (_ref, childCompsMeasurementsMap) => {
   };
 
   _ref.scrollToIndex = (params) => {
-    const { index, viewOffset } = params;
+    const { index, viewOffset = 0 } = params;
 
     const itemByIndex = R.find(R.propEq("index", index))(
       R.values(childCompsMeasurementsMap)
@@ -129,8 +131,14 @@ function FocusableScrollViewComponent(props: Props, ref) {
   );
 
   const getFocusableEntryId = React.useCallback(
-    (_entry: ZappEntry, index?: number) => {
-      const entry = R.isNil(index) ? _entry : data[index];
+    (_entry: ZappEntry | null, index?: number) => {
+      const entry = R.isNil(index)
+        ? Array.isArray(_entry)
+          ? _entry[0]
+          : _entry
+        : Array.isArray(data[index])
+        ? data[index][0]
+        : data[index];
 
       return entry ? `${props.id}--${entry?.id}` : undefined;
     },
@@ -273,11 +281,18 @@ function FocusableScrollViewComponent(props: Props, ref) {
   const renderItem = React.useCallback(
     (item, index) => {
       const renderArgs = { item, index };
-      const id = `${props.id}--${renderArgs?.item?.id}`;
-      const nextFocus = getNextFocus(renderArgs?.index);
+
+      const id = getFocusableEntryId(
+        Array.isArray(item) ? item[0] : item,
+        index
+      );
+
+      const nextFocus = getNextFocus(index);
 
       const onItemLayout = (event) => {
-        childCompsMeasurementsMap.current[item.id] = {
+        childCompsMeasurementsMap.current[
+          Array.isArray(item) ? index : item.id
+        ] = {
           index,
           layout: event.nativeEvent.layout,
         };

package/Components/Screen/index.tsx

@@ -128,7 +128,7 @@ export function Screen(_props: Props) {
     <View style={style}>
       {navBarProps && <NavBar {...navBarProps} hasMenu={hasMenu} />}
 
-      <OfflineFallbackScreen screenData={targetScreenData}>
+      <OfflineFallbackScreen>
         {/* @TODO RouteManager doesn't use props, can they be removed ?  */}
         <RouteManager pathname={pathname} screenData={screenData} />
       </OfflineFallbackScreen>

package/Components/VideoModal/PlayerWrapper.tsx

@@ -121,23 +121,16 @@ const getTabletWidth = (
   return Number(width) - sidebarWidth;
 };
 
-const getStyles = (baseStyle, isMobile, isPortrait) => {
-  if (isMobile && isPortrait) {
-    return { width: SCREEN_WIDTH, height: SCREEN_HEIGHT };
-  }
-
-  if (isMobile && !isPortrait) {
-    return { width: SCREEN_HEIGHT, height: SCREEN_WIDTH };
-  }
-
-  return baseStyle;
-};
-
 const showDetails = (
   isMobile: boolean,
   docked: boolean,
-  isInlineModal
+  isInlineModal,
+  pip
 ): boolean => {
+  if (pip) {
+    return false;
+  }
+
   if (!isInlineModal) {
     return false;
   }
@@ -159,7 +152,7 @@ const showDetails = (
 const PlayerWrapperComponent = (props: Props) => {
   const {
     entry,
-    style: baseStyle,
+    style,
     containerStyle,
     inline,
     docked,
@@ -174,7 +167,7 @@ const PlayerWrapperComponent = (props: Props) => {
 
   const isInlineModal = inline && isModal;
 
-  const style = getStyles(baseStyle, !isTablet, isInlineModal);
+  // const style = getStyles(baseStyle, !isTablet, isInlineModal, pip);
 
   const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
 
@@ -253,7 +246,7 @@ const PlayerWrapperComponent = (props: Props) => {
         </View>
 
         <AnimatedScrollModal>
-          {showDetails(!isTablet, docked, isInlineModal) && (
+          {showDetails(!isTablet, docked, isInlineModal, pip) && (
             <AnimationComponent
               animationType={ComponentAnimationType.componentFade}
               style={defaultStyles.flex}

package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap

@@ -27,8 +27,8 @@ exports[`PlayerWrapper renders inline 1`] = `
           "backgroundColor": "transparent",
         },
         Object {
-          "height": 1334,
-          "width": 750,
+          "height": 800,
+          "width": 300,
         },
         Object {},
       ]
@@ -133,8 +133,8 @@ exports[`PlayerWrapper renders inline and docked 1`] = `
           "backgroundColor": "transparent",
         },
         Object {
-          "height": 1334,
-          "width": 750,
+          "height": undefined,
+          "width": 300,
         },
         Object {},
       ]
@@ -361,8 +361,8 @@ exports[`PlayerWrapper renders properly 1`] = `
           "backgroundColor": "transparent",
         },
         Object {
-          "height": 750,
-          "width": 1334,
+          "height": 800,
+          "width": 300,
         },
         Object {},
       ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "13.0.0-alpha.3592223128",
+  "version": "13.0.0-alpha.4120155420",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -34,10 +34,10 @@
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-alpha.3592223128",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.3592223128",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.3592223128",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.3592223128",
+    "@applicaster/applicaster-types": "13.0.0-alpha.4120155420",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.4120155420",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.4120155420",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.4120155420",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",