@applicaster/quick-brick-core 12.0.0-alpha.4342066143 → 12.0.0-alpha.4354608902

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();
     }
@@ -414,9 +413,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 +484,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 +498,7 @@ export function NavigationProvider({ children }: Props) {
       if (hookPlugin?.lastHook) {
         dispose({ disposeAll: true });
 
-        startUpHooks && setStartUpHooks(false);
+        startUpHooks.current && setStartUpHooks(false);
       }
 
       dispatch(
@@ -599,10 +607,15 @@ export function NavigationProvider({ children }: Props) {
           targetScreen: screen,
           rivers,
           plugins,
-          startUpHooksData: { startUpHooks, setStartUpHooks },
+          startUpHooksData: {
+            startUpHooks: currentStartUpHooks.current,
+            setStartUpHooks,
+          },
         };
 
-        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)
@@ -613,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 }));
       }
@@ -672,15 +686,15 @@ export function NavigationProvider({ children }: Props) {
 
   // It will only work for the regular stack and pathname, It won't work for modals
   // TODO: integrate video/hook and regular modal into stack.
-  const getStackForPathname = React.useCallback((pathname: string):
-    | NavigationScreenState
-    | undefined => {
-    const stack = [...stateRef?.current?.stack?.mainStack];
+  const getStackForPathname = (
+    pathname: string
+  ): NavigationScreenState | undefined => {
+    const stack = [...state?.stack?.mainStack];
 
     const currentStack = stack.find(({ route }) => route === pathname);
 
     return currentStack;
-  }, []);
+  };
 
   const navigator: QuickBrickAppNavigator = React.useMemo(
     () => ({
@@ -724,7 +738,7 @@ export function NavigationProvider({ children }: Props) {
       replaceTop,
       getStack,
       getStackForPathname,
-      mainStack: state?.stack?.mainStack,
+      mainStack: state.stack.mainStack,
     }),
     [rivers, plugins, JSON.stringify(state), appLaunched, startUpHooks]
   );

package/App/NetworkStatusProvider/utils.ts

@@ -3,7 +3,10 @@ import * as R from "ramda";
 
 import { NetInfoState } from "@react-native-community/netinfo";
 import { NETWORK_HOOKS_KEYS } from "./const";
-import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
+import {
+  isVizioPlatform,
+  platformSelect,
+} from "@applicaster/zapp-react-native-utils/reactUtils";
 import { Platform } from "react-native";
 
 type ConnectionStatus = boolean;
@@ -203,6 +206,18 @@ export const subscribeToDeviceNetworkChanges = (callback: NetCb) => {
     registeredListener = webapis.network.addNetworkStateChangeListener(
       samsungNetworkChangeHandler(callback)
     );
+
+    return;
+  }
+
+  if (isVizioPlatform()) {
+    window.addEventListener("online", function () {
+      callback({ online: true });
+    });
+
+    window.addEventListener("offline", function () {
+      callback({ online: false });
+    });
   }
 };
 
@@ -214,5 +229,12 @@ export const subscribeToDeviceNetworkChanges = (callback: NetCb) => {
 export const unsubscribeToDeviceNetworkChanges = (id = registeredListener) => {
   if (hasTizenAPIs()) {
     webapis.network.removeNetworkStateChangeListener(id);
+
+    return;
+  }
+
+  if (isVizioPlatform()) {
+    window.removeEventListener("online", function () {});
+    window.removeEventListener("offline", function () {});
   }
 };

package/App/index.tsx

@@ -1,8 +1,8 @@
 import * as React from "react";
 import * as R from "ramda";
 import {
-  SafeAreaProvider,
   initialWindowMetrics,
+  SafeAreaProvider,
 } from "react-native-safe-area-context";
 
 import { ErrorBoundary } from "./ErrorBoundary";
@@ -27,6 +27,7 @@ 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";
 
 /**
  * @typedef {Object} AppOptions
@@ -99,6 +100,7 @@ export function createQuickBrickApp(options): ZappApp {
     withURLSchemeContextProvider,
     withNetworkStatusProvider,
     withNavigationProvider,
+    withScreenDataContextProvider,
     ZappPipesSearchContext.withProvider,
     InteractionManager,
     withActionExecutor,

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/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/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-alpha.4342066143",
+  "version": "12.0.0-alpha.4354608902",
   "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-alpha.4342066143",
-    "@applicaster/quick-brick-core-plugins": "12.0.0-alpha.4342066143",
-    "@applicaster/zapp-pipes-v2-client": "12.0.0-alpha.4342066143",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.4342066143",
-    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.4342066143",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.4342066143",
-    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.4342066143",
+    "@applicaster/applicaster-types": "12.0.0-alpha.4354608902",
+    "@applicaster/quick-brick-core-plugins": "12.0.0-alpha.4354608902",
+    "@applicaster/zapp-pipes-v2-client": "12.0.0-alpha.4354608902",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.4354608902",
+    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.4354608902",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.4354608902",
+    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.4354608902",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",