@applicaster/quick-brick-core 12.0.0-rc.98 → 13.0.0-alpha.2322412833

package/App/DeepLinking/URLSchemeListener/index.tsx

@@ -1,15 +1,11 @@
-import React, { ReactChild, useCallback, useContext } from "react";
+import React, { useCallback, useContext } from "react";
 
 import { URLSchemeHandler } from "../URLSchemeHandler";
 import { URLSchemeContext } from "./URLSchemeContextProvider";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 
-type Props = {
-  children: ReactChild;
-};
-
-export function URLSchemeListener(props: Props) {
+export function URLSchemeListener({ children }) {
   const { url, done } = useContext(URLSchemeContext);
 
   const navigator = useNavigation();
@@ -33,5 +29,5 @@ export function URLSchemeListener(props: Props) {
     return <URLSchemeHandler url={url} onFinish={onFinish} />;
   }
 
-  return props.children;
+  return children;
 }

package/App/LogicAggregatorContainer/index.tsx

@@ -0,0 +1,5 @@
+import React from "react";
+
+export const LogicAggregatorContainer = ({ components }) => {
+  return components.map((Component, index) => <Component key={index} />);
+};

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/ScreenHooks/ApplyScreenHooks.tsx

@@ -1,15 +1,9 @@
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
-import * as React from "react";
 import { usePluginScreenHooks } from "./usePluginScreenHooks";
 
-type Props = {
-  pathname: string;
-  children: React.ReactChildren;
-};
-
-export function ApplyScreenHooks({ children }: Props) {
+export function ApplyScreenHooks() {
   const { currentRoute } = useNavigation();
   usePluginScreenHooks(currentRoute);
 
-  return children;
+  return null;
 }

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/ThemeManager/index.tsx

@@ -9,17 +9,9 @@ import {
   partitionByKeys,
 } from "@applicaster/zapp-react-native-utils/objectUtils";
 
-type Plugin = {
-  name: string;
-  identifier: string;
-  module: any;
-  type: string;
-  configuration: { [key: string]: any };
-};
-
 type Props = {
   children: React.ReactNode;
-  plugins: Plugin[];
+  plugins: QuickBrickPlugin[];
 };
 
 const DEFAULT_THEME_ID = "base-theme";

package/App/index.tsx

@@ -28,16 +28,14 @@ import { withURLSchemeContextProvider } from "./DeepLinking/URLSchemeListener/UR
 import { appRemoteDataLoader } from "./appRemoteDataLoader";
 import { withActionExecutor } from "@applicaster/zapp-react-native-utils/actionsExecutor/ActionExecutorContext";
 import { withScreenDataContextProvider } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
+import { LogicAggregatorContainer } from "./LogicAggregatorContainer";
 
-/**
- * @typedef {Object} AppOptions
- * @param {Function} InteractionManager decorator to use for managing complex user interactions in the app
- * @param {ReactComponent} Layout Component to use as main layout for the app
-
- * @param {Object} QuickBrickManager QB manager module
- * @param {Function} QuickBrickManager.sendQuickBrickEvent function invoked to pass events to the native side
- * @param {[Function]} ContextProviders array of context providers to pass to the app
- */
+interface AppOptions {
+  Layout: React.ComponentType;
+  OfflineHandler: React.ComponentType;
+  SplashLoader: React.ComponentType;
+  InteractionManager: React.ComponentType;
+}
 
 /**
  * Creates a QuickBrick app with the provided options
@@ -45,12 +43,19 @@ import { withScreenDataContextProvider } from "@applicaster/zapp-react-native-ui
  * @param {AppOptions} options
  * @returns {ReactComponent}
  */
-const App = ({ Layout, OfflineHandler, SplashLoader }): ZappApp =>
-  React.memo(function ZappApp({
-    styles,
-    components: { AppContainer },
-    plugins,
-  }: AppComponentProps) {
+const App = ({
+  Layout,
+  OfflineHandler,
+  SplashLoader,
+  InteractionManager,
+}: AppOptions): ZappApp =>
+  React.memo(function ZappApp(props: AppComponentProps) {
+    const {
+      styles,
+      components: { AppContainer },
+      plugins,
+    } = props;
+
     return (
       <ThemeManager plugins={plugins}>
         <SafeAreaProvider initialMetrics={initialWindowMetrics}>
@@ -59,15 +64,16 @@ const App = ({ Layout, OfflineHandler, SplashLoader }): ZappApp =>
               <URLSchemeListener>
                 <SplashLoader>
                   <OfflineHandler>
-                    <ApplyScreenHooks>
-                      <Layout>
-                        <RouteManager />
-                      </Layout>
-                    </ApplyScreenHooks>
+                    <Layout>
+                      <RouteManager />
+                    </Layout>
                   </OfflineHandler>
                 </SplashLoader>
                 <ModalProvider />
               </URLSchemeListener>
+              <LogicAggregatorContainer
+                components={[InteractionManager, ApplyScreenHooks]}
+              />
             </ErrorBoundary>
           </AppContainer>
         </SafeAreaProvider>
@@ -77,7 +83,7 @@ const App = ({ Layout, OfflineHandler, SplashLoader }): ZappApp =>
 
 export function createQuickBrickApp(options): ZappApp {
   const {
-    InteractionManager = R.identity,
+    InteractionManager = () => null,
     Layout,
     QuickBrickManager,
     OfflineHandler = R.prop("children"),
@@ -95,16 +101,15 @@ export function createQuickBrickApp(options): ZappApp {
     storeConnector, // storeConnector should be first, as it disregards other props
     ...ContextProviders, // contexts consumers are only working below this point
     appRemoteDataLoader,
-    withAppManager, // provides handlers when the app is going in the background, or comes out of it
+    withAppManager, // provides handlers when the app is going in the background, or comes out of it, can be moved to LogicAggregatorContainer
     ZappPipesEntryContext.withProvider,
     withURLSchemeContextProvider,
     withNetworkStatusProvider,
     withNavigationProvider,
     withScreenDataContextProvider,
     ZappPipesSearchContext.withProvider,
-    InteractionManager,
     withActionExecutor,
     withActionsProvider,
-    appLifeCycleManager(appLoader, QuickBrickManager)
-  )(App({ Layout, OfflineHandler, SplashLoader }));
+    appLifeCycleManager(appLoader, QuickBrickManager) // can be moved to LogicAggregatorContainer
+  )(App({ Layout, OfflineHandler, SplashLoader, InteractionManager }));
 }

package/createZappApp/__tests__/__snapshots__/createZappApp.test.js.snap

@@ -20,7 +20,6 @@ Object {
       "isAvailable": null,
       "nextState": null,
     },
-    "isTransitioning": false,
   },
   "cellStyles": Object {},
   "components": Object {

package/defaults/index.js

@@ -1,5 +1,3 @@
-// @flow
-
 /**
  * quick-brick-core module
  * @module @applicaster/quick-brick-core/defaults

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "12.0.0-rc.98",
+  "version": "13.0.0-alpha.2322412833",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
     "test": "jest -w=2",
-    "flow-types": "node_modules/.bin/flow-copy-source -v -i '**/__tests__**' . .",
     "build": "echo 'skipping ts build for core packages'"
   },
   "repository": {
@@ -30,13 +29,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "12.0.0-rc.98",
-    "@applicaster/quick-brick-core-plugins": "12.0.0-rc.98",
-    "@applicaster/zapp-pipes-v2-client": "12.0.0-rc.98",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.98",
-    "@applicaster/zapp-react-native-redux": "12.0.0-rc.98",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-rc.98",
-    "@applicaster/zapp-react-native-utils": "12.0.0-rc.98",
+    "@applicaster/applicaster-types": "13.0.0-alpha.2322412833",
+    "@applicaster/quick-brick-core-plugins": "13.0.0-alpha.2322412833",
+    "@applicaster/zapp-pipes-v2-client": "13.0.0-alpha.2322412833",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.2322412833",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.2322412833",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.2322412833",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.2322412833",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",