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

package/Components/AppContainer/__tests__/AppContainer.test.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { View, Text } from "react-native";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
+import { AppContainer } from "../index";
 
 const styles = {
   iphone: {
@@ -15,11 +15,9 @@ jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
   })),
 }));
 
-const { AppContainer } = require("../index");
-
 describe("<AppContainer />", () => {
   it("renders correctly", () => {
-    const wrapper = shallow(
+    const { toJSON } = render(
       <AppContainer styles={styles}>
         <View>
           <Text>I'm an app</Text>
@@ -27,6 +25,6 @@ describe("<AppContainer />", () => {
       </AppContainer>
     );
 
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/Components/AudioPlayer/__tests__/Runtime.test.js

@@ -1,6 +1,5 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
 
 import { Runtime } from "../Runtime";
 
@@ -18,14 +17,12 @@ const RuntimeProps = (isRTL) => ({
 
 describe("<Runtime />", () => {
   it("RTL renders correctly", () => {
-    const wrapper = shallow(<Runtime {...RuntimeProps(true)} />);
-
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const { toJSON } = render(<Runtime {...RuntimeProps(true)} />);
+    expect(toJSON()).toMatchSnapshot();
   });
 
   it("LTR renders correctly", () => {
-    const wrapper = shallow(<Runtime {...RuntimeProps(false)} />);
-
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const { toJSON } = render(<Runtime {...RuntimeProps(false)} />);
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/Components/AudioPlayer/__tests__/__snapshots__/audioPlayer.test.js.snap

@@ -1,123 +1,66 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<AudioPlayer /> renders correctly 1`] = `
-<AudioPlayerLayout
-  config={
+<View
+  pointerEvents="none"
+  style={
     {
-      "artworkAspectRatio": "1:1",
-      "audioPlayerBackgroundImageQuery": "",
-      "backgroundColor": "black",
-      "backgroundImage": "https://example.com",
-      "channelIcon": "https://example.com",
-      "isRTL": true,
-      "magicBackground": false,
-      "runTimeFontFamily": undefined,
-      "runTimeFontSize": undefined,
-      "summaryColor": "white",
-      "summaryFontFamily": undefined,
-      "summaryFontSize": undefined,
-      "titleColor": "white",
-      "titleFontFamily": undefined,
-      "titleFontSize": undefined,
+      "backgroundColor": "transparent",
+      "overflow": "hidden",
     }
   }
-  style={{}}
 >
-  <Channel
-    config={
+  <View
+    collapsable={false}
+    style={
       {
-        "artworkAspectRatio": "1:1",
-        "audioPlayerBackgroundImageQuery": "",
-        "backgroundColor": "black",
-        "backgroundImage": "https://example.com",
-        "channelIcon": "https://example.com",
-        "isRTL": true,
-        "magicBackground": false,
-        "runTimeFontFamily": undefined,
-        "runTimeFontSize": undefined,
-        "summaryColor": "white",
-        "summaryFontFamily": undefined,
-        "summaryFontSize": undefined,
-        "titleColor": "white",
-        "titleFontFamily": undefined,
-        "titleFontSize": undefined,
+        "backgroundColor": "transparent",
+        "opacity": 0,
+        "overflow": "hidden",
       }
     }
-    srcImage="https://example.com"
-  />
-  <Title
-    config={
-      {
-        "artworkAspectRatio": "1:1",
-        "audioPlayerBackgroundImageQuery": "",
-        "backgroundColor": "black",
-        "backgroundImage": "https://example.com",
-        "channelIcon": "https://example.com",
-        "isRTL": true,
-        "magicBackground": false,
-        "runTimeFontFamily": undefined,
-        "runTimeFontSize": undefined,
-        "summaryColor": "white",
-        "summaryFontFamily": undefined,
-        "summaryFontSize": undefined,
-        "titleColor": "white",
-        "titleFontFamily": undefined,
-        "titleFontSize": undefined,
-      }
-    }
-    title="tittle"
-  />
-  <Summary
-    config={
-      {
-        "artworkAspectRatio": "1:1",
-        "audioPlayerBackgroundImageQuery": "",
-        "backgroundColor": "black",
-        "backgroundImage": "https://example.com",
-        "channelIcon": "https://example.com",
-        "isRTL": true,
-        "magicBackground": false,
-        "runTimeFontFamily": undefined,
-        "runTimeFontSize": undefined,
-        "summaryColor": "white",
-        "summaryFontFamily": undefined,
-        "summaryFontSize": undefined,
-        "titleColor": "white",
-        "titleFontFamily": undefined,
-        "titleFontSize": undefined,
+  >
+    <View
+      accessibilityIgnoresInvertColors={true}
+      style={
+        {
+          "flex": 1,
+        }
       }
-    }
-    summary="Summary"
-  />
-  <Runtime
-    audio_player_artwork_aspect_ratio="1:1"
-    audio_player_background_color="black"
-    audio_player_background_image="https://example.com"
-    audio_player_channel_icon="https://example.com"
-    audio_player_rtl={true}
-    audio_player_summary_color="white"
-    audio_player_title_color="white"
-    config={
-      {
-        "artworkAspectRatio": "1:1",
-        "audioPlayerBackgroundImageQuery": "",
-        "backgroundColor": "black",
-        "backgroundImage": "https://example.com",
-        "channelIcon": "https://example.com",
-        "isRTL": true,
-        "magicBackground": false,
-        "runTimeFontFamily": undefined,
-        "runTimeFontSize": undefined,
-        "summaryColor": "white",
-        "summaryFontFamily": undefined,
-        "summaryFontSize": undefined,
-        "titleColor": "white",
-        "titleFontFamily": undefined,
-        "titleFontSize": undefined,
-      }
-    }
-    end_time="11:11"
-    start_time="10:10"
-  />
-</AudioPlayerLayout>
+    >
+      <Image
+        resizeMode="cover"
+        source={
+          {
+            "uri": "https://example.com",
+          }
+        }
+        style={
+          [
+            {
+              "bottom": 0,
+              "left": 0,
+              "position": "absolute",
+              "right": 0,
+              "top": 0,
+            },
+            {
+              "height": undefined,
+              "width": undefined,
+            },
+            undefined,
+          ]
+        }
+      />
+      <View
+        style={
+          {
+            "backgroundColor": "transparent",
+            "overflow": "hidden",
+          }
+        }
+      />
+    </View>
+  </View>
+</View>
 `;

package/Components/AudioPlayer/__tests__/__snapshots__/audioPlayerLayout.test.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<AudioPlayerLayout  /> renders correctly 1`] = `
+exports[`<AudioPlayerLayout /> renders correctly 1`] = `
 <View
   pointerEvents="none"
   style={
@@ -10,32 +10,48 @@ exports[`<AudioPlayerLayout  /> renders correctly 1`] = `
     }
   }
 >
-  <ForwardRef(AnimatedComponentWrapper)
+  <View
+    collapsable={false}
     style={
-      [
-        {
-          "backgroundColor": "transparent",
-          "overflow": "hidden",
-        },
-        {
-          "opacity": 0,
-        },
-      ]
+      {
+        "backgroundColor": "transparent",
+        "opacity": 0,
+        "overflow": "hidden",
+      }
     }
   >
-    <ImageBackground
-      resizeMode="cover"
-      source={
-        {
-          "uri": "https://example.com",
-        }
-      }
+    <View
+      accessibilityIgnoresInvertColors={true}
       style={
         {
           "flex": 1,
         }
       }
     >
+      <Image
+        resizeMode="cover"
+        source={
+          {
+            "uri": "https://example.com",
+          }
+        }
+        style={
+          [
+            {
+              "bottom": 0,
+              "left": 0,
+              "position": "absolute",
+              "right": 0,
+              "top": 0,
+            },
+            {
+              "height": undefined,
+              "width": undefined,
+            },
+            undefined,
+          ]
+        }
+      />
       <View
         style={
           {
@@ -44,7 +60,7 @@ exports[`<AudioPlayerLayout  /> renders correctly 1`] = `
           }
         }
       />
-    </ImageBackground>
-  </ForwardRef(AnimatedComponentWrapper)>
+    </View>
+  </View>
 </View>
 `;

package/Components/AudioPlayer/__tests__/artWork.test.js

@@ -1,6 +1,5 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
 
 import { Artwork } from "../Artwork";
 
@@ -16,9 +15,8 @@ const artWorkProps = {
 };
 
 describe("<Artwork />", () => {
-  const wrapper = shallow(<Artwork {...artWorkProps} />);
-
   it("renders correctly", () => {
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const { toJSON } = render(<Artwork {...artWorkProps} />);
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/Components/AudioPlayer/__tests__/audioPlayer.test.js

@@ -1,6 +1,5 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
 
 import { AudioPlayer } from "../AudioPlayer";
 
@@ -47,9 +46,8 @@ const audioPlayerProps = {
 };
 
 describe("<AudioPlayer />", () => {
-  const wrapper = shallow(<AudioPlayer {...audioPlayerProps} />);
-
   it("renders correctly", () => {
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const { toJSON } = render(<AudioPlayer {...audioPlayerProps} />);
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/Components/AudioPlayer/__tests__/audioPlayerLayout.test.js

@@ -1,6 +1,5 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
 
 import { AudioPlayerLayout } from "../AudioPlayerLayout";
 
@@ -16,12 +15,12 @@ const audioPlayerLayoutProps = {
   children: [],
 };
 
-jest.useFakeTimers();
-
-describe("<AudioPlayerLayout  />", () => {
-  const wrapper = shallow(<AudioPlayerLayout {...audioPlayerLayoutProps} />);
-
+describe("<AudioPlayerLayout />", () => {
   it("renders correctly", () => {
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const { toJSON } = render(
+      <AudioPlayerLayout {...audioPlayerLayoutProps} />
+    );
+
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/Components/AudioPlayer/__tests__/channel.test.js

@@ -1,6 +1,5 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
 
 import { Channel } from "../Channel";
 
@@ -16,9 +15,8 @@ const channelProps = {
 };
 
 describe("<Channel />", () => {
-  const wrapper = shallow(<Channel {...channelProps} />);
-
   it("renders correctly", () => {
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const { toJSON } = render(<Channel {...channelProps} />);
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/Components/AudioPlayer/__tests__/summary.test.js

@@ -1,6 +1,5 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
 
 import { Summary } from "../Summary";
 
@@ -16,9 +15,8 @@ const summaryProps = {
 };
 
 describe("<Summary />", () => {
-  const wrapper = shallow(<Summary {...summaryProps} />);
-
   it("renders correctly", () => {
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const { toJSON } = render(<Summary {...summaryProps} />);
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/Components/AudioPlayer/__tests__/title.test.js

@@ -1,6 +1,5 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
 
 import { Title } from "../Title";
 
@@ -16,9 +15,8 @@ const titleProps = {
 };
 
 describe("<Title />", () => {
-  const wrapper = shallow(<Title {...titleProps} />);
-
   it("renders correctly", () => {
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const { toJSON } = render(<Title {...titleProps} />);
+    expect(toJSON()).toMatchSnapshot();
   });
 });

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

@@ -6,7 +6,6 @@ import {
   BoundingRect,
 } from "./BaseFocusable.interface";
 
-import { createReactRef } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
 import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 
@@ -35,7 +34,7 @@ type Props = {
 };
 
 export class BaseFocusable<
-  T extends Props = Props
+  T extends Props = Props,
 > extends BaseFocusableInterface<T> {
   constructor(props) {
     super(props);
@@ -45,7 +44,7 @@ export class BaseFocusable<
       focused: initialFocus || false,
     };
 
-    this.ref = createReactRef();
+    this.ref = React.createRef();
   }
 
   componentDidMount() {

package/Components/Cell/Cell.tsx

@@ -274,10 +274,14 @@ 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: String(
-                  item.extensions?.accessibility?.label || item.title
-                ),
+                text: `${accessibilityTitle} ${accessibilityHint}`,
               });
             }
 

package/Components/Cell/CellWithFocusable.tsx

@@ -1,48 +1,10 @@
 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";
-
-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;
-};
+import { FocusableGroup } from "../FocusableGroup";
 
 type Props = {
   item: ZappEntry;
@@ -75,11 +37,7 @@ export function CellWithFocusable(props: Props) {
     focused,
   } = props;
 
-  const isFocused = useCellFocusedState(
-    skipFocusManagerRegistration,
-    groupId,
-    id
-  );
+  const [isFocused, setIsFocused] = React.useState(false);
 
   const state = useCellState({
     id: item.id,
@@ -96,26 +54,53 @@ export function CellWithFocusable(props: Props) {
     }
   }, [focusedButtonId]);
 
-  const handleToggleFocus = (value) => {
-    setFocusedButtonId(value.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]);
 
-    if (value.focusable) {
-      onFocus(value.focusable, value.mouse);
+  const onGroupBlur = React.useCallback(() => {
+    if (!skipFocusManagerRegistration) {
+      setIsFocused(false);
     }
-  };
+  }, [skipFocusManagerRegistration]);
 
   return (
-    <CellRenderer
-      item={item}
+    <FocusableGroup
+      id={`focusable-cell-wrapper-${id}`}
+      testID={"cell-with-focusable-cell-renderer-focusable-group"}
       groupId={groupId}
-      onToggleFocus={handleToggleFocus}
-      state={state}
-      prefixId={id}
-      focusedButtonId={focusedButtonId}
       preferredFocus={preferredFocus}
+      shouldUsePreferredFocus
+      onFocus={onGroupFocus}
+      onBlur={onGroupBlur}
       skipFocusManagerRegistration={skipFocusManagerRegistration}
-      isFocusable={isFocusable}
-      focused={focused}
-    />
+    >
+      <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>
   );
 }