@applicaster/zapp-react-native-utils 16.0.0-rc.35 → 16.0.0-rc.36

package/actionsExecutor/actions/refreshComponent.ts

@@ -14,20 +14,14 @@ const { log_info } = createLogger({
   category: "General",
 });
 
-/**
- * Helper function to find the parent component in a component tree.
- */
-function findParentComponent(
-  childId: string,
-  parent: ZappRiver | ZappUIComponent
-): ZappRiver | ZappUIComponent | null {
-  for (const child of parent.ui_components) {
-    if (child.id === childId) return parent;
+/** Prefer component data.source, otherwise direct UIComponentContext parent. */
+function getComponentFeedData(component) {
+  if (component?.data?.source) {
+    return component.data;
+  }
 
-    if (child.ui_components) {
-      const found = findParentComponent(childId, child);
-      if (found) return found;
-    }
+  if (component?.parent?.data?.source) {
+    return component.parent.data;
   }
 
   return null;
@@ -43,16 +37,7 @@ export const refreshComponentAction: ActionHandler = async (
 ): Promise<ActionResult> => {
   const dispatch = appStore.getDispatch();
 
-  const parentComponent = findParentComponent(
-    context?.component?.id,
-    context?.screenData
-  );
-
-  const componentSource = context?.component?.data?.source;
-
-  const componentData = componentSource
-    ? context.component.data
-    : parentComponent?.data;
+  const componentData = getComponentFeedData(context?.component);
 
   const source = componentData?.source;
   const mapping = componentData?.mapping;

package/actionsExecutor/types.ts

@@ -16,8 +16,10 @@ export interface ActionExecutionContext {
   /** The entry that defines the screen (if screen was opened from an entry) */
   screenEntry?: ZappEntry;
 
-  /** The UI component that triggered the action */
-  component?: ZappUIComponent;
+  /** The UI component that triggered the action.
+   * From UIComponentContext as `{ ...component, parent }`.
+   */
+  component?: ZappUIComponent & { parent?: ZappUIComponent };
 
   /** The route identifier for the current screen */
   screenRoute?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "16.0.0-rc.35",
+  "version": "16.0.0-rc.36",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "16.0.0-rc.35",
+    "@applicaster/applicaster-types": "16.0.0-rc.36",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",

package/reactHooks/cell-click/index.ts

@@ -4,6 +4,7 @@ import * as React from "react";
 import * as R from "ramda";
 import { handleActionSchemeUrl } from "@applicaster/quick-brick-core/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/useUrlSchemeHandler";
 import { CellTapContext } from "@applicaster/zapp-react-native-ui-components/Contexts/CellTapContext";
+import { useUIComponentContext } from "@applicaster/zapp-react-native-ui-components/Contexts/UIComponentContext";
 import {
   useNavigation,
   useProfilerLogging,
@@ -28,7 +29,6 @@ import { useScreenStateStore } from "../navigation/useScreenStateStore";
 type Props = {
   item?: ZappEntry;
   index?: number;
-  component?: ZappUIComponent;
   zappPipesData?: ZappPipesData;
 };
 
@@ -37,16 +37,16 @@ type onPressReturnFn =
   | (() => void);
 
 export const useCellClick = ({
-  component,
   zappPipesData,
   item,
-}: Props): onPressReturnFn => {
+}: Props = {}): onPressReturnFn => {
   const { push, currentRoute } = useNavigation();
   const { pathname } = useRoute();
   const screenStateStore = useScreenStateStore();
 
   const onCellTap: Option<Function> = React.useContext(CellTapContext);
   const actionExecutor = React.useContext(ActionExecutorContext);
+  const component = useUIComponentContext();
   const screenData = useCurrentScreenData();
   const screenState = useScreenContext()?.options;
   const entry = useScreenContext()?.entry;