@applicaster/quick-brick-core 14.0.0-alpha.1308901965 → 14.0.0-alpha.1322105203

package/App/ActionSetters/index.ts

@@ -12,7 +12,6 @@ const debugActions = (actions) =>
     message: `useSubscribeToActionProviders - available actions count: ${
       Object.keys(actions).length
     }`,
-    data: { actions },
   });
 
 const warnUndefinedContext = (context) =>

package/App/ErrorBoundary/index.tsx

@@ -60,6 +60,10 @@ export class ErrorBoundary extends React.Component<Props> {
     useErrorStore.getState().setError(error, info, recoverable);
   }
 
+  static getDerivedStateFromError(_error) {
+    return { hasError: true };
+  }
+
   render() {
     return <ErrorBoundaryContent>{this.props.children}</ErrorBoundaryContent>;
   }

package/App/ModalProvider/ModalBottomSheet/ModalBottomSheetFrame.tsx

@@ -47,7 +47,7 @@ const getSheetHeight = ({ height, bottomOffset, maxHeight }) => {
     ios: height - bottomOffset,
     default:
       (height || maxHeight) -
-      (!isAndroidVersionAtLeast(35) && isAndroidPlatform() ? bottomOffset : 0),
+      (isAndroidPlatform() && !isAndroidVersionAtLeast(35) ? bottomOffset : 0),
   });
 };
 

package/App/NavigationProvider/navigator/reducer.ts

@@ -429,18 +429,34 @@ export default function navigationReducer(
     case ACTIONS.REPLACE:
     case ACTIONS.REPLACE_TOP:
     case ACTIONS.BACK:
-    case ACTIONS.BACK_PLAYER_NESTED_CONTENT:
-      return R.evolve(
-        {
-          stack: applyReducer(navigationStackReducer, { type, payload }),
-          location: applyReducer(locationReducer, {
-            type,
-            payload,
-            meta: state,
-          }),
-        },
-        state
-      );
+    // eslint-disable-next-line
+    case ACTIONS.BACK_PLAYER_NESTED_CONTENT: {
+      // TODO: Check this solution with Pawel, does not work without it on tvs
+      const screenStateStore: UseBoundStore<StoreApi<ScreenStateStore>> =
+        create<ScreenStateStore>((set) => ({
+          data: {},
+          setValue: (key, value) =>
+            set((s) => ({ data: { ...s.data, [key]: value } })),
+          removeValue: (key) =>
+            set((s) => {
+              const data = { ...s.data };
+              delete data[key];
+
+              return { data };
+            }),
+        }));
+
+      const actionWithStore = {
+        type,
+        payload: { ...payload, screenStateStore },
+        meta: state,
+      };
+
+      const stack = applyReducer(navigationStackReducer, actionWithStore);
+      const location = applyReducer(locationReducer, actionWithStore);
+
+      return R.evolve({ stack, location }, state);
+    }
 
     case ACTIONS.SET_NESTED_CONTENT:
       return R.evolve(

package/App/__tests__/createQuickBrickApp.test.js

@@ -42,9 +42,12 @@ jest.mock("../AppStateDecorator", () => ({
   withAppManager: (Comp) => Comp,
 }));
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
-  useDimensions: jest.fn(() => ({ width: 375, height: 800 })),
-}));
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/layout/useDimensions",
+  () => ({
+    useDimensions: jest.fn(() => ({ width: 375, height: 800 })),
+  })
+);
 
 jest.mock("react-native", () => {
   const RNMock = jest.genMockFromModule("react-native");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "14.0.0-alpha.1308901965",
+  "version": "14.0.0-alpha.1322105203",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,13 +28,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "14.0.0-alpha.1308901965",
-    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.1308901965",
-    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.1308901965",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.1308901965",
-    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.1308901965",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.1308901965",
-    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.1308901965",
+    "@applicaster/applicaster-types": "14.0.0-alpha.1322105203",
+    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.1322105203",
+    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.1322105203",
+    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.1322105203",
+    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.1322105203",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.1322105203",
+    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.1322105203",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",
@@ -60,19 +60,12 @@
     "react": "*",
     "react-native": "*",
     "react-native-fs": "*",
-    "react-native-gesture-handler": "*",
     "react-native-linear-gradient": "*",
     "react-native-safe-area-context": "*",
     "react-native-svg": "*",
-    "react-native-web": "*",
     "react-native-webview": "*",
     "uglify-js": "*",
     "validate-color": "*",
     "zustand": "*"
-  },
-  "devDependencies": {
-    "nock": "^10.0.0",
-    "redux-mock-store": "^1.5.3"
-  },
-  "gitHead": "a473487564142c55cdb50f02505cf0b60fe75658"
+  }
 }

package/renderZappApp/index.js

@@ -19,7 +19,7 @@
  * @param {React.ComponentType<any>} App component to start
  */
 export function renderZappApp(options) {
-  const { App, AppRegistry, appMountId } = options;
+  const { App, AppRegistry, appMountId, mode } = options;
 
   if (!App) {
     throw new Error("No App Component provided, nothing to render");
@@ -37,6 +37,7 @@ export function renderZappApp(options) {
     if (appMountId) {
       AppRegistry.runApplication("QuickBrickApp", {
         rootTag: document.getElementById(appMountId),
+        mode,
       });
     }
   }