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

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

@@ -105,7 +105,7 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
         React.createElement(React.Fragment, null,
             (isSubmitting || isSecondaryActionLoading) && React.createElement(FormMask, null),
             React.createElement(FormCache, { localCacheKey: localCacheKey, localCacheExclude: localCacheExclude, setLocalCache: setLocalCache }),
-            React.createElement(FormBody, { keyboardHeight: calculateSaveButtonOffset(), submit: handleSubmit(internalSubmit), isFormSubmitting: isSubmitting, saveButtonLabel: saveButtonLabel, shouldRenderActionBar: saveButtonPosition === "sticky", renderStickySection: renderStickySection, secondaryActions: secondaryActions, setSecondaryActionLoading: setIsSecondaryActionLoading, setSaveButtonHeight: setSaveButtonHeight, saveButtonOffset: saveButtonOffset },
+            React.createElement(FormBody, { keyboardHeight: calculateSaveButtonOffset(), submit: callHandleSubmit, isFormSubmitting: isSubmitting, saveButtonLabel: saveButtonLabel, shouldRenderActionBar: saveButtonPosition === "sticky", renderStickySection: renderStickySection, secondaryActions: secondaryActions, setSecondaryActionLoading: setIsSecondaryActionLoading, setSaveButtonHeight: setSaveButtonHeight, saveButtonOffset: saveButtonOffset },
                 React.createElement(KeyboardAwareScrollView, Object.assign({ enableResetScrollToCoords: false, enableAutomaticScroll: true, keyboardOpeningTime: Platform.OS === "ios" ? tokens["timing-slowest"] : 0, keyboardShouldPersistTaps: "handled", ref: scrollViewRef }, keyboardProps, { extraHeight: headerHeight, contentContainerStyle: !keyboardHeight && styles.scrollContentContainer }),
                     React.createElement(View, { onLayout: ({ nativeEvent }) => {
                             setFormContentHeight(nativeEvent.layout.height);
@@ -116,7 +116,7 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
                         React.createElement(View, { style: styles.formChildContainer },
                             React.createElement(React.Fragment, null,
                                 React.createElement(View, { style: styles.formContent }, children),
-                                saveButtonPosition === "inline" && (React.createElement(View, { style: styles.fixedSaveButton }, renderStickySection ? (renderStickySection(handleSubmit(internalSubmit), saveButtonLabel, isSubmitting)) : (React.createElement(FormSaveButton, { primaryAction: handleSubmit(internalSubmit), label: saveButtonLabel, loading: isSubmitting, secondaryActions: secondaryActions, setSecondaryActionLoading: setIsSecondaryActionLoading, onOpenBottomSheet: () => setIsBottomSheetOpen(true), onCloseBottomSheet: () => setIsBottomSheetOpen(false) })))),
+                                saveButtonPosition === "inline" && (React.createElement(View, { style: styles.fixedSaveButton }, renderStickySection ? (renderStickySection(callHandleSubmit, saveButtonLabel, isSubmitting)) : (React.createElement(FormSaveButton, { primaryAction: callHandleSubmit, label: saveButtonLabel, loading: isSubmitting, secondaryActions: secondaryActions, setSecondaryActionLoading: setIsSecondaryActionLoading, onOpenBottomSheet: () => setIsBottomSheetOpen(true), onCloseBottomSheet: () => setIsBottomSheetOpen(false) })))),
                                 renderFooter))),
                     React.createElement(View, { style: styles.safeArea, ref: bottomViewRef })))),
         React.createElement(FormMessage, null)));
@@ -140,6 +140,18 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
         setKeyboardHeight(0);
         setKeyboardScreenY(0);
     }
+    function callHandleSubmit() {
+        let result;
+        handleSubmit(data => {
+            internalSubmit(data).then(saveResult => {
+                result = saveResult;
+            });
+        })().then(() => {
+            var _a;
+            (_a = removeListenerRef.current) === null || _a === void 0 ? void 0 : _a.call(removeListenerRef);
+            onSubmitSuccess(result);
+        });
+    }
     function internalSubmit(data) {
         return __awaiter(this, void 0, void 0, function* () {
             let performSubmit = true;
@@ -149,11 +161,6 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
             if (performSubmit) {
                 Keyboard.dismiss();
                 return onSubmit(data)
-                    .then((result) => {
-                    var _a;
-                    (_a = removeListenerRef.current) === null || _a === void 0 ? void 0 : _a.call(removeListenerRef);
-                    onSubmitSuccess(result);
-                })
                     .catch(handleSubmitCatch);
             }
         });
@@ -176,7 +183,7 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
     }
     function handleRetry() {
         clearFormErrors();
-        return handleSubmit(internalSubmit)();
+        return callHandleSubmit();
     }
     function calculateSaveButtonOffset() {
         if (saveButtonOffset) {