@applicaster/quick-brick-core 13.0.0-alpha.7138263059 → 13.0.0-alpha.7193146510

package/App/ErrorBoundary/__tests__/errorBoundary.test.jsx

@@ -0,0 +1,232 @@
+import React from "react";
+import { View, Text, TouchableOpacity } from "react-native";
+import { render, fireEvent, act } from "@testing-library/react-native";
+import { useErrorStore } from "../store";
+import { ErrorBoundary } from "../index";
+
+jest.mock(
+  "@applicaster/zapp-react-native-ui-components/Components/ErrorScreen",
+  () => ({
+    // eslint-disable-next-line react/prop-types
+    ErrorScreen: ({ dismissError, message, buttons }) => (
+      <View testID="error-screen">
+        <Text testID="error-message">{message || "Default error message"}</Text>
+        {/* eslint-disable-next-line react/prop-types */}
+        {buttons?.map((button, index) => (
+          <TouchableOpacity
+            key={index}
+            onPress={button.onPress}
+            testID={`button-${index}`}
+          >
+            <Text>{button.text}</Text>
+          </TouchableOpacity>
+        ))}
+
+        {dismissError ? (
+          <TouchableOpacity onPress={dismissError} testID="dismiss-button">
+            <Text>Dismiss Error</Text>
+          </TouchableOpacity>
+        ) : null}
+      </View>
+    ),
+  })
+);
+
+jest.mock("@applicaster/zapp-react-native-bridge/QuickBrick", () => ({
+  sendQuickBrickEvent: jest.fn(),
+  QUICK_BRICK_EVENTS: {
+    FORCE_APP_RELOAD: "force_app_reload",
+  },
+}));
+
+jest.mock("@applicaster/zapp-react-native-utils/logger", () => ({
+  coreLogger: {
+    addSubsystem: () => ({
+      error: jest.fn(),
+    }),
+  },
+}));
+
+// eslint-disable-next-line react/prop-types
+const TestComponent = ({ error, errorMessage = "error !!" }) => {
+  if (error) {
+    throw new Error(errorMessage);
+  }
+
+  return (
+    <View>
+      <Text>all is good</Text>
+    </View>
+  );
+};
+
+describe("<ErrorBoundary />", () => {
+  // Clear all error states between tests
+  beforeEach(() => {
+    useErrorStore.getState().dismissError();
+  });
+
+  describe("when there is no error", () => {
+    it("renders children correctly", () => {
+      const { getByText } = render(
+        <ErrorBoundary>
+          <TestComponent />
+        </ErrorBoundary>
+      );
+
+      expect(getByText("all is good")).toBeTruthy();
+    });
+  });
+
+  describe("when an error is caught", () => {
+    const _consoleLogs = {
+      error: console.error,
+      log: console.log,
+    };
+
+    beforeAll(() => {
+      console.error = jest.fn();
+      console.log = jest.fn();
+    });
+
+    afterAll(() => {
+      console.error = _consoleLogs.error;
+      console.log = _consoleLogs.log;
+    });
+
+    it("renders error state with default values (recoverable error)", () => {
+      const { getByTestId } = render(
+        <ErrorBoundary>
+          <TestComponent error />
+        </ErrorBoundary>
+      );
+
+      expect(getByTestId("error-screen")).toBeTruthy();
+      expect(getByTestId("dismiss-button")).toBeTruthy(); // Should be recoverable by default
+    });
+
+    it("handles non-recoverable errors (no dismiss button)", () => {
+      const { getByTestId, queryByTestId } = render(
+        <ErrorBoundary recoverable={false}>
+          <TestComponent error />
+        </ErrorBoundary>
+      );
+
+      expect(getByTestId("error-screen")).toBeTruthy();
+      expect(queryByTestId("dismiss-button")).toBeFalsy(); // Should not be recoverable
+    });
+
+    it("shows custom error message from caught error", () => {
+      const customErrorMessage = "Custom error message for testing";
+
+      const { getByTestId } = render(
+        <ErrorBoundary>
+          <TestComponent error errorMessage={customErrorMessage} />
+        </ErrorBoundary>
+      );
+
+      // The error info should be passed to the ErrorScreen
+      expect(getByTestId("error-message").props.children).toBeTruthy();
+    });
+
+    it("can dismiss the error and restore the UI", () => {
+      // First render with error
+      const { getByTestId, queryByText, rerender } = render(
+        <ErrorBoundary>
+          <TestComponent error />
+        </ErrorBoundary>
+      );
+
+      // Verify error screen is shown
+      expect(getByTestId("error-screen")).toBeTruthy();
+
+      // Dismiss the error
+      fireEvent.press(getByTestId("dismiss-button"));
+
+      // Force rerender to see the change
+      rerender(
+        <ErrorBoundary>
+          <TestComponent />
+        </ErrorBoundary>
+      );
+
+      // Now the regular content should be visible
+      expect(queryByText("all is good")).toBeTruthy();
+    });
+  });
+
+  describe("error store functionality", () => {
+    it("properly sets error state", () => {
+      const error = new Error("Test error");
+      const errorInfo = "Test error info";
+
+      act(() => {
+        useErrorStore.getState().setError(error, errorInfo, true);
+      });
+
+      const state = useErrorStore.getState();
+      expect(state.hasError).toBe(true);
+      expect(state.error).toBe(error);
+      expect(state.info).toBe(errorInfo);
+      expect(state.recoverable).toBe(true);
+    });
+
+    it("properly resets error state", () => {
+      // First set an error
+      act(() => {
+        useErrorStore
+          .getState()
+          .setError(new Error("Test error"), "Info", true);
+      });
+
+      // Then dismiss it
+      act(() => {
+        useErrorStore.getState().dismissError();
+      });
+
+      const state = useErrorStore.getState();
+      expect(state.hasError).toBe(false);
+      expect(state.error).toBeUndefined();
+      expect(state.info).toBeUndefined();
+      expect(state.recoverable).toBe(true); // Default value when reset
+    });
+
+    it("remembers recoverable state", () => {
+      act(() => {
+        useErrorStore
+          .getState()
+          .setError(new Error("Test error"), "Info", false);
+      });
+
+      const state = useErrorStore.getState();
+      expect(state.recoverable).toBe(false);
+    });
+  });
+
+  describe("integration with ErrorScreen", () => {
+    it("renders restart app button for non-recoverable errors", () => {
+      const { getAllByTestId } = render(
+        <ErrorBoundary recoverable={false}>
+          <TestComponent error />
+        </ErrorBoundary>
+      );
+
+      // Should have the restart app button
+      const buttons = getAllByTestId(/button-/);
+      expect(buttons.length).toBeGreaterThan(0);
+    });
+
+    it("passes error info to the ErrorScreen component", () => {
+      const customErrorMessage = "Very specific error message";
+
+      const { getByTestId } = render(
+        <ErrorBoundary>
+          <TestComponent error errorMessage={customErrorMessage} />
+        </ErrorBoundary>
+      );
+
+      // The error info should be visible in the UI
+      expect(getByTestId("error-message")).toBeTruthy();
+    });
+  });
+});

package/App/ErrorBoundary/__tests__/store.test.js

@@ -0,0 +1,143 @@
+import { act, renderHook } from "@testing-library/react-hooks";
+import { useErrorStore } from "../store";
+
+describe("Error Store", () => {
+  beforeEach(() => {
+    act(() => {
+      useErrorStore.getState().dismissError();
+    });
+  });
+
+  describe("Initial state", () => {
+    it("should have correct default values", () => {
+      const { result } = renderHook(() => useErrorStore());
+
+      expect(result.current).toMatchObject({
+        hasError: false,
+        error: undefined,
+        info: undefined,
+        recoverable: true,
+        setError: expect.any(Function),
+        dismissError: expect.any(Function),
+      });
+    });
+  });
+
+  describe("setError action", () => {
+    it("should set error state with provided values", () => {
+      const testError = new Error("Test error");
+      const testInfo = "Test error info";
+      const isRecoverable = true;
+
+      const { result } = renderHook(() => useErrorStore());
+
+      act(() => {
+        result.current.setError(testError, testInfo, isRecoverable);
+      });
+
+      expect(result.current).toMatchObject({
+        hasError: true,
+        error: testError,
+        info: testInfo,
+        recoverable: isRecoverable,
+        setError: expect.any(Function),
+        dismissError: expect.any(Function),
+      });
+    });
+
+    it("should set non-recoverable error when specified", () => {
+      const testError = new Error("Test error");
+      const testInfo = "Test error info";
+      const isRecoverable = false;
+
+      const { result } = renderHook(() => useErrorStore());
+
+      act(() => {
+        result.current.setError(testError, testInfo, isRecoverable);
+      });
+
+      expect(result.current).toMatchObject({
+        recoverable: false,
+      });
+    });
+
+    it("should default to recoverable error when not specified", () => {
+      const testError = new Error("Test error");
+      const testInfo = "Test error info";
+
+      const { result } = renderHook(() => useErrorStore());
+
+      act(() => {
+        result.current.setError(testError, testInfo);
+      });
+
+      expect(result.current).toMatchObject({
+        recoverable: true,
+      });
+    });
+  });
+
+  describe("dismissError action", () => {
+    it("should reset error state to defaults", () => {
+      const testError = new Error("Test error");
+      const { result } = renderHook(() => useErrorStore());
+
+      act(() => {
+        result.current.setError(testError, "info", false);
+      });
+
+      expect(result.current).toMatchObject({
+        hasError: true,
+        recoverable: false,
+      });
+
+      act(() => {
+        result.current.dismissError();
+      });
+
+      expect(result.current).toMatchObject({
+        hasError: false,
+        error: undefined,
+        info: undefined,
+        recoverable: true,
+        setError: expect.any(Function),
+        dismissError: expect.any(Function),
+      });
+    });
+  });
+
+  describe("Direct store access via API", () => {
+    it("should allow direct access to store outside React components", () => {
+      act(() => {
+        useErrorStore
+          .getState()
+          .setError(new Error("API error"), "API info", false);
+      });
+
+      const { result } = renderHook(() => useErrorStore());
+
+      expect(result.current).toMatchObject({
+        hasError: true,
+        error: expect.objectContaining({ message: "API error" }),
+        info: "API info",
+        recoverable: false,
+      });
+    });
+
+    it("should allow clearing errors via API", () => {
+      act(() => {
+        useErrorStore.getState().setError(new Error("API error"), "API info");
+      });
+
+      act(() => {
+        useErrorStore.getState().dismissError();
+      });
+
+      const { result } = renderHook(() => useErrorStore());
+
+      expect(result.current).toMatchObject({
+        hasError: false,
+      });
+    });
+  });
+});

package/App/ErrorBoundary/index.tsx

@@ -1,42 +1,66 @@
 import * as React from "react";
+import pick from "lodash/pick";
 
 import { coreLogger } from "@applicaster/zapp-react-native-utils/logger";
 import { ErrorScreen } from "@applicaster/zapp-react-native-ui-components/Components/ErrorScreen";
 
+import { useErrorStore } from "./store";
+import * as QuickBrickManager from "@applicaster/zapp-react-native-bridge/QuickBrick";
+
 const errorBoundaryLogger = coreLogger.addSubsystem("react_error-boundary");
 
 type Props = {
   children: React.ReactNode;
+  recoverable?: boolean;
 };
 
-type State = {
-  hasError: boolean;
-  error?: Error;
-  info?: string;
+type ErrorBoundaryContentProps = {
+  children: React.ReactNode;
 };
 
-export class ErrorBoundary extends React.Component<Props, State> {
-  state: State = {
-    hasError: false,
-    error: undefined,
-  };
+const restartApp = () => {
+  QuickBrickManager.sendQuickBrickEvent(
+    QuickBrickManager.QUICK_BRICK_EVENTS.FORCE_APP_RELOAD
+  );
+};
 
-  componentDidCatch(error, info) {
-    errorBoundaryLogger.error({ error, data: info, message: error.message });
-    this.setState({ hasError: true, error, info });
+const restartButton = {
+  text: "Restart the app",
+  onPress: restartApp,
+};
+
+const buttons = [restartButton];
+
+const ErrorBoundaryContent: React.FC<ErrorBoundaryContentProps> = ({
+  children,
+}) => {
+  const { hasError, dismissError, info } = pick(
+    useErrorStore((state) => state),
+    ["hasError", "dismissError", "info"]
+  );
+
+  if (hasError) {
+    return (
+      <ErrorScreen
+        dismissError={dismissError}
+        message={info}
+        buttons={buttons}
+      />
+    );
   }
 
-  dismissError = () => {
-    this.setState({ hasError: false });
-  };
+  return <>{children}</>;
+};
 
-  render() {
-    const { hasError } = this.state as State;
+export class ErrorBoundary extends React.Component<Props> {
+  componentDidCatch(error, info) {
+    errorBoundaryLogger.error({ error, data: info, message: error.message });
+    const { recoverable = true } = this.props;
 
-    if (hasError) {
-      return <ErrorScreen dismissError={this.dismissError} />;
-    }
+    useErrorStore.getState().setError(error, info, recoverable);
+  }
 
-    return this.props.children;
+  render() {
+    return <ErrorBoundaryContent>{this.props.children}</ErrorBoundaryContent>;
   }
 }

package/App/ErrorBoundary/store.ts

@@ -0,0 +1,26 @@
+import { create } from "zustand";
+
+type ErrorState = {
+  hasError: boolean;
+  error?: Error;
+  info?: string;
+  recoverable: boolean;
+  setError: (error: Error, info: string, recoverable?: boolean) => void;
+  dismissError: () => void;
+};
+
+export const useErrorStore = create<ErrorState>((set) => ({
+  hasError: false,
+  error: undefined,
+  info: undefined,
+  recoverable: true,
+  setError: (error: Error, info: string, recoverable = true) =>
+    set({ hasError: true, error, info, recoverable }),
+  dismissError: () =>
+    set({
+      hasError: false,
+      error: undefined,
+      info: undefined,
+      recoverable: true,
+    }),
+}));

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,32 @@
 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,
+  useSafeAreaInsets,
+} from "react-native-safe-area-context";
+import {
+  isAndroidPlatform,
+  isAndroidVersionAtLeast,
+  platformSelect,
+} from "@applicaster/zapp-react-native-utils/reactUtils";
 
 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;
+  dimensions: {
+    statusBarHeight: any;
+    width: number;
+    height: number;
+  };
 };
 
 const styles = StyleSheet.create({
@@ -25,6 +36,34 @@ const styles = StyleSheet.create({
   },
 });
 
+const defaultBottomOffset = platformSelect({
+  ios: 34,
+  android: 0,
+});
+
+const getSheetHeight = ({ height, bottomOffset, maxHeight, dimensions }) => {
+  return platformSelect({
+    ios: height - bottomOffset,
+    default:
+      !isAndroidVersionAtLeast(35) && isAndroidPlatform()
+        ? (height || maxHeight) - (bottomOffset + dimensions.statusBarHeight)
+        : height || maxHeight,
+  });
+};
+
+const useGetSheetHeight = (height, maxHeight, dimensions) => {
+  const { bottom = defaultBottomOffset } = useSafeAreaInsets();
+
+  const bottomOffset = bottom;
+
+  return getSheetHeight({
+    height,
+    bottomOffset,
+    maxHeight,
+    dimensions,
+  });
+};
+
 export function ModalBottomSheetFrame(props: Props) {
   const {
     children,
@@ -34,9 +73,7 @@ export function ModalBottomSheetFrame(props: Props) {
     maxWidth,
     visible,
     handleProps,
-    contentHeight,
     dimensions,
-    paddingBottom,
   } = props;
 
   const extraStyles = {
@@ -44,21 +81,42 @@ 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);
+    }
+  };
+
+  const { bottom = defaultBottomOffset } = useSafeAreaInsets();
+
+  const bottomOffset = bottom;
+
+  const sheetHeight = useGetSheetHeight(height, maxHeight, dimensions);
+
   return (
     <DraggableBottomSheet
-      sheetHeight={contentHeight}
-      visible={visible}
+      sheetHeight={sheetHeight}
+      visible={height > 0 && visible}
       dismiss={props.closeToast}
       hasHeader={handleProps.enabled}
       header={(dragging) => <Handle {...handleProps} focused={dragging} />}
       maxWidth={maxWidth}
       {...dimensions}
+      height={dimensions.height - bottomOffset}
     >
-      <View style={[styles.toastFrameContainer, extraStyles]}>{children}</View>
+      <SafeAreaView
+        edges={["left", "right", "bottom"]}
+        style={[styles.toastFrameContainer, extraStyles]}
+      >
+        <View onLayout={onLayout}>{children}</View>
+      </SafeAreaView>
     </DraggableBottomSheet>
   );
 }

package/App/ModalProvider/ModalBottomSheet/Overlay.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { StyleSheet, TouchableOpacity, Easing, View } from "react-native";
 
 import { AnimatedInOut } from "@applicaster/zapp-react-native-ui-components/Components/AnimatedInOut";
-import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
+import { dismissModal } from "@applicaster/zapp-react-native-utils/modalState";
 
 type Props = {
   overlayColor: string;
@@ -35,21 +35,19 @@ const fadeInAnimation = {
   delay,
 };
 
-const animationConfig = (onAnimationEnd) => ({
+const animationConfig = {
   in: fadeInAnimation,
   out: {
     ...fadeInAnimation,
-    onAnimationEnd,
+    onAnimationEnd: dismissModal,
   },
-});
+};
 
 export function Overlay(props: Props) {
-  const navigator = useNavigation();
-
   return (
     <AnimatedInOut
       visible={props.visible}
-      animationConfig={animationConfig(navigator.closeModalBottomSheet)}
+      animationConfig={animationConfig}
       staticStyles={styles.container}
     >
       <TouchableOpacity