@jobber/components-native 0.87.1 → 0.88.1-JOB-139048-04134dd.0

package/dist/types/src/ContentOverlay/ContentOverlay.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { Modalize } from "react-native-modalize";
+import type { Modalize } from "react-native-modalize";
 import type { ContentOverlayProps } from "./types";
 export declare const ContentOverlay: React.ForwardRefExoticComponent<ContentOverlayProps & React.RefAttributes<{
     open?: Modalize["open"];

package/dist/types/src/ContentOverlay/UNSAFE_WrappedModalize.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+import type { IHandles } from "react-native-modalize/lib/options";
+export declare const UNSAFE_WrappedModalize: React.ForwardRefExoticComponent<Omit<import("react-native-modalize/lib/options").IProps<any> & React.RefAttributes<string | number | boolean | {} | React.ReactPortal | React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | React.ReactNodeArray | undefined>, "ref"> & React.RefAttributes<IHandles>>;

package/dist/types/src/ContentOverlay/index.d.ts

@@ -1,2 +1,3 @@
 export { ContentOverlay } from "./ContentOverlay";
+export { UNSAFE_WrappedModalize } from "./UNSAFE_WrappedModalize";
 export type { ContentOverlayRef, ModalBackgroundColor } from "./types";

package/dist/types/src/InputText/InputText.d.ts

@@ -1,6 +1,6 @@
 import type { SyntheticEvent } from "react";
 import React from "react";
-import type { NativeSyntheticEvent, StyleProp, TextInputFocusEventData, TextInputProps, TextStyle } from "react-native";
+import type { FocusEvent, StyleProp, TextInputProps, TextStyle } from "react-native";
 import { TextInput } from "react-native";
 import type { RegisterOptions } from "react-hook-form";
 import type { IconNames } from "@jobber/design";
@@ -65,7 +65,7 @@ export interface InputTextProps extends Pick<InputFieldWrapperProps, "toolbar" |
      * Callback that is called when the text input is focused
      * @param event
      */
-    readonly onFocus?: (event?: NativeSyntheticEvent<TextInputFocusEventData>) => void;
+    readonly onFocus?: (event?: FocusEvent) => void;
     /**
      * Callback that is called when the text input is blurred
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/components-native",
-  "version": "0.87.1",
+  "version": "0.88.1-JOB-139048-04134dd.0+04134dd81",
   "license": "MIT",
   "description": "React Native implementation of Atlantis",
   "repository": {
@@ -44,7 +44,7 @@
     "deepmerge": "^4.2.2",
     "lodash": "^4.17.21",
     "react-hook-form": "^7.52.0",
-    "react-intl": "^6.4.2",
+    "react-intl": "^7.1.11",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-modalize": "^2.0.13",
     "react-native-portalize": "^1.0.7",
@@ -53,28 +53,27 @@
     "ts-xor": "^1.1.0"
   },
   "devDependencies": {
-    "@react-native-community/datetimepicker": "^7.1.0",
+    "@react-native-community/datetimepicker": "^8.4.5",
+    "@react-native/babel-preset": "^0.81.1",
     "@storybook/addon-a11y": "^9.1.2",
     "@storybook/react": "^9.1.2",
     "@storybook/react-native-web-vite": "^9.1.2",
-    "@testing-library/jest-native": "^5.4.2",
-    "@testing-library/react-native": "^12.0.1",
+    "@testing-library/react-native": "^13.3.3",
     "@types/lodash.chunk": "^4.2.7",
     "@types/lodash.debounce": "^4.0.7",
     "@types/lodash.identity": "^3.0.7",
-    "@types/react": "^18.0.28",
     "@types/react-native-uuid": "^1.4.0",
+    "@types/react-test-renderer": "19.1.0",
     "date-fns": "^2.30.0",
     "date-fns-tz": "^2.0.0",
-    "metro-react-native-babel-preset": "^0.76.0",
-    "react-native": "^0.77.0",
-    "react-native-gesture-handler": "^2.10.2",
-    "react-native-modal-datetime-picker": "^15.0.1",
+    "react-native": "^0.81.4",
+    "react-native-gesture-handler": "^2.28.0",
+    "react-native-modal-datetime-picker": "^18.0.0",
     "react-native-reanimated": "^3.7.1",
     "react-native-safe-area-context": "^5.4.0",
     "react-native-svg": "^15.1.0",
     "react-native-web": "^0.20.0",
-    "react-test-renderer": "^18.2.0",
+    "react-test-renderer": "19.1.0",
     "storybook": "^9.1.2"
   },
   "peerDependencies": {
@@ -83,10 +82,10 @@
     "@react-native-community/datetimepicker": ">=6.7.0",
     "date-fns": "^2.30.0",
     "date-fns-tz": "^2.0.0",
-    "react": "^18.2.0",
-    "react-intl": "^6.4.2",
-    "react-native": ">=0.76.0",
-    "react-native-gesture-handler": ">=2.10.0",
+    "react": "^18 || ^19.1.0",
+    "react-intl": "^6 || ^7",
+    "react-native": ">=0.79.5",
+    "react-native-gesture-handler": ">=2.22.0",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-modal-datetime-picker": " >=13.0.0",
     "react-native-modalize": "^2.0.13",
@@ -95,5 +94,5 @@
     "react-native-safe-area-context": "^5.4.0",
     "react-native-svg": ">=12.0.0"
   },
-  "gitHead": "a26eb1f7a5e8759d3ffbecbf81f846895c47aad4"
+  "gitHead": "04134dd81a80801cb9749c94d92f80b0e1d7c7dc"
 }

package/src/AtlantisContext/AtlantisContext.test.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import type { PropsWithChildren } from "react";
 import React from "react";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react-native";
 import type { AtlantisContextProps } from "./AtlantisContext";
 import {
   AtlantisContext,

package/src/AutoLink/AutoLink.test.tsx

@@ -1,12 +1,10 @@
 import React from "react";
 import { fireEvent, render } from "@testing-library/react-native";
+import { Linking } from "react-native";
 import { copyTextToClipboard } from "./clipboard";
 import { AutoLink } from "./AutoLink";
 
-const mockOpenUrl = jest.fn();
-jest.mock("react-native/Libraries/Linking/Linking", () => ({
-  openURL: mockOpenUrl,
-}));
+const mockOpenUrl = jest.spyOn(Linking, "openURL").mockImplementation();
 
 jest.mock("./clipboard", () => {
   return {

package/src/Button/components/InternalButtonLoading/InternalButtonLoading.tsx

@@ -23,7 +23,6 @@ const leftOffset = -1 * offset;
 
 // looks like deprecation for FlatList in reanimated is cascading down to other exports
 // This is not createAnimatedComponent(FlatList), we are fine
-// eslint-disable-next-line import/no-deprecated
 const AnimatedImage = Animated.createAnimatedComponent(ImageBackground);
 
 function InternalButtonLoadingInternal({

package/src/Checkbox/CheckboxGroup.test.tsx

@@ -172,12 +172,8 @@ describe("when the parent checkbox does not have a label", () => {
   it("does not render the parent checkbox", async () => {
     const { checkboxGroup } = setup(undefined);
 
-    const findParentCheckbox = () => {
-      checkboxGroup.getByLabelText(parentCheckboxLabel);
-    };
-    expect(findParentCheckbox).toThrow(
-      "Unable to find an element with accessibilityLabel: all condiments",
-    );
+    const parentCheckbox = checkboxGroup.queryByLabelText(parentCheckboxLabel);
+    expect(parentCheckbox).toBeNull();
   });
 });
 

package/src/ContentOverlay/ContentOverlay.test.tsx

@@ -4,7 +4,7 @@ import { AccessibilityInfo, View } from "react-native";
 import { Host } from "react-native-portalize";
 import type { ReactTestInstance } from "react-test-renderer";
 import { act } from "react-test-renderer";
-import type { ContentOverlayRef, ModalBackgroundColor } from "./ContentOverlay";
+import type { ContentOverlayRef, ModalBackgroundColor } from "./types";
 import { ContentOverlay } from "./ContentOverlay";
 import { tokens } from "../utils/design";
 import { Button } from "../Button";
@@ -106,23 +106,30 @@ function renderContentOverlay(
   return renderResult;
 }
 
-function renderAndOpenContentOverlay(defaultOptions = getDefaultOptions()) {
+async function renderAndOpenContentOverlay(
+  defaultOptions = getDefaultOptions(),
+) {
   const rendered = renderContentOverlay(defaultOptions);
 
   act(() => {
     fireEvent.press(rendered.getByLabelText(defaultOptions.buttonLabel));
   });
 
+  // Wait for the modal to open asynchronously (due to requestAnimationFrame)
+  await waitFor(() => {
+    expect(rendered.getByTestId("ATL-Overlay-Header")).toBeDefined();
+  });
+
   return rendered;
 }
 
 describe("when open is called on the content overlay ref", () => {
-  it("should open the content overlay, exposing the content to the user", () => {
+  it("should open the content overlay, exposing the content to the user", async () => {
     const options: testRendererOptions = {
       ...getDefaultOptions(),
       text: "I am text within the content overlay",
     };
-    const contentOverlayScreen = renderAndOpenContentOverlay(options);
+    const contentOverlayScreen = await renderAndOpenContentOverlay(options);
 
     expect(contentOverlayScreen.getByText(options.text)).toBeDefined();
   });
@@ -135,7 +142,7 @@ describe("when the close button is clicked on an open content overlay", () => {
       text: "I am text within the content overlay",
       showDismiss: true,
     };
-    const contentOverlayScreen = renderAndOpenContentOverlay(options);
+    const contentOverlayScreen = await renderAndOpenContentOverlay(options);
 
     act(() => {
       fireEvent.press(
@@ -156,7 +163,7 @@ describe("when the close button is clicked on an open content overlay with a def
       onCloseCallback: jest.fn(),
       showDismiss: true,
     };
-    const contentOverlayScreen = renderAndOpenContentOverlay(options);
+    const contentOverlayScreen = await renderAndOpenContentOverlay(options);
 
     act(() => {
       fireEvent.press(
@@ -191,7 +198,7 @@ describe("when the content overlay is created with a defined onOpen prop", () =>
         ...getDefaultOptions(),
         onOpenCallback: jest.fn(),
       };
-      renderAndOpenContentOverlay(options);
+      await renderAndOpenContentOverlay(options);
 
       await waitFor(() => {
         expect(options.onOpenCallback).toHaveBeenCalled();
@@ -201,25 +208,25 @@ describe("when the content overlay is created with a defined onOpen prop", () =>
 });
 
 describe("when title prop passed to content overlay", () => {
-  it("should set the header title", () => {
+  it("should set the header title", async () => {
     const options: testRendererOptions = {
       ...getDefaultOptions(),
       title: "Awesome Title",
     };
-    const contentOverlayScreen = renderAndOpenContentOverlay(options);
+    const contentOverlayScreen = await renderAndOpenContentOverlay(options);
 
     expect(contentOverlayScreen.getByText(options.title)).toBeDefined();
   });
 });
 
 describe("when accessibilityLabel prop passed to content overlay", () => {
-  it("should set the header accessibilityLabel", () => {
+  it("should set the header accessibilityLabel", async () => {
     const options: testRendererOptions = {
       ...getDefaultOptions(),
       a11yLabel: "Awesome a11y Label",
       showDismiss: true,
     };
-    const contentOverlayScreen = renderAndOpenContentOverlay(options);
+    const contentOverlayScreen = await renderAndOpenContentOverlay(options);
 
     expect(
       contentOverlayScreen.getByLabelText(options.a11yLabel || "ohno"),
@@ -228,13 +235,13 @@ describe("when accessibilityLabel prop passed to content overlay", () => {
 });
 
 describe("when accessibilityLabel prop NOT passed to content overlay", () => {
-  it("should use default accessibilityLabel", () => {
+  it("should use default accessibilityLabel", async () => {
     const options: testRendererOptions = {
       ...getDefaultOptions(),
       title: "Awesome Title",
       showDismiss: true,
     };
-    const contentOverlayScreen = renderAndOpenContentOverlay(options);
+    const contentOverlayScreen = await renderAndOpenContentOverlay(options);
 
     expect(
       contentOverlayScreen.getAllByLabelText(`Close ${options.title} modal`),
@@ -251,7 +258,7 @@ describe("when there is a screen reader enabled", () => {
     const options: testRendererOptions = {
       ...getDefaultOptions(),
     };
-    const contentOverlayScreen = renderAndOpenContentOverlay(options);
+    const contentOverlayScreen = await renderAndOpenContentOverlay(options);
 
     expect(
       await contentOverlayScreen.findByTestId("ATL-Overlay-CloseButton"),
@@ -260,12 +267,12 @@ describe("when there is a screen reader enabled", () => {
 });
 
 describe("when fullScreen is set to true", () => {
-  it("should show the dismiss button", () => {
+  it("should show the dismiss button", async () => {
     const options: testRendererOptions = {
       ...getDefaultOptions(),
       fullScreen: true,
     };
-    const contentOverlayScreen = renderAndOpenContentOverlay(options);
+    const contentOverlayScreen = await renderAndOpenContentOverlay(options);
     expect(
       contentOverlayScreen.getByTestId("ATL-Overlay-CloseButton"),
     ).toBeDefined();
@@ -273,12 +280,12 @@ describe("when fullScreen is set to true", () => {
 });
 
 describe("when showDismiss is set to true", () => {
-  it("should show the dismiss button", () => {
+  it("should show the dismiss button", async () => {
     const options: testRendererOptions = {
       ...getDefaultOptions(),
       showDismiss: true,
     };
-    const contentOverlayScreen = renderAndOpenContentOverlay(options);
+    const contentOverlayScreen = await renderAndOpenContentOverlay(options);
     expect(
       contentOverlayScreen.getByTestId("ATL-Overlay-CloseButton"),
     ).toBeDefined();
@@ -292,7 +299,7 @@ describe("when the close button is clicked on an open content overlay with a def
       onBeforeExitCallback: jest.fn(),
       showDismiss: true,
     };
-    const contentOverlayScreen = renderAndOpenContentOverlay(options);
+    const contentOverlayScreen = await renderAndOpenContentOverlay(options);
 
     act(() => {
       fireEvent.press(
@@ -308,11 +315,11 @@ describe("when the close button is clicked on an open content overlay with a def
 
 describe("modalBackgroundColor prop", () => {
   describe("when using the default surface value", () => {
-    it("renders the component with the color-surface color", () => {
+    it("renders the component with the color-surface color", async () => {
       const options: testRendererOptions = {
         ...getDefaultOptions(),
       };
-      const contentOverlayScreen = renderAndOpenContentOverlay(options);
+      const contentOverlayScreen = await renderAndOpenContentOverlay(options);
       const OverlayHeader = contentOverlayScreen.getByTestId(
         "ATL-Overlay-Header",
       ).children[0] as ReactTestInstance;
@@ -337,12 +344,12 @@ describe("modalBackgroundColor prop", () => {
   });
 
   describe("when set to background", () => {
-    it("changes the backround color of the modal to color-surface--background", () => {
+    it("changes the backround color of the modal to color-surface--background", async () => {
       const options: testRendererOptions = {
         ...getDefaultOptions(),
         modalBackgroundColor: "background",
       };
-      const contentOverlayScreen = renderAndOpenContentOverlay(options);
+      const contentOverlayScreen = await renderAndOpenContentOverlay(options);
       const OverlayHeader = contentOverlayScreen.getByTestId(
         "ATL-Overlay-Header",
       ).children[0] as ReactTestInstance;

package/src/ContentOverlay/ContentOverlay.tsx

@@ -7,7 +7,7 @@ import React, {
   useRef,
   useState,
 } from "react";
-import { Modalize } from "react-native-modalize";
+import type { Modalize } from "react-native-modalize";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import type { NativeScrollEvent, NativeSyntheticEvent } from "react-native";
 import {
@@ -26,6 +26,7 @@ import type {
   ContentOverlayRef,
   ModalBackgroundColor,
 } from "./types";
+import { UNSAFE_WrappedModalize } from "./UNSAFE_WrappedModalize";
 import { useIsScreenReaderEnabled } from "../hooks";
 import { IconButton } from "../IconButton";
 import { Heading } from "../Heading";
@@ -153,7 +154,7 @@ function ContentOverlayInternal(
   return (
     <>
       {headerHeightKnown && childrenHeightKnown && (
-        <Modalize
+        <UNSAFE_WrappedModalize
           ref={callbackInternalRef}
           overlayStyle={styles.overlay}
           handleStyle={styles.handle}
@@ -196,7 +197,7 @@ function ContentOverlayInternal(
         >
           {Platform.OS === "android" ? renderedHeader : undefined}
           {renderedChildren}
-        </Modalize>
+        </UNSAFE_WrappedModalize>
       )}
       {!childrenHeightKnown && (
         <View style={[styles.hiddenContent, modalStyle]}>

package/src/ContentOverlay/UNSAFE_WrappedModalize.tsx

@@ -0,0 +1,45 @@
+import React, {
+  forwardRef,
+  useImperativeHandle,
+  useRef,
+  useState,
+} from "react";
+import { Modalize } from "react-native-modalize";
+import type { IHandles } from "react-native-modalize/lib/options";
+
+type Props = React.ComponentProps<typeof Modalize>;
+
+// DON'T USE THIS COMPONENT DIRECTLY.
+// It is exposed only so that the deprecated ContentOverlay component can use this along with the
+// newer one contained in this lib.
+// This is a temporary solution for new architecture. JOB-137549 plans to replace modalize entirely.
+export const UNSAFE_WrappedModalize = forwardRef<IHandles, Props>(
+  (props, ref) => {
+    const innerRef = useRef<IHandles | null>(null);
+    const [openRenderId, setOpenRenderId] = useState(0);
+
+    useImperativeHandle(
+      ref,
+      () => ({
+        open(dest) {
+          setOpenRenderId(id => id + 1);
+          // Open on a fresh tick for additional safety
+          requestAnimationFrame(() => {
+            innerRef.current?.open(dest);
+          });
+        },
+        close(dest) {
+          innerRef.current?.close(dest);
+        },
+      }),
+      [],
+    );
+
+    // Use a unique key to force a remount, ensuring we get fresh gesture handler nodes within modalize
+    return (
+      <Modalize key={`modalize-${openRenderId}`} ref={innerRef} {...props} />
+    );
+  },
+);
+
+UNSAFE_WrappedModalize.displayName = "UNSAFE_WrappedModalize";

package/src/ContentOverlay/hooks/useKeyboardVisibility.test.ts

@@ -1,4 +1,4 @@
-import { act, renderHook } from "@testing-library/react-hooks";
+import { act, renderHook } from "@testing-library/react-native";
 import type { KeyboardEvent } from "react-native";
 import { DeviceEventEmitter } from "react-native";
 import { useKeyboardVisibility } from "./useKeyboardVisibility";

package/src/ContentOverlay/hooks/useViewLayoutHeight.test.ts

@@ -1,4 +1,4 @@
-import { act, renderHook } from "@testing-library/react-hooks";
+import { act, renderHook } from "@testing-library/react-native";
 import type { LayoutChangeEvent } from "react-native";
 import { useViewLayoutHeight } from "./useViewLayoutHeight";
 

package/src/ContentOverlay/index.ts

@@ -1,2 +1,3 @@
 export { ContentOverlay } from "./ContentOverlay";
+export { UNSAFE_WrappedModalize } from "./UNSAFE_WrappedModalize";
 export type { ContentOverlayRef, ModalBackgroundColor } from "./types";

package/src/EmptyState/EmptyState.test.tsx

@@ -1,8 +1,8 @@
 import React from "react";
-import { fireEvent, render } from "@testing-library/react-native";
+import { fireEvent, render, screen } from "@testing-library/react-native";
+import { Path } from "react-native-svg";
 import type { EmptyStateProps } from "./EmptyState";
 import { EmptyState } from "./EmptyState";
-import * as IconComponent from "../Icon/Icon";
 
 const primaryOnPress = jest.fn();
 const secondaryOnPress = jest.fn();
@@ -27,83 +27,70 @@ const component = (overrideProps?: Partial<EmptyStateProps>) => {
     ...overrideProps,
   };
 
-  return render(<EmptyState {...props} />);
+  render(<EmptyState {...props} />);
 };
 
-const iconSpy = jest.spyOn(IconComponent, "Icon");
-
-afterEach(() => jest.clearAllMocks());
-
 describe("EmptyState", () => {
   it("renders the title", () => {
-    const { getByText } = component();
+    component();
 
-    expect(getByText(defaultProps.title)).toBeDefined();
+    expect(screen.getByText(defaultProps.title)).toBeDefined();
   });
 
   it("renders the description", () => {
-    const { getByText } = component();
-
-    expect(getByText(defaultProps.description)).toBeDefined();
-  });
-
-  it("renders the icon", () => {
-    const { getByTestId } = component();
+    component();
 
-    expect(getByTestId(defaultProps.icon)).toBeDefined();
+    expect(screen.getByText(defaultProps.description)).toBeDefined();
   });
 
-  it("calls icon with correct default params", () => {
+  it("renders the icon with default color and large size", () => {
     component();
-
-    expect(iconSpy).toHaveBeenCalledWith(
-      {
-        color: "blue",
-        name: defaultProps.icon,
-        size: "large",
-      },
-      {},
+    const icon = screen.getByTestId(defaultProps.icon);
+    const path = icon.findByType(Path);
+    expect(path.props.fill).toBe("hsl(197, 90%, 12%)");
+    expect(icon.props.style).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          width: 32,
+          height: 32,
+        }),
+      ]),
     );
   });
 
-  it("calls icon with correct params", () => {
-    component({ iconColor: "greyBlue", icon: "link" });
+  it("renders the correct icon color when specified", async () => {
+    component({ iconColor: "warning" });
 
-    expect(iconSpy).toHaveBeenCalledWith(
-      {
-        color: "greyBlue",
-        name: "link",
-        size: "large",
-      },
-      {},
-    );
+    const icon = screen.getByTestId(defaultProps.icon);
+    const pathElement = icon.findByType(Path);
+    expect(pathElement.props.fill).toBe("hsl(51, 64%, 49%)");
   });
 
   it("renders the primary action and allows users to interact with it by clicking", () => {
-    const { getByLabelText } = component();
+    component();
 
-    const button = getByLabelText(defaultProps.primaryAction.label);
+    const button = screen.getByLabelText(defaultProps.primaryAction.label);
     expect(button).toBeDefined();
     fireEvent.press(button);
     expect(primaryOnPress).toHaveBeenCalledTimes(1);
   });
 
   it("renders the secondary action and allows users to interact with it by clicking", () => {
-    const { getByLabelText } = component();
+    component();
 
-    const button = getByLabelText(defaultProps.secondaryAction.label);
+    const button = screen.getByLabelText(defaultProps.secondaryAction.label);
     expect(button).toBeDefined();
     fireEvent.press(button);
     expect(secondaryOnPress).toHaveBeenCalledTimes(1);
   });
 
   it("does render buttons if neither primary nor secondary action is passed in", () => {
-    const { queryAllByRole } = component({
+    component({
       description: "No buttons",
       primaryAction: undefined,
       secondaryAction: undefined,
     });
 
-    expect(queryAllByRole("button")).toHaveLength(0);
+    expect(screen.queryAllByRole("button")).toHaveLength(0);
   });
 });