@jobber/components-native 0.113.2 → 0.113.3

package/jobber-components-native.podspec

@@ -27,7 +27,6 @@ Pod::Spec.new do |s|
         "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
     }
     s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
     s.dependency "RCTRequired"
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/components-native",
-  "version": "0.113.2",
+  "version": "0.113.3",
   "license": "MIT",
   "description": "React Native implementation of Atlantis",
   "repository": {
@@ -124,5 +124,5 @@
     "react-native-screens": ">=4.18.0",
     "react-native-svg": ">=12.0.0"
   },
-  "gitHead": "106e281adc9a3b0e87e125e1a9f1c945ce2de3cd"
+  "gitHead": "895ad886700e1a7e11927702a0e5f49cb554c4e3"
 }

package/src/Form/Form.test.tsx

@@ -1,6 +1,7 @@
 import React, { type ReactElement } from "react";
 import { act, fireEvent, render, waitFor } from "@testing-library/react-native";
 import { Alert, Keyboard } from "react-native";
+import { KeyboardEvents } from "react-native-keyboard-controller";
 import type { FormBannerMessage } from ".";
 import { Form, FormBannerMessageType } from ".";
 import type { FormBannerErrors } from "./types";
@@ -32,15 +33,37 @@ const onChangeSelectMock = jest.fn();
 const onChangeSwitchMock = jest.fn();
 
 const mockScrollTo = jest.fn();
+const mockScrollToEnd = jest.fn();
 const mockScrollToTop = jest.fn();
+const mockMeasureInWindow = jest.fn(
+  (callback: (x: number, y: number, width: number, height: number) => void) => {
+    callback(0, 0, 0, 0);
+  },
+);
+const mockScrollViewRef = {
+  get current() {
+    return { scrollTo: mockScrollTo, scrollToEnd: mockScrollToEnd };
+  },
+  // React assigns the ref while rendering KeyboardAwareScrollView. Keep the
+  // test double available to the keyboard-hide callback instead.
+  set current(value: unknown) {
+    void value;
+  },
+};
+const mockBottomViewRef = {
+  get current() {
+    return { measureInWindow: mockMeasureInWindow };
+  },
+  set current(value: unknown) {
+    void value;
+  },
+};
 
 jest.mock("./hooks/useFormViewRefs", () => ({
   useFormViewRefs: () => {
     return {
-      scrollViewRef: {
-        current: { scrollTo: mockScrollTo },
-      },
-      bottomViewRef: { current: {} },
+      scrollViewRef: mockScrollViewRef,
+      bottomViewRef: mockBottomViewRef,
       scrollToTop: mockScrollToTop,
     };
   },
@@ -566,6 +589,40 @@ describe("Form", () => {
     });
   });
 
+  describe("Keyboard dismissal", () => {
+    it("does not imperatively scroll the form to its end", async () => {
+      const listeners = new Map<string, () => void>();
+      const addListener = KeyboardEvents.addListener as jest.Mock;
+
+      const registerListener = (eventName: string, listener: () => void) => {
+        listeners.set(eventName, listener);
+
+        return { remove: jest.fn() };
+      };
+      addListener
+        .mockImplementationOnce(registerListener)
+        .mockImplementationOnce(registerListener);
+
+      render(<FormTest onSubmit={onSubmitMock} />);
+
+      const hideListener = [...listeners.entries()].find(([eventName]) =>
+        eventName.endsWith("Hide"),
+      )?.[1];
+
+      expect(hideListener).toBeDefined();
+
+      if (!hideListener) {
+        throw new Error("Expected a keyboard hide listener");
+      }
+
+      await act(async () => {
+        hideListener();
+      });
+
+      expect(mockScrollToEnd).not.toHaveBeenCalled();
+    });
+  });
+
   describe("Leaving the form", () => {
     let mockUseConfirmBeforeBack: jest.Mock;
     let mockRemoveLocalCache: jest.Mock;

package/src/Form/Form.tsx

@@ -138,19 +138,9 @@ function InternalForm<T extends FieldValues, S>({
   );
 
   const handleKeyboardHide = useCallback(() => {
-    bottomViewRef?.current?.measureInWindow(
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      (_x: number, y: number, _width: number, _height: number) => {
-        // This fixes extra whitespace below the form if it was scrolled down while the keyboard was open
-        // i.e. a View below the form is higher than the bottom of the window
-        if (y < windowHeight) {
-          scrollViewRef?.current?.scrollToEnd();
-        }
-      },
-    );
     setKeyboardHeight(0);
     setKeyboardScreenY(0);
-  }, [bottomViewRef, scrollViewRef, windowHeight]);
+  }, []);
 
   useEffect(() => {
     const showEvent =