@applicaster/quick-brick-core 12.0.0-alpha.4054240460 → 12.0.0-alpha.4155487673

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

@@ -414,9 +414,12 @@ export function NavigationProvider({ children }: Props) {
     }
   };
 
-  const handleHookCancel = ({ hookPlugin }, dispose) => {
-    if (hookPlugin?.lastHook) {
-      dispose();
+  const handleHookCancel = ({ hookPlugin, callback }, dispose) => {
+    dispose();
+    setStartUpHooks(false);
+
+    if (callback && typeof callback === "function") {
+      callback();
     }
 
     if (hookPlugin.isModalHook()) {
@@ -482,7 +485,13 @@ export function NavigationProvider({ children }: Props) {
     return false;
   }, [pluginConfigurations, plugins, rivers]);
 
-  const [startUpHooks, setStartUpHooks] = React.useState(checkStartUpHooks);
+  const [startUpHooks, _setStartUpHooks] = React.useState(checkStartUpHooks);
+  const currentStartUpHooks = React.useRef(checkStartUpHooks);
+
+  const setStartUpHooks = (value) => {
+    _setStartUpHooks(value);
+    currentStartUpHooks.current = value;
+  };
 
   const handleHookComplete =
     (navigationAction, targetRoute, { screen, options }) =>
@@ -490,7 +499,7 @@ export function NavigationProvider({ children }: Props) {
       if (hookPlugin?.lastHook) {
         dispose({ disposeAll: true });
 
-        startUpHooks && setStartUpHooks(false);
+        startUpHooks.current && setStartUpHooks(false);
       }
 
       dispatch(
@@ -599,7 +608,10 @@ export function NavigationProvider({ children }: Props) {
           targetScreen: screen,
           rivers,
           plugins,
-          startUpHooksData: { startUpHooks, setStartUpHooks },
+          startUpHooksData: {
+            startUpHooks: currentStartUpHooks.current,
+            setStartUpHooks,
+          },
         };
 
         HooksManager(hooksOptions)

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

@@ -7,6 +7,10 @@
 import * as React from "react";
 import * as R from "ramda";
 import { Dimensions } from "react-native";
+import {
+  isNotEmpty,
+  isNotNil,
+} from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
 
 import {
   createZappReduxStore,
@@ -27,6 +31,9 @@ import { remoteDataLoader } from "../App/appRemoteDataLoader/remoteDataLoader";
 import * as QuickBrickManager from "@applicaster/zapp-react-native-bridge/QuickBrick";
 import { isAndroidPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
 
+const isNotEmptyObject = (value: unknown) =>
+  isNotNil(value) && R.is(Object, value) && isNotEmpty(value);
+
 /**
  * Creates a Zapp App with the provided options
  * @export
@@ -55,8 +62,8 @@ export function createZappApp(zappAppConfig: ZappAppConfig) {
 
   const useTabletLayout =
     isTablet({ width, height }, width > height ? "landscape" : "portrait") &&
-    tabletLayout &&
-    tabletCellStyles;
+    isNotEmptyObject(tabletLayout) &&
+    isNotEmptyObject(tabletCellStyles);
 
   function fetchPluginConfiguration(plugin) {
     const configuration = R.compose(

package/package.json

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