@applicaster/zapp-react-native-ui-components 13.0.0-alpha.1909212433 → 13.0.0-alpha.2178537102

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/FocusableTvOS";
+import { Focusable } from "@applicaster/zapp-react-native-ui-components/Components/Focusable";
 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";

package/Components/FocusableGroup/index.tsx

@@ -3,6 +3,9 @@ import * as React from "react";
 import { BaseFocusable } from "../BaseFocusable";
 import { FocusableGroupContextProvider } from "../../Contexts/FocusableGroupContext";
 import { withFocusableContext } from "../../Contexts/FocusableGroupContext/withFocusableContext";
+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";
 
 type Props = {
   testID?: string;
@@ -19,6 +22,7 @@ type Props = {
   resetFocusToInitialValue?: boolean;
   onFocus?: () => void;
   onBlur?: () => void;
+  onGroupFocusChanged?: (event?: any) => void;
   onWillUpdateFocus?: (event?: any) => void;
   willReceiveFocus?: (event?: any) => void;
   onDidUpdateFocus?: (event?: any) => void;
@@ -73,6 +77,17 @@ class FocusableGroup extends BaseFocusable<Props> {
     return this.props.isWithMemory ?? true;
   }
 
+  /**
+   * indicates whether the Group focus changed
+   * @returns {Promise}
+   */
+  onGroupFocusChanged: FocusManager.FocusEventCB = (focusable) => {
+    const { onGroupFocusChanged = noop } = this.props;
+    onGroupFocusChanged(focusable);
+
+    focusManager.invokeHandler?.(FOCUS_EVENTS.GROUP_FOCUS_CHANGED, this);
+  };
+
   render() {
     const { children, id, style } = this.props;
     const focusableId = `focusable-group-${id}`;

package/Components/FocusableScrollView/index.tsx

@@ -11,13 +11,6 @@ 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;
@@ -39,27 +32,17 @@ export type Props = ScrollViewProps & {
   initialFocusDirection?: FocusManager.Android.FocusNavigationDirections;
   onAllComponentsLoaded?: () => void;
   omitPropsPropagation?: Array<keyof FlatListProps<any>>;
-  renderItem: FocusableScrollViewRenderItem;
+  renderItem: (info: {
+    item: ZappUIComponent;
+    index: number;
+    focused: boolean;
+    parentFocus: ParentFocus;
+  }) => React.ReactElement;
 } & 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
@@ -90,7 +73,7 @@ const extendScrollViewRef = (_ref, childCompsMeasurementsMap) => {
   };
 
   _ref.scrollToIndex = (params) => {
-    const { index, viewOffset = 0 } = params;
+    const { index, viewOffset } = params;
 
     const itemByIndex = R.find(R.propEq("index", index))(
       R.values(childCompsMeasurementsMap)
@@ -146,11 +129,8 @@ function FocusableScrollViewComponent(props: Props, ref) {
   );
 
   const getFocusableEntryId = React.useCallback(
-    (_entry: ZappEntry | null, index?: number) => {
-      const entry: { id?: string } = getEntry(
-        R.isNil(index) ? _entry : data,
-        index
-      );
+    (_entry: ZappEntry, index?: number) => {
+      const entry = R.isNil(index) ? _entry : data[index];
 
       return entry ? `${props.id}--${entry?.id}` : undefined;
     },
@@ -293,18 +273,11 @@ function FocusableScrollViewComponent(props: Props, ref) {
   const renderItem = React.useCallback(
     (item, index) => {
       const renderArgs = { item, index };
-
-      const id = getFocusableEntryId(
-        Array.isArray(item) ? item[0] : item,
-        index
-      );
-
-      const nextFocus = getNextFocus(index);
+      const id = `${props.id}--${renderArgs?.item?.id}`;
+      const nextFocus = getNextFocus(renderArgs?.index);
 
       const onItemLayout = (event) => {
-        childCompsMeasurementsMap.current[
-          Array.isArray(item) ? index : item.id
-        ] = {
+        childCompsMeasurementsMap.current[item.id] = {
           index,
           layout: event.nativeEvent.layout,
         };

package/package.json

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