@applicaster/quick-brick-core 15.1.6-alpha.3988508055 → 15.1.6

package/App/ModalProvider/ModalBottomSheet/ModalBottomSheetFrame.tsx

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

package/App/NotificationToastRenderer/NotificationToastManager.ts

@@ -24,13 +24,11 @@ export interface ToastStyle {
   letterSpacing?: number;
 }
 
-export const DEFAULT_TOAST_TIMEOUT = 4000;
-
 export interface ToastPayload {
   id?: string;
   message: string;
   extraMessage?: string; // secondary line; TV renderers show it as a subtitle, mobile ignores it
-  timeout?: number; // ms; defaults to DEFAULT_TOAST_TIMEOUT (4000) if omitted
+  timeout?: number; // ms; if omitted, toast stays until dismissed
   style?: ToastStyle;
   [key: string]: unknown;
 }
@@ -124,11 +122,7 @@ class NotificationToastManager {
   };
 
   private handleShowToast = (payload: ToastPayload) => {
-    const item = {
-      ...payload,
-      id: payload.id ?? String(this.nextId++),
-      timeout: payload.timeout ?? DEFAULT_TOAST_TIMEOUT,
-    };
+    const item = { ...payload, id: payload.id ?? String(this.nextId++) };
 
     const queuedIndex = this.queue.findIndex((queued) => queued.id === item.id);
 

package/App/NotificationToastRenderer/__tests__/NotificationToastManager.test.ts

@@ -1,7 +1,6 @@
 import {
   notificationToastManager,
   NOTIFICATION_TOAST_EVENTS,
-  DEFAULT_TOAST_TIMEOUT,
 } from "../NotificationToastManager";
 import { postEvent } from "@applicaster/zapp-react-native-utils/reactHooks/useSubscriberFor";
 
@@ -211,27 +210,4 @@ describe("NotificationToastManager", () => {
 
     expect(onShow).not.toHaveBeenCalled();
   });
-
-  it("defaults timeout to DEFAULT_TOAST_TIMEOUT (4000ms) when omitted and auto-hides", () => {
-    const onShow = jest.fn();
-    const onHide = jest.fn();
-    on(NOTIFICATION_TOAST_EVENTS.SHOW, onShow);
-    on(NOTIFICATION_TOAST_EVENTS.HIDE, onHide);
-
-    notificationToastManager.showToast({
-      message: "Added to queue",
-    });
-
-    expect(onShow).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: "Added to queue",
-        timeout: DEFAULT_TOAST_TIMEOUT,
-      }),
-      expect.any(Function)
-    );
-
-    jest.advanceTimersByTime(DEFAULT_TOAST_TIMEOUT);
-
-    expect(onHide).toHaveBeenCalledTimes(1);
-  });
 });

package/App/NotificationToastRenderer/__tests__/NotificationToastRenderer.test.tsx

@@ -1,11 +1,13 @@
 import React from "react";
 import { Text } from "react-native";
-import { act, fireEvent, render } from "@testing-library/react-native";
+import { act, fireEvent } from "@testing-library/react-native";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 
 import { notificationToastManager } from "../NotificationToastManager";
 import { NotificationToastRenderer } from "../NotificationToastRenderer";
 
 jest.mock("react-native-safe-area-context", () => ({
+  ...jest.requireActual("react-native-safe-area-context"),
   useSafeAreaInsets: () => ({ top: 44 }),
 }));
 
@@ -29,7 +31,7 @@ describe("NotificationToastRenderer", () => {
   });
 
   it("renders its children", () => {
-    const { getByText } = render(
+    const { getByText } = renderWithProviders(
       <NotificationToastRenderer>
         <Text>child content</Text>
       </NotificationToastRenderer>
@@ -39,7 +41,7 @@ describe("NotificationToastRenderer", () => {
   });
 
   it("shows no message before any toast is emitted", () => {
-    const { getByTestId } = render(<NotificationToastRenderer />);
+    const { getByTestId } = renderWithProviders(<NotificationToastRenderer />);
 
     expect(
       getByTestId("NotificationToastRenderer-message").props.children
@@ -47,7 +49,7 @@ describe("NotificationToastRenderer", () => {
   });
 
   it("displays the message from a toast emitted by the manager", () => {
-    const { getByTestId } = render(<NotificationToastRenderer />);
+    const { getByTestId } = renderWithProviders(<NotificationToastRenderer />);
 
     act(() => {
       notificationToastManager.showToast({ message: "You are offline" });
@@ -59,7 +61,7 @@ describe("NotificationToastRenderer", () => {
   });
 
   it("applies the toast's style to the message text", () => {
-    const { getByTestId } = render(<NotificationToastRenderer />);
+    const { getByTestId } = renderWithProviders(<NotificationToastRenderer />);
 
     act(() => {
       notificationToastManager.showToast({
@@ -76,7 +78,7 @@ describe("NotificationToastRenderer", () => {
   it("dismisses the toast when the touchable area is pressed", () => {
     const dismissSpy = jest.spyOn(notificationToastManager, "dismiss");
 
-    const { getByTestId } = render(<NotificationToastRenderer />);
+    const { getByTestId } = renderWithProviders(<NotificationToastRenderer />);
 
     fireEvent.press(getByTestId("NotificationToastRenderer-touchable"));
 

package/App/NotificationToastRenderer/__tests__/useNotificationHeight.test.tsx

@@ -1,26 +1,27 @@
 import { renderHook } from "@testing-library/react-native";
 
 let mockInsets = { top: 0 };
-const mockGetNavbarHeight = jest.fn();
 
 jest.mock("react-native-safe-area-context", () => ({
   useSafeAreaInsets: () => mockInsets,
 }));
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/layout", () => ({
-  getNavbarHeight: () => mockGetNavbarHeight(),
+jest.mock("@applicaster/zapp-react-native-utils/reactUtils", () => ({
+  ...jest.requireActual("@applicaster/zapp-react-native-utils/reactUtils"),
+  platformSelect: jest.fn(({ ios, android }) => ({ ios, android })),
 }));
 
+import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { useNotificationHeight } from "../useNotificationHeight";
 
 describe("useNotificationHeight", () => {
   beforeEach(() => {
-    mockGetNavbarHeight.mockClear();
+    (platformSelect as jest.Mock).mockClear();
   });
 
-  it("adds the safe area top inset to the nav bar height", () => {
+  it("adds the safe area top inset to the platform nav bar height", () => {
     mockInsets = { top: 44 };
-    mockGetNavbarHeight.mockReturnValueOnce(56);
+    (platformSelect as jest.Mock).mockReturnValueOnce(56);
 
     const { result } = renderHook(() => useNotificationHeight());
 
@@ -32,7 +33,7 @@ describe("useNotificationHeight", () => {
 
   it("falls back to a 0 status height when there is no top inset", () => {
     mockInsets = { top: 0 };
-    mockGetNavbarHeight.mockReturnValueOnce(44);
+    (platformSelect as jest.Mock).mockReturnValueOnce(44);
 
     const { result } = renderHook(() => useNotificationHeight());
 
@@ -42,17 +43,11 @@ describe("useNotificationHeight", () => {
     });
   });
 
-  it("uses getNavbarHeight for the nav bar height", () => {
+  it("selects the nav bar height per platform via platformSelect", () => {
     mockInsets = { top: 20 };
-    mockGetNavbarHeight.mockReturnValueOnce(56);
 
-    const { result } = renderHook(() => useNotificationHeight());
-
-    expect(mockGetNavbarHeight).toHaveBeenCalled();
+    renderHook(() => useNotificationHeight());
 
-    expect(result.current).toEqual({
-      statusHeight: 20,
-      notificationHeight: 76,
-    });
+    expect(platformSelect).toHaveBeenCalledWith({ ios: 44, android: 56 });
   });
 });

package/App/NotificationToastRenderer/useNotificationHeight.tsx

@@ -1,10 +1,11 @@
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { getNavbarHeight } from "@applicaster/zapp-react-native-utils/reactHooks/layout";
+
+import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 
 export const useNotificationHeight = () => {
   const insets = useSafeAreaInsets();
 
-  const navBarHeight = getNavbarHeight();
+  const navBarHeight = platformSelect({ ios: 44, android: 56 });
 
   const statusHeight = insets.top;
   const notificationHeight = statusHeight + navBarHeight;

package/App/index.tsx

@@ -31,6 +31,7 @@ import { withActionExecutor } from "@applicaster/zapp-react-native-utils/actions
 import { withScreenDataContextProvider } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
 import { LogicAggregatorContainer } from "./LogicAggregatorContainer";
 import { LoadingOverlay } from "./LoadingOverlay";
+import { NotificationToastRenderer } from "./NotificationToastRenderer";
 import { ZappAppWrapper } from "./components/ZappAppWrapper";
 
 interface AppOptions {
@@ -67,11 +68,13 @@ const App = ({
               <ErrorBoundary>
                 <URLSchemeListener>
                   <SplashLoader>
-                    <OfflineHandler>
-                      <Layout>
-                        <RouteManager />
-                      </Layout>
-                    </OfflineHandler>
+                    <NotificationToastRenderer>
+                      <OfflineHandler>
+                        <Layout>
+                          <RouteManager />
+                        </Layout>
+                      </OfflineHandler>
+                    </NotificationToastRenderer>
                   </SplashLoader>
                   <ModalProvider />
                 </URLSchemeListener>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "15.1.6-alpha.3988508055",
+  "version": "15.1.6",
   "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.6-alpha.3988508055",
-    "@applicaster/quick-brick-core-plugins": "15.1.6-alpha.3988508055",
-    "@applicaster/zapp-pipes-v2-client": "15.1.6-alpha.3988508055",
-    "@applicaster/zapp-react-native-bridge": "15.1.6-alpha.3988508055",
-    "@applicaster/zapp-react-native-redux": "15.1.6-alpha.3988508055",
-    "@applicaster/zapp-react-native-ui-components": "15.1.6-alpha.3988508055",
-    "@applicaster/zapp-react-native-utils": "15.1.6-alpha.3988508055",
+    "@applicaster/applicaster-types": "15.1.6",
+    "@applicaster/quick-brick-core-plugins": "15.1.6",
+    "@applicaster/zapp-pipes-v2-client": "15.1.6",
+    "@applicaster/zapp-react-native-bridge": "15.1.6",
+    "@applicaster/zapp-react-native-redux": "15.1.6",
+    "@applicaster/zapp-react-native-ui-components": "15.1.6",
+    "@applicaster/zapp-react-native-utils": "15.1.6",
     "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;
-}