@applicaster/quick-brick-core 13.0.0-alpha.5049772260 → 13.0.0-alpha.5131435627

package/App/ModalProvider/ModalBottomSheet/DraggableBottomSheet/index.tsx

@@ -300,7 +300,6 @@ export class DraggableBottomSheet extends Component<Props, ComponentState> {
                   simultaneousHandlers={this.drawer}
                 >
                   <Animated.ScrollView
-                    style={{ marginBottom: this._snapPoints.top }}
                     bounces={false}
                     onScrollBeginDrag={this._onRegisterLastScroll}
                     scrollEventThrottle={1}

package/App/ModalProvider/ModalBottomSheet/ModalBottomSheetFrame.tsx

@@ -1,21 +1,20 @@
 import React from "react";
-import { StyleSheet, View } from "react-native";
+import { LayoutChangeEvent, StyleSheet, View } from "react-native";
 
 import { Handle, HandleProps } from "./Handle";
 import { DraggableBottomSheet } from "./DraggableBottomSheet";
+import { SafeAreaView } from "react-native-safe-area-context";
 
 type Props = {
   children: React.ReactChild;
   backgroundColor: string;
   cornerRadius: number;
-  contentHeight: number;
   maxHeight: number;
   maxWidth: number;
   visible: boolean;
   handleProps: HandleProps;
   closeToast: () => void;
   dimensions: { width: number; height: number };
-  paddingBottom: number;
 };
 
 const styles = StyleSheet.create({
@@ -34,9 +33,7 @@ export function ModalBottomSheetFrame(props: Props) {
     maxWidth,
     visible,
     handleProps,
-    contentHeight,
     dimensions,
-    paddingBottom,
   } = props;
 
   const extraStyles = {
@@ -44,13 +41,22 @@ export function ModalBottomSheetFrame(props: Props) {
     borderTopLeftRadius: cornerRadius,
     borderTopRightRadius: cornerRadius,
     maxHeight,
-    paddingBottom,
     maxWidth: Math.min(Number(maxWidth), dimensions.width),
   };
 
+  const [height, setHeight] = React.useState(0);
+
+  const onLayout = (event: LayoutChangeEvent) => {
+    const { height } = event.nativeEvent.layout;
+
+    if (height !== 0) {
+      setHeight((oldHeight) => oldHeight || height);
+    }
+  };
+
   return (
     <DraggableBottomSheet
-      sheetHeight={contentHeight}
+      sheetHeight={height}
       visible={visible}
       dismiss={props.closeToast}
       hasHeader={handleProps.enabled}
@@ -58,7 +64,13 @@ export function ModalBottomSheetFrame(props: Props) {
       maxWidth={maxWidth}
       {...dimensions}
     >
-      <View style={[styles.toastFrameContainer, extraStyles]}>{children}</View>
+      <SafeAreaView
+        edges={["left", "right", "bottom"]}
+        style={[styles.toastFrameContainer, extraStyles]}
+        onLayout={onLayout}
+      >
+        <View>{children}</View>
+      </SafeAreaView>
     </DraggableBottomSheet>
   );
 }

package/App/ModalProvider/ModalBottomSheet/index.tsx

@@ -3,7 +3,7 @@ import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Keyboard, StyleSheet, View } from "react-native";
 
 import { Overlay } from "./Overlay";
@@ -38,12 +38,11 @@ export function ModalBottomSheet(props: Props) {
   const theme = useTheme<BaseThemePropertiesMobile>();
   const navigator = useNavigation();
   const dimensions = useDimensions();
-  const [sheetHeight, setSheetHeight] = useState(0);
   const [visible, setVisible] = useState(true);
   const dismiss = () => setVisible(false);
   const { bottom = defaultBottomOffset } = useSafeAreaInsets();
 
-  const bottomOffset = bottom + dimensions.statusBarHeight;
+  const bottomOffset = bottom;
 
   const {
     modal_bottom_sheet_background_color: sheetBackgroundColor,
@@ -61,14 +60,6 @@ export function ModalBottomSheet(props: Props) {
     modalBottomSheetContentProps,
   } = props;
 
-  const onLayout = useCallback(({ nativeEvent }) => {
-    const calculatedHeight = nativeEvent?.layout?.height;
-
-    if (calculatedHeight > 0 && sheetHeight === 0) {
-      setSheetHeight(Math.min(calculatedHeight, sheetMaxHeight));
-    }
-  }, []);
-
   useEffect(() => {
     Keyboard.dismiss();
   }, []);
@@ -77,8 +68,6 @@ export function ModalBottomSheet(props: Props) {
 
   const maxWidth = isTablet ? sheetTabletMaxWidth : dimensions.width;
 
-  const modalVisible = visible && sheetHeight > 0;
-
   return (
     <View style={styles.container}>
       <Overlay
@@ -89,12 +78,10 @@ export function ModalBottomSheet(props: Props) {
       <ModalBottomSheetFrame
         backgroundColor={sheetBackgroundColor}
         cornerRadius={sheetCornerRadius}
-        contentHeight={sheetHeight + bottomOffset}
         maxHeight={sheetMaxHeight + bottomOffset}
-        paddingBottom={bottomOffset}
         maxWidth={maxWidth}
         dimensions={dimensions}
-        visible={modalVisible}
+        visible={visible}
         closeToast={dismiss}
         handleProps={{
           enabled: sheetHandleEnabled,
@@ -102,18 +89,15 @@ export function ModalBottomSheet(props: Props) {
           focusedColor: sheetHandleFocusedColor,
         }}
       >
-        <View onLayout={onLayout}>
-          <ModalBottomSheetContent
-            width={
-              Math.min(sheetTabletMaxWidth, dimensions.width) ||
-              dimensions.width
-            }
-            maxHeight={sheetMaxHeight}
-            {...modalBottomSheetContentProps}
-            dismiss={dismiss}
-            currentRoute={navigator.currentRoute}
-          />
-        </View>
+        <ModalBottomSheetContent
+          width={
+            Math.min(sheetTabletMaxWidth, dimensions.width) || dimensions.width
+          }
+          maxHeight={sheetMaxHeight}
+          {...modalBottomSheetContentProps}
+          dismiss={dismiss}
+          currentRoute={navigator.currentRoute}
+        />
       </ModalBottomSheetFrame>
     </View>
   );

package/App/ModalProvider/ModalPresenter.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { Modal, ModalProps } from "react-native";
 
-type Props = {
+type Props = ModalProps & {
   children: React.ReactChild;
   ModalContainer?: React.FC<ModalProps> | React.ComponentClass<ModalProps>;
   visible: boolean;

package/App/ModalProvider/index.tsx

@@ -40,7 +40,11 @@ export function ModalProvider() {
   return (
     <PathnameContext.Provider value={pathname}>
       <ScreenContextProvider pathname={pathname}>
-        <ModalPresenter visible={shouldShowModal} {...modalState?.options}>
+        <ModalPresenter
+          visible={shouldShowModal}
+          {...modalState?.options}
+          statusBarTranslucent
+        >
           <ModalChildrenWrapper>
             <ModalContent modalScreenProps={modalScreenProps} />
           </ModalChildrenWrapper>

package/package.json

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