@applicaster/zapp-react-native-ui-components 13.0.0-alpha.1177234712 → 13.0.0-alpha.1212224153

package/Components/Cell/Cell.tsx

@@ -61,6 +61,7 @@ type Props = {
   skipFocusManagerRegistration?: boolean;
   shouldUpdate: boolean;
   behavior: Behavior;
+  componentsMapOffset: number;
 };
 
 type State = {
@@ -273,14 +274,10 @@ export class CellComponent extends React.Component<Props, State> {
             if (isFocused) {
               const accessibilityManager = AccessibilityManager.getInstance();
 
-              const accessibilityTitle =
-                item?.extensions?.accessibility?.label || item?.title || "";
-
-              const accessibilityHint =
-                item?.extensions?.accessibility?.hint || "";
-
               accessibilityManager.readText({
-                text: `${accessibilityTitle} ${accessibilityHint}`,
+                text: String(
+                  item.extensions?.accessibility?.label || item.title
+                ),
               });
             }
 

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";
@@ -65,6 +65,7 @@ type Props = {
   isFocusable: boolean;
   shouldUpdate: boolean;
   behavior: Behavior;
+  componentsMapOffset: number;
 };
 
 type State = {
@@ -179,6 +180,7 @@ export class TvOSCellComponent extends React.Component<Props, State> {
       groupId,
       component,
       index,
+      componentsMapOffset,
     } = this.props;
 
     this.setScreenLayout(componentAnchorPointY, screenLayout);
@@ -193,13 +195,11 @@ export class TvOSCellComponent extends React.Component<Props, State> {
       const extraAnchorPointYOffset =
         screenLayout?.extraAnchorPointYOffset || 0;
 
-      const marginTop = screenLayout?.screenMarginTop || 0;
-
       const totalOffset =
         headerOffset +
-        (componentAnchorPointY || 0) +
-        extraAnchorPointYOffset -
-        marginTop;
+          (componentAnchorPointY || 0) +
+          extraAnchorPointYOffset -
+          componentsMapOffset || 0;
 
       mainOffsetUpdater?.(
         { tag: this.target },
@@ -247,7 +247,7 @@ export class TvOSCellComponent extends React.Component<Props, State> {
 
     const focusableId = R.join("-", [component?.id, id, index]);
 
-    const handleFocus = (arg1: any, index: number) => {
+    const handleFocus = (arg1: any, index?: number) => {
       const focusFn = onFocus || noop;
       focusFn(arg1, index);
 
@@ -280,7 +280,7 @@ export class TvOSCellComponent extends React.Component<Props, State> {
       <View onLayout={this.onLayout} style={styles.container}>
         <Focusable
           id={focusableId}
-          groupId={groupId || component?.id}
+          groupId={String(groupId || component?.id)}
           onFocus={handleFocus}
           onBlur={onBlur || this.onBlur}
           isParallaxDisabled={this.layout?.width > 1740}
@@ -292,20 +292,18 @@ export class TvOSCellComponent extends React.Component<Props, State> {
           style={baseCellStyles}
           isFocusable={isFocusable}
         >
-          {(focused) => {
-            return (
-              <FocusableCell
-                {...{
-                  index,
-                  CellRenderer,
-                  item,
-                  focused: this.props.focused || selectedCell || focused,
-                  scrollTo: this.scrollTo,
-                  behavior,
-                }}
-              />
-            );
-          }}
+          {(focused) => (
+            <FocusableCell
+              {...{
+                index,
+                CellRenderer,
+                item,
+                focused: !!(this.props.focused || selectedCell || focused),
+                scrollTo: this.scrollTo,
+                behavior,
+              }}
+            />
+          )}
         </Focusable>
       </View>
     );

package/Components/Cell/index.js

@@ -11,6 +11,7 @@ import { ScreenScrollingContext } from "../../Contexts/ScreenScrollingContext";
 
 import { ScreenLayoutContextConsumer } from "../../Contexts/ScreenLayoutContext";
 import { createContext } from "@applicaster/zapp-react-native-utils/reactUtils/createContext";
+import { withComponentsMapOffsetContextConsumer } from "../../Contexts/ComponentsMapOffsetContext";
 
 // TODO | Gallery QB | Extract this
 export const ScrollInterceptorContext = createContext(
@@ -30,5 +31,6 @@ export const Cell = R.compose(
   RiverOffsetContext.withConsumer,
   HorizontalScrollContext.withConsumer,
   withConsumer,
-  ScreenLayoutContextConsumer
+  ScreenLayoutContextConsumer,
+  withComponentsMapOffsetContextConsumer
 )(Component);

package/Components/Focusable/FocusableTvOS.tsx

@@ -9,7 +9,7 @@ import {
   focusManager,
   forceFocusableFocus,
 } from "@applicaster/zapp-react-native-utils/appUtils/focusManager/index.ios";
-import { findNodeHandle } from "react-native";
+import { findNodeHandle, ViewStyle } from "react-native";
 
 function noop() {}
 
@@ -35,6 +35,10 @@ type Props = {
   forceFocus?: boolean;
   initialFocus?: boolean;
   onLayout?: (e: any) => void;
+  willReceiveFocus: () => void;
+  hasReceivedFocus: () => void;
+  offsetUpdater: (arg1: string, arg2: number) => number;
+  style: ViewStyle;
 };
 
 export class Focusable extends BaseFocusable<Props> {

package/Components/FocusableList/index.tsx

@@ -15,6 +15,7 @@ import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 
 import { useParentFocus, useCheckItemIdsForUnique } from "./hooks";
 import { FocusableListItemWrapper } from "./FocusableListItemWrapper";
+import { FocusableScrollView } from "../FocusableScrollView";
 
 const mapIndexed = R.addIndex(R.map);
 
@@ -54,6 +55,7 @@ export type Props<ItemT> = FlatListProps<ItemT> & {
   disableNextFocusUp?: boolean;
   disableNextFocusLeft?: boolean;
   disableNextFocusRight?: boolean;
+  useScrollView?: boolean;
 } & ParentFocus;
 
 function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
@@ -88,6 +90,7 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
     data = [],
     // eslint-disable-next-line unused-imports/no-unused-vars
     omitPropsPropagation = [],
+    useScrollView = false,
   } = props;
 
   useCheckItemIdsForUnique({ componentId: props.id, items: data });
@@ -273,6 +276,7 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
         "initialFocusDirection",
         "withStateMemory",
         "useSequentialLoading",
+        "useScrollView",
         ...omitPropsPropagation,
       ],
       R.__
@@ -295,15 +299,28 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
   return (
     // @ts-ignore
     <ChildrenFocusDeactivatorView flex={1}>
-      <FlatList
-        focusable={false}
-        scrollEnabled={false}
-        ref={ref}
-        {...getFlatListProps(props)}
-        renderItem={renderItem}
-        onEndReached={onEndReached}
-        initialNumToRender={initialNumToRender}
-      />
+      {useScrollView ? (
+        <FocusableScrollView
+          ref={ref}
+          {...getFlatListProps(props)}
+          onEndReached={onEndReached}
+          initialNumToRender={initialNumToRender}
+          renderItem={renderItem}
+          focused={focused}
+          data={data}
+        />
+      ) : (
+        <FlatList
+          testID="focusable-list-flat-list"
+          focusable={false}
+          scrollEnabled={false}
+          ref={ref}
+          {...getFlatListProps(props)}
+          renderItem={renderItem}
+          onEndReached={onEndReached}
+          initialNumToRender={initialNumToRender}
+        />
+      )}
     </ChildrenFocusDeactivatorView>
   );
 }

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,17 +39,27 @@ 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[];
 type Action = { index?: number; isFocusable: boolean; type?: string };
 
+const unwrapArray = (maybeArray) =>
+  Array.isArray(maybeArray) ? maybeArray[0] : maybeArray;
+
+function getEntry<T>(data: T | T[], index: unknown): T {
+  let entry;
+
+  if (R.isNil(index)) {
+    entry = unwrapArray(data);
+  } else if (typeof index === "number") {
+    entry = unwrapArray(data[index]);
+  }
+
+  return entry;
+}
+
 const focusableStateReducer = (
   state: State,
   { index = null, isFocusable, type = null }: Action
@@ -73,7 +90,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 +146,11 @@ 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: { id?: string } = getEntry(
+        R.isNil(index) ? _entry : data,
+        index
+      );
 
       return entry ? `${props.id}--${entry?.id}` : undefined;
     },
@@ -273,11 +293,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/Layout/TV/NavBarContainer.tsx

@@ -1,7 +1,5 @@
 import * as React from "react";
 import { View, StyleSheet } from "react-native";
-import { ScreenLayoutContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenLayoutContext";
-import { ifEmptyUseFallback } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { useCurrentScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
 import { useScreenConfiguration } from "../../River/useScreenConfiguration";
 
@@ -12,12 +10,15 @@ type Props = {
 };
 
 const styles = StyleSheet.create({
-  container: { position: "absolute", top: 0, zIndex: 10, width: 1920 },
+  container: {
+    position: "absolute",
+    top: 0,
+    zIndex: 10,
+    width: 1920,
+  },
 });
 
 export const NavBarContainer = ({ children, isVisible, onReady }: Props) => {
-  const screenLayout = React.useContext(ScreenLayoutContext);
-  const screenMarginTop = screenLayout?.screenMarginTop || 0;
   const screen = useCurrentScreenData();
   const screenConfig = useScreenConfiguration(screen?.id);
 
@@ -26,9 +27,9 @@ export const NavBarContainer = ({ children, isVisible, onReady }: Props) => {
       // limits the height of the focusable container of the TopMenuBarTV component
       // to prevent it from being overlapped by the screen content,
       // as it makes TopMenuBarTV unfocusable on tvOS
-      maxHeight: ifEmptyUseFallback(screenConfig?.marginTop, screenMarginTop),
+      maxHeight: 1,
     }),
-    [screenLayout, screenConfig]
+    [screenConfig]
   );
 
   React.useEffect(() => {

package/Components/Layout/TV/__tests__/__snapshots__/NavBarContainer.test.tsx.snap

@@ -11,7 +11,7 @@ exports[`NavBarContainer renders 1`] = `
         "zIndex": 10,
       },
       {
-        "maxHeight": 10,
+        "maxHeight": 1,
       },
     ]
   }

package/Components/Layout/TV/__tests__/__snapshots__/ScreenContainer.test.tsx.snap

@@ -22,7 +22,7 @@ exports[`ScreenContainer renders 1`] = `
           "zIndex": 10,
         },
         {
-          "maxHeight": 10,
+          "maxHeight": 1,
         },
       ]
     }

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

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

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

@@ -38,16 +38,22 @@ function Image({
 
   const shouldRenderImg = source && !error;
 
-  const _source = shouldRenderImg
-    ? withDimensions(source)
-    : { uri: placeholderImage };
+  // 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]
+  );
 
   return (
+    // @ts-ignore
     <MemoizedImage
       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}
+      source={
+        shouldRenderImg ? withDimensions(source) : defaultPlaceHolderImage
+      }
       {...R.omit(["source"], otherProps)}
     />
   );

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).toBeUndefined();
+    expect(testInstance.findByType(Image).props.source).toEqual({ uri: "" });
   });
 });

package/Components/River/TV/index.tsx

@@ -1,4 +1,9 @@
+import { compose } from "ramda";
 import { River as RiverComponent } from "./River";
 import { withTvEventHandler } from "./withTVEventHandler";
+import { withComponentsMapOffsetContext } from "../../../Contexts/ComponentsMapOffsetContext";
 
-export const River = withTvEventHandler(RiverComponent);
+export const River = compose(
+  withTvEventHandler,
+  withComponentsMapOffsetContext
+)(RiverComponent);

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

@@ -81,13 +81,6 @@ 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),
 }));
@@ -160,13 +153,7 @@ const plugins = [];
 const navigation = {};
 
 const props = { components, cellStyles, riverComponents, navigation };
-
-const store = mockStore({
-  components,
-  cellStyles,
-  plugins,
-  getState: jest.fn(),
-});
+const store = mockStore({ components, cellStyles, plugins });
 
 jest.useFakeTimers();
 

package/Components/VideoLive/LiveImageManager.ts

@@ -8,8 +8,6 @@ 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 =
@@ -64,9 +62,6 @@ 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>
@@ -123,11 +118,6 @@ export class LiveImageManager implements PlayerLifecycleListener {
     });
   };
 
-  private cancelCheckPlayerPositionTimeout = () => {
-    clearTimeout(this.checkPlayerPositionTimeout);
-    this.checkPlayerPositionTimeout = null;
-  };
-
   public onViewportEnter = (item: LiveImage) => {
     log_debug(
       `onViewportEnter: live-image ${playerInfo(
@@ -135,21 +125,7 @@ export class LiveImageManager implements PlayerLifecycleListener {
       )}, primary ${playerInfo(this.primaryPlayer)}`
     );
 
-    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);
-    }
+    this.checkPlayerPosition(item);
   };
 
   public onViewportLeave = (item: LiveImage) => {
@@ -270,8 +246,6 @@ 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,27 +244,25 @@ const PlayerLiveImageComponent = (props: Props) => {
   }, [item.id]);
 
   React.useEffect(() => {
-    if (isMeasurement(item) || !playerManager) {
-      return;
-    }
-
-    const isPlayerRegistered = playerManager.isPlayerRegistered(playerId);
+    if (playerManager) {
+      const isPlayerRegistered = playerManager.isPlayerRegistered(playerId);
 
-    if (isPlayerRegistered) {
-      log_error(
-        `PlayerLiveImageComponent: player ${playerId} already registered`
-      );
-    } else {
-      playerManager.registerPlayer({
-        id: playerId,
-        playerController: controller,
-      });
+      if (isPlayerRegistered) {
+        log_error(
+          `PlayerLiveImageComponent: player ${playerId} already registered`
+        );
+      } else {
+        playerManager.registerPlayer({
+          id: playerId,
+          playerController: controller,
+        });
 
-      return () => {
-        playerManager.unregisterPlayer(playerId);
-      };
+        return () => {
+          playerManager.unregisterPlayer(playerId);
+        };
+      }
     }
-  }, [liveImageItem, playerId, controller, item.id]);
+  }, [liveImageItem, playerId, controller]);
 
   const onPositionUpdated = React.useCallback(
     (data) => {

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

@@ -4,7 +4,6 @@ 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";
@@ -33,7 +32,7 @@ const mockStore = configureStore();
 
 const store = mockStore({ appData: {} });
 
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
+const Wrapper = ({ children }: { children: React.ReactChildren }) => (
   /* @ts-ignore */
   <Provider store={store}>
     <ThemeContext.Provider
@@ -119,53 +118,4 @@ 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,6 +31,11 @@ exports[`PlayerLiveImageComponent should render correctly with default props 1`]
         playerId="player1"
         resizeMode="cover"
         screenConfig={{}}
+        source={
+          {
+            "uri": "",
+          }
+        }
         style={{}}
       />
     </View>