@applicaster/quick-brick-core 13.0.0-alpha.5371423120 → 13.0.0-alpha.6714678893

package/App/NavigationProvider/NavigationProvider.tsx

@@ -66,6 +66,7 @@ import { inflateUrl } from "@applicaster/zapp-react-native-ui-components/Compone
 import { useModalStore } from "@applicaster/zapp-react-native-utils/modalState";
 import { useSubscriberFor } from "@applicaster/zapp-react-native-utils/reactHooks/useSubscriberFor";
 import { QBUIComponentEvents } from "@applicaster/zapp-react-native-ui-components/events";
+import { Hook } from "@applicaster/zapp-react-native-utils/appUtils/HooksManager/Hook";
 
 const logger = coreAppLogger.addSubsystem("Navigator");
 
@@ -75,17 +76,6 @@ type Props = {
   plugins?: QuickBrickPlugin[];
 };
 
-type EntryWithParent = ZappEntry & { parent?: EntryWithParent };
-
-type SingleEntry = {
-  data: EntryWithParent;
-  route: string;
-  id: string;
-  parentId?: string;
-};
-
-type EntryContextType = { [K in string]: SingleEntry };
-
 const navigationActions = {
   [ACTIONS.PUSH]: push,
   [ACTIONS.REPLACE]: replace,
@@ -122,9 +112,7 @@ export function NavigationProvider({ children }: Props) {
   const pathname = state?.location?.pathname;
   const pathnameRef = React.useRef(pathname);
 
-  const { context }: EntryContextType = React.useContext(
-    ZappPipesEntryContext.Context
-  );
+  const { context } = React.useContext(ZappPipesEntryContext.Context);
 
   const { openModal, dismissModal } = useModalStore();
 
@@ -380,7 +368,18 @@ export function NavigationProvider({ children }: Props) {
     }
   };
 
-  const handleHookPresent = ({ hookPlugin, route, payload }, dispose) => {
+  const handleHookPresent = (
+    {
+      hookPlugin,
+      route,
+      payload,
+    }: {
+      hookPlugin: Hook;
+      route: string;
+      payload: object;
+    },
+    dispose
+  ) => {
     if (hookPlugin?.lastHook) {
       dispose();
     }
@@ -614,7 +613,9 @@ export function NavigationProvider({ children }: Props) {
           },
         };
 
-        HooksManager(hooksOptions)
+        const hooksManager = HooksManager(hooksOptions);
+
+        hooksManager.subscriber
           .on(HOOKS_EVENTS.PRESENT_SCREEN_HOOK, handleHookPresent)
           .on(HOOKS_EVENTS.ERROR, handleHookError)
           .on(HOOKS_EVENTS.CANCEL, handleHookCancel)
@@ -625,8 +626,9 @@ export function NavigationProvider({ children }: Props) {
               screen,
               options,
             })
-          )
-          .handleHooks(legacyScreenData({ entry, screen }));
+          );
+
+        hooksManager.handleHooks(legacyScreenData({ entry, screen }));
       } else {
         dispatch(navigationAction(targetRoute, { screen, entry, options }));
       }

package/App/NavigationProvider/__tests__/__snapshots__/navigationProvider.test.tsx.snap

@@ -11,9 +11,7 @@ Object {
     "presentationStyle": "overFullScreen",
     "transparent": true,
   },
-  "props": Object {
-    "screenData": Object {},
-  },
+  "props": undefined,
   "screen": Object {
     "id": "A1234",
     "navigations": Array [],

package/App/NavigationProvider/utils.ts

@@ -54,11 +54,10 @@ export function legacyScreenData(
   screenState: NavigationScreenData,
   plugins?: QuickBrickPlugin[]
 ): QuickBrickNavigationData {
-  // @ts-ignore - this happens only on launch
-  if (!screenState) return {};
-
-  const entry = screenState?.entry;
   let targetScreen = screenState?.screen;
+  const entry = screenState?.entry;
+  // @ts-ignore - this happens only on launch
+  if (!targetScreen) return {};
 
   /**
    * HACK: We mutate targetScreen by merging screenOrientation for the player.
@@ -127,6 +126,10 @@ export function getNavigationTarget(
   targetRoute?: string;
   externalUrl?: string;
 } {
+  if (!item) {
+    return {};
+  }
+
   const targetRoute = getTargetRoute(item, pathname, {
     layoutVersion,
     contentTypes,

package/App/remoteContextReloader/consts.ts

@@ -19,3 +19,5 @@ export const TYPE_KEYS = [
   "layout",
   "pipesEndpoints",
 ];
+
+export const ACTIVE_LAYOUT_ID_STORAGE_KEY = "active_layout_id";

package/App/remoteContextReloader/getRemoteContextData/getNativeRemoteContextData.ts

@@ -1,5 +1,5 @@
 import * as R from "ramda";
-import { Dimensions } from "react-native";
+import { Dimensions, NativeModules } from "react-native";
 import { loadAppContextData } from "@applicaster/zapp-react-native-redux";
 import { isTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { mapPromises } from "@applicaster/zapp-react-native-utils/arrayUtils";
@@ -7,6 +7,9 @@ import { fetchPluginConfiguration, getPromiseForType } from "../helpers";
 import { cacheAssets } from "../../AssetCache";
 import { actions as appDataActions } from "@applicaster/zapp-react-native-redux/AppData";
 import { logger } from "@applicaster/zapp-react-native-utils/logger";
+import { ACTIVE_LAYOUT_ID_STORAGE_KEY } from "../consts";
+const { AppLoaderBridge } = NativeModules;
+import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
 
 export async function getNativeRemoteContextData(
   dispatch,
@@ -33,11 +36,19 @@ export async function getNativeRemoteContextData(
       R.pathSatisfies(R.is(Function), ["module", "selectLayout"])
     )(plugins);
 
-    await layoutManagerPlugin?.module?.selectLayout({
-      runtimeConfigurationUrls,
-      plugin: layoutManagerPlugin,
-      isTablet: isTabletDevice,
-    });
+    if (layoutManagerPlugin) {
+      await layoutManagerPlugin.module?.selectLayout({
+        runtimeConfigurationUrls,
+        plugin: layoutManagerPlugin,
+        isTablet: isTabletDevice,
+      });
+    } else {
+      const layoutId = await localStorage.getItem(ACTIVE_LAYOUT_ID_STORAGE_KEY);
+
+      if (layoutId) {
+        await AppLoaderBridge?.switchLayout(layoutId, null);
+      }
+    }
   } catch (error) {
     logger.error({
       message: "Error selecting layout using layout manager plugin",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "13.0.0-alpha.5371423120",
+  "version": "13.0.0-alpha.6714678893",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -29,13 +29,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-alpha.5371423120",
-    "@applicaster/quick-brick-core-plugins": "13.0.0-alpha.5371423120",
-    "@applicaster/zapp-pipes-v2-client": "13.0.0-alpha.5371423120",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.5371423120",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.5371423120",
-    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.5371423120",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.5371423120",
+    "@applicaster/applicaster-types": "13.0.0-alpha.6714678893",
+    "@applicaster/quick-brick-core-plugins": "13.0.0-alpha.6714678893",
+    "@applicaster/zapp-pipes-v2-client": "13.0.0-alpha.6714678893",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.6714678893",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.6714678893",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.6714678893",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.6714678893",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",