@jobber/components-native 0.75.3-TAYLORtes-c9be7a8.250 → 0.75.3-cleanup-fo-ffcd368.137

package/src/EmptyState/EmptyState.style.ts

@@ -1,9 +1,10 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../utils/design";
+import { buildThemedStyles } from "../AtlantisThemeContext";
 
-export const styles = StyleSheet.create({
-  icon: {
-    marginVertical: tokens["space-small"],
-    alignItems: "center",
-  },
+export const useStyles = buildThemedStyles(tokens => {
+  return {
+    icon: {
+      marginVertical: tokens["space-small"],
+      alignItems: "center",
+    },
+  };
 });

package/src/EmptyState/EmptyState.tsx

@@ -1,7 +1,7 @@
 import { IconColorNames, IconNames } from "@jobber/design";
 import React from "react";
 import { View } from "react-native";
-import { styles } from "./EmptyState.style";
+import { useStyles } from "./EmptyState.style";
 import { Text } from "../Text";
 import { Content } from "../Content";
 import { Icon } from "../Icon";
@@ -65,6 +65,8 @@ export function EmptyState({
   secondaryAction,
   iconColor = "blue",
 }: EmptyStateProps): JSX.Element {
+  const styles = useStyles();
+
   return (
     <Content>
       {icon && (

package/src/ErrorMessageWrapper/ErrorMessageWrapper.style.ts

@@ -1,32 +1,33 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../utils/design";
+import { buildThemedStyles } from "../AtlantisThemeContext";
 
-export const styles = StyleSheet.create({
-  wrapper: {
-    position: "relative",
-    width: "100%",
-  },
-  wrapForCard: {
-    paddingHorizontal: tokens["space-base"],
-    paddingVertical: tokens["space-small"],
-  },
-  messageWrapper: {
-    flexDirection: "row",
-  },
-  messageWrapperIcon: {
-    flex: 0,
-    flexBasis: "auto",
-    paddingTop: tokens["space-minuscule"],
-    paddingRight: tokens["space-smaller"],
-  },
-  messageWrapperContent: {
-    flex: 1,
-  },
-  screenReaderMessage: {
-    position: "absolute",
-    top: 0,
-    left: 0,
-    width: "100%",
-    height: "100%",
-  },
+export const useStyles = buildThemedStyles(tokens => {
+  return {
+    wrapper: {
+      position: "relative",
+      width: "100%",
+    },
+    wrapForCard: {
+      paddingHorizontal: tokens["space-base"],
+      paddingVertical: tokens["space-small"],
+    },
+    messageWrapper: {
+      flexDirection: "row",
+    },
+    messageWrapperIcon: {
+      flex: 0,
+      flexBasis: "auto",
+      paddingTop: tokens["space-minuscule"],
+      paddingRight: tokens["space-smaller"],
+    },
+    messageWrapperContent: {
+      flex: 1,
+    },
+    screenReaderMessage: {
+      position: "absolute",
+      top: 0,
+      left: 0,
+      width: "100%",
+      height: "100%",
+    },
+  };
 });

package/src/ErrorMessageWrapper/ErrorMessageWrapper.tsx

@@ -2,7 +2,7 @@ import React, { ReactNode, useEffect, useRef } from "react";
 import { View, ViewStyle } from "react-native";
 import { v4 } from "react-native-uuid";
 import { useErrorMessageContext } from "./context";
-import { styles } from "./ErrorMessageWrapper.style";
+import { useStyles } from "./ErrorMessageWrapper.style";
 import { Icon } from "../Icon";
 import { Text } from "../Text";
 
@@ -22,11 +22,6 @@ interface ErrorMessageWrapperProps {
   readonly children: ReactNode;
 }
 
-const wrapForStyle: Record<WrapForTypes, ViewStyle | undefined> = {
-  card: styles.wrapForCard,
-  default: undefined,
-};
-
 /**
  * Adds an error message below the children but ensure the message gets read
  * out first.
@@ -46,6 +41,12 @@ export function ErrorMessageWrapper({
 
   const hasErrorMessage = Boolean(message);
 
+  const styles = useStyles();
+
+  const wrapForStyle: Record<WrapForTypes, ViewStyle | undefined> = {
+    card: styles.wrapForCard,
+    default: undefined,
+  };
   useEffect(() => {
     if (register) {
       register({ id: uuid, ref: a11yMessageRef, hasErrorMessage });

package/src/Flex/Flex.styles.tsx

@@ -1,6 +1,6 @@
 import { StyleSheet, ViewStyle } from "react-native";
 import { ColumnKeys, Spacing, spacing } from "./types";
-import { tokens } from "../utils/design";
+import { tokens as staticTokens } from "../utils/design";
 
 export const styles = StyleSheet.create({
   row: { flexDirection: "row" },
@@ -21,7 +21,7 @@ export const columnStyles: Record<ColumnKeys, ViewStyle> = StyleSheet.create({
 export const gapStyles = StyleSheet.create(
   spacing.reduce((gapObj, space) => {
     let paddingLeft = 0;
-    if (space !== "none") paddingLeft = tokens[`space-${space}`];
+    if (space !== "none") paddingLeft = staticTokens[`space-${space}`];
 
     gapObj[space] = { paddingLeft };
 

package/src/Form/Form.style.ts

@@ -1,34 +1,35 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../utils/design";
+import { buildThemedStyles } from "../AtlantisThemeContext";
 
-export const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    flexGrow: 1,
-    width: "100%",
-  },
-  safeArea: {
-    backgroundColor: tokens["color-surface"],
-  },
-  scrollContentContainer: {
-    flexGrow: 1,
-  },
-  scrollView: {
-    flexGrow: 1,
-  },
-  formChildContainer: {
-    flexGrow: 1,
-    justifyContent: "flex-start",
-  },
-  formContent: {
-    paddingVertical: tokens["space-small"],
-  },
-  fixedSaveButton: {
-    padding: tokens["space-base"],
-    backgroundColor: tokens["color-surface"],
-  },
-  activityIndicator: {
-    marginVertical: tokens["space-base"],
-    flex: 1,
-  },
+export const useStyles = buildThemedStyles(tokens => {
+  return {
+    container: {
+      flex: 1,
+      flexGrow: 1,
+      width: "100%",
+    },
+    safeArea: {
+      backgroundColor: tokens["color-surface"],
+    },
+    scrollContentContainer: {
+      flexGrow: 1,
+    },
+    scrollView: {
+      flexGrow: 1,
+    },
+    formChildContainer: {
+      flexGrow: 1,
+      justifyContent: "flex-start",
+    },
+    formContent: {
+      paddingVertical: tokens["space-small"],
+    },
+    fixedSaveButton: {
+      padding: tokens["space-base"],
+      backgroundColor: tokens["color-surface"],
+    },
+    activityIndicator: {
+      marginVertical: tokens["space-base"],
+      flex: 1,
+    },
+  };
 });

package/src/Form/Form.test.tsx

@@ -545,7 +545,7 @@ describe("Form", () => {
   });
 
   describe("Safe Area", () => {
-    it("does render a safe area when there's a saveButtonOffset is provided", () => {
+    it("does render a safe area when there's NO saveButtonOffset provided", () => {
       const { getByTestId } = render(<FormTest onSubmit={onSubmitMock} />);
 
       expect(getByTestId("ATL-FormSafeArea")).toBeDefined();

package/src/Form/Form.tsx

@@ -8,7 +8,7 @@ import {
   View,
   findNodeHandle,
 } from "react-native";
-import { styles } from "./Form.style";
+import { useStyles } from "./Form.style";
 import { FormErrorBanner } from "./components/FormErrorBanner";
 import { KEYBOARD_SAVE_BUTTON_DISTANCE } from "./constants";
 import { FormMessageBanner } from "./components/FormMessageBanner";
@@ -136,6 +136,8 @@ function InternalForm<T extends FieldValues, S>({
     setMessageBannerHeight(event.nativeEvent.layout.height);
   };
 
+  const styles = useStyles();
+
   return (
     <FormProvider {...formMethods}>
       <>
@@ -150,7 +152,7 @@ function InternalForm<T extends FieldValues, S>({
 
         <FormBody
           keyboardHeight={calculateSaveButtonOffset()}
-          submit={handleSubmit(internalSubmit)}
+          submit={callHandleSubmit}
           isFormSubmitting={isSubmitting}
           saveButtonLabel={saveButtonLabel}
           shouldRenderActionBar={saveButtonPosition === "sticky"}
@@ -193,13 +195,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 +247,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 +270,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 +297,7 @@ function InternalForm<T extends FieldValues, S>({
   function handleRetry() {
     clearFormErrors();
 
-    return handleSubmit(internalSubmit)();
+    return callHandleSubmit();
   }
 
   function calculateSaveButtonOffset() {

package/src/Form/components/FormActionBar/FormActionBar.style.ts

@@ -1,11 +1,12 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../../../utils/design";
+import { buildThemedStyles } from "../../../AtlantisThemeContext";
 
-export const styles = StyleSheet.create({
-  saveButton: {
-    padding: tokens["space-base"],
-    backgroundColor: tokens["color-surface"],
-    width: "100%",
-    ...tokens["shadow-high"],
-  },
+export const useStyles = buildThemedStyles(tokens => {
+  return {
+    saveButton: {
+      padding: tokens["space-base"],
+      backgroundColor: tokens["color-surface"],
+      width: "100%",
+      ...tokens["shadow-high"],
+    },
+  };
 });

package/src/Form/components/FormActionBar/FormActionBar.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { LayoutChangeEvent, StyleSheet } from "react-native";
 import Reanimated from "react-native-reanimated";
-import { styles } from "./FormActionBar.style";
+import { useStyles } from "./FormActionBar.style";
 import { SecondaryActionProp } from "../../types";
 import { FormSaveButton } from "../FormSaveButton";
 
@@ -32,6 +32,8 @@ export function FormActionBar({
   secondaryActions,
   setSecondaryActionLoading,
 }: FormActionBarProps): JSX.Element {
+  const styles = useStyles();
+
   const buttonStyle = StyleSheet.flatten([
     styles.saveButton,
     {

package/src/Form/components/FormBody/FormBody.style.ts

@@ -1,27 +1,28 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../../../utils/design";
+import { buildThemedStyles } from "../../../AtlantisThemeContext";
 
-export const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    flexGrow: 1,
-    width: "100%",
-  },
-  safeArea: {
-    backgroundColor: tokens["color-surface"],
-  },
-  scrollContentContainer: {
-    flexGrow: 1,
-  },
-  scrollView: {
-    flexGrow: 1,
-  },
-  formChildContainer: {
-    flexGrow: 1,
-    justifyContent: "flex-start",
-  },
-  activityIndicator: {
-    marginVertical: tokens["space-base"],
-    flex: 1,
-  },
+export const useStyles = buildThemedStyles(tokens => {
+  return {
+    container: {
+      flex: 1,
+      flexGrow: 1,
+      width: "100%",
+    },
+    safeArea: {
+      backgroundColor: tokens["color-surface"],
+    },
+    scrollContentContainer: {
+      flexGrow: 1,
+    },
+    scrollView: {
+      flexGrow: 1,
+    },
+    formChildContainer: {
+      flexGrow: 1,
+      justifyContent: "flex-start",
+    },
+    activityIndicator: {
+      marginVertical: tokens["space-base"],
+      flex: 1,
+    },
+  };
 });

package/src/Form/components/FormBody/FormBody.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from "react";
 import { View } from "react-native";
-import { styles } from "./FormBody.style";
+import { useStyles } from "./FormBody.style";
 import { useScreenInformation } from "../../hooks/useScreenInformation";
 import { FormActionBar, FormActionBarProps } from "../FormActionBar";
 import { tokens } from "../../../utils/design";
@@ -26,6 +26,7 @@ export function FormBody({
 }: FormBodyProps): JSX.Element {
   const paddingBottom = useBottomPadding();
   const fullViewPadding = useMemo(() => ({ paddingBottom }), [paddingBottom]);
+  const styles = useStyles();
 
   return (
     <>

package/src/Form/components/FormMask/FormMask.style.tsx

@@ -1,16 +1,17 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../../../utils/design";
+import { buildThemedStyles } from "../../../AtlantisThemeContext";
 
-export const styles = StyleSheet.create({
-  mask: {
-    zIndex: tokens["elevation-modal"],
-    width: "100%",
-    height: "100%",
-    position: "absolute",
-    top: 0,
-    left: 0,
-    backgroundColor: tokens["color-overlay--dimmed"],
-    padding: tokens["space-base"],
-    justifyContent: "center",
-  },
+export const useStyles = buildThemedStyles(tokens => {
+  return {
+    mask: {
+      zIndex: tokens["elevation-modal"],
+      width: "100%",
+      height: "100%",
+      position: "absolute",
+      top: 0,
+      left: 0,
+      backgroundColor: tokens["color-overlay--dimmed"],
+      padding: tokens["space-base"],
+      justifyContent: "center",
+    },
+  };
 });

package/src/Form/components/FormMask/FormMask.tsx

@@ -1,11 +1,12 @@
 import React from "react";
 import { View } from "react-native";
-import { styles } from "./FormMask.style";
+import { useStyles } from "./FormMask.style";
 import { ActivityIndicator } from "../../../ActivityIndicator";
 import { useAtlantisI18n } from "../../../hooks/useAtlantisI18n";
 
 export function FormMask(): JSX.Element {
   const { t } = useAtlantisI18n();
+  const styles = useStyles();
 
   return (
     <View style={styles.mask} accessibilityLabel={t("loading")}>

package/src/Form/components/FormMessage/components/InternalFormMessage/InternalFormMessage.style.ts

@@ -1,18 +1,19 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../../../../../utils/design";
+import { buildThemedStyles } from "../../../../../AtlantisThemeContext";
 
-export const styles = StyleSheet.create({
-  wrapper: {
-    backgroundColor: tokens["color-surface"],
-    flex: 1,
-    justifyContent: "center",
-  },
-  closeAction: {
-    position: "absolute",
-    top: 0,
-    right: 0,
-    zIndex: 1,
-  },
-  scrollWrapper: { height: "100%" },
-  scrollWrapperContent: { flexGrow: 1, justifyContent: "center" },
+export const useStyles = buildThemedStyles(tokens => {
+  return {
+    wrapper: {
+      backgroundColor: tokens["color-surface"],
+      flex: 1,
+      justifyContent: "center",
+    },
+    closeAction: {
+      position: "absolute",
+      top: 0,
+      right: 0,
+      zIndex: 1,
+    },
+    scrollWrapper: { height: "100%" },
+    scrollWrapperContent: { flexGrow: 1, justifyContent: "center" },
+  };
 });

package/src/Form/components/FormMessage/components/InternalFormMessage/InternalFormMessage.tsx

@@ -2,7 +2,7 @@ import React, { useMemo } from "react";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { Modal, StatusBar, View } from "react-native";
 import { ScrollView } from "react-native-gesture-handler";
-import { styles } from "./InternalFormMessage.style";
+import { useStyles } from "./InternalFormMessage.style";
 import { EmptyState, EmptyStateProps } from "../../../../../EmptyState";
 import { useAtlantisI18n } from "../../../../../hooks/useAtlantisI18n";
 
@@ -16,6 +16,7 @@ export function InternalFormMessage({
   onRequestClose,
 }: FormMessageProps): JSX.Element {
   const { t } = useAtlantisI18n();
+  const styles = useStyles();
   const emptyStateData: EmptyStateProps = useMemo(() => {
     if (data.secondaryAction) {
       return data;

package/src/FormatFile/FormatFile.style.ts

@@ -1,17 +1,20 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../utils/design";
+import { buildThemedStyles } from "../AtlantisThemeContext";
 
-export const styles = StyleSheet.create({
-  thumbnailContainer: {
-    backgroundColor: tokens["color-surface--background"],
-    borderWidth: tokens["border-base"],
-    borderColor: tokens["color-border"],
-    borderRadius: tokens["radius-base"],
-    marginBottom: tokens["space-small"],
-  },
-  thumbnailContainerGrid: {
-    width: tokens["space-extravagant"],
-    height: tokens["space-extravagant"],
-    marginRight: tokens["space-small"],
-  },
+export const useStyles = buildThemedStyles(tokens => {
+  return {
+    thumbnailContainer: {
+      backgroundColor: tokens["color-surface--background"],
+      borderWidth: tokens["border-base"],
+      borderColor: tokens["color-border"],
+      borderRadius: tokens["radius-base"],
+      marginBottom: tokens["space-small"],
+      // This is to prevent the image from overflowing the container's border radius, otherwise it can "bleed" out the corners
+      overflow: "hidden",
+    },
+    thumbnailContainerGrid: {
+      width: tokens["space-extravagant"],
+      height: tokens["space-extravagant"],
+      marginRight: tokens["space-small"],
+    },
+  };
 });

package/src/FormatFile/FormatFile.tsx

@@ -1,6 +1,6 @@
 import React, { createRef, useCallback, useState } from "react";
 import { TouchableOpacity, View } from "react-native";
-import { styles } from "./FormatFile.style";
+import { useStyles } from "./FormatFile.style";
 import { MediaView } from "./components/MediaView";
 import {
   BottomSheetOptionsSuffix,
@@ -96,6 +96,8 @@ function FormatFileContent({
   onUploadComplete,
   isMedia,
 }: FormatFileContentProps): JSX.Element {
+  const styles = useStyles();
+
   return (
     <View
       style={[

package/src/FormatFile/components/ErrorIcon/ErrorIcon.style.ts

@@ -1,11 +1,12 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../../../utils/design";
+import { buildThemedStyles } from "../../../AtlantisThemeContext";
 
-export const styles = StyleSheet.create({
-  circle: {
-    width: tokens["space-large"],
-    height: tokens["space-large"],
-    borderRadius: tokens["radius-circle"],
-    backgroundColor: tokens["color-surface"],
-  },
+export const useStyles = buildThemedStyles(tokens => {
+  return {
+    circle: {
+      width: tokens["space-large"],
+      height: tokens["space-large"],
+      borderRadius: tokens["radius-circle"],
+      backgroundColor: tokens["color-surface"],
+    },
+  };
 });

package/src/FormatFile/components/ErrorIcon/ErrorIcon.tsx

@@ -1,9 +1,11 @@
 import React from "react";
 import { View } from "react-native";
-import { styles } from "./ErrorIcon.style";
+import { useStyles } from "./ErrorIcon.style";
 import { Icon } from "../../../Icon";
 
 export function ErrorIcon(): JSX.Element {
+  const styles = useStyles();
+
   return (
     <View testID="format-file-error-icon" style={styles.circle}>
       <Icon name="alert" color="critical" />