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

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jobber/components-native",
-    "version": "0.81.2-cleanup-fo-1e1db4e.33+1e1db4e5",
+    "version": "0.81.2",
     "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": "1e1db4e51bfb455c15a597be0e3e882044b7da01"
+    "gitHead": "cf3a355dd95152faff62049df5e68c70dba26d27"
 }

package/dist/src/Checkbox/Checkbox.js

@@ -42,15 +42,15 @@ function CheckboxInternal({ label, checked, defaultChecked, indeterminate = fals
         } },
         React.createElement(View, { style: styles.checkBoxContainer },
             label && (React.createElement(View, { style: styles.label },
-                React.createElement(Text, { variation: textVariation, align: "start" }, label))),
+                React.createElement(Text, { variation: textVariation, align: "start" }, label),
+                assistiveText && (React.createElement(Text, { level: "textSupporting", align: "start", variation: textVariation }, assistiveText)))),
             React.createElement(View, { style: [
                     styles.checkbox,
                     disabled && styles.disabledCheckbox,
                     {
                         backgroundColor,
                     },
-                ] }, (internalValue || indeterminate) && (React.createElement(Icon, { name: iconName, color: "white" })))),
-        assistiveText && (React.createElement(Text, { level: "textSupporting", align: "start", variation: textVariation }, assistiveText))));
+                ] }, (internalValue || indeterminate) && (React.createElement(Icon, { name: iconName, color: "white" }))))));
 }
 function getBackgroundColor(checked, disabled, indeterminate) {
     const { tokens } = useAtlantisTheme();

package/dist/src/Checkbox/Checkbox.style.js

@@ -9,11 +9,12 @@ export const useStyles = buildThemedStyles(tokens => {
             width: "100%",
             justifyContent: "space-between",
             flexDirection: "row",
-            alignItems: "center",
+            alignItems: "flex-start",
             paddingVertical: tokens["space-small"],
         },
         label: {
             flex: 1,
+            gap: tokens["space-smaller"],
         },
         checkbox: {
             borderRadius: tokens["radius-base"],

package/dist/src/Form/Form.js

@@ -106,7 +106,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: callHandleSubmit, isFormSubmitting: isSubmitting, saveButtonLabel: saveButtonLabel, shouldRenderActionBar: saveButtonPosition === "sticky", renderStickySection: renderStickySection, secondaryActions: secondaryActions, setSecondaryActionLoading: setIsSecondaryActionLoading, setSaveButtonHeight: setSaveButtonHeight, saveButtonOffset: saveButtonOffset },
+            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(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);
@@ -117,7 +117,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(callHandleSubmit, saveButtonLabel, isSubmitting)) : (React.createElement(FormSaveButton, { primaryAction: callHandleSubmit, label: saveButtonLabel, loading: isSubmitting, secondaryActions: secondaryActions, setSecondaryActionLoading: setIsSecondaryActionLoading, onOpenBottomSheet: () => setIsBottomSheetOpen(true), onCloseBottomSheet: () => setIsBottomSheetOpen(false) })))),
+                                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) })))),
                                 renderFooter))),
                     React.createElement(View, { style: styles.safeArea, ref: bottomViewRef })))),
         React.createElement(FormMessage, null)));
@@ -141,18 +141,6 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
         setKeyboardHeight(0);
         setKeyboardScreenY(0);
     }
-    function callHandleSubmit() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let result;
-            yield handleSubmit((data) => __awaiter(this, void 0, void 0, function* () {
-                const saveResult = yield internalSubmit(data);
-                result = saveResult;
-            }))();
-            (_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;
@@ -161,7 +149,13 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
             }
             if (performSubmit) {
                 Keyboard.dismiss();
-                return onSubmit(data).catch(handleSubmitCatch);
+                return onSubmit(data)
+                    .then((result) => {
+                    var _a;
+                    (_a = removeListenerRef.current) === null || _a === void 0 ? void 0 : _a.call(removeListenerRef);
+                    onSubmitSuccess(result);
+                })
+                    .catch(handleSubmitCatch);
             }
         });
     }
@@ -183,7 +177,7 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
     }
     function handleRetry() {
         clearFormErrors();
-        return callHandleSubmit();
+        return handleSubmit(internalSubmit)();
     }
     function calculateSaveButtonOffset() {
         if (saveButtonOffset) {