@jobber/components-native 0.84.4-match-mobi-55ef4ec.7 → 0.84.4-match-mobi-540af48.10

package/src/Content/ContentVertical.style.ts

@@ -16,6 +16,10 @@ export const useVerticalStyles = buildThemedStyles(tokens => {
       padding: 0,
     },
 
+    minusculeChildSpace: {
+      paddingTop: tokens["space-minuscule"],
+    },
+
     smallestChildSpace: {
       paddingTop: tokens["space-smallest"],
     },
@@ -28,6 +32,10 @@ export const useVerticalStyles = buildThemedStyles(tokens => {
       paddingTop: tokens["space-small"],
     },
 
+    slimChildSpace: {
+      paddingTop: tokens["space-slim"],
+    },
+
     baseChildSpace: {
       paddingTop: tokens["space-base"],
     },
@@ -35,5 +43,17 @@ export const useVerticalStyles = buildThemedStyles(tokens => {
     largeChildSpace: {
       paddingTop: tokens["space-large"],
     },
+
+    largerChildSpace: {
+      paddingTop: tokens["space-larger"],
+    },
+
+    largestChildSpace: {
+      paddingTop: tokens["space-largest"],
+    },
+
+    extravagantChildSpace: {
+      paddingTop: tokens["space-extravagant"],
+    },
   };
 });

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(() => {
+  await act(async () => {
     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,9 +142,9 @@ 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(() => {
+    await act(async () => {
       fireEvent.press(
         contentOverlayScreen.getByTestId("ATL-Overlay-CloseButton"),
       );
@@ -156,9 +163,9 @@ 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(() => {
+    await act(async () => {
       fireEvent.press(
         contentOverlayScreen.getByTestId("ATL-Overlay-CloseButton"),
       );
@@ -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,9 +299,9 @@ 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(() => {
+    await act(async () => {
       fireEvent.press(
         contentOverlayScreen.getByTestId("ATL-Overlay-CloseButton"),
       );
@@ -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";
@@ -56,7 +57,7 @@ function ContentOverlayInternal(
     avoidKeyboardLikeIOS,
   }: ContentOverlayProps,
   ref: Ref<ContentOverlayRef>,
-): JSX.Element {
+) {
   isDraggable = onBeforeExit ? false : isDraggable;
   const isCloseableOnOverlayTap = onBeforeExit ? false : true;
   const { t } = useAtlantisI18n();
@@ -70,9 +71,9 @@ function ContentOverlayInternal(
   const shouldShowDismiss =
     showDismiss || isScreenReaderEnabled || isFullScreenOrTopPosition;
   const [showHeaderShadow, setShowHeaderShadow] = useState<boolean>(false);
-  const overlayHeader = useRef<View>();
+  const overlayHeader = useRef<View>(null);
 
-  const internalRef = useRef<Modalize>();
+  const internalRef = useRef<Modalize>(null);
   const [modalizeMethods, setModalizeMethods] = useState<ContentOverlayRef>();
   const callbackInternalRef = useCallback((instance: Modalize) => {
     if (instance && !internalRef.current) {
@@ -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]}>
@@ -243,7 +244,6 @@ function ContentOverlayInternal(
           {shouldShowDismiss && (
             <View
               style={styles.dismissButton}
-              // @ts-expect-error tsc-ci
               ref={overlayHeader}
               accessibilityLabel={accessibilityLabel || closeOverlayA11YLabel}
               accessible={true}

package/src/ContentOverlay/UNSAFE_WrappedModalize.tsx

@@ -0,0 +1,41 @@
+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>;
+
+export const UNSAFE_WrappedModalize = forwardRef<IHandles | undefined, 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";
@@ -8,19 +8,19 @@ const keyboardEvent: Partial<KeyboardEvent> = {
 };
 
 describe("when the user is typing", () => {
-  it("sets the isKeyboardVisible to true", () => {
+  it("sets the isKeyboardVisible to true", async () => {
     const { result } = renderHook(() => useKeyboardVisibility());
 
-    act(() => {
+    await act(async () => {
       DeviceEventEmitter.emit("keyboardDidShow", keyboardEvent);
     });
 
     expect(result.current.isKeyboardVisible).toBe(true);
   });
-  it("the keyboardDidShow event emits the keyboard height", () => {
+  it("the keyboardDidShow event emits the keyboard height", async () => {
     const { result } = renderHook(() => useKeyboardVisibility());
 
-    act(() => {
+    await act(async () => {
       DeviceEventEmitter.emit("keyboardDidShow", keyboardEvent);
     });
 
@@ -31,10 +31,10 @@ describe("when the user is typing", () => {
 });
 
 describe("when the user not typing", () => {
-  it("sets the isKeyboardVisible to false", () => {
+  it("sets the isKeyboardVisible to false", async () => {
     const { result } = renderHook(() => useKeyboardVisibility());
 
-    act(() => {
+    await act(async () => {
       DeviceEventEmitter.emit("keyboardDidHide");
     });
 

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/Disclosure/Disclosure.tsx

@@ -61,7 +61,7 @@ export function Disclosure({
   onToggle,
   isEmpty,
   animationDuration = staticTokens["timing-slowest"],
-}: DisclosureProps): JSX.Element {
+}: DisclosureProps) {
   const styles = useStyles();
 
   return (

package/src/Divider/Divider.tsx

@@ -26,7 +26,7 @@ export function Divider({
   size = "base",
   direction = "horizontal",
   testID = "Divider",
-}: DividerProps): JSX.Element {
+}: DividerProps) {
   const horizontalStyles = useHorizontalStyles();
   const verticalStyles = useVerticalStyles();
 

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);
   });
 });

package/src/EmptyState/EmptyState.tsx

@@ -65,7 +65,7 @@ export function EmptyState({
   primaryAction,
   secondaryAction,
   iconColor = "blue",
-}: EmptyStateProps): JSX.Element {
+}: EmptyStateProps) {
   const styles = useStyles();
 
   return (

package/src/ErrorMessageWrapper/ErrorMessageWrapper.tsx

@@ -34,7 +34,7 @@ export function ErrorMessageWrapper({
   message,
   wrapFor = "default",
   children,
-}: ErrorMessageWrapperProps): JSX.Element {
+}: ErrorMessageWrapperProps) {
   const errorMessageContext = useErrorMessageContext();
   const register = errorMessageContext?.register;
   const unregister = errorMessageContext?.unregister;

package/src/ErrorMessageWrapper/context/ErrorMessageProvider.tsx

@@ -13,9 +13,7 @@ interface ErrorMessageProviderProps {
   readonly children: ReactNode;
 }
 
-export function ErrorMessageProvider({
-  children,
-}: ErrorMessageProviderProps): JSX.Element {
+export function ErrorMessageProvider({ children }: ErrorMessageProviderProps) {
   const [elements, setElements] = useState<
     ErrorMessageContextProps["elements"]
   >({});
@@ -51,13 +49,13 @@ export function ErrorMessageProvider({
   }
 }
 
-function getMeasure(ref: RefObject<View>) {
+function getMeasure(ref: RefObject<View | null>) {
   return function measure(...args: Parameters<NativeMethods["measureLayout"]>) {
     ref.current?.measureLayout(...args);
   };
 }
 
-function getAccessibilityFocus(ref: RefObject<View>) {
+function getAccessibilityFocus(ref: RefObject<View | null>) {
   return function accessibilityFocus() {
     const reactTag = findNodeHandle(ref.current);
     reactTag &&

package/src/ErrorMessageWrapper/context/types.ts

@@ -50,7 +50,7 @@ type ElementID = Element["id"];
 export interface ErrorMessageContextRegisterParams {
   readonly id: ElementID;
   readonly hasErrorMessage: Methods["hasErrorMessage"];
-  readonly ref: RefObject<View>;
+  readonly ref: RefObject<View | null>;
 }
 
 export interface ErrorMessageContextProps {

package/src/Flex/Flex.tsx

@@ -11,7 +11,7 @@ export function Flex({
   align = "center",
   gap = "base",
   children,
-}: PropsWithChildren<FlexProps>): JSX.Element {
+}: PropsWithChildren<FlexProps>) {
   if (template.length === 1) {
     console.warn("Please use <Content /> component for a stacked layout");
   }
@@ -54,7 +54,7 @@ function Row({
   align = "center",
   gap = "base",
   children,
-}: PropsWithChildren<FlexProps>): JSX.Element {
+}: PropsWithChildren<FlexProps>) {
   return (
     <View testID="ATL-Flex-Row" style={[styles.row, { alignItems: align }]}>
       {Children.map(children, (child, index) => (