@applicaster/zapp-react-native-ui-components 13.0.0-alpha.2040752175 → 13.0.0-alpha.2113353282

package/Components/CellRendererResolver/__tests__/__snapshots__/cellRendererResolver.test.js.snap

@@ -3,24 +3,24 @@
 exports[`CellRendererResolver renders correctly 1`] = `
 <View
   someProp={
-    Object {
-      "cellOptions": Object {},
-      "cellStyles": Object {
-        "ABCDE-123456": Object {
-          "configuration": Object {},
+    {
+      "cellOptions": {},
+      "cellStyles": {
+        "ABCDE-123456": {
+          "configuration": {},
           "plugin_identifier": "custom_renderer_plugin",
         },
-        "FGHIJ-123456": Object {
-          "configuration": Object {},
+        "FGHIJ-123456": {
+          "configuration": {},
           "plugin_identifier": "unknown_plugin",
         },
       },
-      "component": Object {
-        "styles": Object {
+      "component": {
+        "styles": {
           "cell_plugin_configuration_id": "ABCDE-123456",
         },
       },
-      "styles": Object {},
+      "styles": {},
     }
   }
 />
@@ -29,24 +29,24 @@ exports[`CellRendererResolver renders correctly 1`] = `
 exports[`CellRendererResolver with a default renderer plugin renders correctly 1`] = `
 <View
   someProp={
-    Object {
-      "cellOptions": Object {},
-      "cellStyles": Object {
-        "ABCDE-123456": Object {
-          "configuration": Object {},
+    {
+      "cellOptions": {},
+      "cellStyles": {
+        "ABCDE-123456": {
+          "configuration": {},
           "plugin_identifier": "custom_renderer_plugin",
         },
-        "FGHIJ-123456": Object {
-          "configuration": Object {},
+        "FGHIJ-123456": {
+          "configuration": {},
           "plugin_identifier": "unknown_plugin",
         },
       },
-      "component": Object {
-        "styles": Object {
+      "component": {
+        "styles": {
           "cell_plugin_configuration_id": "ABCDE-123456",
         },
       },
-      "styles": Object {},
+      "styles": {},
     }
   }
 />

package/Components/CellRendererResolver/__tests__/cellRendererResolver.test.js

@@ -2,9 +2,11 @@ import * as React from "react";
 import { View } from "react-native";
 import { shallow } from "enzyme";
 
-jest.mock("../../default-cell-renderer", () =>
-  jest.fn((prop) => <View whoAmI="default renderer" someProp={prop} />)
-);
+jest.mock("../../default-cell-renderer", () => {
+  const View = jest.requireActual("react-native").View;
+
+  return jest.fn((prop) => <View whoAmI="default renderer" someProp={prop} />);
+});
 
 const { CellRendererResolver } = require("../index");
 

package/Components/ComponentResolver/__tests__/__snapshots__/componentResolver.test.js.snap

@@ -5,22 +5,22 @@ exports[`ComponentResolver renders correctly 1`] = `
   value={null}
 >
   <Memo(ComponentResolver)
-    cellStyles={Object {}}
+    cellStyles={{}}
     component={
-      Object {
+      {
         "component_type": "some_component",
       }
     }
     components={
-      Object {
+      {
         "SomeComponent": [MockFunction],
       }
     }
     decorators={[MockFunction]}
     dispatch={[Function]}
-    plugins={Array []}
+    plugins={[]}
     store={
-      Object {
+      {
         "clearActions": [Function],
         "dispatch": [Function],
         "getActions": [Function],

package/Components/ComponentResolver/__tests__/componentResolver.test.js

@@ -4,19 +4,21 @@ import { shallow } from "enzyme";
 import { shallowToJson } from "enzyme-to-json";
 import configureStore from "redux-mock-store";
 
-const logger = {
+const mockLogger = {
   warning: jest.fn(),
 };
 
 jest.mock("../../../Helpers/logger", () => ({
   componentsLogger: {
-    addSubsystem: jest.fn(() => logger),
+    addSubsystem: jest.fn(() => mockLogger),
   },
 }));
 
-jest.mock("../../default-cell-renderer", () =>
-  jest.fn((prop) => <View whoAmI="default renderer" someProp={prop} />)
-);
+jest.mock("../../default-cell-renderer", () => {
+  const View = jest.requireActual("react-native").View;
+
+  return jest.fn((prop) => <View whoAmI="default renderer" someProp={prop} />);
+});
 
 const mock_rtl_flag = false;
 
@@ -48,7 +50,7 @@ function clearAllMocks() {
   SomeComponent.mockClear();
   decorators.mockClear();
   renderFunction.mockClear();
-  logger.warning.mockClear();
+  mockLogger.warning.mockClear();
 }
 
 describe("ComponentResolver", () => {
@@ -104,16 +106,16 @@ describe("ComponentResolverComponent", () => {
     expect(shallowToJson(wrapper)).toMatchSnapshot();
     expect(wrapper.isEmptyRender()).toBe(true);
 
-    expect(logger.warning).toHaveBeenCalledTimes(2);
+    expect(mockLogger.warning).toHaveBeenCalledTimes(2);
 
-    expect(logger.warning).toHaveBeenNthCalledWith(
+    expect(mockLogger.warning).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
         message: "Could not resolve cell builder plugin",
       })
     );
 
-    expect(logger.warning).toHaveBeenNthCalledWith(
+    expect(mockLogger.warning).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
         message: warningMessage,

package/Components/DisplayState/__tests__/__snapshots__/displayState.test.js.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`DISPLAY_STATES matches the snapshot 1`] = `
-Object {
+{
   "CONTENT": "CONTENT",
   "CONTROLS": "CONTROLS",
   "DISCOVERY": "DISCOVERY",
@@ -9,7 +9,7 @@ Object {
 `;
 
 exports[`DisplayStateContext has the correct properties 1`] = `
-Object {
+{
   "Consumer": [MockFunction],
   "Provider": [MockFunction],
   "withConsumer": [MockFunction],

package/Components/ErrorScreen/index.tsx

@@ -1,13 +1,13 @@
 import React, { useMemo } from "react";
 import * as R from "ramda";
 import {
-  View,
+  ImageStyle,
   StyleSheet,
   Text,
-  ViewStyle,
-  TextStyle,
-  ImageStyle,
   TextProps,
+  TextStyle,
+  View,
+  ViewStyle,
 } from "react-native";
 import { defaultAsset } from "./defaultAsset";
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
@@ -150,13 +150,13 @@ export function ErrorScreen(props: Props) {
   return (
     <View style={[baseStyles.container, styles.screen]}>
       <View style={[baseStyles.container, styles.component]}>
-        {assetEnabled && (
+        {assetEnabled ? (
           <Image
             fadeDuration={0}
             source={{ uri: asset }}
             style={styles.asset}
           />
-        )}
+        ) : null}
         <Text style={styles.title} {...titleProps}>
           {title}
         </Text>

package/Components/Focusable/Focusable.tsx

@@ -1,5 +1,5 @@
+/* eslint-disable react/no-unknown-property */
 import * as React from "react";
-import * as R from "ramda";
 
 import { BaseFocusable } from "../BaseFocusable";
 import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
@@ -42,8 +42,6 @@ class Focusable extends BaseFocusable<Props> {
     this.resetLongPressTimeout = this.resetLongPressTimeout.bind(this);
     this.longPress = this.longPress.bind(this);
     this.press = this.press.bind(this);
-    this.focus = this.focus.bind(this);
-    this.blur = this.blur.bind(this);
   }
 
   /**
@@ -55,37 +53,6 @@ class Focusable extends BaseFocusable<Props> {
     return this.preferredFocus();
   }
 
-  /**
-   * Sets the focus on this item. Will trigger sequentially a sequence of
-   * functions (willReceiveFocus, focus, hasReceivedFocus). If these functions (defined in the Focusable
-   * Item underlying component) return promises, execution will wait before it proceeds to the next. This
-   * is useful for triggering sequential operations that specifically require to fully run before or after
-   * focus is actually set on that item.
-   * @param {string} scrollDirection string representation of the direction of the navigation which landed
-   * to this item being focused
-   */
-  setFocus(scrollDirection) {
-    const focusMethods = [
-      this.willReceiveFocus,
-      this.focus,
-      this.hasReceivedFocus,
-    ];
-
-    const self = this;
-
-    return R.reduce(
-      (sequence, method) => {
-        return sequence
-          .then(() => method.apply(self, [scrollDirection]))
-          .catch((e) => {
-            throw e;
-          });
-      },
-      Promise.resolve(),
-      focusMethods
-    );
-  }
-
   startLongPressTimeout() {
     this.longPressTimeout = setTimeout(() => {
       this.longPress(null);
@@ -102,26 +69,6 @@ class Focusable extends BaseFocusable<Props> {
     }
   }
 
-  /**
-   * will invoke the underlying component's focus method
-   * @param {Object} scrollDirection
-   * @returns {Promise}
-   */
-  focus(scrollDirection) {
-    return this.onFocus(this, scrollDirection); // invokeComponentMethod(this, "onFocus", scrollDirection);
-  }
-
-  /**
-   * will invoke the underlying component's blur method
-   * @param {Object} scrollDirection
-   * @returns {Promise}
-   */
-  blur(
-    scrollDirection?: FocusManager.Web.Direction | FocusManager.IOS.Direction
-  ) {
-    return this.onBlur(this, scrollDirection);
-  }
-
   /**
    * will invoke the underlying component's press method
    * @param {Object} keyEvent

package/Components/Focusable/FocusableTvOS.tsx

@@ -90,7 +90,7 @@ export class Focusable extends BaseFocusable<Props> {
     onBlur(nativeEvent);
   }
 
-  setFocus(direction, callback) {
+  setFocus(_direction, callback) {
     const focusMethods = [
       { method: this.willReceiveFocus },
       { method: this.focus, args: [callback] },

package/Components/Focusable/Touchable.tsx

@@ -1,25 +1,24 @@
 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/FocusableGroup/FocusableTvOS.tsx

@@ -1,17 +1,31 @@
 import * as React from "react";
 import { FocusableGroupNative } from "@applicaster/zapp-react-native-ui-components/Components/NativeFocusables";
 import { BaseFocusable } from "@applicaster/zapp-react-native-ui-components/Components/BaseFocusable";
-
-function noop() {}
+import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
+
+const { log_verbose } = createLogger({
+  subsystem: "General",
+  category: "FocusableGroup",
+});
+
+type FocusableGroupNativeEvent = {
+  nativeEvent: {
+    focusHeading: FocusManager.Direction;
+    groupId: string;
+    isActive: boolean;
+    isFocusDisabled: boolean;
+    isFocusingByUser: boolean;
+    itemId: string;
+    target: number;
+  };
+};
 
 type Props = {
   id: string;
   children: (arg1: boolean) => React.ComponentType<any>;
-  onWillUpdateFocus: (nativeEvent: any) => void;
-  onDidUpdateFocus: (nativeEvent: any) => void;
   isFocusDisabled: boolean;
   initialItemId: string;
-  resetFocusToInitialValue: boolean;
+  isPreferredFocusDisabled: boolean;
   focusGroupRef: React.Component;
   shouldUsePreferredFocus: boolean;
   groupId: string;
@@ -21,86 +35,27 @@ type Props = {
 };
 
 export class FocusableGroup extends BaseFocusable<Props> {
-  focusableGroupNativeRef: React.Component | null;
-  constructor(props) {
-    super(props);
-    this.focusableGroupNativeRef = null;
-
-    this.state = {
-      isActive: false,
-    };
-
-    this.onWillUpdateFocus = this.onWillUpdateFocus.bind(this);
-    this.onDidUpdateFocus = this.onDidUpdateFocus.bind(this);
-    this.isGroup = true;
-
-    this.shouldUsePreferredFocus = this.shouldUsePreferredFocus.bind(this);
-    this.measureView = this.measureView.bind(this);
-  }
-
-  connectedScreenId() {
-    const {
-      screenData: { screenId, parentScreenId },
-    } = this.props;
-
-    if (screenId) {
-      return null;
-    }
-
-    return parentScreenId ? `${parentScreenId}-${screenId}` : screenId;
-  }
-
-  /**
-   * tells whether the group should give focus to a preferred item when it gains focus from another
-   * group
-   * @returns {boolean}
-   */
-  shouldUsePreferredFocus() {
-    return this.props.shouldUsePreferredFocus || false;
-  }
-
-  /**
-   * indicates whether the underlying component should claim preferred focus
-   * when navigating into the group of this item
-   * @returns {boolean}
-   */
-  isPreferredFocus() {
-    return this.props.preferredFocus || false;
-  }
-
-  onWillUpdateFocus({ nativeEvent }) {
-    const { isActive } = nativeEvent;
-    this.setState({ isActive });
-    const { onWillUpdateFocus = noop } = this.props;
-    onWillUpdateFocus(nativeEvent);
-  }
-
-  onDidUpdateFocus({ nativeEvent }) {
-    const { onDidUpdateFocus = noop } = this.props;
-    onDidUpdateFocus(nativeEvent);
-  }
-
-  setFocusDisabled(isFocusDisabled) {
-    if (this.ref) {
-      this.ref.current.setNativeProps({
-        isFocusDisabled,
-      });
-    }
-  }
-
   render() {
     const {
       children,
       id,
       isFocusDisabled,
       initialItemId,
-      resetFocusToInitialValue,
-      style,
+      isPreferredFocusDisabled,
+      style = {},
       groupId,
       ...otherProps
     } = this.props;
 
-    const focusableStyles = style || {};
+    const onGroupFocus = ({ nativeEvent }: FocusableGroupNativeEvent) => {
+      log_verbose("FOCUSABLE_GROUP: onGroupFocus", { nativeEvent });
+      this.onFocus(this.ref, nativeEvent.focusHeading);
+    };
+
+    const onGroupBlur = ({ nativeEvent }: FocusableGroupNativeEvent) => {
+      log_verbose("FOCUSABLE_GROUP: onGroupBlur", { nativeEvent });
+      this.onBlur(this.ref, nativeEvent.focusHeading);
+    };
 
     return (
       <FocusableGroupNative
@@ -109,15 +64,11 @@ export class FocusableGroup extends BaseFocusable<Props> {
         ref={this.ref}
         isFocusDisabled={isFocusDisabled}
         initialItemId={initialItemId}
-        resetFocusToInitialValue={resetFocusToInitialValue}
-        onLayout={this.measureView}
-        onViewFocus={this.onFocus}
-        onViewPress={this.onPress}
-        onViewBlur={this.onBlur}
-        style={focusableStyles}
+        isPreferredFocusDisabled={isPreferredFocusDisabled}
+        onGroupFocus={onGroupFocus}
+        onGroupBlur={onGroupBlur}
+        style={style}
         {...otherProps}
-        onWillUpdateFocus={this.onWillUpdateFocus}
-        onDidUpdateFocus={this.onDidUpdateFocus}
       >
         {children}
       </FocusableGroupNative>

package/Components/FocusableGroup/index.tsx

@@ -16,12 +16,10 @@ type Props = {
   prioritiseFocusOn?: number;
   groupId?: string;
   hasTVPreferredFocus?: boolean;
-  resetFocusToInitialValue?: boolean;
+  isPreferredFocusDisabled?: boolean;
   onFocus?: () => void;
   onBlur?: () => void;
-  onWillUpdateFocus?: (event?: any) => void;
   willReceiveFocus?: (event?: any) => void;
-  onDidUpdateFocus?: (event?: any) => void;
   hasLostFocus?: any;
   nextFocusUp?: any;
   nextFocusDown?: any;

package/Components/FocusableList/index.tsx

@@ -87,7 +87,6 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
     initialFocusDirection = "down",
     data = [],
     // eslint-disable-next-line unused-imports/no-unused-vars
-    onAllComponentsLoaded, // TODO: re-implement it
     omitPropsPropagation = [],
   } = props;
 

package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js

@@ -16,6 +16,15 @@ import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Co
 import { Provider } from "react-redux";
 import configureStore from "redux-mock-store";
 
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useRoute",
+  () => ({
+    useRoute: jest.fn().mockReturnValue({
+      pathname: "/home",
+    }),
+  })
+);
+
 const homeStack = {
   route: "/home",
   state: {

package/Components/GeneralContentScreen/utils/useCurationAPI.ts

@@ -9,7 +9,7 @@ import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
 import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { Categories } from "./logger";
 import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
-import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
+import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useRoute";
 import {
   ZappPipesEntryContext,
   ZappPipesScreenContext,

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

@@ -39,6 +39,7 @@ jest.mock(
 );
 
 jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
+  ...jest.requireActual<any>("@applicaster/zapp-react-native-utils/theme"),
   useTheme: () => ({}),
 }));
 

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

@@ -3,7 +3,7 @@
 exports[`LayoutContainer renders 1`] = `
 <View
   style={
-    Object {
+    {
       "flex": 1,
       "height": 1080,
       "width": 1920,

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

@@ -3,14 +3,14 @@
 exports[`NavBarContainer renders 1`] = `
 <View
   style={
-    Array [
-      Object {
+    [
+      {
         "position": "absolute",
         "top": 0,
         "width": 1920,
         "zIndex": 10,
       },
-      Object {
+      {
         "maxHeight": 10,
       },
     ]

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

@@ -4,8 +4,8 @@ exports[`ScreenContainer renders 1`] = `
 <RNCSafeAreaProvider
   onInsetsChange={[Function]}
   style={
-    Array [
-      Object {
+    [
+      {
         "flex": 1,
       },
       undefined,
@@ -14,14 +14,14 @@ exports[`ScreenContainer renders 1`] = `
 >
   <View
     style={
-      Array [
-        Object {
+      [
+        {
           "position": "absolute",
           "top": 0,
           "width": 1920,
           "zIndex": 10,
         },
-        Object {
+        {
           "maxHeight": 10,
         },
       ]
@@ -30,7 +30,7 @@ exports[`ScreenContainer renders 1`] = `
   >
     <View
       isVisible={true}
-      menuPlugin={Object {}}
+      menuPlugin={{}}
       navigationProps={null}
     />
   </View>
@@ -38,13 +38,13 @@ exports[`ScreenContainer renders 1`] = `
 `;
 
 exports[`ScreenContainer sets margins provided by the theme 1`] = `
-Array [
-  Object {
+[
+  {
     "flex": 1,
     "height": "100%",
     "width": "100%",
   },
-  Object {
+  {
     "backgroundColor": "transparent",
     "marginBottom": 10,
     "paddingBottom": 0,

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

@@ -8,7 +8,7 @@ exports[`Layout TV renders 1`] = `
 >
   <View
     Components={
-      Object {
+      {
         "Background": [Function],
         "NavBar": [Function],
       }