@jobber/components-native 0.81.1 → 0.81.2-cleanup-fo-1e1db4e.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/components-native",
-  "version": "0.81.1",
+  "version": "0.81.2-cleanup-fo-1e1db4e.33+1e1db4e5",
   "license": "MIT",
   "description": "React Native implementation of Atlantis",
   "repository": {
@@ -80,5 +80,5 @@
     "react-native-safe-area-context": "^4.5.2",
     "react-native-svg": ">=12.0.0"
   },
-  "gitHead": "a560cd303472b8638a3ef95fe3f26ac4afa2f607"
+  "gitHead": "1e1db4e51bfb455c15a597be0e3e882044b7da01"
 }

package/src/Form/Form.test.tsx

@@ -300,6 +300,32 @@ describe("Form", () => {
       });
     });
 
+    it("should call onSubmitSuccess after submit promise resolves", async () => {
+      onSubmitMock.mockImplementationOnce(() => {
+        return Promise.resolve({
+          resolvedPromiseData: "passed",
+        });
+      });
+      const { getByLabelText } = render(<FormTest onSubmit={onSubmitMock} />);
+      const saveButton = getByLabelText(saveButtonText);
+
+      const newValue = "New Value";
+      fireEvent.changeText(getByLabelText(testInputTextPlaceholder), newValue);
+      expect(onChangeMock).toHaveBeenCalled();
+
+      fireEvent(getByLabelText(switchLabel), "onValueChange", true);
+      expect(onChangeSwitchMock).toHaveBeenCalled();
+
+      fireEvent.press(saveButton);
+
+      await waitFor(() => {
+        expect(onSubmitMock).toHaveBeenCalled();
+      });
+      expect(onSuccessMock).toHaveBeenCalledWith({
+        resolvedPromiseData: "passed",
+      });
+    });
+
     it("should dismiss keyboard when form is saved", async () => {
       const keyboardDismissSpy = jest.spyOn(Keyboard, "dismiss");
       const { getByLabelText } = render(<FormTest onSubmit={onSubmitMock} />);

package/src/Form/Form.tsx

@@ -152,7 +152,7 @@ function InternalForm<T extends FieldValues, S>({
 
         <FormBody
           keyboardHeight={calculateSaveButtonOffset()}
-          submit={handleSubmit(internalSubmit)}
+          submit={callHandleSubmit}
           isFormSubmitting={isSubmitting}
           saveButtonLabel={saveButtonLabel}
           shouldRenderActionBar={saveButtonPosition === "sticky"}
@@ -195,13 +195,13 @@ function InternalForm<T extends FieldValues, S>({
                     <View style={styles.fixedSaveButton}>
                       {renderStickySection ? (
                         renderStickySection(
-                          handleSubmit(internalSubmit),
+                          callHandleSubmit,
                           saveButtonLabel,
                           isSubmitting,
                         )
                       ) : (
                         <FormSaveButton
-                          primaryAction={handleSubmit(internalSubmit)}
+                          primaryAction={callHandleSubmit}
                           label={saveButtonLabel}
                           loading={isSubmitting}
                           secondaryActions={secondaryActions}
@@ -247,6 +247,18 @@ function InternalForm<T extends FieldValues, S>({
     setKeyboardScreenY(0);
   }
 
+  async function callHandleSubmit() {
+    let result: S | undefined;
+
+    await handleSubmit(async data => {
+      const saveResult = await internalSubmit(data);
+      result = saveResult as S;
+    })();
+
+    removeListenerRef.current?.();
+    onSubmitSuccess(result as S);
+  }
+
   async function internalSubmit(data: FormValues<T>) {
     let performSubmit = true;
 
@@ -257,12 +269,7 @@ function InternalForm<T extends FieldValues, S>({
     if (performSubmit) {
       Keyboard.dismiss();
 
-      return onSubmit(data)
-        .then((result: S) => {
-          removeListenerRef.current?.();
-          onSubmitSuccess(result);
-        })
-        .catch(handleSubmitCatch);
+      return onSubmit(data).catch(handleSubmitCatch);
     }
   }
 
@@ -289,7 +296,7 @@ function InternalForm<T extends FieldValues, S>({
   function handleRetry() {
     clearFormErrors();
 
-    return handleSubmit(internalSubmit)();
+    return callHandleSubmit();
   }
 
   function calculateSaveButtonOffset() {