@applicaster/zapp-react-native-ui-components 13.0.0-alpha.5033140607 → 13.0.0-alpha.5330008750

package/Components/TextInputTv/__tests__/TextInputTv.test.js

@@ -1,18 +1,13 @@
 import React from "react";
-import TestRenderer from "react-test-renderer";
-
-jest.mock("react-native", () => {
-  const RNMock = jest.genMockFromModule("react-native");
-  const { TextInput } = jest.requireActual("react-native");
-
-  return {
-    ...RNMock,
-    TextInput,
-    Platform: {
-      OS: "samsung_tv",
-      isTV: true,
-    },
-  };
+import { Platform } from "react-native";
+import { render } from "@testing-library/react-native";
+
+Platform.OS = "samsung_tv";
+
+Object.defineProperty(Platform, "isTV", {
+  get() {
+    return true;
+  },
 });
 
 jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
@@ -20,12 +15,12 @@ jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
 }));
 
 const { TextInputTv } = require("../");
-const { Platform, TextInput } = require("react-native");
+const testIDToTest = "TextInput-tv";
 
 describe("<TextInputTv />", () => {
   it("renders", () => {
-    const testInstance = TestRenderer.create(<TextInputTv />);
-    expect(testInstance.toJSON).toBeTruthy();
+    const { toJSON } = render(<TextInputTv />);
+    expect(toJSON()).toMatchSnapshot();
   });
 
   describe("on native", () => {
@@ -34,8 +29,8 @@ describe("<TextInputTv />", () => {
     });
 
     it("returns React-Native TextInput component if not on samsung", () => {
-      const testInstance = TestRenderer.create(<TextInputTv />);
-      expect(testInstance.root.findByType(TextInput)).toBeTruthy();
+      const { getByTestId } = render(<TextInputTv />);
+      expect(getByTestId(testIDToTest)).toBeTruthy();
     });
   });
 
@@ -45,29 +40,30 @@ describe("<TextInputTv />", () => {
     });
 
     it("returns React input component if on samsung", () => {
-      const testInstance = TestRenderer.create(<TextInputTv type="samsung" />);
-      expect(testInstance.root.findByType("input")).toBeTruthy();
+      const { getByTestId } = render(<TextInputTv type="samsung" />);
+      expect(getByTestId(testIDToTest)).toBeTruthy();
     });
 
     it("flattens styles", () => {
       Platform.OS = "samsung_tv";
       const style = [{ width: 200 }, { height: 200 }];
-      const testInstance = TestRenderer.create(<TextInputTv style={style} />);
 
-      expect(typeof testInstance.root.findByType("input").props.style).toBe(
-        "object"
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" style={style} />
       );
+
+      expect(getByTestId(testIDToTest).props.style).toBeObject();
     });
 
     it("maps onChangeText to onChange", () => {
       Platform.OS = "samsung_tv";
       const onChangeText = jest.fn();
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv onChangeText={onChangeText} />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" onChangeText={onChangeText} />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
       expect(inputInstance.props.onChange).toBeDefined();
       expect(inputInstance.props.onChangeText).toBeUndefined();
     });
@@ -76,11 +72,11 @@ describe("<TextInputTv />", () => {
       Platform.OS = "samsung_tv";
       const onChangeText = jest.fn();
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv onChangeText={onChangeText} />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" onChangeText={onChangeText} />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
       const value = "foobar";
       inputInstance.props.onChange({ target: { value: value } });
       expect(onChangeText).toBeCalledWith(value);
@@ -89,11 +85,12 @@ describe("<TextInputTv />", () => {
     it("maps onEndEditing to onBlur", () => {
       Platform.OS = "samsung_tv";
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv onEndEditing={() => null} />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" onEndEditing={() => null} />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
+
       expect(inputInstance.props.onBlur).toBeDefined();
       expect(inputInstance.props.onEndEditing).toBeUndefined();
     });
@@ -101,11 +98,12 @@ describe("<TextInputTv />", () => {
     it("maps onPress to onClick", () => {
       Platform.OS = "samsung_tv";
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv onPress={() => null} />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" onPress={() => null} />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
+
       expect(inputInstance.props.onClick).toBeDefined();
       expect(inputInstance.props.onPress).toBeUndefined();
     });
@@ -113,22 +111,24 @@ describe("<TextInputTv />", () => {
     it("replaces secureTextEntry with type:'password'", () => {
       Platform.OS = "samsung_tv";
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv secureTextEntry={true} />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" secureTextEntry />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
+
       expect(inputInstance.props.type).toBe("password");
     });
 
     it("removes 'onChangeText', 'secureTextEntry', 'onEndEditing', 'onPress' props", () => {
       Platform.OS = "samsung_tv";
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv onChangeText secureTextEntry onEndEditing />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" onChangeText secureTextEntry onEndEditing />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
+
       expect(inputInstance.props.onChangeText).toBeUndefined();
       expect(inputInstance.props.secureTextEntry).toBeUndefined();
       expect(inputInstance.props.onEndEditing).toBeUndefined();

package/Components/TextInputTv/__tests__/__snapshots__/TextInputTv.test.js.snap

@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<TextInputTv /> renders 1`] = `
+<input
+  testID="TextInput-tv"
+/>
+`;

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 } };
         }
@@ -175,10 +175,10 @@ function TextInputTV(props: Props, ref) {
   return isWebPlatform ? (
     <>
       {additional && additional()}
-      <input ref={ref} {...inputProps} />
+      <input testID="TextInput-tv" ref={ref} {...inputProps} />
     </>
   ) : (
-    <TextInput ref={ref} {...inputProps} />
+    <TextInput testID="TextInput-tv" ref={ref} {...inputProps} />
   );
 }
 

package/Components/Touchable/__tests__/__snapshots__/touchable.test.tsx.snap

@@ -14,7 +14,7 @@ exports[`<Touchable /> when not running in automated tests environment renders c
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
   style={
-    Object {
+    {
       "opacity": 1,
     }
   }
@@ -40,7 +40,7 @@ exports[`<Touchable /> when running in automated tests environment has accessibl
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
   style={
-    Object {
+    {
       "opacity": 1,
     }
   }

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/Transitioner/__tests__/__snapshots__/AnimationManager.test.js.snap

@@ -1,16 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`AnimationManager initialState() returns a state composed from the initial configuration 1`] = `
-Object {
+{
   "animating": false,
   "duration": 123,
   "easing": [MockFunction],
-  "from": Object {
+  "from": {
     "index": 0,
   },
-  "to": Object {
+  "to": {
     "index": 0,
-    "style": Object {},
+    "style": {},
   },
 }
 `;
@@ -18,25 +18,25 @@ Object {
 exports[`AnimationManager returns the animation manager with the injected transition configuration 1`] = `
 AnimationManager {
   "animatedValue": 0,
-  "config": Object {
-    "back": Object {
+  "config": {
+    "back": {
       "duration": 123,
       "easing": [MockFunction],
-      "from": Object {
-        "style": Object {},
+      "from": {
+        "style": {},
       },
-      "to": Object {
-        "style": Object {},
+      "to": {
+        "style": {},
       },
     },
-    "push": Object {
+    "push": {
       "duration": 123,
       "easing": [MockFunction],
-      "from": Object {
-        "style": Object {},
+      "from": {
+        "style": {},
       },
-      "to": Object {
-        "style": Object {},
+      "to": {
+        "style": {},
       },
     },
   },
@@ -44,25 +44,25 @@ AnimationManager {
 `;
 
 exports[`AnimationManager returns the animation manager with the injected transition configuration 2`] = `
-Object {
-  "back": Object {
+{
+  "back": {
     "duration": 123,
     "easing": [MockFunction],
-    "from": Object {
-      "style": Object {},
+    "from": {
+      "style": {},
     },
-    "to": Object {
-      "style": Object {},
+    "to": {
+      "style": {},
     },
   },
-  "push": Object {
+  "push": {
     "duration": 123,
     "easing": [MockFunction],
-    "from": Object {
-      "style": Object {},
+    "from": {
+      "style": {},
     },
-    "to": Object {
-      "style": Object {},
+    "to": {
+      "style": {},
     },
   },
 }

package/Components/Transitioner/__tests__/__snapshots__/Scene.test.js.snap

@@ -4,14 +4,14 @@ exports[`<Scene /> renders correctly 1`] = `
 <ForwardRef(AnimatedComponentWrapper)
   pointerEvents="auto"
   style={
-    Array [
-      Object {
+    [
+      {
         "flex": 1,
       },
-      Object {
+      {
         "paddingBottom": 49,
       },
-      Object {
+      {
         "fontScale": 2,
         "height": 1334,
         "scale": 2,
@@ -33,14 +33,14 @@ exports[`<Scene /> renders the overlay while animating 1`] = `
 <ForwardRef(AnimatedComponentWrapper)
   pointerEvents="auto"
   style={
-    Array [
-      Object {
+    [
+      {
         "flex": 1,
       },
-      Object {
+      {
         "paddingBottom": 49,
       },
-      Object {
+      {
         "height": "100%",
         "width": "100%",
       },
@@ -54,7 +54,7 @@ exports[`<Scene /> renders the overlay while animating 1`] = `
   </ContextProvider>
   <ForwardRef(AnimatedComponentWrapper)
     style={
-      Object {
+      {
         "opacity": 1,
       }
     }

package/Components/Transitioner/__tests__/__snapshots__/config.test.js.snap

@@ -5,34 +5,34 @@ exports[`transitionConfig accepts an Animated.Value as a parameter 1`] = `"Canno
 exports[`transitionConfig accepts an Animated.Value as a parameter 2`] = `[Function]`;
 
 exports[`transitionConfig returns a back object is valid 1`] = `
-Object {
+{
   "duration": 350,
   "easing": [Function],
-  "from": Object {
-    "style": Object {
+  "from": {
+    "style": {
       "height": 1334,
       "position": "absolute",
-      "transform": Array [
-        Object {
+      "transform": [
+        {
           "translateX": 0,
         },
       ],
       "width": 750,
     },
   },
-  "to": Object {
-    "overlayStyle": Object {
+  "to": {
+    "overlayStyle": {
       "backgroundColor": "black",
       "height": 1334,
       "opacity": 0.35,
       "position": "absolute",
       "width": 750,
     },
-    "style": Object {
+    "style": {
       "height": 1334,
       "position": "absolute",
-      "transform": Array [
-        Object {
+      "transform": [
+        {
           "translateX": -1,
         },
       ],
@@ -43,34 +43,34 @@ Object {
 `;
 
 exports[`transitionConfig returns a push object is valid 1`] = `
-Object {
+{
   "duration": 350,
   "easing": [Function],
-  "from": Object {
-    "overlayStyle": Object {
+  "from": {
+    "overlayStyle": {
       "backgroundColor": "black",
       "height": 1334,
       "opacity": 0,
       "position": "absolute",
       "width": 750,
     },
-    "style": Object {
+    "style": {
       "height": 1334,
       "position": "absolute",
-      "transform": Array [
-        Object {
+      "transform": [
+        {
           "translateX": 0,
         },
       ],
       "width": 750,
     },
   },
-  "to": Object {
-    "style": Object {
+  "to": {
+    "style": {
       "height": 1334,
       "position": "absolute",
-      "transform": Array [
-        Object {
+      "transform": [
+        {
           "translateX": 750,
         },
       ],

package/Components/Transitioner/__tests__/__snapshots__/transitioner.test.js.snap

@@ -3,7 +3,7 @@
 exports[`<TransitionerComponent /> renders correctly 1`] = `
 <View
   style={
-    Object {
+    {
       "flex": 1,
       "overflow": "hidden",
     }
@@ -12,7 +12,7 @@ exports[`<TransitionerComponent /> renders correctly 1`] = `
   <Scene
     isActive={true}
     screenUniqueId="mocked-uuid"
-    style={Object {}}
+    style={{}}
   >
     <View
       foo="bar"

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/PlayerLiveImageComponent.tsx

@@ -244,25 +244,27 @@ const PlayerLiveImageComponent = (props: Props) => {
   }, [item.id]);
 
   React.useEffect(() => {
-    if (playerManager) {
-      const isPlayerRegistered = playerManager.isPlayerRegistered(playerId);
+    if (isMeasurement(item) || !playerManager) {
+      return;
+    }
 
-      if (isPlayerRegistered) {
-        log_error(
-          `PlayerLiveImageComponent: player ${playerId} already registered`
-        );
-      } else {
-        playerManager.registerPlayer({
-          id: playerId,
-          playerController: controller,
-        });
+    const isPlayerRegistered = playerManager.isPlayerRegistered(playerId);
 
-        return () => {
-          playerManager.unregisterPlayer(playerId);
-        };
-      }
+    if (isPlayerRegistered) {
+      log_error(
+        `PlayerLiveImageComponent: player ${playerId} already registered`
+      );
+    } else {
+      playerManager.registerPlayer({
+        id: playerId,
+        playerController: controller,
+      });
+
+      return () => {
+        playerManager.unregisterPlayer(playerId);
+      };
     }
-  }, [liveImageItem, playerId, controller]);
+  }, [liveImageItem, playerId, controller, item.id]);
 
   const onPositionUpdated = React.useCallback(
     (data) => {