@jobber/components-native 0.75.3-NAZARIIad-655df4e.237 → 0.75.3-POC-fixing-d44fac2.136

package/dist/types/src/InputPressable/InputPressable.d.ts

@@ -54,7 +54,6 @@ export interface InputPressableProps {
     readonly suffix?: {
         icon?: IconNames;
         label?: string;
-        onPress?: () => void;
     };
     /**
      * Add a clear action on the input that clears the value.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/components-native",
-  "version": "0.75.3-NAZARIIad-655df4e.237+655df4e1",
+  "version": "0.75.3-POC-fixing-d44fac2.136+b57471fe",
   "license": "MIT",
   "description": "React Native implementation of Atlantis",
   "repository": {
@@ -79,5 +79,5 @@
     "react-native-safe-area-context": "^4.5.2",
     "react-native-svg": ">=12.0.0"
   },
-  "gitHead": "655df4e193b5e3dffbb266c5a644be3c88d86df3"
+  "gitHead": "b57471fec4113fb6fb2f3e0fb76273ad024896d9"
 }

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 => {
+      return internalSubmit(data).then(saveResult => {
+        result = saveResult as S;
+      });
+    })().then(() => {
+      removeListenerRef.current?.();
+      onSubmitSuccess(result);
+    });
+  }
+
   async function internalSubmit(data: FormValues<T>) {
     let performSubmit = true;
 
@@ -255,12 +268,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);
     }
   }
 
@@ -287,7 +295,7 @@ function InternalForm<T extends FieldValues, S>({
   function handleRetry() {
     clearFormErrors();
 
-    return handleSubmit(internalSubmit)();
+    return callHandleSubmit();
   }
 
   function calculateSaveButtonOffset() {

package/src/InputPressable/InputPressable.tsx

@@ -67,7 +67,6 @@ export interface InputPressableProps {
   readonly suffix?: {
     icon?: IconNames;
     label?: string;
-    onPress?: () => void;
   };
   /**
    * Add a clear action on the input that clears the value.