@applicaster/quick-brick-core 12.0.0-rc.1 → 12.0.0-rc.100

package/App/ThemeManager/index.tsx

@@ -1,8 +1,9 @@
 import * as R from "ramda";
 import * as React from "react";
 
+import { isEqual } from "@applicaster/zapp-react-native-utils/equalUtils";
 import { ThemeContext } from "@applicaster/zapp-react-native-utils/theme";
-import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 import {
   mapKeys,
   partitionByKeys,
@@ -35,7 +36,7 @@ function populateTheme(plugin) {
 
 const TABLET_PREFIX = "tablet_";
 
-const prepareForTablet = (dimensions) => (themeProps) => {
+const prepareForTablet = (isTablet) => (themeProps) => {
   const [tabletThemeProps, mobileTheme] = partitionByKeys(
     R.compose(R.startsWith(TABLET_PREFIX), R.head),
     themeProps
@@ -62,12 +63,12 @@ const prepareForTablet = (dimensions) => (themeProps) => {
     R.omit(["tablet_theme"])
   )(tabletThemeProps);
 
-  return dimensions.deviceInfo.isTablet ? tabletTheme : mobileTheme;
+  return isTablet ? tabletTheme : mobileTheme;
 };
 
-const selectThemes = (dimensions, plugins) =>
+const selectThemes = (isTablet, plugins) =>
   R.compose(
-    R.map(prepareForTablet(dimensions)),
+    R.map(prepareForTablet(isTablet)),
     R.fromPairs,
     R.reject(R.isNil),
     R.map(populateTheme),
@@ -80,36 +81,38 @@ const ThemeContextProvider = ({
   setSelectedThemeId,
   children,
 }: any) => {
-  const value = React.useMemo(
-    () => ({ themes, selectedThemeId, setSelectedThemeId }),
-    [themes, selectedThemeId, setSelectedThemeId]
-  );
+  const value = { themes, selectedThemeId, setSelectedThemeId };
 
   return (
     <ThemeContext.Provider value={value}>{children}</ThemeContext.Provider>
   );
 };
 
+const MemoizedThemeContextProvider = React.memo(
+  ThemeContextProvider,
+  isEqual({
+    byValue: ["selectedThemeId", "setSelectedThemeId"],
+    byReference: ["children", "themes"],
+  })
+);
+
 function ThemeManagerComponent({ children, plugins }: Props) {
-  const dimensions = useDimensions("screen", { deviceInfo: true });
-  const [themes, setThemes] = React.useState(selectThemes(dimensions, plugins));
+  const isTablet = useIsTablet();
+
+  const themes = selectThemes(isTablet, plugins);
 
   const [selectedThemeId, setSelectedThemeId] =
     React.useState(DEFAULT_THEME_ID);
 
-  React.useEffect(() => {
-    setThemes(selectThemes(dimensions, plugins));
-  }, [plugins, dimensions]);
-
   return (
-    <ThemeContextProvider
+    <MemoizedThemeContextProvider
       themes={themes}
       selectedThemeId={selectedThemeId}
       setSelectedThemeId={setSelectedThemeId}
     >
       {children}
-    </ThemeContextProvider>
+    </MemoizedThemeContextProvider>
   );
 }
 
-export const ThemeManager = React.memo<Props>(ThemeManagerComponent);
+export const ThemeManager = ThemeManagerComponent;

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,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
@@ -104,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/__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.1",
+  "version": "12.0.0-rc.100",
   "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.1",
-    "@applicaster/quick-brick-core-plugins": "12.0.0-rc.1",
-    "@applicaster/zapp-pipes-v2-client": "12.0.0-rc.1",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.1",
-    "@applicaster/zapp-react-native-redux": "12.0.0-rc.1",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-rc.1",
-    "@applicaster/zapp-react-native-utils": "12.0.0-rc.1",
+    "@applicaster/applicaster-types": "12.0.0-rc.100",
+    "@applicaster/quick-brick-core-plugins": "12.0.0-rc.100",
+    "@applicaster/zapp-pipes-v2-client": "12.0.0-rc.100",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.100",
+    "@applicaster/zapp-react-native-redux": "12.0.0-rc.100",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-rc.100",
+    "@applicaster/zapp-react-native-utils": "12.0.0-rc.100",
     "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",