@jobber/components-native 0.75.3-MIKEmake--c9b6b60.253 → 0.75.3-POC-fixing-d44fac2.135

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/components-native",
-  "version": "0.75.3-MIKEmake--c9b6b60.253+c9b6b608",
+  "version": "0.75.3-POC-fixing-d44fac2.135+d44fac22",
   "license": "MIT",
   "description": "React Native implementation of Atlantis",
   "repository": {
@@ -64,7 +64,6 @@
   },
   "peerDependencies": {
     "@babel/core": "^7.4.5",
-    "@jobber/design": "*",
     "@react-native-community/datetimepicker": ">=6.7.0",
     "date-fns": "^2.30.0",
     "date-fns-tz": "^2.0.0",
@@ -80,5 +79,5 @@
     "react-native-safe-area-context": "^4.5.2",
     "react-native-svg": ">=12.0.0"
   },
-  "gitHead": "c9b6b608680b2fb8ce6ce0e1f38dcae9849901e4"
+  "gitHead": "d44fac22c580ff68fe8dc51bfb60d678e4d0e691"
 }

package/src/Form/Form.tsx

@@ -150,7 +150,7 @@ function InternalForm<T extends FieldValues, S>({
 
         <FormBody
           keyboardHeight={calculateSaveButtonOffset()}
-          submit={handleSubmit(internalSubmit)}
+          submit={callHandleSubmit}
           isFormSubmitting={isSubmitting}
           saveButtonLabel={saveButtonLabel}
           shouldRenderActionBar={saveButtonPosition === "sticky"}
@@ -193,13 +193,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}
@@ -245,6 +245,19 @@ function InternalForm<T extends FieldValues, S>({
     setKeyboardScreenY(0);
   }
 
+  function callHandleSubmit() {
+    let result: S;
+
+    handleSubmit(data => {
+      internalSubmit(data).then(saveResult => {
+        result = saveResult as S;
+      })
+    })().then(() => {
+          removeListenerRef.current?.();
+          onSubmitSuccess(result);
+        });
+  }
+
   async function internalSubmit(data: FormValues<T>) {
     let performSubmit = true;
 
@@ -256,10 +269,6 @@ function InternalForm<T extends FieldValues, S>({
       Keyboard.dismiss();
 
       return onSubmit(data)
-        .then((result: S) => {
-          removeListenerRef.current?.();
-          onSubmitSuccess(result);
-        })
         .catch(handleSubmitCatch);
     }
   }
@@ -287,7 +296,7 @@ function InternalForm<T extends FieldValues, S>({
   function handleRetry() {
     clearFormErrors();
 
-    return handleSubmit(internalSubmit)();
+    return callHandleSubmit();
   }
 
   function calculateSaveButtonOffset() {