@applicaster/quick-brick-core 15.1.13-alpha.1034774223 → 15.1.13

package/App/ModalProvider/ModalBottomSheet/ModalBottomSheetFrame.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { LayoutChangeEvent, StyleSheet, View } from "react-native";
+import { LayoutChangeEvent, Platform, StyleSheet, View } from "react-native";
 
 import { Handle, HandleProps } from "./Handle";
 import { DraggableBottomSheet } from "./DraggableBottomSheet";
@@ -11,12 +11,9 @@ import {
 import {
   isAndroidPlatform,
   isAndroidVersionAtLeast,
-  isApplePlatform,
   platformSelect,
 } from "@applicaster/zapp-react-native-utils/reactUtils";
 
-import { useKeyboardHeight } from "./hooks";
-
 type Props = {
   children: React.ReactChild;
   backgroundColor: string;
@@ -107,8 +104,6 @@ export function ModalBottomSheetFrame(props: Props) {
 
   const sheetHeight = useGetSheetHeight(height, maxHeight);
 
-  const keyboardHeight = useKeyboardHeight();
-
   return (
     <DraggableBottomSheet
       sheetHeight={sheetHeight}
@@ -118,9 +113,7 @@ export function ModalBottomSheetFrame(props: Props) {
       header={(dragging) => <Handle {...handleProps} focused={dragging} />}
       maxWidth={maxWidth}
       {...dimensions}
-      height={
-        safeAreaDims.height - (isApplePlatform() ? bottom : 0) - keyboardHeight
-      }
+      height={safeAreaDims.height - (Platform.OS === "ios" ? bottom : 0)}
     >
       <SafeAreaView
         edges={["left", "right", "bottom"]}

package/App/ModalProvider/ModalBottomSheet/index.tsx

@@ -47,11 +47,9 @@ export function ModalBottomSheet(props: Props) {
 
   const {
     ModalBottomSheetContent = ModalComponent,
-    modalBottomSheetContentProps = {},
+    modalBottomSheetContentProps,
   } = props;
 
-  const { key, ...restContentProps } = modalBottomSheetContentProps;
-
   useEffect(() => {
     Keyboard.dismiss();
   }, []);
@@ -84,12 +82,11 @@ export function ModalBottomSheet(props: Props) {
         }}
       >
         <ModalBottomSheetContent
-          key={key as any}
           width={
             Math.min(sheetTabletMaxWidth, dimensions.width) || dimensions.width
           }
           maxHeight={sheetMaxHeight}
-          {...restContentProps}
+          {...modalBottomSheetContentProps}
           dismiss={dismiss}
           currentRoute={navigator.currentRoute}
         />

package/package.json

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

package/App/ModalProvider/ModalBottomSheet/hooks/__tests__/useKeyboardHeight.android.test.ts

@@ -1,105 +0,0 @@
-import { act, renderHook } from "@testing-library/react-native";
-import { Keyboard } from "react-native";
-
-jest.mock("@applicaster/zapp-react-native-utils/reactUtils", () => ({
-  isApplePlatform: () => false,
-}));
-
-// Import after mocks so module-level isApple resolves to false.
-// eslint-disable-next-line import/first
-import { useKeyboardHeight } from "../useKeyboardHeight";
-
-type KeyboardListener = (event?: {
-  endCoordinates: { height: number };
-}) => void;
-
-function setupKeyboardListenerMock() {
-  const listeners: Record<string, KeyboardListener> = {};
-  const removeMocks: Record<string, jest.Mock> = {};
-
-  const addListenerSpy = jest
-    .spyOn(Keyboard, "addListener")
-    .mockImplementation((event: string, callback: KeyboardListener) => {
-      listeners[event] = callback;
-
-      const remove = jest.fn();
-      removeMocks[event] = remove;
-
-      return { remove };
-    });
-
-  return { listeners, removeMocks, addListenerSpy };
-}
-
-describe("useKeyboardHeight (non-Apple platforms)", () => {
-  let listeners: Record<string, KeyboardListener>;
-  let removeMocks: Record<string, jest.Mock>;
-  let addListenerSpy: jest.SpyInstance;
-
-  beforeEach(() => {
-    const mock = setupKeyboardListenerMock();
-    listeners = mock.listeners;
-    removeMocks = mock.removeMocks;
-    addListenerSpy = mock.addListenerSpy;
-  });
-
-  afterEach(() => {
-    addListenerSpy.mockRestore();
-  });
-
-  it("returns 0 initially and subscribes to didShow / didHide events", () => {
-    const { result } = renderHook(() => useKeyboardHeight());
-
-    expect(result.current).toBe(0);
-    expect(addListenerSpy).toHaveBeenCalledTimes(2);
-
-    expect(addListenerSpy).toHaveBeenCalledWith(
-      "keyboardDidShow",
-      expect.any(Function)
-    );
-
-    expect(addListenerSpy).toHaveBeenCalledWith(
-      "keyboardDidHide",
-      expect.any(Function)
-    );
-  });
-
-  it("updates height when keyboardDidShow fires", () => {
-    const { result } = renderHook(() => useKeyboardHeight());
-
-    act(() => {
-      listeners.keyboardDidShow?.({
-        endCoordinates: { height: 412 },
-      });
-    });
-
-    expect(result.current).toBe(412);
-  });
-
-  it("resets height to 0 when keyboardDidHide fires", () => {
-    const { result } = renderHook(() => useKeyboardHeight());
-
-    act(() => {
-      listeners.keyboardDidShow?.({
-        endCoordinates: { height: 412 },
-      });
-    });
-
-    expect(result.current).toBe(412);
-
-    act(() => {
-      listeners.keyboardDidHide?.();
-    });
-
-    expect(result.current).toBe(0);
-  });
-
-  it("removes listeners on unmount", () => {
-    const { unmount } = renderHook(() => useKeyboardHeight());
-
-    unmount();
-
-    expect(removeMocks.keyboardDidShow).toHaveBeenCalledTimes(1);
-    expect(removeMocks.keyboardDidHide).toHaveBeenCalledTimes(1);
-  });
-});

package/App/ModalProvider/ModalBottomSheet/hooks/__tests__/useKeyboardHeight.test.ts

@@ -1,102 +0,0 @@
-import { act, renderHook } from "@testing-library/react-native";
-import { Keyboard } from "react-native";
-import { useKeyboardHeight } from "../useKeyboardHeight";
-
-jest.mock("@applicaster/zapp-react-native-utils/reactUtils", () => ({
-  isApplePlatform: () => true,
-}));
-
-type KeyboardListener = (event?: {
-  endCoordinates: { height: number };
-}) => void;
-
-function setupKeyboardListenerMock() {
-  const listeners: Record<string, KeyboardListener> = {};
-  const removeMocks: Record<string, jest.Mock> = {};
-
-  const addListenerSpy = jest
-    .spyOn(Keyboard, "addListener")
-    .mockImplementation((event: string, callback: KeyboardListener) => {
-      listeners[event] = callback;
-
-      const remove = jest.fn();
-      removeMocks[event] = remove;
-
-      return { remove };
-    });
-
-  return { listeners, removeMocks, addListenerSpy };
-}
-
-describe("useKeyboardHeight (Apple platforms)", () => {
-  let listeners: Record<string, KeyboardListener>;
-  let removeMocks: Record<string, jest.Mock>;
-  let addListenerSpy: jest.SpyInstance;
-
-  beforeEach(() => {
-    const mock = setupKeyboardListenerMock();
-    listeners = mock.listeners;
-    removeMocks = mock.removeMocks;
-    addListenerSpy = mock.addListenerSpy;
-  });
-
-  afterEach(() => {
-    addListenerSpy.mockRestore();
-  });
-
-  it("returns 0 initially and subscribes to willShow / willHide events", () => {
-    const { result } = renderHook(() => useKeyboardHeight());
-
-    expect(result.current).toBe(0);
-    expect(addListenerSpy).toHaveBeenCalledTimes(2);
-
-    expect(addListenerSpy).toHaveBeenCalledWith(
-      "keyboardWillShow",
-      expect.any(Function)
-    );
-
-    expect(addListenerSpy).toHaveBeenCalledWith(
-      "keyboardWillHide",
-      expect.any(Function)
-    );
-  });
-
-  it("updates height when keyboardWillShow fires", () => {
-    const { result } = renderHook(() => useKeyboardHeight());
-
-    act(() => {
-      listeners.keyboardWillShow?.({
-        endCoordinates: { height: 336 },
-      });
-    });
-
-    expect(result.current).toBe(336);
-  });
-
-  it("resets height to 0 when keyboardWillHide fires", () => {
-    const { result } = renderHook(() => useKeyboardHeight());
-
-    act(() => {
-      listeners.keyboardWillShow?.({
-        endCoordinates: { height: 280 },
-      });
-    });
-
-    expect(result.current).toBe(280);
-
-    act(() => {
-      listeners.keyboardWillHide?.();
-    });
-
-    expect(result.current).toBe(0);
-  });
-
-  it("removes listeners on unmount", () => {
-    const { unmount } = renderHook(() => useKeyboardHeight());
-
-    unmount();
-
-    expect(removeMocks.keyboardWillShow).toHaveBeenCalledTimes(1);
-    expect(removeMocks.keyboardWillHide).toHaveBeenCalledTimes(1);
-  });
-});

package/App/ModalProvider/ModalBottomSheet/hooks/index.ts

@@ -1 +0,0 @@
-export { useKeyboardHeight } from "./useKeyboardHeight";

package/App/ModalProvider/ModalBottomSheet/hooks/useKeyboardHeight.ts

@@ -1,30 +0,0 @@
-import React from "react";
-import { Keyboard, KeyboardEvent } from "react-native";
-import { isApplePlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
-
-const isApple = isApplePlatform();
-
-export function useKeyboardHeight() {
-  const [keyboardHeight, setKeyboardHeight] = React.useState(0);
-
-  React.useEffect(() => {
-    // iOS supports smooth 'willShow' / 'willHide' events
-    const showEvent = isApple ? "keyboardWillShow" : "keyboardDidShow";
-    const hideEvent = isApple ? "keyboardWillHide" : "keyboardDidHide";
-
-    const showListener = Keyboard.addListener(showEvent, (e: KeyboardEvent) => {
-      setKeyboardHeight(e.endCoordinates.height);
-    });
-
-    const hideListener = Keyboard.addListener(hideEvent, () => {
-      setKeyboardHeight(0);
-    });
-
-    return () => {
-      showListener.remove();
-      hideListener.remove();
-    };
-  }, []);
-
-  return keyboardHeight;
-}