@applicaster/zapp-react-native-ui-components 13.0.0-alpha.8532113155 → 13.0.0-alpha.9103242840

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

@@ -1,10 +1,48 @@
 import * as React from "react";
 
+import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
+import * as FOCUS_EVENTS from "@applicaster/zapp-react-native-utils/appUtils/focusManager/events";
 import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
 
+import { isAppleTV } from "../../Helpers/Platform";
 import { useCellState } from "../MasterCell/utils";
-import { FocusableGroup } from "../FocusableGroup";
+
+const useCellFocusedState = (
+  skipFocusManagerRegistration: boolean,
+  groupId: string,
+  id: string
+) => {
+  const [currentCellFocused, setCurrentCellFocused] = React.useState(false);
+
+  React.useEffect(() => {
+    const isGroupItemFocused = () => {
+      if (!skipFocusManagerRegistration) {
+        const isFocused = focusManager.isGroupItemFocused(groupId, id);
+        setCurrentCellFocused(isFocused);
+      }
+    };
+
+    const handler = () => {
+      // tvOS hack for properly checking focus
+      if (isAppleTV()) {
+        setTimeout(() => {
+          isGroupItemFocused();
+        }, 0);
+      } else {
+        isGroupItemFocused();
+      }
+    };
+
+    focusManager.on(FOCUS_EVENTS.FOCUS, handler);
+
+    return () => {
+      focusManager.removeHandler(FOCUS_EVENTS.FOCUS, handler);
+    };
+  }, [groupId, skipFocusManagerRegistration]);
+
+  return currentCellFocused;
+};
 
 type Props = {
   item: ZappEntry;
@@ -37,7 +75,11 @@ export function CellWithFocusable(props: Props) {
     focused,
   } = props;
 
-  const [isFocused, setIsFocused] = React.useState(false);
+  const isFocused = useCellFocusedState(
+    skipFocusManagerRegistration,
+    groupId,
+    id
+  );
 
   const state = useCellState({
     id: item.id,
@@ -54,52 +96,26 @@ export function CellWithFocusable(props: Props) {
     }
   }, [focusedButtonId]);
 
-  const handleToggleFocus = React.useCallback(
-    (value) => {
-      setFocusedButtonId(value.focusedButtonId);
-
-      if (value.focusable) {
-        onFocus(value.focusable, value.mouse);
-      }
-    },
-    [onFocus]
-  );
-
-  const onGroupFocus = React.useCallback(() => {
-    if (!skipFocusManagerRegistration) {
-      setIsFocused(true);
-    }
-  }, [skipFocusManagerRegistration]);
+  const handleToggleFocus = (value) => {
+    setFocusedButtonId(value.focusedButtonId);
 
-  const onGroupBlur = React.useCallback(() => {
-    if (!skipFocusManagerRegistration) {
-      setIsFocused(false);
+    if (value.focusable) {
+      onFocus(value.focusable, value.mouse);
     }
-  }, [skipFocusManagerRegistration]);
+  };
 
   return (
-    <FocusableGroup
-      id={`focusable-cell-wrapper-${id}`}
-      testID={"cell-with-focusable-cell-renderer-focusable-group"}
+    <CellRenderer
+      item={item}
       groupId={groupId}
+      onToggleFocus={handleToggleFocus}
+      state={state}
+      prefixId={id}
+      focusedButtonId={focusedButtonId}
       preferredFocus={preferredFocus}
-      shouldUsePreferredFocus
-      onFocus={onGroupFocus}
-      onBlur={onGroupBlur}
-    >
-      <CellRenderer
-        testID={"cell-with-focusable-cell-renderer"}
-        item={item}
-        groupId={`focusable-cell-wrapper-${id}`}
-        onToggleFocus={handleToggleFocus}
-        state={state}
-        prefixId={id}
-        focusedButtonId={focusedButtonId}
-        preferredFocus={true}
-        skipFocusManagerRegistration={skipFocusManagerRegistration}
-        isFocusable={isFocusable}
-        focused={focused}
-      />
-    </FocusableGroup>
+      skipFocusManagerRegistration={skipFocusManagerRegistration}
+      isFocusable={isFocusable}
+      focused={focused}
+    />
   );
 }

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/__tests__/CellWIthFocusable.test.js

@@ -1,7 +1,7 @@
 import { View } from "react-native";
 import React from "react";
 import { act, render } from "@testing-library/react-native";
-import { CellWithFocusable } from "../CellWithFocusable.tsx";
+import { CellWithFocusable } from "../CellWithFocusable";
 
 import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
 
@@ -23,9 +23,7 @@ describe("CellWithFocusable", () => {
 
     const wrapper = renderWith(props);
 
-    const element = wrapper.getByTestId("cell-with-focusable-cell-renderer");
-
-    expect(element.props.state).toBe("default");
+    expect(wrapper.UNSAFE_getByType("View").props.state).toBe("default");
   });
 
   it("should render in default state", () => {
@@ -42,9 +40,8 @@ describe("CellWithFocusable", () => {
     focusManager.isGroupItemFocused = jest.fn(() => true);
 
     const wrapper = renderWith(props);
-    const element = wrapper.getByTestId("cell-with-focusable-cell-renderer");
 
-    expect(element.props.state).toBe("default");
+    expect(wrapper.UNSAFE_getByType("View").props.state).toBe("default");
   });
 
   it("should render in focused state", () => {
@@ -58,17 +55,13 @@ describe("CellWithFocusable", () => {
       scrollTo: jest.fn(),
     };
 
+    focusManager.isGroupItemFocused = jest.fn(() => true);
     const wrapper = renderWith(props);
 
-    const focusableGroupComponent = wrapper.getByTestId(
-      "cell-with-focusable-cell-renderer-focusable-group"
-    );
-
     act(() => {
-      focusableGroupComponent.props.onFocus();
+      focusManager.on.mock.calls[focusManager.on.mock.calls.length - 1][1]();
     });
 
-    const element = wrapper.getByTestId("cell-with-focusable-cell-renderer");
-    expect(element.props.state).toBe("focused");
+    expect(wrapper.UNSAFE_getByType("View").props.state).toBe("focused");
   });
 });

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/Focusable/Touchable.tsx

@@ -1,24 +1,25 @@
 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/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/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