@jobber/components-native 0.75.3-POC-fixing-d44fac2.136 → 0.75.3-POC-fixing-ffcd368.137

package/src/Checkbox/Checkbox.style.ts

@@ -1,36 +1,37 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../utils/design";
+import { buildThemedStyles } from "../AtlantisThemeContext";
 
-const checkboxDimensions = tokens["space-large"] + tokens["space-smaller"];
+export const useStyles = buildThemedStyles(tokens => {
+  const checkboxDimensions = tokens["space-large"] + tokens["space-smaller"];
 
-export const styles = StyleSheet.create({
-  container: {
-    width: "100%",
-  },
+  return {
+    container: {
+      width: "100%",
+    },
 
-  checkBoxContainer: {
-    width: "100%",
-    justifyContent: "space-between",
-    flexDirection: "row",
-    alignItems: "center",
-    paddingVertical: tokens["space-small"],
-  },
+    checkBoxContainer: {
+      width: "100%",
+      justifyContent: "space-between",
+      flexDirection: "row",
+      alignItems: "center",
+      paddingVertical: tokens["space-small"],
+    },
 
-  label: {
-    flex: 1,
-  },
+    label: {
+      flex: 1,
+    },
 
-  checkbox: {
-    borderRadius: tokens["radius-base"],
-    borderWidth: tokens["border-thick"],
-    justifyContent: "flex-end",
-    width: checkboxDimensions,
-    height: checkboxDimensions,
-    marginLeft: tokens["space-smaller"],
-    borderColor: tokens["color-interactive"],
-  },
+    checkbox: {
+      borderRadius: tokens["radius-base"],
+      borderWidth: tokens["border-thick"],
+      justifyContent: "flex-end",
+      width: checkboxDimensions,
+      height: checkboxDimensions,
+      marginLeft: tokens["space-smaller"],
+      borderColor: tokens["color-interactive"],
+    },
 
-  disabledCheckbox: {
-    borderColor: tokens["color-disabled"],
-  },
+    disabledCheckbox: {
+      borderColor: tokens["color-disabled"],
+    },
+  };
 });

package/src/Checkbox/Checkbox.tsx

@@ -1,11 +1,11 @@
 import React from "react";
 import { ColorValue, Pressable, View } from "react-native";
 import { XOR } from "ts-xor";
-import { tokens } from "@jobber/design";
-import { styles } from "./Checkbox.style";
+import { useStyles } from "./Checkbox.style";
 import { Text } from "../Text";
 import { Icon } from "../Icon";
 import { FormField } from "../FormField";
+import { useAtlantisTheme } from "../AtlantisThemeContext";
 
 interface CommonCheckboxProps {
   /**
@@ -125,6 +125,8 @@ function CheckboxInternal({
     indeterminate,
   );
 
+  const styles = useStyles();
+
   return (
     <Pressable
       accessibilityRole="checkbox"
@@ -180,6 +182,8 @@ function getBackgroundColor(
   disabled: boolean,
   indeterminate: boolean,
 ): ColorValue {
+  const { tokens } = useAtlantisTheme();
+
   if (checked || indeterminate) {
     if (disabled) {
       return tokens["color-disabled"];

package/src/Checkbox/CheckboxGroup.style.ts

@@ -1,15 +1,16 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../utils/design";
+import { buildThemedStyles } from "../AtlantisThemeContext";
 
-export const styles = StyleSheet.create({
-  container: {
-    width: "100%",
-    justifyContent: "center",
-    alignItems: "center",
-    paddingHorizontal: tokens["space-base"],
-    paddingVertical: tokens["space-small"],
-  },
-  nestedCheckboxes: {
-    marginLeft: tokens["space-large"],
-  },
+export const useStyles = buildThemedStyles(tokens => {
+  return {
+    container: {
+      width: "100%",
+      justifyContent: "center",
+      alignItems: "center",
+      paddingHorizontal: tokens["space-base"],
+      paddingVertical: tokens["space-small"],
+    },
+    nestedCheckboxes: {
+      marginLeft: tokens["space-large"],
+    },
+  };
 });

package/src/Checkbox/CheckboxGroup.tsx

@@ -3,7 +3,7 @@ import { View } from "react-native";
 import isEmpty from "lodash/isEmpty";
 import reduce from "lodash/reduce";
 import { XOR } from "ts-xor";
-import { styles } from "./CheckboxGroup.style";
+import { useStyles } from "./CheckboxGroup.style";
 import { Checkbox, CheckboxProps } from "./Checkbox";
 import { CheckboxElement, CheckboxGroupState } from "./types";
 import {
@@ -111,6 +111,8 @@ function CheckboxGroupInternal({
   };
   const indeterminate = checkIndeterminateStatus(actualCheckedValues);
 
+  const styles = useStyles();
+
   function cloneChildCheckbox(
     checkbox: React.ReactElement<CheckboxProps>,
   ): React.ReactElement<CheckboxProps> {

package/src/Chip/Chip.style.ts

@@ -1,34 +1,35 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../utils/design";
+import { buildThemedStyles } from "../AtlantisThemeContext";
 
-const chipHeight = tokens["space-larger"] + tokens["space-small"];
+export const useStyles = buildThemedStyles(tokens => {
+  const chipHeight = tokens["space-larger"] + tokens["space-small"];
 
-export const styles = StyleSheet.create({
-  container: {
-    alignItems: "center",
-    borderRadius: tokens["radius-circle"],
-    flexDirection: "row",
-    height: chipHeight,
-    justifyContent: "center",
-    marginHorizontal: tokens["space-smaller"],
-    marginTop: tokens["space-small"],
-    paddingHorizontal: tokens["space-small"],
-  },
-  iconLeft: {
-    marginHorizontal: tokens["space-smallest"],
-  },
-  chipText: {
-    flexGrow: 1,
-    flexShrink: 1,
-    marginHorizontal: tokens["space-smallest"],
-  },
-  dismissIcon: {
-    backgroundColor: tokens["color-surface"],
-    borderRadius: tokens["radius-circle"],
-    marginLeft: tokens["space-smaller"],
-    padding: tokens["space-smaller"],
-  },
-  activeDismissIcon: {
-    backgroundColor: tokens["color-surface--background"],
-  },
+  return {
+    container: {
+      alignItems: "center",
+      borderRadius: tokens["radius-circle"],
+      flexDirection: "row",
+      height: chipHeight,
+      justifyContent: "center",
+      marginHorizontal: tokens["space-smaller"],
+      marginTop: tokens["space-small"],
+      paddingHorizontal: tokens["space-small"],
+    },
+    iconLeft: {
+      marginHorizontal: tokens["space-smallest"],
+    },
+    chipText: {
+      flexGrow: 1,
+      flexShrink: 1,
+      marginHorizontal: tokens["space-smallest"],
+    },
+    dismissIcon: {
+      backgroundColor: tokens["color-surface"],
+      borderRadius: tokens["radius-circle"],
+      marginLeft: tokens["space-smaller"],
+      padding: tokens["space-smaller"],
+    },
+    activeDismissIcon: {
+      backgroundColor: tokens["color-surface--background"],
+    },
+  };
 });

package/src/Chip/Chip.test.tsx

@@ -35,7 +35,7 @@ it("renders an inactive Chip with a default backgroundColor", () => {
     backgroundColor: tokens["color-surface--reverse"],
   });
   expect(getByTestId("chipTest").props.style).toContainEqual({
-    backgroundColor: tokens["color-surface--background"],
+    backgroundColor: tokens["color-interactive--background"],
   });
 });
 

package/src/Chip/Chip.tsx

@@ -1,10 +1,10 @@
 import React, { useMemo } from "react";
 import { AccessibilityRole, Pressable, View } from "react-native";
 import { IconNames } from "@jobber/design";
-import { styles } from "./Chip.style";
+import { useStyles } from "./Chip.style";
 import { Icon } from "../Icon";
 import { Typography } from "../Typography";
-import { tokens } from "../utils/design";
+import { useAtlantisTheme } from "../AtlantisThemeContext";
 
 export type AccentType = "client" | "invoice" | "job" | "request" | "quote";
 
@@ -57,8 +57,6 @@ export interface ChipProps {
   readonly accent?: AccentType;
 }
 
-const defaultAccentColor = tokens["color-surface--reverse"];
-
 export function Chip({
   icon,
   label,
@@ -70,6 +68,10 @@ export function Chip({
   accessibilityRole = "radio",
   accent,
 }: ChipProps): JSX.Element {
+  const styles = useStyles();
+  const { tokens } = useAtlantisTheme();
+  const defaultAccentColor = tokens["color-surface--reverse"];
+
   const { chipStyle, iconCustomColor, dismissColor } = useMemo(() => {
     const accentColor = accent ? tokens[`color-${accent}`] : defaultAccentColor;
 
@@ -80,7 +82,7 @@ export function Chip({
         backgroundColor:
           inactiveBackgroundColor === "surface"
             ? tokens["color-surface"]
-            : tokens["color-surface--background"],
+            : tokens["color-interactive--background"],
       },
       isActive && { backgroundColor: accentColor },
     ];

package/src/Content/Content.test.tsx

@@ -1,11 +1,11 @@
 import React from "react";
-import { render } from "@testing-library/react-native";
+import { render, renderHook } from "@testing-library/react-native";
 import { View } from "react-native";
 import { ReactTestInstance } from "react-test-renderer";
 import { Content, ContentProps } from "./Content";
-import { spaceStyles } from "./ContentSpaceAround.style";
-import { verticalStyles } from "./ContentVertical.style";
-import { horizontalStyles } from "./ContentHorizontal.style";
+import { useSpaceAroundStyles } from "./ContentSpaceAround.style";
+import { useVerticalStyles } from "./ContentVertical.style";
+import { useHorizontalStyles } from "./ContentHorizontal.style";
 import { Text } from "../Text";
 
 function getContentComponent(parentView: ReactTestInstance) {
@@ -21,7 +21,10 @@ function getContentChildren(contentView: ReactTestInstance) {
 const text = "🌚 I am the text 🌞";
 
 function setupContent(
-  props?: Pick<ContentProps, "spacing" | "childSpacing" | "direction">,
+  props?: Pick<
+    ContentProps,
+    "spacing" | "childSpacing" | "direction" | "UNSAFE_style"
+  >,
 ) {
   const container = render(
     <View accessibilityLabel="contentView">
@@ -29,6 +32,7 @@ function setupContent(
         spacing={props?.spacing}
         childSpacing={props?.childSpacing}
         direction={props?.direction}
+        UNSAFE_style={props?.UNSAFE_style}
       >
         <Text>{text}</Text>
         <Text>{text}</Text>
@@ -43,6 +47,16 @@ function setupContent(
   return { ...container, parentView, contentView, contentChildren };
 }
 
+let spaceStyles: ReturnType<typeof useSpaceAroundStyles>;
+let verticalStyles: ReturnType<typeof useVerticalStyles>;
+let horizontalStyles: ReturnType<typeof useHorizontalStyles>;
+
+beforeAll(() => {
+  spaceStyles = renderHook(() => useSpaceAroundStyles()).result.current;
+  verticalStyles = renderHook(() => useVerticalStyles()).result.current;
+  horizontalStyles = renderHook(() => useHorizontalStyles()).result.current;
+});
+
 describe("Space around", () => {
   it("should have a base padding around the component", () => {
     const { contentView } = setupContent();
@@ -259,3 +273,77 @@ describe("Horizontal", () => {
     });
   });
 });
+
+describe("UNSAFE_style", () => {
+  it("applies custom styles to container", () => {
+    const customStyle = {
+      backgroundColor: "red",
+      padding: 16,
+    };
+
+    const { parentView } = setupContent({
+      UNSAFE_style: {
+        container: customStyle,
+      },
+    });
+
+    const contentView = getContentComponent(parentView);
+    expect(contentView.props.style).toEqual(
+      expect.arrayContaining([expect.objectContaining(customStyle)]),
+    );
+  });
+
+  it("applies custom styles to child wrapper", () => {
+    const customStyle = {
+      backgroundColor: "blue",
+      marginLeft: 8,
+    };
+
+    const { parentView } = setupContent({
+      UNSAFE_style: {
+        childWrapper: customStyle,
+      },
+    });
+
+    const contentView = getContentComponent(parentView);
+    const contentChildren = getContentChildren(contentView);
+
+    contentChildren.forEach(child => {
+      expect(child.props.style).toEqual(
+        expect.arrayContaining([expect.objectContaining(customStyle)]),
+      );
+    });
+  });
+
+  it("applies custom styles to both container and child wrapper", () => {
+    const containerStyle = {
+      backgroundColor: "red",
+      padding: 16,
+    };
+
+    const childWrapperStyle = {
+      backgroundColor: "blue",
+      marginLeft: 8,
+    };
+
+    const { parentView } = setupContent({
+      UNSAFE_style: {
+        container: containerStyle,
+        childWrapper: childWrapperStyle,
+      },
+    });
+
+    const contentView = getContentComponent(parentView);
+    const contentChildren = getContentChildren(contentView);
+
+    expect(contentView.props.style).toEqual(
+      expect.arrayContaining([expect.objectContaining(containerStyle)]),
+    );
+
+    contentChildren.forEach(child => {
+      expect(child.props.style).toEqual(
+        expect.arrayContaining([expect.objectContaining(childWrapperStyle)]),
+      );
+    });
+  });
+});

package/src/Content/Content.tsx

@@ -1,8 +1,8 @@
 import React, { ReactNode } from "react";
-import { View } from "react-native";
-import { horizontalStyles } from "./ContentHorizontal.style";
-import { verticalStyles } from "./ContentVertical.style";
-import { spaceStyles } from "./ContentSpaceAround.style";
+import { StyleProp, View, ViewStyle } from "react-native";
+import { useHorizontalStyles } from "./ContentHorizontal.style";
+import { useVerticalStyles } from "./ContentVertical.style";
+import { useSpaceAroundStyles } from "./ContentSpaceAround.style";
 
 export type Spacing =
   | "none"
@@ -12,6 +12,11 @@ export type Spacing =
   | "smallest"
   | "large";
 
+export interface ContentUnsafeStyle {
+  container?: StyleProp<ViewStyle>;
+  childWrapper?: StyleProp<ViewStyle>;
+}
+
 export interface ContentProps {
   /**
    * The child or children that will be given spacing.
@@ -29,6 +34,13 @@ export interface ContentProps {
   readonly childSpacing?: Spacing;
 
   readonly direction?: "horizontal" | "vertical";
+
+  /**
+   * **Use at your own risk:** Custom style for specific elements. This should only be used as a
+   * **last resort**. Using this may result in unexpected side effects.
+   * More information in the [Customizing components Guide](https://atlantis.getjobber.com/guides/customizing-components).
+   */
+  readonly UNSAFE_style?: ContentUnsafeStyle;
 }
 
 export function Content({
@@ -36,13 +48,20 @@ export function Content({
   spacing = "base",
   childSpacing = "base",
   direction = "vertical",
+  UNSAFE_style,
 }: ContentProps): JSX.Element {
+  const horizontalStyles = useHorizontalStyles();
+  const verticalStyles = useVerticalStyles();
+  const spaceAroundStyles = useSpaceAroundStyles();
+
   const styles = direction === "horizontal" ? horizontalStyles : verticalStyles;
   const styleName = `${spacing}Space` as const;
-  const containerStyle = spaceStyles[styleName];
+  const containerStyle = spaceAroundStyles[styleName];
 
   return (
-    <View style={[styles.wrapper, containerStyle]}>{renderChildren()}</View>
+    <View style={[styles.wrapper, containerStyle, UNSAFE_style?.container]}>
+      {renderChildren()}
+    </View>
   );
 
   function renderChildren() {
@@ -53,12 +72,17 @@ export function Content({
     const childContainerStyle = styles[spaceName];
 
     return childArray.map((child, index) => {
-      // In order to get spacing between the children, we apply the child spacing on each of
-      // the children except for the first (top) child
       const childStyle = index !== 0 ? [childContainerStyle] : [];
 
       return (
-        <View key={index} style={[styles.childWrapper, ...childStyle]}>
+        <View
+          key={index}
+          style={[
+            styles.childWrapper,
+            ...childStyle,
+            UNSAFE_style?.childWrapper,
+          ]}
+        >
           {child}
         </View>
       );

package/src/Content/ContentHorizontal.style.ts

@@ -1,38 +1,39 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../utils/design";
-
-export const horizontalStyles = StyleSheet.create({
-  wrapper: {
-    flexDirection: "row",
-  },
-
-  childWrapper: {
-    flexGrow: 1,
-    flexShrink: 1,
-    flexBasis: 0,
-  },
-
-  noneChildSpace: {
-    padding: 0,
-  },
-
-  smallestChildSpace: {
-    paddingLeft: tokens["space-smallest"],
-  },
-
-  smallerChildSpace: {
-    paddingLeft: tokens["space-smaller"],
-  },
-
-  smallChildSpace: {
-    paddingLeft: tokens["space-small"],
-  },
-
-  baseChildSpace: {
-    paddingLeft: tokens["space-base"],
-  },
-
-  largeChildSpace: {
-    paddingLeft: tokens["space-large"],
-  },
+import { buildThemedStyles } from "../AtlantisThemeContext";
+
+export const useHorizontalStyles = buildThemedStyles(tokens => {
+  return {
+    wrapper: {
+      flexDirection: "row",
+    },
+
+    childWrapper: {
+      flexGrow: 1,
+      flexShrink: 1,
+      flexBasis: 0,
+    },
+
+    noneChildSpace: {
+      padding: 0,
+    },
+
+    smallestChildSpace: {
+      paddingLeft: tokens["space-smallest"],
+    },
+
+    smallerChildSpace: {
+      paddingLeft: tokens["space-smaller"],
+    },
+
+    smallChildSpace: {
+      paddingLeft: tokens["space-small"],
+    },
+
+    baseChildSpace: {
+      paddingLeft: tokens["space-base"],
+    },
+
+    largeChildSpace: {
+      paddingLeft: tokens["space-large"],
+    },
+  };
 });

package/src/Content/ContentSpaceAround.style.ts

@@ -1,28 +1,29 @@
-import { StyleSheet } from "react-native";
-import { tokens } from "../utils/design";
+import { buildThemedStyles } from "../AtlantisThemeContext";
 
-export const spaceStyles = StyleSheet.create({
-  noneSpace: {
-    padding: 0,
-  },
+export const useSpaceAroundStyles = buildThemedStyles(tokens => {
+  return {
+    noneSpace: {
+      padding: 0,
+    },
 
-  smallestSpace: {
-    padding: tokens["space-smallest"],
-  },
+    smallestSpace: {
+      padding: tokens["space-smallest"],
+    },
 
-  smallerSpace: {
-    padding: tokens["space-smaller"],
-  },
+    smallerSpace: {
+      padding: tokens["space-smaller"],
+    },
 
-  smallSpace: {
-    padding: tokens["space-small"],
-  },
+    smallSpace: {
+      padding: tokens["space-small"],
+    },
 
-  baseSpace: {
-    padding: tokens["space-base"],
-  },
+    baseSpace: {
+      padding: tokens["space-base"],
+    },
 
-  largeSpace: {
-    padding: tokens["space-large"],
-  },
+    largeSpace: {
+      padding: tokens["space-large"],
+    },
+  };
 });