@applicaster/zapp-react-native-ui-components 12.0.0-alpha.4223432180 → 12.0.0-alpha.4241289980

package/Components/Cell/Cell.tsx

@@ -276,20 +276,13 @@ export class CellComponent extends React.Component<Props, State> {
           skipFocusManagerRegistration={skipFocusManagerRegistration}
         >
           {(focused, event) => {
-            const isFocused = this.isCellFocused(focused);
-
-            if (isFocused) {
-              const accessibilityManager = AccessibilityManager.getInstance();
-              accessibilityManager.readText({ text: item.title });
-            }
-
             return (
               <FocusableCell
                 {...{
                   index,
                   CellRenderer,
                   item,
-                  focused: isFocused,
+                  focused: this.isCellFocused(focused),
                   scrollTo: this.scrollToIndex(event),
                   behavior,
                 }}

package/Components/Focusable/index.android.tsx

@@ -128,10 +128,7 @@ function FocusableComponent(props: Props, forwardedRef) {
 
   const _onBlur = React.useCallback(
     (ref, options = {}) => {
-      if (ref.props.id !== focusManager.focusedId) {
-        setFocused(false);
-      }
-
+      setFocused(false);
       onBlur?.(ref, options);
     },
     [onBlur]
@@ -151,14 +148,15 @@ function FocusableComponent(props: Props, forwardedRef) {
     [isRTL, nextFocusDown, nextFocusUp, nextFocusLeft, nextFocusRight]
   );
 
-  const contextState = React.useMemo(() => {
-    return {
+  const contextState = React.useMemo(
+    () => ({
       focused,
       ...parentFocus,
       ref: touchableRef,
       setIsFocusable,
-    };
-  }, [parentFocus, focused]);
+    }),
+    [parentFocus, focused]
+  );
 
   return (
     <Touchable
@@ -175,13 +173,9 @@ function FocusableComponent(props: Props, forwardedRef) {
       {...parentFocus}
     >
       <FocusableContext.Provider value={contextState}>
-        {React.useMemo(
-          () =>
-            typeof children === "function"
-              ? children(focused, parentFocus, touchableRef)
-              : children,
-          [children, focused, parentFocus]
-        )}
+        {typeof children === "function"
+          ? children(focused, parentFocus, touchableRef)
+          : children}
       </FocusableContext.Provider>
     </Touchable>
   );

package/Components/FocusableList/FocusableChild.ts

@@ -1,6 +1,7 @@
 import * as React from "react";
 import { isEqual } from "@applicaster/zapp-react-native-utils/equalUtils";
 import { useFocusable } from "../Focusable/index.android";
+import { useCellState } from "./hooks/useCellState.android";
 
 /**
  * returns parent focus from prop or from context
@@ -29,14 +30,15 @@ const useParentFocus = (
   );
 
 function FocusableChildComponent(props) {
-  const { setIsFocusable, focused, ...focusableContext } = useFocusable();
-
+  const { setIsFocusable, ...focusableContext } = useFocusable();
   const parentFocus = useParentFocus(props, focusableContext);
 
   const onLoadFailed = React.useCallback(() => {
     setIsFocusable(false);
   }, []);
 
+  const focused = useCellState(props.id);
+
   return props.renderItem({
     ...props,
     focused,

package/Components/FocusableList/index.tsx

@@ -88,7 +88,6 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
     data = [],
     // eslint-disable-next-line unused-imports/no-unused-vars
     onAllComponentsLoaded, // TODO: re-implement it
-    omitPropsPropagation = [],
   } = props;
 
   useCheckItemIdsForUnique({ componentId: props.id, items: data });
@@ -253,9 +252,9 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
     ]
   );
 
-  const getFlatListProps = React.useCallback(
-    R.omit(
-      [
+  const flatListProps = React.useMemo(
+    () =>
+      R.omit([
         "onListElementFocus",
         "onListElementPress",
         "onListElementPressOut",
@@ -268,17 +267,17 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
         "focusableItemProps",
         "renderItem",
         "extraChildrenData",
+        "extraData",
+        "keyExtractor",
         "onAllComponentsLoaded",
         "focused",
         "id",
         "initialFocusDirection",
         "withStateMemory",
         "useSequentialLoading",
-        ...omitPropsPropagation,
-      ],
-      R.__
-    ),
-    [omitPropsPropagation]
+        ...(props.omitPropsPropagation || []),
+      ])(props),
+    [props]
   );
 
   const onEndReached = React.useCallback(
@@ -290,7 +289,7 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
 
   const initialNumToRender = toFiniteNumberWithDefault(
     10,
-    props.initialNumToRender
+    flatListProps.initialNumToRender
   );
 
   return (
@@ -299,10 +298,12 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
       <FlatList
         focusable={false}
         scrollEnabled={false}
+        extraData={props.extraData}
         ref={ref}
-        {...getFlatListProps(props)}
+        {...flatListProps}
         renderItem={renderItem}
         onEndReached={onEndReached}
+        keyExtractor={props.keyExtractor}
         initialNumToRender={initialNumToRender}
       />
     </ChildrenFocusDeactivatorView>

package/Components/FocusableScrollView/index.tsx

@@ -284,7 +284,7 @@ function FocusableScrollViewComponent(props: Props, ref) {
       };
 
       return (
-        <View key={id} onLayout={onItemLayout}>
+        <View onLayout={onItemLayout}>
           <Focusable
             {...nextFocus}
             onFocus={(element, direction) =>

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

@@ -47,8 +47,9 @@ export function FocusableView({ style, children, item, ...otherProps }: Props) {
 
   const accessibilityManager = useAccessibilityManager({});
 
-  const { ttsLabel = "" } =
-    actionContext?.initialEntryState(item)?.getAccessibility?.(item) || {};
+  const { ttsLabel } = actionContext
+    ?.initialEntryState(item)
+    ?.getAccessibility(item);
 
   const onPress = (event) => {
     event?.preventDefault?.();

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

@@ -38,22 +38,21 @@ 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)
+    : defaultPlaceHolderImage;
+
   return (
     // @ts-ignore
     <MemoizedImage
       style={style as ImageStyle}
       onError={() => setErrorState(true)}
-      source={
-        shouldRenderImg ? withDimensions(source) : defaultPlaceHolderImage
-      }
+      source={_source?.uri ? _source : undefined}
       {...R.omit(["source"], otherProps)}
     />
   );

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

@@ -31,10 +31,10 @@ function Image({
 
   return (
     <RnImage
-      defaultSource={placeholderImage || null}
+      defaultSource={placeholderImage || ""}
       style={style}
       source={updatedSource}
-      {...R.omit(["source", "placeholderImage"], otherProps)}
+      {...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).toEqual({ uri: "" });
+    expect(testInstance.findByType(Image).props.source).toBeUndefined();
   });
 });

package/Components/PlayerContainer/PlayerContainer.tsx

@@ -362,15 +362,21 @@ const PlayerContainerComponent = (props: Props) => {
   const toggleFullscreen = (event) => {
     const { fullscreen = false } = event || {};
 
-    setTimeout(() => {
-      if (fullscreen) {
-        navigator.fullscreenVideoModal();
+    if (fullscreen) {
+      // in order to avoid UI glitches with player we have to start re-render ealier and then start real rotation
+      navigator.fullscreenVideoModal();
+
+      setTimeout(() => {
         playerEvent("onFullscreenPlayerWillPresent");
-      } else {
-        navigator.maximiseVideoModal();
+      });
+    } else {
+      // in order to avoid UI glitches with player we have to start re-render ealier and then start real rotation
+      navigator.maximiseVideoModal();
+
+      setTimeout(() => {
         playerEvent("onFullscreenPlayerWillDismiss");
-      }
-    });
+      });
+    }
   };
 
   const onCellTap = (entry) => {
@@ -465,10 +471,6 @@ const PlayerContainerComponent = (props: Props) => {
 
     if (mode === VideoModalMode.FULLSCREEN) {
       toggleFullscreen({ fullscreen: false });
-
-      if (!isModal) {
-        playerManager.closeNativePlayer();
-      }
     }
 
     return !!(

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={Object {}}
-        source={
-          Object {
-            "uri": "",
-          }
-        }
         style={Object {}}
       />
     </View>

package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx

@@ -223,8 +223,7 @@ export const AnimatedScrollModalComponent = ({ children }: Props) => {
       (videoModalState.mode === "MAXIMIZED" &&
         videoModalState.previousMode === "MINIMIZED" &&
         previousItemId === videoModalState.item?.id) ||
-      (previousItemId !== videoModalState.item?.id &&
-        videoModalState.mode !== "FULLSCREEN")
+      previousItemId !== videoModalState.item?.id
     ) {
       setPlayerAnimationState(PlayerAnimationStateEnum.maximaze);
       setTimeout(() => resetPlayerAnimationState());

package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx

@@ -60,10 +60,7 @@ export const AnimationView = ({
   const {
     width: screenWidth,
     deviceInfo: { isTablet, isTabletLandscape },
-  } = useDimensions("window", {
-    deviceInfo: true,
-    updateForInactiveScreens: true,
-  });
+  } = useDimensions("window", { deviceInfo: true });
 
   const { videoModalState } = useNavigation();
   const insets = useSafeAreaInsets();
@@ -304,18 +301,13 @@ export const AnimationView = ({
           typeof additionalData.height === "number" && additionalData.height;
       }
 
-      if (
-        videoModalState.mode === "MAXIMIZED" &&
-        defaultValue.x !== screenWidth &&
-        width &&
-        height
-      ) {
+      if (defaultValue.x === 0 && width && height) {
         const value = { x: width, y: height };
         setDefaultValue(value);
         animatedValue.setValue(value);
       }
     }
-  }, [screenWidth]);
+  }, [additionalData, screenWidth]);
 
   React.useEffect(() => {
     if (

package/Components/ZappFrameworkComponents/BarView/BarView.tsx

@@ -45,10 +45,7 @@ const BarView = ({ screenStyles, barState = defaultState }: Props) => {
   );
 
   return (
-    <SafeAreaView
-      style={[style.view, isRTL ? style.rtlStyle : {}]}
-      testID="BarView-safeAreaView"
-    >
+    <SafeAreaView style={[style.view, isRTL ? style.rtlStyle : {}]}>
       {backButton}
       <BarTitle title={barState.title} screenStyles={screenStyles} />
       {closeButton}

package/Components/ZappFrameworkComponents/BarView/Buttons/BackButton.tsx

@@ -11,16 +11,12 @@ const renderEmptyView = () => {
   return <View style={emptyViewStyle} />;
 };
 
-type FloatingButtonProps = Testable & {
+type FloatingButtonProps = {
   onPress: () => void;
   screenStyles: any;
 };
 
-const BackButton = ({
-  onPress,
-  screenStyles,
-  testID = "backButton",
-}: FloatingButtonProps) => {
+const BackButton = ({ onPress, screenStyles }: FloatingButtonProps) => {
   const containerStyle: any = {};
 
   if (!onPress) {
@@ -29,7 +25,6 @@ const BackButton = ({
 
   return (
     <ActionButton
-      testID={`${testID}-actionButton`}
       onPress={onPress}
       buttonStyles={containerStyle}
       imageUrl={screenStyles.back_button_image}

package/Components/ZappFrameworkComponents/BarView/Buttons/CloseButton.tsx

@@ -11,16 +11,12 @@ const renderEmptyView = () => {
   return <View style={emptyViewStyle} />;
 };
 
-type CloseButtonProps = Testable & {
+type CloseButtonProps = {
   onPress: () => void;
   screenStyles?: any;
 };
 
-const CloseButton = ({
-  onPress,
-  screenStyles,
-  testID = "closeButton",
-}: CloseButtonProps) => {
+const CloseButton = ({ onPress, screenStyles }: CloseButtonProps) => {
   const containerStyle: any = {};
 
   if (!onPress) {
@@ -29,7 +25,6 @@ const CloseButton = ({
 
   return (
     <ActionButton
-      testID={`${testID}-actionButton`}
       onPress={onPress}
       buttonStyles={containerStyle}
       imageUrl={screenStyles.close_button_image}

package/Components/ZappFrameworkComponents/Buttons/ActionButton.tsx

@@ -28,7 +28,7 @@ styles: {
 }
 */
 
-type ActionButtonProps = Testable & {
+type ActionButtonProps = {
   onPress: () => void;
   buttonStyles: any;
   imageUrl: string;
@@ -46,16 +46,11 @@ const ActionButton = ({
   buttonStyles,
   imageUrl,
   imageStyle = closeButtonStyle,
-  testID,
 }: ActionButtonProps) => {
   return (
-    <View style={buttonStyles} testID={testID}>
-      <TouchableOpacity onPress={onPress} testID={`${testID}-touchable`}>
-        <Image
-          source={{ uri: imageUrl }}
-          style={imageStyle}
-          testID={`${testID}-image`}
-        />
+    <View style={buttonStyles}>
+      <TouchableOpacity onPress={onPress}>
+        <Image source={{ uri: imageUrl }} style={imageStyle} />
       </TouchableOpacity>
     </View>
   );

package/Contexts/CachedDimensionsContext/index.ts

@@ -1,6 +1,5 @@
 import { create, useStore } from "zustand";
 import { produce } from "immer";
-import { useCallback, useMemo } from "react";
 
 type Dimensions = {
   width: Option<number>;
@@ -32,19 +31,16 @@ export const useCachedDimensions = (id: string) => {
     dimensionsStore
   ) as DimensionsState;
 
-  const getCachedDimensions = useCallback(() => {
+  const getCachedDimensions = () => {
     return dimensions[id] || initialDimensions();
-  }, [dimensions?.[id], id]);
+  };
 
-  const handleSetCachedDimensions = useCallback((newDimensions) => {
+  const handleSetCachedDimensions = (newDimensions) => {
     setCachedDimensions(id, newDimensions);
-  }, []);
-
-  return useMemo(
-    () => ({
-      getCachedDimensions,
-      setCachedDimensions: handleSetCachedDimensions,
-    }),
-    [getCachedDimensions, handleSetCachedDimensions]
-  );
+  };
+
+  return {
+    getCachedDimensions,
+    setCachedDimensions: handleSetCachedDimensions,
+  };
 };

package/Contexts/ScreenContext/index.tsx

@@ -177,12 +177,7 @@ export function withScreenContext(Component: React.ComponentType<any>) {
   return function WithScreenContextWrapper(props) {
     return (
       <ScreenContext.Consumer>
-        {useCallback(
-          (value) => (
-            <Component {...props} screenContext={value} />
-          ),
-          [Component, props]
-        )}
+        {(value) => <Component {...props} screenContext={value} />}
       </ScreenContext.Consumer>
     );
   };

package/package.json

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

package/Components/Focusable/__tests__/index.android.test.tsx

@@ -1,72 +0,0 @@
-import React from "react";
-import { render, act } from "@testing-library/react-native";
-import { Touchable } from "../../Touchable";
-
-const mockUseIsRTL = jest.fn();
-
-jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
-  useIsRTL: mockUseIsRTL,
-}));
-
-const mockUseFocusManager = jest.fn();
-
-jest.mock("@applicaster/zapp-react-native-utils/focusManager", () => ({
-  useFocusManager: mockUseFocusManager,
-}));
-
-const mockUsePrevious = jest.fn();
-
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/utils", () => ({
-  usePrevious: mockUsePrevious,
-}));
-
-const { Focusable } = require("../index.android");
-
-describe("Focusable", () => {
-  const mockFocusManager = {
-    isFocused: jest.fn(),
-    onDisableFocusChange: jest.fn(),
-    registerFocusable: jest.fn(),
-    focusedId: "test-id",
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockUseIsRTL.mockReturnValue(false);
-    mockUseFocusManager.mockReturnValue(mockFocusManager);
-    mockUsePrevious.mockReturnValue(false);
-  });
-
-  it("updates disableFocus state when disableFocus prop changes", () => {
-    const { rerender } = render(
-      <Focusable id="test-id" disableFocus={false}>
-        <Touchable testID="touchable" />
-      </Focusable>
-    );
-
-    rerender(
-      <Focusable id="test-id" disableFocus={true}>
-        <Touchable testID="touchable" />
-      </Focusable>
-    );
-
-    expect(mockFocusManager.onDisableFocusChange).toHaveBeenCalledWith(
-      "test-id"
-    );
-  });
-
-  it("calls focusManager.registerFocusable on mount and unregisters on unmount", () => {
-    const unregister = jest.fn();
-    mockFocusManager.registerFocusable.mockReturnValue(unregister);
-
-    const { unmount } = render(
-      <Focusable id="test-id">
-        <Touchable testID="touchable" />
-      </Focusable>
-    );
-
-    expect(mockFocusManager.registerFocusable).toHaveBeenCalled();
-    act(() => unmount());
-    expect(unregister).toHaveBeenCalled();
-  });
-});

package/Components/ZappFrameworkComponents/BarView/__tests__/BarView.test.tsx

@@ -1,87 +0,0 @@
-import React from "react";
-import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
-import { fireEvent } from "@testing-library/react-native";
-
-const mockUseIsRTL = jest.fn(() => true);
-
-jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
-  useIsRTL: mockUseIsRTL,
-}));
-
-const BarView = require("../BarView").default;
-
-describe("BarView", () => {
-  const screenStyles = {
-    title_font_color: "#000",
-    title_font_android: "Roboto",
-    title_font_ios: "San Francisco",
-    title_font_size: "16",
-    background_color: "#fff",
-  };
-
-  const barState = {
-    backHandler: jest.fn(),
-    closeHandler: jest.fn(),
-    title: "Test Title",
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it("renders without crashing", () => {
-    mockUseIsRTL.mockReturnValue(false);
-
-    const { getByText } = renderWithProviders(
-      <BarView screenStyles={screenStyles} barState={barState} />
-    );
-
-    expect(getByText("Test Title")).toBeTruthy();
-  });
-
-  it("applies RTL styles when isRTL is true", () => {
-    mockUseIsRTL.mockReturnValue(true);
-
-    const { getByTestId } = renderWithProviders(
-      <BarView screenStyles={screenStyles} barState={barState} />
-    );
-
-    expect(getByTestId("BarView-safeAreaView").props.style).toContainEqual({
-      transform: [{ scaleX: -1 }],
-    });
-  });
-
-  it("does not apply RTL styles when isRTL is false", () => {
-    mockUseIsRTL.mockReturnValue(false);
-
-    const { getByTestId } = renderWithProviders(
-      <BarView screenStyles={screenStyles} barState={barState} />
-    );
-
-    expect(getByTestId("BarView-safeAreaView").props.style).not.toContainEqual({
-      transform: [{ scaleX: -1 }],
-    });
-  });
-
-  it("calls closeHandler when CloseButton is pressed", () => {
-    mockUseIsRTL.mockReturnValue(false);
-
-    const { getByTestId } = renderWithProviders(
-      <BarView screenStyles={screenStyles} barState={barState} />
-    );
-
-    fireEvent.press(getByTestId("closeButton-actionButton-touchable"));
-    expect(barState.closeHandler).toHaveBeenCalled();
-  });
-
-  it("calls backHandler when BackButton is pressed", () => {
-    mockUseIsRTL.mockReturnValue(false);
-
-    const { getByTestId } = renderWithProviders(
-      <BarView screenStyles={screenStyles} barState={barState} />
-    );
-
-    fireEvent.press(getByTestId("backButton-actionButton-touchable"));
-    expect(barState.backHandler).toHaveBeenCalled();
-  });
-});