update jest

draftbit · Dec 4, 2024 · d0009af · d0009af
1 parent 3a478ba
commit d0009af
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/core/jest-setup.js b/packages/core/jest-setup.js
@@ -25,3 +25,9 @@ jest.mock("expo-asset", () => {
 jest.mock("@react-native-async-storage/async-storage", () =>
   require("@react-native-async-storage/async-storage/jest/async-storage-mock")
 );
+
+jest.mock("expo-font", () => ({
+  loadAsync: jest.fn(),
+  isLoaded: jest.fn(() => true),
+  isLoading: jest.fn(() => false),
+}));
diff --git a/packages/core/src/components/Button.tsx b/packages/core/src/components/Button.tsx
@@ -8,6 +8,7 @@ import {
   TextStyle,
   ActivityIndicator,
   ViewStyle,
+  StyleProp,
 } from "react-native";
 import { withTheme } from "@draftbit/theme";
 import type { ReadTheme } from "@draftbit/theme";
@@ -112,7 +113,7 @@ function Base({
           {
             opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1,
           },
-          buttonStyles as ViewStyle,
+          buttonStyles as StyleProp<ViewStyle>,
         ];
       }}
       {...props}
@@ -151,7 +152,7 @@ const Solid = ({ style, theme, ...props }: Props): JSX.Element => {
           borderRadius: 8,
           backgroundColor: theme.colors.branding.primary,
         },
-        style as ViewStyle,
+        style as StyleProp<ViewStyle>,
       ]}
       {...props}
     />
@@ -178,7 +179,7 @@ const Outline = ({ style, theme, ...props }: Props): JSX.Element => {
           //@ts-ignore
           color: theme.colors.branding.primary,
         },
-        style as ViewStyle,
+        style as StyleProp<ViewStyle>,
       ]}
       {...props}
     />