@applicaster/zapp-react-native-ui-components 13.0.0-alpha.3311671337 → 13.0.0-alpha.3322736490

package/Components/Cell/Cell.tsx

@@ -12,6 +12,7 @@ import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 import { CellWithFocusable } from "./CellWithFocusable";
 import { BaseFocusable } from "../BaseFocusable";
 import { AccessibilityManager } from "@applicaster/zapp-react-native-utils/appUtils/accessibilityManager";
+import { styles } from "./styles";
 
 type Props = {
   item: ZappEntry;
@@ -68,17 +69,6 @@ type State = {
   hasFocusableInside: boolean;
 };
 
-const baseCellStyles = {
-  height: "100%",
-  display: "flex",
-  flex: 1,
-} as const;
-
-const touchableStyles = {
-  flex: 1,
-  height: "100%",
-} as const;
-
 export class CellComponent extends React.Component<Props, State> {
   constructor(props) {
     super(props);
@@ -252,7 +242,7 @@ export class CellComponent extends React.Component<Props, State> {
       <View
         testID={`${component?.id}-${id}`}
         accessible={false}
-        style={touchableStyles}
+        style={styles.touchableCell}
       >
         <Focusable
           id={focusableId}
@@ -264,7 +254,7 @@ export class CellComponent extends React.Component<Props, State> {
           hasReceivedFocus={hasReceivedFocus || this.hasReceivedFocus}
           preferredFocus={preferredFocus}
           offsetUpdater={offsetUpdater}
-          style={baseCellStyles}
+          style={styles.baseCell}
           isFocusable={isFocusable}
           skipFocusManagerRegistration={skipFocusManagerRegistration}
         >

package/Components/Cell/CellWithFocusable.tsx

@@ -5,6 +5,8 @@ import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/
 
 import { useCellState } from "../MasterCell/utils";
 import { FocusableGroup } from "../FocusableGroup";
+import { CellWrapper } from "./CellWrapper";
+import { styles } from "./styles";
 
 type Props = {
   item: ZappEntry;
@@ -21,6 +23,8 @@ type Props = {
   focused?: boolean;
 };
 
+const addPrefix = (id: string) => `focusable-cell-wrapper-${id}`;
+
 export function CellWithFocusable(props: Props) {
   const {
     index,
@@ -40,7 +44,7 @@ export function CellWithFocusable(props: Props) {
   const [isFocused, setIsFocused] = React.useState(false);
 
   const state = useCellState({
-    id: item.id,
+    item,
     behavior,
     focused: isFocused || toBooleanWithDefaultFalse(focused),
   });
@@ -79,7 +83,7 @@ export function CellWithFocusable(props: Props) {
 
   return (
     <FocusableGroup
-      id={`focusable-cell-wrapper-${id}`}
+      id={addPrefix(id)}
       testID={"cell-with-focusable-cell-renderer-focusable-group"}
       groupId={groupId}
       preferredFocus={preferredFocus}
@@ -88,19 +92,21 @@ export function CellWithFocusable(props: Props) {
       onBlur={onGroupBlur}
       skipFocusManagerRegistration={skipFocusManagerRegistration}
     >
-      <CellRenderer
-        testID={"cell-with-focusable-cell-renderer"}
-        item={item}
-        groupId={`focusable-cell-wrapper-${id}`}
-        onToggleFocus={handleToggleFocus}
-        state={state}
-        prefixId={id}
-        focusedButtonId={focusedButtonId}
-        preferredFocus={true}
-        skipFocusManagerRegistration={skipFocusManagerRegistration}
-        isFocusable={isFocusable}
-        focused={focused}
-      />
+      <CellWrapper style={styles.cellWrapper}>
+        <CellRenderer
+          testID={"cell-with-focusable-cell-renderer"}
+          item={item}
+          groupId={addPrefix(id)}
+          onToggleFocus={handleToggleFocus}
+          state={state}
+          prefixId={id}
+          focusedButtonId={focusedButtonId}
+          preferredFocus={true}
+          skipFocusManagerRegistration={skipFocusManagerRegistration}
+          isFocusable={isFocusable}
+          focused={focused}
+        />
+      </CellWrapper>
     </FocusableGroup>
   );
 }

package/Components/Cell/CellWrapper.tsx

@@ -0,0 +1,18 @@
+import * as React from "react";
+import { View, ViewStyle } from "react-native";
+import { isTvOSPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
+
+const isTvOS = isTvOSPlatform();
+
+type Props = {
+  style: ViewStyle;
+  children: React.ReactNode;
+};
+
+export const CellWrapper = ({ style, children }: Props) => {
+  if (isTvOS) {
+    return <View style={style}>{children}</View>;
+  }
+
+  return <>{children}</>;
+};

package/Components/Cell/styles.ts

@@ -0,0 +1,17 @@
+import { StyleSheet } from "react-native";
+
+export const styles = StyleSheet.create({
+  cellWrapper: {
+    flex: 0,
+    height: "100%",
+  },
+  baseCell: {
+    height: "100%",
+    display: "flex",
+    flex: 1,
+  },
+  touchableCell: {
+    flex: 1,
+    height: "100%",
+  },
+});

package/Components/ErrorScreen/index.tsx

@@ -105,6 +105,11 @@ const defaultProps = {
       alignItems: "center",
       justifyContent: "center",
     },
+    focusedButton: {
+      backgroundColor: "#3a3a3a",
+      borderColor: "#ffffff",
+      borderWidth: 2,
+    },
     buttonText: {
       fontFamily: platformSelect({
         ios: "SFProText-Medium",
@@ -116,6 +121,9 @@ const defaultProps = {
       color: "rgba(255, 255, 255, 1)",
       textTransform: "uppercase",
     },
+    focusedText: {
+      color: "#ffffff",
+    },
   },
 };
 

package/Components/FocusableCell/index.tsx

@@ -23,7 +23,7 @@ export function FocusableCell(props: Props) {
     behavior,
   } = props;
 
-  const state = useCellState({ id: item.id, behavior, focused });
+  const state = useCellState({ item, behavior, focused });
 
   React.useEffect(() => {
     if (focused && scrollTo && !isAndroid) {

package/Components/HandlePlayable/HandlePlayable.tsx

@@ -1,17 +1,18 @@
 import * as React from "react";
 import * as R from "ramda";
-import { ViewStyle } from "react-native";
 import {
   findPluginByType,
   findPluginByIdentifier,
 } from "@applicaster/zapp-react-native-utils/pluginUtils";
-import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks/layout";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
-import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
-import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
+import {
+  useDimensions,
+  useNavigation,
+} from "@applicaster/zapp-react-native-utils/reactHooks";
 
 import { BufferAnimation } from "../PlayerContainer/BufferAnimation";
 import { PlayerContainer } from "../PlayerContainer";
+import { useModalSize } from "../VideoModal/hooks";
 
 type Props = {
   item: ZappEntry;
@@ -78,12 +79,6 @@ const getPlayer = (
   return getPlayerWithModuleProperties(PlayerModule);
 };
 
-const dimensionsContext: "window" | "screen" = platformSelect({
-  android_tv: "window",
-  amazon: "window",
-  default: "screen",
-});
-
 type PlayableComponent = {
   Component: React.ComponentType<any>;
 };
@@ -91,16 +86,11 @@ type PlayableComponent = {
 export function HandlePlayable({
   item,
   isModal,
-  modalHeight,
-  modalWidth,
   mode,
   groupId,
 }: Props): React.ReactElement | null {
   const state = usePickFromState();
 
-  const { width: screenWidth, height: screenHeight } =
-    useDimensions(dimensionsContext);
-
   const { closeVideoModal } = useNavigation();
 
   const [Player, playerModuleProperties] = getPlayer(item, state);
@@ -118,9 +108,7 @@ export function HandlePlayable({
     if (!isModal) {
       closeVideoModal();
     }
-  }, []);
 
-  React.useEffect(() => {
     const castStateHandler = async () => {
       const castState = await CastPlugin?.getCastState();
       setCasting(castState === "Connected");
@@ -142,23 +130,29 @@ export function HandlePlayable({
   }, []);
 
   React.useEffect(() => {
-    if (casting) {
-      setPlayable({ Component: CastPlugin?.CastHandler });
-    } else {
-      setPlayable({ Component: PlayerContainer });
-    }
+    setPlayable({
+      Component: casting ? CastPlugin?.CastHandler : PlayerContainer,
+    });
   }, [casting]);
 
-  const Component = playable?.Component;
+  const { width: screenWidth, height: screenHeight } = useDimensions("window");
+
+  const modalSize = useModalSize();
 
   const style = React.useMemo(
     () => ({
-      width: isModal ? modalWidth : mode === "PIP" ? "100%" : screenWidth,
-      height: isModal ? modalHeight : mode === "PIP" ? "100%" : screenHeight,
+      width: isModal ? modalSize.width : mode === "PIP" ? "100%" : screenWidth,
+      height: isModal
+        ? modalSize.height
+        : mode === "PIP"
+          ? "100%"
+          : screenHeight,
     }),
-    [screenWidth, screenHeight, modalHeight, modalWidth, isModal, mode]
+    [screenWidth, screenHeight, modalSize, isModal, mode]
   );
 
+  const Component = playable?.Component;
+
   if (Component) {
     return (
       <Component
@@ -174,5 +168,5 @@ export function HandlePlayable({
     );
   }
 
-  return !isModal ? <BufferAnimation videoStyle={style as ViewStyle} /> : null;
+  return !isModal ? <BufferAnimation videoStyle={style} /> : null;
 }

package/Components/MasterCell/DefaultComponents/Image/Image.ios.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { Image as RnImage, ImageStyle } from "react-native";
-import * as R from "ramda";
+import { equals, omit } from "ramda";
 
 import { useImageSource } from "./hooks";
 
@@ -17,7 +17,7 @@ type Props = Record<string, any> & {
   withDimensions: (source: Source) => Source;
 };
 
-const MemoizedImage = React.memo(RnImage, R.equals);
+const MemoizedImage = React.memo(RnImage, equals);
 
 function Image({
   style,
@@ -44,11 +44,12 @@ function Image({
 
   return (
     <MemoizedImage
+      key={_source?.uri || "no-image"}
       style={style as ImageStyle}
       onError={React.useCallback(() => setErrorState(true), [])}
       // as we have defaults as "" for placeholder image, we need to pass undefined to source to not throw warnings
       source={_source?.uri ? _source : undefined}
-      {...R.omit(["source"], otherProps)}
+      {...omit(["source"], otherProps)}
     />
   );
 }

package/Components/MasterCell/DefaultComponents/Image/hooks/useImage.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as R from "ramda";
+import { path } from "ramda";
 
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
@@ -7,9 +7,13 @@ import { extractAsset } from "./utils";
 
 type Return = { uri: string } | null;
 
+const getSourceContext = path(["source", "context"]);
+const getSourceUri = path(["source", "uri"]);
+const getState = path(["state"]);
+
 export const useImageSource = ({ uri, entry, otherProps }): Return => {
-  const uriContext = R.path(["source", "context"], otherProps);
-  const uriState = R.path(["state"], otherProps);
+  const uriContext = getSourceContext(otherProps);
+  const uriState = getState(otherProps);
 
   const action = useActions(uriContext);
 
@@ -34,7 +38,7 @@ export const useImageSource = ({ uri, entry, otherProps }): Return => {
     return { uri };
   }
 
-  const uriFromSource = R.path(["source", "uri"], otherProps);
+  const uriFromSource = getSourceUri(otherProps);
 
   if (uriFromSource) {
     return { uri: uriFromSource };
@@ -56,7 +60,7 @@ const getSource = (uri, showDefault, placeholderImage, otherProps) => {
     return { uri };
   }
 
-  const uriFromSource = R.path(["source", "uri"], otherProps);
+  const uriFromSource = getSourceUri(otherProps);
 
   if (uriFromSource) {
     return { uri: uriFromSource };
@@ -72,8 +76,8 @@ export const useImageSourceWithDefault = ({
   placeholderImage,
   otherProps,
 }): Return => {
-  const uriContext = R.path(["source", "context"], otherProps);
-  const uriState = R.path(["state"], otherProps);
+  const uriContext = getSourceContext(otherProps);
+  const uriState = getState(otherProps);
 
   const action = useActions(uriContext);
 

package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/const.ts

@@ -0,0 +1,3 @@
+export const PREFIX = "tv_buttons";
+
+export const BUTTON_PREFIX = `${PREFIX}_button`;

package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/index.ts

@@ -1,4 +1,4 @@
-import * as R from "ramda";
+import { times } from "@applicaster/zapp-react-native-utils/utils";
 import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
 
 import { Button } from "./Button";
@@ -9,13 +9,14 @@ import {
 } from "./utils";
 
 import { compact } from "@applicaster/zapp-react-native-utils/cellUtils";
+import { PREFIX, BUTTON_PREFIX } from "./const";
 
 export {
   insertButtonsBetweenLabels,
   insertButtonsBetweenLabelContainers,
 } from "./utils";
 
-const PREFIX = "tv_buttons";
+const buttonId = (index: number) => `${BUTTON_PREFIX}_${index}`;
 
 type Props = {
   value: Function;
@@ -42,7 +43,6 @@ export const TvActionButtons = ({
     return null;
   }
 
-  const prefix1Button = `${PREFIX}_button_1`;
   const independentStyles = value(`${PREFIX}_container_independent_styles`);
 
   return {
@@ -73,11 +73,11 @@ export const TvActionButtons = ({
       buttonsCount,
     },
     elements: compact(
-      R.times((index) => {
-        const prefixSpecificButton = `${PREFIX}_button_${index + 1}`;
+      times((index) => {
+        const prefixSpecificButton = buttonId(index + 1);
 
         return Button({
-          prefix: independentStyles ? prefixSpecificButton : prefix1Button,
+          prefix: independentStyles ? prefixSpecificButton : buttonId(1),
           value,
           platformValue,
           pluginIdentifier: getPluginIdentifier(configuration, PREFIX, index),

package/Components/MasterCell/utils/behaviorProvider.ts

@@ -6,6 +6,7 @@ import React, { useEffect } from "react";
 import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
 import { BehaviorSubject } from "rxjs";
 import { masterCellLogger } from "../logger";
+import get from "lodash/get";
 
 const parseContextKey = (key: string): string | null => {
   if (!key?.startsWith("@{ctx/")) return null;
@@ -72,11 +73,13 @@ export const useBehaviorUpdate = (behavior: Behavior) => {
 // We cant use async in this function (its inside render),
 // so we rely on useBehaviorUpdate to update current value and trigger re-render
 export const isCellSelected = (
-  id: string | number,
+  item: ZappEntry,
   behavior?: Behavior
 ): boolean => {
   if (!behavior) return false;
 
+  const id = behavior.selector ? get(item, behavior.selector) : item.id;
+
   if (behavior.selection_source === "now_playing") {
     const player = playerManager.getActivePlayer();
 

package/Components/MasterCell/utils/index.ts

@@ -190,24 +190,24 @@ export const getFocusedButtonId = (focusable) => {
   });
 };
 
-export const isSelected = (id: string | number, behavior?: Behavior) => {
-  return isCellSelected(id, behavior);
+export const isSelected = (item: ZappEntry, behavior?: Behavior) => {
+  return isCellSelected(item, behavior);
 };
 
 export const useCellState = ({
-  id,
+  item,
   behavior,
   focused,
 }: {
-  id: string | number;
+  item: ZappEntry;
   behavior: Behavior;
   focused: boolean;
 }): CellState => {
   const lastUpdate = useBehaviorUpdate(behavior);
 
   const _isSelected = useMemo(
-    () => isSelected(id, behavior),
-    [behavior, id, lastUpdate]
+    () => isSelected(item, behavior),
+    [behavior, item, lastUpdate]
   );
 
   return getCellState({ focused, selected: _isSelected });

package/Components/ModalComponent/Button/assets.ts

@@ -1,4 +1,4 @@
 /* eslint-disable max-len */
 
 export const defaultSelectedAsset: string =
-  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAGsSURBVHgB7drdaYRAFIbhk2yuBTuwlXSQDrKdrOnErSSlpATBe0nOBxEMEXV+nDnjfg8MwiK4vKjMDIoQERERERERERHRY+j7vtHxJvTfb5wvHd/DMLyLpyc5IcTRw6eOZvrtcrlcq6q6i6PTBVqKM/GJdKpAa3EmrpGe5ST2xIFxHF/FwSnuoL1x1L2u66s4KD7QkXGg6EBHx4FiA6WIA0UGShUHiguUMg4UFSh1HCgmUI44UESgXHEgaCatf/wWslLeeY1GMsWBF/GEOHpodeouGkl8Vso7rtFIxjjg9YhNcea/+W4nrFyjkcxxwDnQUpxJrEhW4oBToLU4k9BIluKA60t6M6i+kzrfF7e1OODziLV6uG2d53onWYwDvi/pViJGshoHvCeKsSJZjgNBM+nQSNbjQPBSwzdSCXEgylrMNVIpcSDaYnVvJPWhA9OAZuO87HEg6mreIdIWE3Eg+nZHhEhm4sAh+0EBkUzFgcM2zDwimYsDh+4oOkQyGQcO33LdEclsHEiyJ70SyXScpBAJX3vNRif01yxSJ7SMH1USEREREREREREV7Ad//SBSU+GIIAAAAABJRU5ErkJggg==";
+  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAACXBIWXMAACE4AAAhOAFFljFgAAAA+0lEQVR4nO3a3QnCQBBF4ZRiSXZgKVqKnVnCQBpQwb0QJA752ZjszPlg3/JwOU8b2K4DAAAAAAAAkIOZnczsvPeOQypxHmb27Pv+sveeQxnG0SFSMRaHSIUXJ32kKXHKue+99e+I4yCOgzgO4jiI4yCOgzgO4jiajfMedd366t50nK3/b0LE2SpSqDi1I4WMUytSs3G6z/jbhOGLIzUdR7aKFCKO1I4UKo7UihQyjqyNFDqOLI2UIo7MjZQqjkyNVL7LFUdmRMoXRypEihtHVkSKH0cWRMoTR2ZEyhdHJkTKG0ecSMSRkUjE+TaIRJxfeFQJAAAAAAAANOwFT0Mt2UgcaMoAAAAASUVORK5CYII=";

package/Components/OfflineHandler/utils/index.ts

@@ -57,7 +57,7 @@ export const useNotificationHeight = () => {
 
   const navBarHeight = platformSelect({ ios: 44, android: 56 });
 
-  const statusHeight = Platform.OS === "android" ? 0 : insets.top;
+  const statusHeight = insets.top;
   const notificationHeight = statusHeight + navBarHeight;
 
   return { statusHeight, notificationHeight };

package/Components/PlayerContainer/PlayerContainer.tsx

@@ -9,6 +9,7 @@ import {
   isApplePlatform,
   isTV,
   platformSelect,
+  isAndroidTVPlatform,
 } from "@applicaster/zapp-react-native-utils/reactUtils";
 
 import { TVEventHandlerComponent } from "@applicaster/zapp-react-native-tvos-ui-components/Components/TVEventHandlerComponent";
@@ -91,17 +92,22 @@ export type PlayNextData = {
   onPlayNextPerformNextVideoPlay: () => void;
 };
 
-export type PlayerState = {
-  duration: number;
-  currentTime?: number;
-  seekableDuration: number;
-  isLive: boolean;
-  isBuffering: boolean;
-  isPaused: boolean;
-};
-
 const focusableBottomContainerId = "player-container-bottom";
 
+const isAndroidTV = isAndroidTVPlatform();
+
+const withBorderHack = () => {
+  if (isAndroidTV) {
+    /* @HACK: see GH#7269 */
+    return {
+      borderWidth: 1,
+      borderColor: "transparent",
+    };
+  }
+
+  return {};
+};
+
 // Styles
 const webStyles = {
   focusableGroup: {
@@ -653,7 +659,14 @@ const PlayerContainerComponent = (props: Props) => {
                   testID={"player-screen-container"}
                 >
                   {/* Player container */}
-                  <View style={styles.playerWrapper} testID={"player-wrapper"}>
+                  <View
+                    style={[
+                      styles.playerWrapper,
+                      // eslint-disable-next-line react-native/no-inline-styles, react-native/no-color-literals
+                      withBorderHack(),
+                    ]}
+                    testID={"player-wrapper"}
+                  >
                     <PlayerFocusableWrapperView
                       nextFocusDown={context.bottomFocusableId}
                     >

package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx

@@ -23,10 +23,12 @@ import {
   setScrollModalAnimatedValue,
 } from "./utils";
 
+import { DURATION_TO_MINIMIZE } from "./const";
+
 const getAnimatedConfig = (toValue) => {
   return {
     toValue,
-    duration: 200,
+    duration: DURATION_TO_MINIMIZE,
     useNativeDriver: true,
   };
 };

package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx

@@ -24,8 +24,11 @@ import {
   gestureListenerHelper,
   getAnimationDefaultValue,
   getAnimationStyle,
+  getMoveUpValue,
 } from "./utils";
 
+import { DURATION_TO_MINIMIZE, DEFAULT_DURATION_FOR_ANIMATION } from "./const";
+
 type Props = {
   animationType: string;
   children: React.ReactNode;
@@ -97,14 +100,16 @@ export const AnimationView = ({
 
   const inlineAudioPlayer = additionalData.inlineAudioPlayer;
 
-  const moveUpValue = additionalData.saveArea
-    ? -insets.top + (isAudioItem ? 0 : progressBarHeight)
-    : isTablet
-      ? isTabletLandscape &&
-        (!isAudioItem || (isAudioItem && inlineAudioPlayer))
-        ? -tabletLandscapePlayerTopPosition + progressBarHeight
-        : -130
-      : -50 + progressBarHeight;
+  const moveUpValue = getMoveUpValue({
+    additionalData,
+    insets,
+    isAudioItem,
+    progressBarHeight,
+    isTablet,
+    isTabletLandscape,
+    inlineAudioPlayer,
+    tabletLandscapePlayerTopPosition,
+  });
 
   const moveComponentHorizontalValue = additionalData.moveValue
     ? isRTL
@@ -119,7 +124,10 @@ export const AnimationView = ({
     (animationType, state) => {
       const defaultConfig = {
         toValue: 0,
-        duration: state === PlayerAnimationStateEnum.minimize ? 150 : 100,
+        duration:
+          state === PlayerAnimationStateEnum.minimize
+            ? DURATION_TO_MINIMIZE
+            : DEFAULT_DURATION_FOR_ANIMATION,
         useNativeDriver: true,
       };
 
@@ -440,6 +448,10 @@ export const AnimationComponent = (props: Props) => {
     videoModalState: { visible },
   } = useNavigation();
 
+  if (additionalData?.disableAnimatedComponent) {
+    return <>{props.children}</>;
+  }
+
   const useAnimation =
     visible && !additionalData.disableAnimatedComponent && !isTV();