@applicaster/zapp-react-native-ui-components 13.0.0-alpha.1360301199 → 13.0.0-alpha.1488035644

package/Components/BaseFocusable/index.ios.ts

@@ -25,7 +25,7 @@ type Props = {
 };
 
 export class BaseFocusable<
-  T extends Props = Props
+  T extends Props = Props,
 > extends BaseFocusableInterface<T> {
   constructor(props) {
     super(props);

package/Components/BaseFocusable/index.tsx

@@ -35,7 +35,7 @@ type Props = {
 };
 
 export class BaseFocusable<
-  T extends Props = Props
+  T extends Props = Props,
 > extends BaseFocusableInterface<T> {
   constructor(props) {
     super(props);

package/Components/Cell/CellWithFocusable.tsx

@@ -34,10 +34,10 @@ const useCellFocusedState = (
       }
     };
 
-    focusManager.on(FOCUS_EVENTS.FOCUS, handler);
+    focusManager.on?.(FOCUS_EVENTS.FOCUS, handler);
 
     return () => {
-      focusManager.removeHandler(FOCUS_EVENTS.FOCUS, handler);
+      focusManager.removeHandler?.(FOCUS_EVENTS.FOCUS, handler);
     };
   }, [groupId, skipFocusManagerRegistration]);
 
@@ -46,7 +46,7 @@ const useCellFocusedState = (
 
 type Props = {
   item: ZappEntry;
-  CellRenderer: React.FunctionComponent<any>;
+  CellRenderer: React.ComponentType<ZappNewCellRendererProps>;
   id: string;
   groupId: string;
   onFocus: Function;
@@ -76,7 +76,7 @@ export function CellWithFocusable(props: Props) {
   } = props;
 
   const isFocused = useCellFocusedState(
-    skipFocusManagerRegistration,
+    skipFocusManagerRegistration || false,
     groupId,
     id
   );
@@ -96,13 +96,16 @@ export function CellWithFocusable(props: Props) {
     }
   }, [focusedButtonId]);
 
-  const handleToggleFocus = (value) => {
-    setFocusedButtonId(value.focusedButtonId);
+  const handleToggleFocus = React.useCallback(
+    (value) => {
+      setFocusedButtonId(value.focusedButtonId);
 
-    if (value.focusable) {
-      onFocus(value.focusable, value.mouse);
-    }
-  };
+      if (value.focusable) {
+        onFocus(value.focusable, value.mouse);
+      }
+    },
+    [onFocus]
+  );
 
   return (
     <CellRenderer

package/Components/Focusable/Touchable.tsx

@@ -1,25 +1,24 @@
 import * as React from "react";
 
-type Props =
-  | {
-      id: string;
-      children: React.ReactNode;
-      onPress?: (ref: FocusManager.TouchableRef) => void;
-      onPressIn?: (ref: FocusManager.TouchableRef) => void;
-      onPressOut?: (ref: FocusManager.TouchableRef) => void;
-      onLongPress?: (ref: FocusManager.TouchableRef) => void;
-      onFocus?: (
-        ref: FocusManager.TouchableRef,
-        options: FocusManager.Android.CallbackOptions
-      ) => void;
-      onBlur?: (
-        ref: FocusManager.TouchableRef,
-        options: FocusManager.Android.CallbackOptions
-      ) => void;
-
-      disableFocus?: boolean;
-      blockFocus?: boolean;
-    } & Partial<ParentFocus>;
+type Props = {
+  id: string;
+  children: React.ReactNode;
+  onPress?: (ref: FocusManager.TouchableRef) => void;
+  onPressIn?: (ref: FocusManager.TouchableRef) => void;
+  onPressOut?: (ref: FocusManager.TouchableRef) => void;
+  onLongPress?: (ref: FocusManager.TouchableRef) => void;
+  onFocus?: (
+    ref: FocusManager.TouchableRef,
+    options: FocusManager.Android.CallbackOptions
+  ) => void;
+  onBlur?: (
+    ref: FocusManager.TouchableRef,
+    options: FocusManager.Android.CallbackOptions
+  ) => void;
+
+  disableFocus?: boolean;
+  blockFocus?: boolean;
+} & Partial<ParentFocus>;
 
 export class Touchable extends React.Component<Props> {
   onPress(focusableRef: FocusManager.TouchableRef): void {

package/Components/MasterCell/DefaultComponents/BorderContainerView/__tests__/index.test.tsx

@@ -0,0 +1,66 @@
+import {
+  BorderContainerView,
+  getBorderPadding, // Export for testing (using a double underscore prefix is a common convention)
+} from "../index";
+import * as React from "react";
+import { render } from "@testing-library/react-native";
+import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
+import { View } from "react-native";
+
+jest.mock("@applicaster/zapp-react-native-utils/numberUtils", () => ({
+  toNumberWithDefaultZero: jest.fn((value) => Number(value) || 0),
+}));
+
+describe("BorderContainerView", () => {
+  describe("getBorderPadding", () => {
+    it("returns 0 for inside", () => {
+      expect(getBorderPadding("inside", 10)).toBe(0);
+    });
+
+    it("returns borderWidth / 2 for center", () => {
+      expect(getBorderPadding("center", 10)).toBe(5);
+    });
+
+    it("returns borderWidth for outside", () => {
+      expect(getBorderPadding("outside", 10)).toBe(10);
+    });
+
+    it("returns borderWidth for invalid position", () => {
+      // @ts-ignore
+      expect(getBorderPadding("other_value", 10)).toBe(10);
+    });
+  });
+
+  it("Border component renders null if no borderPosition", () => {
+    const style = { borderWidth: 5, borderRadius: 10, borderColor: "red" };
+
+    const padding = {
+      paddingTop: 2,
+      paddingRight: 3,
+      paddingBottom: 4,
+      paddingLeft: 5,
+    };
+
+    const borderPosition = null;
+
+    const { queryByTestId } = render(
+      <BorderContainerView
+        style={style}
+        testID="border-container"
+        borderPosition={borderPosition}
+        borderPaddingTop={toNumberWithDefaultZero(padding.paddingTop)}
+        borderPaddingRight={toNumberWithDefaultZero(padding.paddingRight)}
+        borderPaddingBottom={toNumberWithDefaultZero(padding.paddingBottom)}
+        borderPaddingLeft={toNumberWithDefaultZero(padding.paddingLeft)}
+      >
+        <View testID="child" />
+      </BorderContainerView>
+    );
+
+    const children = queryByTestId("border-container").children;
+
+    expect(children[1].props.testID).toBe("child");
+
+    expect(children[0].children.length).toBe(0);
+  });
+});

package/Components/MasterCell/DefaultComponents/BorderContainerView/index.tsx

@@ -28,7 +28,10 @@ const styles = StyleSheet.create({
   },
 });
 
-const getBorderPadding = (borderPosition: BorderPosition, borderWidth) => {
+export const getBorderPadding = (
+  borderPosition: BorderPosition,
+  borderWidth: number
+) => {
   switch (borderPosition) {
     case "inside":
       return 0;

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

@@ -38,22 +38,16 @@ function Image({
 
   const shouldRenderImg = source && !error;
 
-  // Default placeholder image fallback is empty string because it won't rerender
-  // in case of undefined or {uri: undefined} source
-  // https://github.com/facebook/react-native/issues/9195
-  const defaultPlaceHolderImage = React.useMemo(
-    () => ({ uri: placeholderImage || "" }),
-    [source, error]
-  );
+  const _source = shouldRenderImg
+    ? withDimensions(source)
+    : { uri: placeholderImage };
 
   return (
-    // @ts-ignore
     <MemoizedImage
       style={style as ImageStyle}
       onError={React.useCallback(() => setErrorState(true), [])}
-      source={
-        shouldRenderImg ? withDimensions(source) : defaultPlaceHolderImage
-      }
+      // 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)}
     />
   );

package/Components/MasterCell/DefaultComponents/ImageBorderContainer/__tests__/index.test.ts

@@ -0,0 +1,93 @@
+import { ImageBorderContainer } from "../index";
+import { getImageContainerMarginStyles } from "@applicaster/zapp-react-native-utils/cellUtils";
+
+const mockValue = (key) => {
+  const values = {
+    cell_padding_top: 1,
+    cell_padding_left: 2,
+    cell_padding_right: 3,
+    cell_padding_bottom: 4,
+    image_border_size: 5,
+    image_focused_border_color: "red",
+    image_selected_border_color: "blue",
+    image_focused_selected_border_color: "green",
+    image_border_color: "black",
+    image_corner_radius: 10,
+    image_border_position: "outside",
+    image_border_padding_top: 6,
+    image_border_padding_right: 7,
+    image_border_padding_bottom: 8,
+    image_border_padding_left: 9,
+    image_margin_top: 11,
+    image_margin_left: 12,
+    image_margin_right: 13,
+    image_margin_bottom: 14,
+  };
+
+  return values[key] || 0;
+};
+
+describe("ImageBorderContainer", () => {
+  it("calculates style properties correctly", () => {
+    const marginStyles = getImageContainerMarginStyles({ value: mockValue });
+
+    expect(marginStyles.marginTop).toBe(11);
+    expect(marginStyles.marginLeft).toBe(12);
+    expect(marginStyles.marginRight).toBe(13);
+    expect(marginStyles.marginBottom).toBe(14);
+
+    const props = {
+      value: mockValue,
+      state: "default",
+      imageStyles: {},
+    };
+
+    const result = ImageBorderContainer(props);
+
+    expect(result.style.marginTop).toBe(12); // 11 + 1
+    expect(result.style.marginLeft).toBe(14); // 12 + 2
+    expect(result.style.marginRight).toBe(16); // 13 + 3
+    expect(result.style.marginBottom).toBe(18); // 14 + 4
+    expect(result.style.borderWidth).toBe(5);
+    expect(result.style.borderColor).toBe("black");
+    expect(result.style.borderRadius).toBe(10);
+    expect(result.additionalProps.borderPosition).toBe("outside");
+    expect(result.additionalProps.borderPaddingTop).toBe(6);
+    expect(result.additionalProps.borderPaddingRight).toBe(7);
+    expect(result.additionalProps.borderPaddingBottom).toBe(8);
+    expect(result.additionalProps.borderPaddingLeft).toBe(9);
+  });
+
+  it("handles focused state correctly", () => {
+    const props = {
+      value: mockValue,
+      state: "focused",
+      imageStyles: {},
+    };
+
+    const result = ImageBorderContainer(props);
+    expect(result.style.borderColor).toBe("red");
+  });
+
+  it("handles selected state correctly", () => {
+    const props = {
+      value: mockValue,
+      state: "selected",
+      imageStyles: {},
+    };
+
+    const result = ImageBorderContainer(props);
+    expect(result.style.borderColor).toBe("blue");
+  });
+
+  it("handles focused and selected state correctly", () => {
+    const props = {
+      value: mockValue,
+      state: "focused_selected",
+      imageStyles: {},
+    };
+
+    const result = ImageBorderContainer(props);
+    expect(result.style.borderColor).toBe("green");
+  });
+});

package/Components/MasterCell/DefaultComponents/SecondaryImage/utils.ts

@@ -17,7 +17,7 @@ const SECONDARY_IMAGE_PREFIX = "secondary_image";
 
 type ImageSizing = typeof IMAGE_SIZING_FIT | typeof IMAGE_SIZING_FILL;
 
-type ImagePosition = typeof IMAGE_POSITION[keyof typeof IMAGE_POSITION];
+type ImagePosition = (typeof IMAGE_POSITION)[keyof typeof IMAGE_POSITION];
 
 export type DisplayMode =
   | typeof DISPLAY_MODE_FIXED

package/Components/MasterCell/DefaultComponents/__tests__/image.test.js

@@ -39,6 +39,6 @@ describe("image with no source", () => {
     );
 
     const testInstance = testRenderer.root;
-    expect(testInstance.findByType(Image).props.source).toEqual({ uri: "" });
+    expect(testInstance.findByType(Image).props.source).toBeUndefined();
   });
 });

package/Components/MasterCell/__tests__/__snapshots__/masterCell.test.js.snap

@@ -11,7 +11,6 @@ exports[`masterCellBuilder when using a custom data adapter renders correctly 1`
   <View
     cellUUID="mocked-uuid"
     key="0"
-    skipButtons={false}
     style={
       {
         "backgroundColor": "#2F2F2F",
@@ -41,7 +40,6 @@ exports[`masterCellBuilder when using custom containerStyle renders correctly 1`
   <View
     cellUUID="mocked-uuid"
     key="0"
-    skipButtons={false}
     style={{}}
     wrapperRef={
       {
@@ -63,7 +61,6 @@ exports[`masterCellBuilder when using custom default components renders correctl
   <mockConstructor
     cellUUID="mocked-uuid"
     key="0"
-    skipButtons={false}
     style={{}}
     wrapperRef={
       {
@@ -85,7 +82,6 @@ exports[`masterCellBuilder when using default options can be invoked as a React
   <View
     cellUUID="mocked-uuid"
     key="0"
-    skipButtons={false}
     style={
       {
         "backgroundColor": "#2F2F2F",
@@ -111,7 +107,6 @@ exports[`masterCellBuilder when using default options can be invoked as a React
       cellUUID="mocked-uuid"
       key="0"
       numberOfLines={1}
-      skipButtons={false}
       style={
         {
           "borderTopLeftRadius": 4,
@@ -125,7 +120,6 @@ exports[`masterCellBuilder when using default options can be invoked as a React
     <View
       cellUUID="mocked-uuid"
       key="1"
-      skipButtons={false}
       style={
         {
           "height": 30,
@@ -144,7 +138,6 @@ exports[`masterCellBuilder when using default options can be invoked as a React
         key="0"
         label="Test Entry"
         numberOfLines={1}
-        skipButtons={false}
         style={
           {
             "color": "#EFEFEF",
@@ -158,7 +151,6 @@ exports[`masterCellBuilder when using default options can be invoked as a React
     <View
       cellUUID="mocked-uuid"
       key="2"
-      skipButtons={false}
       style={
         {
           "height": 60,
@@ -177,7 +169,6 @@ exports[`masterCellBuilder when using default options can be invoked as a React
         key="0"
         label="Summary of the test entry"
         numberOfLines={2}
-        skipButtons={false}
         style={
           {
             "color": "#EFEFEF",
@@ -192,7 +183,6 @@ exports[`masterCellBuilder when using default options can be invoked as a React
     <View
       cellUUID="mocked-uuid"
       key="3"
-      skipButtons={false}
       style={
         {
           "height": 42,
@@ -209,7 +199,6 @@ exports[`masterCellBuilder when using default options can be invoked as a React
       <ImageContainer
         cellUUID="mocked-uuid"
         key="0"
-        skipButtons={false}
         style={
           {
             "height": 42,

package/Components/MasterCell/elementMapper.tsx

@@ -1,4 +1,5 @@
 import * as React from "react";
+import { View } from "react-native";
 
 type ElementProps = {
   type: string;
@@ -44,11 +45,21 @@ const cellPlayerTypes = new Set([
 export function elementMapper(
   components,
   otherProps?: {
+    preferredFocus?: boolean;
     skipButtons?: boolean;
     cellUUID?: string;
-    [key: string]: any;
     emitAsyncElementRegistrate?: () => void;
     emitAsyncElementLayout?: () => void;
+    focused?: boolean;
+    focusedButtonId?: string;
+    groupId?: string;
+    isFocusable?: boolean;
+    onToggleFocus?: (arg0: unknown) => void;
+    prefixId?: string;
+    skipFocusManagerRegistration?: boolean;
+    component?: ZappUIComponent;
+    componentId?: string;
+    wrapperRef: React.RefObject<typeof View>;
   }
 ) {
   return function Element({

package/Components/MasterCell/index.tsx

@@ -11,7 +11,24 @@ import { getEntryState, hasFocusableInsideBuilder } from "./utils";
 
 type Props = {
   item: ZappEntry;
-  state: null | "selected" | "focused";
+  state: null | "selected" | "focused" | "default";
+  emitAsyncElementRegistrate?: () => void;
+  emitAsyncElementLayout?: () => void;
+  skipButtons?: boolean;
+  cellUUID?: string;
+  // New props from CellWithFocusable
+  groupId?: string;
+  onToggleFocus?: (arg0: unknown) => void;
+  prefixId?: string;
+  focusedButtonId?: string;
+  preferredFocus?: boolean;
+  skipFocusManagerRegistration?: boolean;
+  isFocusable?: boolean;
+  focused?: boolean;
+  // New props from Gallery
+  component?: ZappUIComponent;
+  componentId?: string;
+  screenId: string;
 };
 
 const defaultContainerStyle = { flex: 1 };
@@ -39,6 +56,24 @@ type MasterCellBuilderOptions = {
   };
 };
 
+// retrieve screendata from route
+const useMasterCellScreen = (screenId?: string) => {
+  let _screenId = screenId;
+  const { screenData } = useRoute();
+
+  if (!screenId) {
+    // get screenId from targetScreen or screenData
+    _screenId =
+      screenData && "targetScreen" in screenData
+        ? screenData?.targetScreen?.id
+        : screenData?.id;
+  }
+
+  const { screen } = useScreenState(_screenId);
+
+  return screen;
+};
+
 export function masterCellBuilder({
   components = defaultComponents,
   cellConfiguration,
@@ -63,15 +98,8 @@ export function masterCellBuilder({
    * inflated with the data coming from the data source
    * @param {"selected" | "focused" | null} props.state state of the component
    */
-  function MasterCell({ item, state, ...otherProps }: Props) {
-    const { screenData } = useRoute();
-
-    const screenId =
-      screenData && "targetScreen" in screenData
-        ? screenData?.targetScreen?.id
-        : screenData?.id;
-
-    const { screen } = useScreenState(screenId);
+  function MasterCell({ item, state, screenId, ...otherProps }: Props) {
+    const screen = useMasterCellScreen(screenId);
 
     const selectedState = screen?.selectedEntry;
 
@@ -97,18 +125,56 @@ export function masterCellBuilder({
       item?.id,
     ]);
 
-    const remapElements = mapElementWithKey(
-      elementMapper(componentsMap, {
-        ...otherProps,
-        wrapperRef,
-        cellUUID,
-        skipButtons,
-      })
+    const remapElements = React.useMemo(
+      () =>
+        mapElementWithKey(
+          elementMapper(componentsMap, {
+            wrapperRef,
+            emitAsyncElementRegistrate: otherProps.emitAsyncElementRegistrate,
+            emitAsyncElementLayout: otherProps.emitAsyncElementLayout,
+            preferredFocus: otherProps.preferredFocus,
+            cellUUID: cellUUID || otherProps.cellUUID,
+            skipButtons: skipButtons || otherProps.skipButtons,
+            // cellWithFocusable
+            focused: otherProps.focused,
+            focusedButtonId: otherProps.focusedButtonId,
+            groupId: otherProps.groupId,
+            isFocusable: otherProps.isFocusable,
+            onToggleFocus: otherProps.onToggleFocus,
+            prefixId: otherProps.prefixId,
+            skipFocusManagerRegistration:
+              otherProps.skipFocusManagerRegistration,
+            // gallery
+            component: otherProps.component,
+            componentId: otherProps.componentId,
+          })
+        ),
+      [
+        componentsMap,
+        otherProps.emitAsyncElementRegistrate,
+        otherProps.emitAsyncElementLayout,
+        cellUUID || otherProps.cellUUID,
+        skipButtons || otherProps.skipButtons,
+        otherProps.focused,
+        otherProps.focusedButtonId,
+        otherProps.groupId,
+        otherProps.isFocusable,
+        otherProps.onToggleFocus,
+        otherProps.prefixId,
+        otherProps.skipFocusManagerRegistration,
+        otherProps.component,
+        otherProps.componentId,
+      ]
+    );
+
+    const renderElements = React.useMemo(
+      () => elements.map(remapElements),
+      [remapElements, elements]
     );
 
     return (
       <View style={containerStyle} ref={wrapperRef}>
-        {elements.map(remapElements)}
+        {renderElements}
       </View>
     );
   }

package/Components/MasterCell/utils/index.ts

@@ -103,7 +103,7 @@ export const useFilterChildren = <
       item: any;
       pluginIdentifier: string;
     };
-  }
+  },
 >(
   children: T[]
 ): T[] => {

package/Components/Tabs/Tab.tsx

@@ -69,8 +69,8 @@ const getStyles = (configuration, selected, focused) => {
           ? tab_cell_background_color_selected_active
           : tab_cell_background_color_selected_default
         : focused
-        ? tab_cell_background_color_active
-        : tab_cell_background_color_default,
+          ? tab_cell_background_color_active
+          : tab_cell_background_color_default,
       justifyContent: "center",
       alignItems: "center",
       position: "relative",
@@ -85,8 +85,8 @@ const getStyles = (configuration, selected, focused) => {
           ? tab_cell_border_color_active_focused
           : tab_cell_border_color_active
         : focused
-        ? tab_cell_border_color_default_focused
-        : tab_cell_border_color_default,
+          ? tab_cell_border_color_default_focused
+          : tab_cell_border_color_default,
     },
     label: {
       fontFamily: text_label_font_family,
@@ -98,8 +98,8 @@ const getStyles = (configuration, selected, focused) => {
           ? text_label_selected_active_font_color
           : text_label_selected_default_font_color
         : focused
-        ? text_label_active_font_color
-        : text_label_default_font_color,
+          ? text_label_active_font_color
+          : text_label_default_font_color,
     },
     underline: {
       position: "absolute",

package/Components/TextInputTv/index.tsx

@@ -94,8 +94,8 @@ function TextInputTV(props: Props, ref) {
             styles.textAlign === "center"
               ? styles.textAlign
               : styles.textAlign === "left"
-              ? "right"
-              : "left";
+                ? "right"
+                : "left";
 
           return { style: { ...styles, textAlign } };
         }

package/Components/Transitioner/AnimationManager.js

@@ -3,19 +3,19 @@ import { Animated } from "react-native";
 import { NAV_ACTION_PUSH, NAV_ACTION_BACK } from "./Transitioner";
 
 type TransitionConfig = {
-  duration: number,
-  easing: any,
+  duration: number;
+  easing: any;
   from: {
-    style: any,
-  },
+    style: any;
+  };
   to: {
-    style: any,
-  },
+    style: any;
+  };
 };
 
 type Props = {
-  transitionConfig: TransitionConfig,
-  contentStyle: { [string]: any },
+  transitionConfig: TransitionConfig;
+  contentStyle: { [string]: any };
 };
 
 /**

package/Components/VideoLive/LiveImageManager.ts

@@ -8,6 +8,8 @@ import { loggerLiveImageManager } from "./loggerHelper";
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { Component } from "react";
 
+const TIMEOUT_FOR_DELAY_CHECK_PLAYER_POSITION = 500; // ms
+
 const { log_debug, log_info, log_error } = loggerLiveImageManager;
 
 export type LiveImageManagerEvent =
@@ -62,6 +64,9 @@ export class LiveImageManager implements PlayerLifecycleListener {
   protected currentlyPlaying: LiveImage | null = null;
   protected primaryPlayer: Player | null = null;
 
+  private checkPlayerPositionTimeout: ReturnType<typeof setTimeout> | null =
+    null;
+
   protected listeners: Record<
     string,
     Record<LiveImageManagerEvent, (event?: Record<string, any>) => void>
@@ -118,6 +123,11 @@ export class LiveImageManager implements PlayerLifecycleListener {
     });
   };
 
+  private cancelCheckPlayerPositionTimeout = () => {
+    clearTimeout(this.checkPlayerPositionTimeout);
+    this.checkPlayerPositionTimeout = null;
+  };
+
   public onViewportEnter = (item: LiveImage) => {
     log_debug(
       `onViewportEnter: live-image ${playerInfo(
@@ -125,7 +135,21 @@ export class LiveImageManager implements PlayerLifecycleListener {
       )}, primary ${playerInfo(this.primaryPlayer)}`
     );
 
-    this.checkPlayerPosition(item);
+    if (!isTV()) {
+      // mobile only
+      // we have to delay running checkPlayerPosition, because sometimes on fast scrolling we get wrong order onEnter, then onLeave.
+      // which could cause select wrong item to play
+
+      this.cancelCheckPlayerPositionTimeout();
+
+      this.checkPlayerPositionTimeout = setTimeout(() => {
+        this.cancelCheckPlayerPositionTimeout();
+
+        this.checkPlayerPosition(item);
+      }, TIMEOUT_FOR_DELAY_CHECK_PLAYER_POSITION);
+    } else {
+      this.checkPlayerPosition(item);
+    }
   };
 
   public onViewportLeave = (item: LiveImage) => {
@@ -246,6 +270,8 @@ export class LiveImageManager implements PlayerLifecycleListener {
   };
 
   public checkPlayerPosition = (item: LiveImage) => {
+    this.cancelCheckPlayerPositionTimeout();
+
     log_debug(
       `checkPlayerPosition: live-image playerId: ${playerInfo(
         item.player

package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap

@@ -31,11 +31,6 @@ exports[`PlayerLiveImageComponent should render correctly with default props 1`]
         playerId="player1"
         resizeMode="cover"
         screenConfig={{}}
-        source={
-          {
-            "uri": "",
-          }
-        }
         style={{}}
       />
     </View>

package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx

@@ -100,10 +100,11 @@ export const AnimationView = ({
   const moveUpValue = additionalData.saveArea
     ? -insets.top + (isAudioItem ? 0 : progressBarHeight)
     : isTablet
-    ? isTabletLandscape && (!isAudioItem || (isAudioItem && inlineAudioPlayer))
-      ? -tabletLandscapePlayerTopPosition + progressBarHeight
-      : -130
-    : -50 + progressBarHeight;
+      ? isTabletLandscape &&
+        (!isAudioItem || (isAudioItem && inlineAudioPlayer))
+        ? -tabletLandscapePlayerTopPosition + progressBarHeight
+        : -130
+      : -50 + progressBarHeight;
 
   const moveComponentHorizontalValue = additionalData.moveValue
     ? isRTL
@@ -434,8 +435,8 @@ export const AnimationComponent = (props: Props) => {
   const Component = useAnimation
     ? AnimationView
     : style
-    ? View
-    : React.Fragment;
+      ? View
+      : React.Fragment;
 
   if (
     additionalData.extraAnimation &&

package/Components/VideoModal/ModalAnimation/utils.ts

@@ -108,8 +108,8 @@ export const calculateAnimationValue = (animationType, dragPosition, data) => {
               : { forWidth: 3, forHeight: 3 }
             : { forWidth: 2, forHeight: 2 }
           : isTabletLandscape
-          ? { forWidth: 8, forHeight: 6.5 }
-          : { forWidth: 3.5, forHeight: 2 };
+            ? { forWidth: 8, forHeight: 6.5 }
+            : { forWidth: 3.5, forHeight: 2 };
 
       const minWidth =
         isAudioItem && !inlineAudioPlayer ? minimisedHeight : minimisedWidth;

package/Components/default-cell-renderer/__tests__/__snapshots__/defaultCellRenderer.test.tsx.snap

@@ -12,8 +12,6 @@ exports[`DefaultCellRenderer returns a react component and it renders correctly
   <View
     cellUUID="mocked-uuid"
     key="0"
-    skipButtons={false}
-    store={null}
     style={
       {
         "backgroundColor": "transparent",
@@ -31,7 +29,6 @@ exports[`DefaultCellRenderer returns a react component and it renders correctly
     <ImageContainer
       cellUUID="mocked-uuid"
       key="0"
-      skipButtons={false}
       style={
         {
           "borderRadius": 3,
@@ -43,8 +40,6 @@ exports[`DefaultCellRenderer returns a react component and it renders correctly
     <View
       cellUUID="mocked-uuid"
       key="1"
-      skipButtons={false}
-      store={null}
       wrapperRef={
         {
           "current": null,
@@ -56,7 +51,6 @@ exports[`DefaultCellRenderer returns a react component and it renders correctly
         key="0"
         label=""
         numberOfLines={2}
-        skipButtons={false}
         style={
           {
             "color": "#000",
@@ -83,8 +77,6 @@ exports[`DefaultCellRenderer returns a react component for LG TVs 1`] = `
   <View
     cellUUID="mocked-uuid"
     key="0"
-    skipButtons={false}
-    store={null}
     style={
       {
         "aspectRatio": 0.880733945,
@@ -101,8 +93,6 @@ exports[`DefaultCellRenderer returns a react component for LG TVs 1`] = `
     <View
       cellUUID="mocked-uuid"
       key="0"
-      skipButtons={false}
-      store={null}
       style={
         {
           "backgroundColor": "rgba(47,47,47,1.0)",
@@ -120,8 +110,6 @@ exports[`DefaultCellRenderer returns a react component for LG TVs 1`] = `
       <View
         cellUUID="mocked-uuid"
         key="0"
-        skipButtons={false}
-        store={null}
         wrapperRef={
           {
             "current": null,
@@ -131,7 +119,6 @@ exports[`DefaultCellRenderer returns a react component for LG TVs 1`] = `
         <ImageContainer
           cellUUID="mocked-uuid"
           key="0"
-          skipButtons={false}
           style={
             {
               "aspectRatio": 1.7782608696,
@@ -142,8 +129,6 @@ exports[`DefaultCellRenderer returns a react component for LG TVs 1`] = `
         <View
           cellUUID="mocked-uuid"
           key="1"
-          skipButtons={false}
-          store={null}
           wrapperRef={
             {
               "current": null,
@@ -154,7 +139,6 @@ exports[`DefaultCellRenderer returns a react component for LG TVs 1`] = `
             key="0"
             label=""
             numberOfLines={2}
-            skipButtons={false}
             style={
               {
                 "color": "rgba(239,239,239,1.0)",
@@ -170,8 +154,6 @@ exports[`DefaultCellRenderer returns a react component for LG TVs 1`] = `
         <View
           cellUUID="mocked-uuid"
           key="2"
-          skipButtons={false}
-          store={null}
           style={
             {
               "paddingHorizontal": "6%",
@@ -188,7 +170,6 @@ exports[`DefaultCellRenderer returns a react component for LG TVs 1`] = `
             key="0"
             label=""
             numberOfLines={1}
-            skipButtons={false}
             style={
               {
                 "color": "rgba(239,239,239,1.0)",
@@ -216,8 +197,6 @@ exports[`DefaultCellRenderer returns a react component for Samsung TVs 1`] = `
   <View
     cellUUID="mocked-uuid"
     key="0"
-    skipButtons={false}
-    store={null}
     style={
       {
         "aspectRatio": 0.880733945,
@@ -234,8 +213,6 @@ exports[`DefaultCellRenderer returns a react component for Samsung TVs 1`] = `
     <View
       cellUUID="mocked-uuid"
       key="0"
-      skipButtons={false}
-      store={null}
       style={
         {
           "backgroundColor": "rgba(47,47,47,1.0)",
@@ -253,8 +230,6 @@ exports[`DefaultCellRenderer returns a react component for Samsung TVs 1`] = `
       <View
         cellUUID="mocked-uuid"
         key="0"
-        skipButtons={false}
-        store={null}
         wrapperRef={
           {
             "current": null,
@@ -264,7 +239,6 @@ exports[`DefaultCellRenderer returns a react component for Samsung TVs 1`] = `
         <ImageContainer
           cellUUID="mocked-uuid"
           key="0"
-          skipButtons={false}
           style={
             {
               "aspectRatio": 1.7782608696,
@@ -275,8 +249,6 @@ exports[`DefaultCellRenderer returns a react component for Samsung TVs 1`] = `
         <View
           cellUUID="mocked-uuid"
           key="1"
-          skipButtons={false}
-          store={null}
           wrapperRef={
             {
               "current": null,
@@ -287,7 +259,6 @@ exports[`DefaultCellRenderer returns a react component for Samsung TVs 1`] = `
             key="0"
             label=""
             numberOfLines={2}
-            skipButtons={false}
             style={
               {
                 "color": "rgba(239,239,239,1.0)",
@@ -303,8 +274,6 @@ exports[`DefaultCellRenderer returns a react component for Samsung TVs 1`] = `
         <View
           cellUUID="mocked-uuid"
           key="2"
-          skipButtons={false}
-          store={null}
           style={
             {
               "paddingHorizontal": "6%",
@@ -321,7 +290,6 @@ exports[`DefaultCellRenderer returns a react component for Samsung TVs 1`] = `
             key="0"
             label=""
             numberOfLines={1}
-            skipButtons={false}
             style={
               {
                 "color": "rgba(239,239,239,1.0)",

package/Contexts/ScreenContext/index.tsx

@@ -99,8 +99,9 @@ export function ScreenContextProvider({
   const isNested = useNestedNavigationContext();
   const currentScreenScreenData = useCurrentScreenData();
 
-  const screenNavBarStateRef =
-    useRef<null | ReturnType<typeof createStore>>(null);
+  const screenNavBarStateRef = useRef<null | ReturnType<typeof createStore>>(
+    null
+  );
 
   const getScreenNavBarState = useCallback(() => {
     if (screenNavBarStateRef.current !== null) {

package/Decorators/ZappPipesDataConnector/__tests__/Hero.js

@@ -2,7 +2,7 @@ import React, { useEffect } from "react";
 import { View } from "react-native";
 
 type Props = {
-  onLoadFinished: () => void,
+  onLoadFinished: () => void;
 };
 
 export function Hero(props: Props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "13.0.0-alpha.1360301199",
+  "version": "13.0.0-alpha.1488035644",
   "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.1360301199",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.1360301199",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.1360301199",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.1360301199",
+    "@applicaster/applicaster-types": "13.0.0-alpha.1488035644",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.1488035644",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.1488035644",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.1488035644",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",