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

package/dist/types/src/Checkbox/Checkbox.style.d.ts

@@ -6,11 +6,12 @@ export declare const useStyles: () => {
         width: "100%";
         justifyContent: "space-between";
         flexDirection: "row";
-        alignItems: "center";
+        alignItems: "flex-start";
         paddingVertical: number;
     };
     label: {
         flex: number;
+        gap: number;
     };
     checkbox: {
         borderRadius: number;

package/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/src/Checkbox/Checkbox.style.ts

@@ -12,12 +12,13 @@ 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: {

package/src/Checkbox/Checkbox.tsx

@@ -152,6 +152,15 @@ function CheckboxInternal({
             <Text variation={textVariation} align="start">
               {label}
             </Text>
+            {assistiveText && (
+              <Text
+                level="textSupporting"
+                align="start"
+                variation={textVariation}
+              >
+                {assistiveText}
+              </Text>
+            )}
           </View>
         )}
         <View
@@ -168,11 +177,6 @@ function CheckboxInternal({
           )}
         </View>
       </View>
-      {assistiveText && (
-        <Text level="textSupporting" align="start" variation={textVariation}>
-          {assistiveText}
-        </Text>
-      )}
     </Pressable>
   );
 }

package/src/Form/Form.test.tsx

@@ -300,32 +300,6 @@ 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={callHandleSubmit}
+          submit={handleSubmit(internalSubmit)}
           isFormSubmitting={isSubmitting}
           saveButtonLabel={saveButtonLabel}
           shouldRenderActionBar={saveButtonPosition === "sticky"}
@@ -195,13 +195,13 @@ function InternalForm<T extends FieldValues, S>({
                     <View style={styles.fixedSaveButton}>
                       {renderStickySection ? (
                         renderStickySection(
-                          callHandleSubmit,
+                          handleSubmit(internalSubmit),
                           saveButtonLabel,
                           isSubmitting,
                         )
                       ) : (
                         <FormSaveButton
-                          primaryAction={callHandleSubmit}
+                          primaryAction={handleSubmit(internalSubmit)}
                           label={saveButtonLabel}
                           loading={isSubmitting}
                           secondaryActions={secondaryActions}
@@ -247,18 +247,6 @@ 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;
 
@@ -269,7 +257,12 @@ function InternalForm<T extends FieldValues, S>({
     if (performSubmit) {
       Keyboard.dismiss();
 
-      return onSubmit(data).catch(handleSubmitCatch);
+      return onSubmit(data)
+        .then((result: S) => {
+          removeListenerRef.current?.();
+          onSubmitSuccess(result);
+        })
+        .catch(handleSubmitCatch);
     }
   }
 
@@ -296,7 +289,7 @@ function InternalForm<T extends FieldValues, S>({
   function handleRetry() {
     clearFormErrors();
 
-    return callHandleSubmit();
+    return handleSubmit(internalSubmit)();
   }
 
   function calculateSaveButtonOffset() {