@applicaster/quick-brick-core 12.0.0-rc.11 → 12.0.0-rc.111

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/__tests__/createQuickBrickApp.test.js

@@ -15,6 +15,11 @@ jest.mock(
 // This is meant to silence errors with react-native-gesture-handler
 jest.mock("../ModalProvider/ModalBottomSheet", () => () => null);
 
+jest.mock(
+  "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation",
+  () => () => null
+);
+
 jest.mock("react-native-safe-area-context", () => ({
   SafeAreaProvider: jest.fn(
     () =>

package/App/index.tsx

@@ -1,15 +1,10 @@
 import * as React from "react";
 import * as R from "ramda";
 import {
-  SafeAreaProvider,
   initialWindowMetrics,
+  SafeAreaProvider,
 } from "react-native-safe-area-context";
 
-import type {
-  AppComponentProps,
-  ZappApp,
-} from "@applicaster/zapp-react-native-flow-types";
-
 import { ErrorBoundary } from "./ErrorBoundary";
 import { RouteManager } from "./RouteManager";
 import { withNavigationProvider } from "./NavigationProvider";
@@ -32,16 +27,15 @@ import {
 import { withURLSchemeContextProvider } from "./DeepLinking/URLSchemeListener/URLSchemeContextProvider";
 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
@@ -49,12 +43,19 @@ import { withActionExecutor } from "@applicaster/zapp-react-native-utils/actions
  * @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}>
@@ -63,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>
@@ -81,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"),
@@ -99,15 +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/const/index.ts

@@ -34,3 +34,7 @@ export const requiredSessionKeys = [
   "userAgent",
   "version_name",
 ];
+
+export const QUICK_BRICK_NAVBAR = "quick-brick-navbar";
+
+export const QUICK_BRICK_CONTENT = "quick-brick-content";

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

@@ -20,13 +20,13 @@ Object {
       "isAvailable": null,
       "nextState": null,
     },
-    "isTransitioning": false,
   },
   "cellStyles": Object {},
   "components": Object {
     "AppContainer": [Function],
     "ContentScreen": [Function],
     "HookRenderer": [Function],
+    "ModalComponent": [Function],
     "PlayerContainer": Object {
       "$$typeof": Symbol(react.memo),
       "WrappedComponent": Object {

package/createZappApp/{index.js → index.tsx}

@@ -7,11 +7,10 @@
 import * as React from "react";
 import * as R from "ramda";
 import { Dimensions } from "react-native";
-
-import type {
-  AppComponentProps,
-  ZappAppConfig,
-} from "@applicaster/zapp-react-native-flow-types";
+import {
+  isNotEmpty,
+  isNotNil,
+} from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
 
 import {
   createZappReduxStore,
@@ -32,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
@@ -60,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-rc.11",
+  "version": "12.0.0-rc.111",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -30,15 +30,15 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "12.0.0-rc.11",
-    "@applicaster/quick-brick-core-plugins": "12.0.0-rc.11",
-    "@applicaster/zapp-pipes-v2-client": "12.0.0-rc.11",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.11",
-    "@applicaster/zapp-react-native-redux": "12.0.0-rc.11",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-rc.11",
-    "@applicaster/zapp-react-native-utils": "12.0.0-rc.11",
+    "@applicaster/applicaster-types": "12.0.0-rc.111",
+    "@applicaster/quick-brick-core-plugins": "12.0.0-rc.111",
+    "@applicaster/zapp-pipes-v2-client": "12.0.0-rc.111",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.111",
+    "@applicaster/zapp-react-native-redux": "12.0.0-rc.111",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-rc.111",
+    "@applicaster/zapp-react-native-utils": "12.0.0-rc.111",
     "atob": "^2.1.2",
-    "axios": "^0.21.2",
+    "axios": "^0.28.0",
     "btoa": "^1.2.1",
     "camelize": "^1.0.0",
     "md5": "^2.3.0",
@@ -58,7 +58,6 @@
     "react-native-safe-area-context": "*"
   },
   "devDependencies": {
-    "@applicaster/zapp-react-native-flow-types": "1.5.0",
     "@types/react-native": "0.69.6",
     "@types/tizen-tv-webapis": "^2.0.1",
     "nock": "^10.0.0",