@applicaster/zapp-react-native-ui-components 13.0.0-alpha.7222542422 → 13.0.0-alpha.7846284820

package/Components/River/__tests__/componentsMap.test.js

@@ -81,6 +81,13 @@ const mockScreenData = {
   id: "A1234",
 };
 
+jest.mock("@applicaster/zapp-react-native-redux/AppStore", () => ({
+  appStore: {
+    get: jest.fn((prop) => mockStore[prop]),
+    getState: jest.fn(),
+  },
+}));
+
 jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
   useIsRTL: jest.fn(() => mock_rtl_flag),
 }));
@@ -153,7 +160,13 @@ const plugins = [];
 const navigation = {};
 
 const props = { components, cellStyles, riverComponents, navigation };
-const store = mockStore({ components, cellStyles, plugins });
+
+const store = mockStore({
+  components,
+  cellStyles,
+  plugins,
+  getState: jest.fn(),
+});
 
 jest.useFakeTimers();
 

package/Components/Screen/index.tsx

@@ -55,6 +55,7 @@ export function Screen(_props: Props) {
     height,
     deviceInfo,
   } = useDimensions("screen", {
+    updateForInactiveScreens: false,
     fullDimensions: true,
   });
 

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/Transitioner/Scene.tsx

@@ -1,4 +1,5 @@
 import React from "react";
+import { equals } from "ramda";
 import { Animated, ViewProps, ViewStyle } from "react-native";
 import { useSafeAreaFrame } from "react-native-safe-area-context";
 
@@ -8,6 +9,11 @@ import { PathnameContext } from "../../Contexts/PathnameContext";
 import { ScreenDataContext } from "../../Contexts/ScreenDataContext";
 import { ScreenContextProvider } from "../../Contexts/ScreenContext";
 
+const fullWidthDimensions = {
+  height: "100%",
+  width: "100%",
+};
+
 type Props = {
   children: any;
   style: any;
@@ -20,6 +26,47 @@ type Props = {
   screenData: NavigationScreenData;
 };
 
+export function CurrentScreenContextProvider({
+  children,
+  ...props
+}: {
+  children: any;
+  pathname: string;
+  isActive: boolean;
+  screenData: NavigationScreenData;
+}) {
+  const { pathname, isActive = false, screenData } = props;
+
+  const [initialScreenData, setInitialScreenData] = React.useState(screenData);
+
+  React.useLayoutEffect(() => {
+    const screenDataChanged = !equals(initialScreenData, screenData);
+
+    if (isActive && screenDataChanged) {
+      setInitialScreenData(screenData);
+    }
+  }, [initialScreenData, screenData, isActive]);
+
+  return (
+    <ScreenDataContext.Provider value={initialScreenData}>
+      <PathnameContext.Provider value={pathname}>
+        <ScreenContextProvider pathname={pathname}>
+          {children}
+        </ScreenContextProvider>
+      </PathnameContext.Provider>
+    </ScreenDataContext.Provider>
+  );
+}
+
+const withCurrentScreenContext = (Component) =>
+  function SceneComponent(props: Props) {
+    return (
+      <CurrentScreenContextProvider {...props}>
+        <Component {...props} />
+      </CurrentScreenContextProvider>
+    );
+  };
+
 /**
  * Animated View container for any purpose.
  * Renders given children with given style object.
@@ -32,53 +79,35 @@ type Props = {
  * @param contentStyle
  * @param screenUniqueId
  */
-export function Scene({
+function SceneComponent({
   children,
   style,
   pointerEvents = "auto",
   overlayStyle,
   animating,
   contentStyle,
-  pathname,
   isActive = false,
   screenData,
 }: Props) {
-  const [initialScreenData, setInitialScreenData] = React.useState(screenData);
-
   useScreenOrientationHandler({
     screenData,
     isActive,
   });
 
-  React.useLayoutEffect(() => {
-    if (isActive) {
-      setInitialScreenData(screenData);
-    }
-  }, [screenData, isActive]);
-
   const frame = useSafeAreaFrame();
   const isAnimating = animating && overlayStyle;
 
-  const dimensions = isAnimating
-    ? {
-        width: "100%",
-        height: "100%",
-      }
-    : frame;
+  const dimensions = isAnimating ? fullWidthDimensions : frame;
 
   return (
     <Animated.View
       pointerEvents={pointerEvents}
       style={[style, contentStyle, dimensions]}
     >
-      <ScreenDataContext.Provider value={initialScreenData}>
-        <PathnameContext.Provider value={pathname}>
-          <ScreenContextProvider pathname={pathname}>
-            {children}
-          </ScreenContextProvider>
-        </PathnameContext.Provider>
-      </ScreenDataContext.Provider>
+      {children}
       {isAnimating && <Animated.View style={overlayStyle} />}
     </Animated.View>
   );
 }
+
+export const Scene = withCurrentScreenContext(SceneComponent);

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

@@ -1,63 +1,79 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<Scene /> renders correctly 1`] = `
-<ForwardRef(AnimatedComponentWrapper)
-  pointerEvents="auto"
+<CurrentScreenContextProvider
+  contentStyle={
+    {
+      "paddingBottom": 49,
+    }
+  }
+  overlayStyle={
+    {
+      "opacity": 1,
+    }
+  }
   style={
-    [
-      {
-        "flex": 1,
-      },
+    {
+      "flex": 1,
+    }
+  }
+>
+  <SceneComponent
+    contentStyle={
       {
         "paddingBottom": 49,
-      },
+      }
+    }
+    overlayStyle={
       {
-        "fontScale": 2,
-        "height": 1334,
-        "scale": 2,
-        "statusBarHeight": null,
-        "width": 750,
-      },
-    ]
-  }
->
-  <ContextProvider>
-    <ContextProvider>
-      <ScreenContextProvider />
-    </ContextProvider>
-  </ContextProvider>
-</ForwardRef(AnimatedComponentWrapper)>
+        "opacity": 1,
+      }
+    }
+    style={
+      {
+        "flex": 1,
+      }
+    }
+  />
+</CurrentScreenContextProvider>
 `;
 
 exports[`<Scene /> renders the overlay while animating 1`] = `
-<ForwardRef(AnimatedComponentWrapper)
-  pointerEvents="auto"
+<CurrentScreenContextProvider
+  animating={true}
+  contentStyle={
+    {
+      "paddingBottom": 49,
+    }
+  }
+  overlayStyle={
+    {
+      "opacity": 1,
+    }
+  }
   style={
-    [
-      {
-        "flex": 1,
-      },
+    {
+      "flex": 1,
+    }
+  }
+>
+  <SceneComponent
+    animating={true}
+    contentStyle={
       {
         "paddingBottom": 49,
-      },
+      }
+    }
+    overlayStyle={
       {
-        "height": "100%",
-        "width": "100%",
-      },
-    ]
-  }
->
-  <ContextProvider>
-    <ContextProvider>
-      <ScreenContextProvider />
-    </ContextProvider>
-  </ContextProvider>
-  <ForwardRef(AnimatedComponentWrapper)
+        "opacity": 1,
+      }
+    }
     style={
       {
-        "opacity": 1,
+        "flex": 1,
       }
     }
   />
-</ForwardRef(AnimatedComponentWrapper)>
+</CurrentScreenContextProvider>
 `;

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

@@ -9,7 +9,7 @@ exports[`<TransitionerComponent /> renders correctly 1`] = `
     }
   }
 >
-  <Scene
+  <SceneComponent
     isActive={true}
     screenUniqueId="mocked-uuid"
     style={{}}
@@ -23,6 +23,6 @@ exports[`<TransitionerComponent /> renders correctly 1`] = `
         children
       </Text>
     </View>
-  </Scene>
+  </SceneComponent>
 </View>
 `;

package/Components/Transitioner/index.js

@@ -1,5 +1,4 @@
 import * as React from "react";
-import { useWindowDimensions } from "react-native";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
 import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks/layout";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
@@ -7,10 +6,15 @@ import { TransitionerComponent } from "./Transitioner";
 
 export const Transitioner = (props) => {
   const navigator = useNavigation();
-  const { height, width } = useWindowDimensions();
 
-  const dimensions = useDimensions("window", { deviceInfo: true });
-  const isTablet = dimensions?.deviceInfo?.isTablet;
+  const {
+    width,
+    height,
+    deviceInfo: { isTablet },
+  } = useDimensions("window", {
+    updateForInactiveScreens: false,
+    deviceInfo: true,
+  });
 
   const { appData } = usePickFromState(["appData"]);
   const isTabletPortrait = appData?.isTabletPortrait;

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

@@ -44,7 +44,10 @@ type Props = {
 };
 
 const PlayerLiveImageComponent = (props: Props) => {
-  const dimensions = useDimensions("screen", { fullDimensions: true });
+  const dimensions = useDimensions("screen", {
+    fullDimensions: true,
+    updateForInactiveScreens: false,
+  });
 
   const { item, style, playerId } = props;
 
@@ -135,13 +138,16 @@ const PlayerLiveImageComponent = (props: Props) => {
     } else {
       throw new Error("Player factory item is null");
     }
-  }, [playerId, item, playerPluginId, screenConfig]);
+  }, [playerId, item.id, playerPluginId, screenConfig]);
 
   React.useEffect(() => {
     liveImageItem.setMode = setModeDebounced;
   }, [setModeDebounced, liveImageItem]);
 
-  const { start, end } = React.useMemo(() => getAutoplaySettings(item), [item]);
+  const { start, end } = React.useMemo(
+    () => getAutoplaySettings(item),
+    [item.id]
+  );
 
   const controller = liveImageItem.getPlayer();
   const player = usePlayer(playerId);
@@ -174,7 +180,7 @@ const PlayerLiveImageComponent = (props: Props) => {
 
       unregister();
     };
-  }, [item, liveImageItem]);
+  }, [item.id, liveImageItem]);
 
   React.useEffect(() => {
     if (!player) {
@@ -244,25 +250,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) => {
@@ -302,7 +310,7 @@ const PlayerLiveImageComponent = (props: Props) => {
         LiveImageManager.instance.checkPlayerPosition(liveImageItem);
       }
     },
-    [liveImageItem, dimensions]
+    [liveImageItem, dimensions.height, dimensions.width]
   );
 
   const platformSpecificProps = isApplePlatform()

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

@@ -4,6 +4,7 @@ import { render } from "@testing-library/react-native";
 import * as PlayerFactory from "@applicaster/zapp-react-native-utils/appUtils/playerManager/playerFactory";
 import { ThemeContext } from "@applicaster/zapp-react-native-utils/theme";
 import * as navigationHooks from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
+import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils/playerManager";
 
 import { PlayerLiveImage } from "../PlayerLiveImageComponent";
 import * as useNavigationHooks from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
@@ -32,7 +33,7 @@ const mockStore = configureStore();
 
 const store = mockStore({ appData: {} });
 
-const Wrapper = ({ children }: { children: React.ReactChildren }) => (
+const Wrapper = ({ children }: { children: React.ReactNode }) => (
   /* @ts-ignore */
   <Provider store={store}>
     <ThemeContext.Provider
@@ -118,4 +119,53 @@ describe("PlayerLiveImageComponent", () => {
 
     // TODO: implement this test
   });
+
+  it("should register the player for normal item", () => {
+    render(
+      <Wrapper>
+        <PlayerLiveImage {...defaultProps} />
+      </Wrapper>
+    );
+
+    const isPlayerRegistered = playerManager.isPlayerRegistered(
+      defaultProps.playerId
+    );
+
+    expect(isPlayerRegistered).toBe(true);
+  });
+
+  it("should unregister the player for normal item", () => {
+    const component = render(
+      <Wrapper>
+        <PlayerLiveImage {...defaultProps} />
+      </Wrapper>
+    );
+
+    component.unmount();
+
+    const isPlayerRegistered = playerManager.isPlayerRegistered(
+      defaultProps.playerId
+    );
+
+    expect(isPlayerRegistered).toBe(false);
+  });
+
+  it("should not register the player for 'pre-measurement' item", () => {
+    const props = {
+      ...defaultProps,
+      item: {
+        ...defaultProps.item,
+        id: "pre-measurement-1",
+      },
+    };
+
+    render(
+      <Wrapper>
+        <PlayerLiveImage {...props} />
+      </Wrapper>
+    );
+
+    const isPlayerRegistered = playerManager.isPlayerRegistered(props.playerId);
+    expect(isPlayerRegistered).toBe(false);
+  });
 });

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;