@applicaster/zapp-react-native-utils 15.0.0-rc.50 → 15.0.0-rc.53

package/appUtils/focusManagerAux/utils/index.ts

@@ -102,7 +102,7 @@ export const getNavbarNode = (focusableTree) => {
 
 export const waitForContent = (focusableTree) => {
   const contentHasAnyChildren = (): boolean => {
-    const countOfChildren = pathOr(
+    const countOfChildren = pathOr<number>(
       0,
       ["children", "length"],
       getContentNode(focusableTree)

package/focusManager/aux/index.ts

@@ -49,7 +49,7 @@ export const findSelectedMenuId = (
 ) => {
   const sectionName = QUICK_BRICK_NAVBAR_SECTIONS[sectionKey];
 
-  return pathOr(
+  return pathOr<string | undefined>(
     undefined,
     ["children", index, "id"],
     focusableTree.find(sectionName)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "15.0.0-rc.50",
+  "version": "15.0.0-rc.53",
   "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": "15.0.0-rc.50",
+    "@applicaster/applicaster-types": "15.0.0-rc.53",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",

package/utils/index.ts

@@ -42,6 +42,13 @@ export {
   partial,
   clamp,
   reverse,
+  takeRight,
+  fromPairs,
+  sortBy,
+  merge,
+  values,
+  head,
+  findIndex,
   set,
   compact,
 } from "lodash";

package/utils/path.ts

@@ -1,5 +1,8 @@
-import { get } from "lodash";
+import { pathOr } from "./pathOr";
 
-export const path = (route, record) => {
-  return get(record, route, undefined);
+export const path = <T = any>(
+  route: (string | number) | (string | number)[],
+  record: any
+) => {
+  return pathOr<T>(undefined, route, record);
 };

package/utils/pathOr.ts

@@ -1,5 +1,9 @@
 import { get } from "lodash";
 
-export const pathOr = (defaultValue, path, record) => {
+export const pathOr = <T = any>(
+  defaultValue: T,
+  path: (number | string) | (number | string)[],
+  record: any
+): T => {
   return get(record, path, defaultValue);
 };

package/zappFrameworkUtils/HookCallback/callbackNavigationAction.ts

@@ -1,6 +1,6 @@
 import { useNavigation, useRivers, useScreenContext } from "../../reactHooks";
 import { createLogger } from "../../logger";
-import { useCallback, useMemo } from "react";
+import { useCallback, useMemo, useRef, useEffect } from "react";
 
 export enum NavigationCallbackOptions {
   DEFAULT = "default",
@@ -17,6 +17,7 @@ export enum ResultType {
 export type CallbackResult = hookCallbackArgs & {
   options?: {
     resultType?: ResultType;
+    navigator?: QuickBrickAppNavigator;
   };
 };
 
@@ -45,7 +46,7 @@ const legacyMappingKeys = {
     actionType: "login_completion_action",
     targetScreen: "navigate_to_login_screen",
   },
-  "quick-brick-user-account-ui-component": {
+  "quick-brick-user-account-ui-component.login": {
     actionType: "callbackAction",
   },
   "quick-brick-login-multi-login-providers.login": {
@@ -83,7 +84,8 @@ export const getNavigationKeys = (
 ): NavKeys => {
   const general = (item?.general ?? {}) as General;
 
-  const pluginIdentifier = (item as any).identifier ?? item?.type ?? "";
+  const pluginIdentifier =
+    (item as any).identifier ?? item?.type ?? item?.component_type ?? "";
 
   const legacy =
     legacyMappingKeys[`${pluginIdentifier}.${resultType}`] ??
@@ -135,6 +137,12 @@ export const useCallbackNavigationAction = (
   const rivers = useRivers();
   const screenContext = useScreenContext();
 
+  const navigationRef = useRef(navigation);
+
+  useEffect(() => {
+    navigationRef.current = navigation;
+  }, [navigation]);
+
   const overrideCallbackFromComponent = useMemo(() => {
     log_verbose(`${LogPrefix}: overridden callbackAction by component`);
 
@@ -168,20 +176,35 @@ export const useCallbackNavigationAction = (
         return;
       }
 
-      const data = getNavigationKeys(item, args.options?.resultType ?? null);
+      let data = getNavigationKeys(item, args.options?.resultType ?? null);
 
       if (!data) {
-        hookCallback?.(args);
+        const isScreen = !hookCallback;
 
-        return;
+        if (isScreen && args.options?.resultType === ResultType.login) {
+          log_debug(
+            `${LogPrefix} no navigation data found, applying GO BACK for login screen`
+          );
+
+          data = {
+            action: NavigationCallbackOptions.GO_BACK,
+            targetScreenId: null,
+          };
+        } else {
+          hookCallback?.(args);
+
+          return;
+        }
       }
 
       hookCallback?.({ ...args, success: false, cancelled: true });
+      const currentNavigation = navigationRef.current;
 
       switch (data.action) {
         case NavigationCallbackOptions.GO_BACK: {
-          if (navigation.canGoBack()) {
-            navigation.goBack();
+          if (currentNavigation.canGoBack()) {
+            currentNavigation.goBack();
+
             log_info(`${LogPrefix} performing 'GO BACK' action`);
           } else {
             log_info(`${LogPrefix} cannot perform 'GO BACK' action — ignoring`);
@@ -191,7 +214,7 @@ export const useCallbackNavigationAction = (
         }
 
         case NavigationCallbackOptions.GO_HOME: {
-          navigation.goHome();
+          currentNavigation.goHome();
           log_info(`${LogPrefix} performing 'GO HOME' action`);
           break;
         }
@@ -207,7 +230,7 @@ export const useCallbackNavigationAction = (
           const screen = rivers[screenId];
 
           if (screen) {
-            navigation.replace(screen);
+            currentNavigation.replace(screen);
 
             log_info(
               `${LogPrefix} performing 'GO TO SCREEN' action to screen: ${screenId}`
@@ -224,7 +247,7 @@ export const useCallbackNavigationAction = (
         }
       }
     },
-    [item, navigation, rivers]
+    [item, rivers]
   );
 
   return overrideCallbackFromComponent || callbackAction;

package/zappFrameworkUtils/HookCallback/hookCallbackManifestExtensions.config.js

@@ -20,7 +20,7 @@ const callbackKeyPrefix = (key, prefix, keySeparator = "_") =>
 
 const extendManifestWithHookCallback = (prefix = null) => ({
   group: true,
-  label: "CallBack Navigation",
+  label: `CallBack Navigation: ${prefix}`,
   folded: true,
   fields: [
     {