@jobber/components-native 0.113.2 → 0.113.3

package/dist/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/dist/src/Form/Form.js

@@ -96,20 +96,9 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
         setKeyboardScreenY(windowHeight - event.height);
     }, [windowHeight]);
     const handleKeyboardHide = useCallback(() => {
-        var _a;
-        (_a = bottomViewRef === null || bottomViewRef === void 0 ? void 0 : bottomViewRef.current) === null || _a === void 0 ? void 0 : _a.measureInWindow(
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        (_x, y, _width, _height) => {
-            var _a;
-            // 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) {
-                (_a = scrollViewRef === null || scrollViewRef === void 0 ? void 0 : scrollViewRef.current) === null || _a === void 0 ? void 0 : _a.scrollToEnd();
-            }
-        });
         setKeyboardHeight(0);
         setKeyboardScreenY(0);
-    }, [bottomViewRef, scrollViewRef, windowHeight]);
+    }, []);
     useEffect(() => {
         const showEvent = Platform.OS === "ios" ? "keyboardWillShow" : "keyboardDidShow";
         const hideEvent = Platform.OS === "ios" ? "keyboardWillHide" : "keyboardDidHide";

package/dist/src/Form/Form.test.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import React 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 { Form, FormBannerMessageType } from ".";
 import { FormSubmitErrorType } from "./types";
 import { atlantisContextDefaultValues } from "../AtlantisContext";
@@ -35,14 +36,34 @@ const onChangeMock = jest.fn();
 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) => {
+    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) {
+        void value;
+    },
+};
+const mockBottomViewRef = {
+    get current() {
+        return { measureInWindow: mockMeasureInWindow };
+    },
+    set current(value) {
+        void value;
+    },
+};
 jest.mock("./hooks/useFormViewRefs", () => ({
     useFormViewRefs: () => {
         return {
-            scrollViewRef: {
-                current: { scrollTo: mockScrollTo },
-            },
-            bottomViewRef: { current: {} },
+            scrollViewRef: mockScrollViewRef,
+            bottomViewRef: mockBottomViewRef,
             scrollToTop: mockScrollToTop,
         };
     },
@@ -321,6 +342,30 @@ describe("Form", () => {
             expect(queryByTestId("ATL-FormSafeArea")).toBeNull();
         });
     });
+    describe("Keyboard dismissal", () => {
+        it("does not imperatively scroll the form to its end", () => __awaiter(void 0, void 0, void 0, function* () {
+            var _a;
+            const listeners = new Map();
+            const addListener = KeyboardEvents.addListener;
+            const registerListener = (eventName, listener) => {
+                listeners.set(eventName, listener);
+                return { remove: jest.fn() };
+            };
+            addListener
+                .mockImplementationOnce(registerListener)
+                .mockImplementationOnce(registerListener);
+            render(React.createElement(FormTest, { onSubmit: onSubmitMock }));
+            const hideListener = (_a = [...listeners.entries()].find(([eventName]) => eventName.endsWith("Hide"))) === null || _a === void 0 ? void 0 : _a[1];
+            expect(hideListener).toBeDefined();
+            if (!hideListener) {
+                throw new Error("Expected a keyboard hide listener");
+            }
+            yield act(() => __awaiter(void 0, void 0, void 0, function* () {
+                hideListener();
+            }));
+            expect(mockScrollToEnd).not.toHaveBeenCalled();
+        }));
+    });
     describe("Leaving the form", () => {
         let mockUseConfirmBeforeBack;
         let mockRemoveLocalCache;