@applicaster/quick-brick-core 12.0.0-alpha.5786305091 → 12.0.0-alpha.9151207838

package/App/ModalProvider/ModalBottomSheet/index.tsx

@@ -13,6 +13,7 @@ import {
   useNavigation,
 } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks/layout";
+import { ModalComponent } from "@applicaster/zapp-react-native-ui-components/Components";
 
 const styles = StyleSheet.create({
   container: {
@@ -55,7 +56,10 @@ export function ModalBottomSheet(props: Props) {
     modal_bottom_sheet_tablet_max_width: sheetTabletMaxWidth,
   } = theme;
 
-  const { ModalBottomSheetContent, modalBottomSheetContentProps } = props;
+  const {
+    ModalBottomSheetContent = ModalComponent,
+    modalBottomSheetContentProps,
+  } = props;
 
   const onLayout = useCallback(({ nativeEvent }) => {
     const calculatedHeight = nativeEvent?.layout?.height;

package/App/ModalProvider/ModalContent.tsx

@@ -17,7 +17,7 @@ const styles = StyleSheet.create({
 export function ModalContent(props: Props) {
   const { modalScreenProps } = props;
 
-  if (modalScreenProps?.screenData?.ModalBottomSheetContent) {
+  if (modalScreenProps?.screenData?.modalBottomSheetContentProps) {
     const { ModalBottomSheetContent, modalBottomSheetContentProps } =
       modalScreenProps?.screenData || {};
 

package/App/NavigationProvider/NavigationProvider.tsx

@@ -63,6 +63,7 @@ import { findParent } from "@applicaster/zapp-react-native-ui-components/Context
 import { ZappPipesEntryContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
 import { PlayNextState } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/OverlayObserver/OverlaysObserver";
 import { inflateUrl } from "@applicaster/zapp-react-native-ui-components/Components/LinkHandler/LinkHandler";
+import { useModalStore } from "@applicaster/zapp-react-native-utils/modalState";
 
 const logger = coreAppLogger.addSubsystem("Navigator");
 
@@ -130,8 +131,7 @@ export function NavigationProvider({ children }: Props) {
     ZappPipesEntryContext.Context
   );
 
-  const [modalState, setModalState] =
-    React.useState<ModalState>(initialModalState);
+  const { openModal, dismissModal, modalState } = useModalStore();
 
   const playNextOverlayState = React.useRef();
 
@@ -615,31 +615,6 @@ export function NavigationProvider({ children }: Props) {
     },
   });
 
-  const openModal = React.useCallback(
-    ({ item, options = {}, props = {} }: OpenModalArg) => {
-      setModalState({
-        visible: true,
-        screen: item as ZappRiver,
-        options: {
-          animated: true,
-          animationType: "slide",
-          onShow: () => {},
-          presentationStyle: "overFullScreen",
-          transparent: true,
-          ...options,
-          onDismiss: () => {
-            setModalState(initialModalState);
-          },
-          onRequestClose: () => {
-            dismissModal();
-          },
-        },
-        props,
-      });
-    },
-    []
-  );
-
   const openPiP = React.useCallback(() => {
     dispatch(setVideoPiP());
   }, []);
@@ -660,10 +635,6 @@ export function NavigationProvider({ children }: Props) {
     }
   }, [state?.options?.videoModal?.previousMode]);
 
-  const dismissModal = React.useCallback(() => {
-    setModalState(() => ({ ...initialModalState }));
-  }, []);
-
   const openModalBottomSheet = React.useCallback(
     ({
       ModalBottomSheetContent,

package/App/NavigationProvider/__tests__/__snapshots__/navigationProvider.test.tsx.snap

@@ -11,7 +11,9 @@ Object {
     "presentationStyle": "overFullScreen",
     "transparent": true,
   },
-  "props": Object {},
+  "props": Object {
+    "screenData": Object {},
+  },
   "screen": Object {
     "id": "A1234",
     "navigations": Array [],
@@ -41,7 +43,9 @@ Object {
     "presentationStyle": "overFullScreen",
     "transparent": true,
   },
-  "props": Object {},
+  "props": Object {
+    "screenData": Object {},
+  },
   "screen": Object {
     "id": "A1234",
     "navigations": Array [],

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

@@ -27,6 +27,7 @@ Object {
     "AppContainer": [Function],
     "ContentScreen": [Function],
     "HookRenderer": [Function],
+    "ModalComponent": [Function],
     "PlayerContainer": Object {
       "$$typeof": Symbol(react.memo),
       "WrappedComponent": Object {

package/package.json

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