@draftbit/core 49.5.2-ace73d.2 → 49.5.2-e8f32c.2

package/src/deprecated-components/Card.tsx

@@ -12,10 +12,10 @@ import Image from "../components/Image";
 import Surface from "../components/Surface";
 import { Title, Subtitle, Caption } from "../components/Typography";
 
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import Config from "../components/Config";
 
-import type { ReadTheme } from "@draftbit/theme";
+import type { Theme } from "../styles/DefaultTheme";
 import type { IconSlot } from "../interfaces/Icon";
 
 const ICON_SIZE = Config.cardIconSize;
@@ -31,7 +31,7 @@ export const TopRightCircleIcon = withTheme(
     onPress,
   }: {
     icon: string;
-    theme: ReadTheme;
+    theme: Theme;
     onPress?: () => void;
   } & IconSlot) => {
     return (
@@ -61,11 +61,7 @@ export const TopRightCircleIcon = withTheme(
             ];
           }}
         >
-          <Icon
-            name={icon}
-            size={ICON_SIZE}
-            color={theme.colors.background.brand}
-          />
+          <Icon name={icon} size={ICON_SIZE} color={theme.colors.surface} />
         </Pressable>
       </Surface>
     );
@@ -82,7 +78,7 @@ type Props = {
   aspectRatio?: number;
   elevation?: number;
   numColumns?: number;
-  theme: ReadTheme;
+  theme: Theme;
   titleStyle?: StyleProp<TextStyle>;
   subtitleStyle?: StyleProp<TextStyle>;
   descriptionStyle?: StyleProp<TextStyle>;
@@ -120,7 +116,7 @@ const Card: React.FC<React.PropsWithChildren<Props>> = ({
     ...styles
   } = StyleSheet.flatten(style || {});
 
-  const backgroundColor = bgColor ? bgColor : theme.colors.background.brand;
+  const backgroundColor = bgColor ? bgColor : theme.colors.surface;
   const innerPadding = padding ? padding : 12;
 
   return (

package/src/deprecated-components/CheckboxGroup.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { View, StyleProp, ViewStyle } from "react-native";
-import type { ReadTheme } from "@draftbit/theme";
+import type { Theme } from "../styles/DefaultTheme";
 import {
   checkboxGroupContext,
   Direction,
@@ -11,7 +11,7 @@ export interface CheckboxGroupProps {
   style?: StyleProp<ViewStyle>;
   values: string[];
   onValueChange: (value: string, selected: boolean) => void;
-  theme: ReadTheme;
+  theme: Theme;
   children: React.ReactNode;
 }
 

package/src/deprecated-components/Container.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { View, ImageBackground, StyleSheet, } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import Elevation from "../components/Elevation";
 /**
  * @deprecated DEPRECATED

package/src/deprecated-components/Container.js.map

@@ -1 +1 @@
-{"version":3,"file":"Container.js","sourceRoot":"","sources":["Container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,IAAI,EACJ,eAAe,EAGf,UAAU,GAEX,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAwBhD;;GAEG;AACH,MAAM,SAAS,GAA6C,CAAC,EAC3D,qBAAqB,EACrB,WAAW,EACX,WAAW,EACX,eAAe,EACf,eAAe,EACf,yBAAyB,EACzB,SAAS,EACT,KAAK,EACL,QAAQ,EACR,KAAK,EAAE,wDAAwD;AAC/D,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,EACJ,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,UAAU,EACV,aAAa,EACb,YAAY,EACZ,cAAc,EACd,UAAU,EACV,OAAO,EACP,UAAU,EACV,aAAa,EACb,WAAW,EACX,YAAY,EACZ,eAAe,EACf,iBAAiB,EACjB,GAAG,SAAS,EACb,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAEpC,MAAM,cAAc,GAAyB;QAC3C,eAAe;QACf,WAAW;QACX,WAAW;QACX,KAAK,EAAE,MAAM;QACb,GAAG,SAAS;KACb,CAAC;IAEF,MAAM,UAAU,GAAyB;QACvC,IAAI;QACJ,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,UAAU;QACV,aAAa;QACb,YAAY;QACZ,cAAc;QACd,UAAU;QACV,OAAO;QACP,UAAU;QACV,aAAa;QACb,WAAW;QACX,YAAY;QACZ,eAAe;QACf,iBAAiB,EAAE,iBAAiB,IAAI,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KACvE,CAAC;IAEF,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IAE1C,IAAI,SAAS;QAAE,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC;IAEpD,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,cAAc,EAAE,KAAK,CAAC,KAAM,IAAI,IAC3C,eAAe,CAAC,CAAC,CAAC,CACjB,oBAAC,eAAe,IACd,MAAM,EACJ,OAAO,eAAe,KAAK,QAAQ;YACjC,CAAC,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE;YAC1B,CAAC,CAAC,eAAe,EAErB,UAAU,EAAE,yBAAyB,EACrC,KAAK,EAAE;YACL,IAAI,EAAE,CAAC;SACR;QAED,oBAAC,IAAI,IAAC,KAAK,EAAE,UAAU,IAAG,QAAQ,CAAQ,CAC1B,CACnB,CAAC,CAAC,CAAC,CACF,oBAAC,IAAI,IAAC,KAAK,EAAE,UAAU,IAAG,QAAQ,CAAQ,CAC3C,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"Container.js","sourceRoot":"","sources":["Container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,IAAI,EACJ,eAAe,EAGf,UAAU,GAEX,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAwBhD;;GAEG;AACH,MAAM,SAAS,GAA6C,CAAC,EAC3D,qBAAqB,EACrB,WAAW,EACX,WAAW,EACX,eAAe,EACf,eAAe,EACf,yBAAyB,EACzB,SAAS,EACT,KAAK,EACL,QAAQ,EACR,KAAK,EAAE,wDAAwD;AAC/D,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,EACJ,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,UAAU,EACV,aAAa,EACb,YAAY,EACZ,cAAc,EACd,UAAU,EACV,OAAO,EACP,UAAU,EACV,aAAa,EACb,WAAW,EACX,YAAY,EACZ,eAAe,EACf,iBAAiB,EACjB,GAAG,SAAS,EACb,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAEpC,MAAM,cAAc,GAAyB;QAC3C,eAAe;QACf,WAAW;QACX,WAAW;QACX,KAAK,EAAE,MAAM;QACb,GAAG,SAAS;KACb,CAAC;IAEF,MAAM,UAAU,GAAyB;QACvC,IAAI;QACJ,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,UAAU;QACV,aAAa;QACb,YAAY;QACZ,cAAc;QACd,UAAU;QACV,OAAO;QACP,UAAU;QACV,aAAa;QACb,WAAW;QACX,YAAY;QACZ,eAAe;QACf,iBAAiB,EAAE,iBAAiB,IAAI,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KACvE,CAAC;IAEF,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IAE1C,IAAI,SAAS;QAAE,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC;IAEpD,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,cAAc,EAAE,KAAK,CAAC,KAAM,IAAI,IAC3C,eAAe,CAAC,CAAC,CAAC,CACjB,oBAAC,eAAe,IACd,MAAM,EACJ,OAAO,eAAe,KAAK,QAAQ;YACjC,CAAC,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE;YAC1B,CAAC,CAAC,eAAe,EAErB,UAAU,EAAE,yBAAyB,EACrC,KAAK,EAAE;YACL,IAAI,EAAE,CAAC;SACR;QAED,oBAAC,IAAI,IAAC,KAAK,EAAE,UAAU,IAAG,QAAQ,CAAQ,CAC1B,CACnB,CAAC,CAAC,CAAC,CACF,oBAAC,IAAI,IAAC,KAAK,EAAE,UAAU,IAAG,QAAQ,CAAQ,CAC3C,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,SAAS,CAAC,CAAC"}

package/src/deprecated-components/Container.tsx

@@ -7,10 +7,10 @@ import {
   StyleSheet,
   ViewStyle,
 } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 
 import Elevation from "../components/Elevation";
-import type { ReadTheme } from "@draftbit/theme";
+import type { Theme } from "../styles/DefaultTheme";
 
 type ResizeModeType =
   | "cover"
@@ -21,7 +21,7 @@ type ResizeModeType =
   | undefined;
 
 type Props = {
-  theme: ReadTheme;
+  theme: Theme;
   useThemeGutterPadding: boolean;
   borderColor: string;
   borderWidth: number;

package/src/deprecated-components/DeprecatedButton.js

@@ -3,26 +3,26 @@ import { ActivityIndicator, View, Text, StyleSheet, Pressable, } from "react-nat
 import color from "color";
 import Config from "../components/Config";
 import Elevation from "../components/Elevation";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 /**
  * @deprecated DEPRECATED
  */
-const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false, labelColor, color: colorOverride, children, onPress, elevation = 0, theme: { colors, typography }, ...rest }) => {
+const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false, labelColor, color: colorOverride, children, onPress, elevation = 0, theme: { colors, disabledOpacity, roundness, typography }, ...rest }) => {
     let backgroundColor, borderColor, textColor, borderWidth;
-    const buttonColor = colorOverride || colors.branding.primary;
+    const buttonColor = colorOverride || colors.primary;
     if (type === "solid") {
         backgroundColor = buttonColor;
         if (disabled) {
-            textColor = color(colors.background.brand).alpha(0.5).rgb().string();
+            textColor = color(colors.surface).alpha(disabledOpacity).rgb().string();
         }
         else {
-            textColor = labelColor || colors.background.brand;
+            textColor = labelColor || colors.surface;
         }
     }
     else {
         backgroundColor = "transparent";
         if (disabled) {
-            textColor = color(buttonColor).alpha(0.5).rgb().string();
+            textColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
         }
         else {
             textColor = labelColor || buttonColor;
@@ -30,7 +30,7 @@ const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false,
     }
     if (type === "outline") {
         if (disabled) {
-            borderColor = color(buttonColor).alpha(0.5).rgb().string();
+            borderColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
         }
         else {
             borderColor = buttonColor;
@@ -45,7 +45,7 @@ const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false,
         backgroundColor,
         borderColor,
         borderWidth,
-        borderRadius: 8,
+        borderRadius: roundness,
     };
     const textStyle = {
         textAlign: "center",

package/src/deprecated-components/DeprecatedButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeprecatedButton.js","sourceRoot":"","sources":["DeprecatedButton.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"DeprecatedButton.js","sourceRoot":"","sources":["DeprecatedButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,iBAAiB,EACjB,IAAI,EACJ,IAAI,EACJ,UAAU,EAIV,SAAS,GAEV,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAqDvC;;GAEG;AACH,MAAM,MAAM,GAA6C,CAAC,EACxD,IAAI,EACJ,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,IAAI,GAAG,OAAO,EACd,OAAO,GAAG,KAAK,EACf,UAAU,EACV,KAAK,EAAE,aAAa,EACpB,QAAQ,EACR,OAAO,EACP,SAAS,GAAG,CAAC,EACb,KAAK,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,EACzD,GAAG,IAAI,EACR,EAAE,EAAE;IACH,IAAI,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC;IACzD,MAAM,WAAW,GAAG,aAAa,IAAI,MAAM,CAAC,OAAO,CAAC;IAEpD,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,eAAe,GAAG,WAAW,CAAC;QAE9B,IAAI,QAAQ,EAAE;YACZ,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;SACzE;aAAM;YACL,SAAS,GAAG,UAAU,IAAI,MAAM,CAAC,OAAO,CAAC;SAC1C;KACF;SAAM;QACL,eAAe,GAAG,aAAa,CAAC;QAEhC,IAAI,QAAQ,EAAE;YACZ,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;SACtE;aAAM;YACL,SAAS,GAAG,UAAU,IAAI,WAAW,CAAC;SACvC;KACF;IAED,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,IAAI,QAAQ,EAAE;YACZ,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;SACxE;aAAM;YACL,WAAW,GAAG,WAAW,CAAC;SAC3B;QACD,WAAW,GAAG,UAAU,CAAC,aAAa,CAAC;KACxC;SAAM;QACL,WAAW,GAAG,aAAa,CAAC;QAC5B,WAAW,GAAG,CAAC,CAAC;KACjB;IAED,MAAM,WAAW,GAAG;QAClB,eAAe;QACf,WAAW;QACX,WAAW;QACX,YAAY,EAAE,SAAS;KACxB,CAAC;IAEF,MAAM,SAAS,GAAyB;QACtC,SAAS,EAAE,QAAQ;QACnB,KAAK,EAAE,SAAS;QAChB,cAAc,EAAE,EAAE;QAClB,gBAAgB,EAAE,EAAE;KACrB,CAAC;IAEF,MAAM,SAAS,GAAG;QAChB,MAAM,CAAC,IAAI;QACX;YACE,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,CAAC,CAAC;YACf,KAAK,EAAE,MAAM,CAAC,cAAc;SAC7B;KACF,CAAC;IAEF,OAAO,CACL,oBAAC,SAAS,IAAC,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;QACnD,oBAAC,SAAS,OACJ,IAAI,EACR,OAAO,EAAE,OAAO,EAChB,kBAAkB,EAAE,EAAE,QAAQ,EAAE,EAChC,iBAAiB,EAAC,QAAQ,EAC1B,QAAQ,EAAE,QAAQ,IAAI,OAAO,EAC7B,KAAK,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;YAEnC,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,OAAO;gBACxB,IAAI,IAAI,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAC1B,oBAAC,IAAI,IAAC,KAAK,EAAE,SAAS;oBACpB,oBAAC,IAAI,IACH,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,CAAC,cAAc,EAC3B,KAAK,EAAE,SAAS,GAChB,CACG,CACR,CAAC,CAAC,CAAC,IAAI;gBACP,OAAO,CAAC,CAAC,CAAC,CACT,oBAAC,iBAAiB,IAChB,IAAI,EAAC,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,GAChB,CACH,CAAC,CAAC,CAAC,IAAI;gBACR,oBAAC,IAAI,IAAC,aAAa,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,IAC1D,QAAQ,CACJ,CACF,CACG,CACF,CACb,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE;QACN,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,OAAO;KACrB;IACD,OAAO,EAAE;QACP,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB;IACD,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC,cAAc;KAC7B;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC,MAAM,CAAC,CAAC"}

package/src/deprecated-components/DeprecatedButton.tsx

@@ -13,9 +13,9 @@ import {
 import color from "color";
 import Config from "../components/Config";
 import Elevation from "../components/Elevation";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 
-import type { ReadTheme } from "@draftbit/theme";
+import type { Theme } from "../styles/DefaultTheme";
 import type { IconSlot } from "../interfaces/Icon";
 
 /**
@@ -62,7 +62,7 @@ type Props = {
   onPress: () => void;
   elevation?: number;
   style?: StyleProp<ViewStyle>;
-  theme: ReadTheme;
+  theme: Theme;
 } & PressableProps &
   IconSlot;
 
@@ -80,25 +80,25 @@ const Button: React.FC<React.PropsWithChildren<Props>> = ({
   children,
   onPress,
   elevation = 0,
-  theme: { colors, typography },
+  theme: { colors, disabledOpacity, roundness, typography },
   ...rest
 }) => {
   let backgroundColor, borderColor, textColor, borderWidth;
-  const buttonColor = colorOverride || colors.branding.primary;
+  const buttonColor = colorOverride || colors.primary;
 
   if (type === "solid") {
     backgroundColor = buttonColor;
 
     if (disabled) {
-      textColor = color(colors.background.brand).alpha(0.5).rgb().string();
+      textColor = color(colors.surface).alpha(disabledOpacity).rgb().string();
     } else {
-      textColor = labelColor || colors.background.brand;
+      textColor = labelColor || colors.surface;
     }
   } else {
     backgroundColor = "transparent";
 
     if (disabled) {
-      textColor = color(buttonColor).alpha(0.5).rgb().string();
+      textColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
     } else {
       textColor = labelColor || buttonColor;
     }
@@ -106,7 +106,7 @@ const Button: React.FC<React.PropsWithChildren<Props>> = ({
 
   if (type === "outline") {
     if (disabled) {
-      borderColor = color(buttonColor).alpha(0.5).rgb().string();
+      borderColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
     } else {
       borderColor = buttonColor;
     }
@@ -120,7 +120,7 @@ const Button: React.FC<React.PropsWithChildren<Props>> = ({
     backgroundColor,
     borderColor,
     borderWidth,
-    borderRadius: 8,
+    borderRadius: roundness,
   };
 
   const textStyle: StyleProp<TextStyle> = {

package/src/deprecated-components/DeprecatedCardWrapper.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import Touchable from "../components/Touchable";
 const getWidth = (numColumns) => {
     switch (numColumns) {

package/src/deprecated-components/DeprecatedCardWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeprecatedCardWrapper.js","sourceRoot":"","sources":["DeprecatedCardWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAYhD,MAAM,QAAQ,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtC,QAAQ,UAAU,EAAE;QAClB,KAAK,CAAC;YACJ,OAAO,KAAK,CAAC;QACf,KAAK,CAAC;YACJ,OAAO,KAAK,CAAC;QACf;YACE,OAAO,MAAM,CAAC;KACjB;AACH,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,IAAI,GAA6C,CAAC,EACtD,UAAU,GAAG,CAAC,EACd,QAAQ,EACR,OAAO,EACP,KAAK,EACL,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;IACnC,OAAO,CACL,oBAAC,SAAS,IACR,QAAQ,EAAE,CAAC,OAAO,EAClB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,KACrB,IAAI,IAEP,QAAQ,CACC,CACb,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"DeprecatedCardWrapper.js","sourceRoot":"","sources":["DeprecatedCardWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAYhD,MAAM,QAAQ,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtC,QAAQ,UAAU,EAAE;QAClB,KAAK,CAAC;YACJ,OAAO,KAAK,CAAC;QACf,KAAK,CAAC;YACJ,OAAO,KAAK,CAAC;QACf;YACE,OAAO,MAAM,CAAC;KACjB;AACH,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,IAAI,GAA6C,CAAC,EACtD,UAAU,GAAG,CAAC,EACd,QAAQ,EACR,OAAO,EACP,KAAK,EACL,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;IACnC,OAAO,CACL,oBAAC,SAAS,IACR,QAAQ,EAAE,CAAC,OAAO,EAClB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,KACrB,IAAI,IAEP,QAAQ,CACC,CACb,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,IAAI,CAAC,CAAC"}

package/src/deprecated-components/DeprecatedCardWrapper.tsx

@@ -1,15 +1,15 @@
 import React from "react";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import Touchable from "../components/Touchable";
 import { StyleProp, ViewStyle } from "react-native";
-import type { ReadTheme } from "@draftbit/theme";
+import theme from "../styles/DefaultTheme";
 
 type Props = {
   numColumns?: number;
   children?: React.ReactNode;
   onPress?: () => void;
   style?: StyleProp<ViewStyle>;
-  theme: ReadTheme;
+  theme: typeof theme;
 };
 
 const getWidth = (numColumns: number) => {

package/src/deprecated-components/DeprecatedFAB.js

@@ -4,26 +4,26 @@ import color from "color";
 import Config from "../components/Config";
 import Text from "../components/Text";
 import Elevation from "../components/Elevation";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 /**
  * @deprecated DEPRECATED
  */
-const FAB = ({ Icon, icon, disabled = false, type = "solid", loading = false, color: colorOverride, label, onPress, elevation = 0, style, theme: { colors, typography }, ...rest }) => {
+const FAB = ({ Icon, icon, disabled = false, type = "solid", loading = false, color: colorOverride, label, onPress, elevation = 0, style, theme: { colors, disabledOpacity, roundness, typography }, ...rest }) => {
     let backgroundColor, borderColor, textColor, borderWidth;
-    const buttonColor = colorOverride || colors.branding.primary;
+    const buttonColor = colorOverride || colors.primary;
     if (type === "standard" || type === "extended" || type === "fixed") {
         backgroundColor = buttonColor;
         if (disabled) {
-            textColor = color(colors.background.brand).alpha(0.5).rgb().string();
+            textColor = color(colors.surface).alpha(disabledOpacity).rgb().string();
         }
         else {
-            textColor = colors.background.brand;
+            textColor = colors.surface;
         }
     }
     else {
         backgroundColor = "transparent";
         if (disabled) {
-            textColor = color(buttonColor).alpha(0.5).rgb().string();
+            textColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
         }
         else {
             textColor = buttonColor;
@@ -31,7 +31,7 @@ const FAB = ({ Icon, icon, disabled = false, type = "solid", loading = false, co
     }
     if (type === "outline") {
         if (disabled) {
-            borderColor = color(buttonColor).alpha(0.5).rgb().string();
+            borderColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
         }
         else {
             borderColor = buttonColor;
@@ -46,7 +46,7 @@ const FAB = ({ Icon, icon, disabled = false, type = "solid", loading = false, co
         backgroundColor,
         borderColor,
         borderWidth,
-        borderRadius: 8,
+        borderRadius: roundness,
         alignItems: "center",
         justifyContent: "center",
     };

package/src/deprecated-components/DeprecatedFAB.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeprecatedFAB.js","sourceRoot":"","sources":["DeprecatedFAB.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"DeprecatedFAB.js","sourceRoot":"","sources":["DeprecatedFAB.tsx"],"names":[],"mappings":"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"}

package/src/deprecated-components/DeprecatedFAB.tsx

@@ -13,9 +13,9 @@ import color from "color";
 import Config from "../components/Config";
 import Text from "../components/Text";
 import Elevation from "../components/Elevation";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 
-import type { ReadTheme } from "@draftbit/theme";
+import type { Theme } from "../styles/DefaultTheme";
 import type { IconSlot } from "../interfaces/Icon";
 
 /**
@@ -63,7 +63,7 @@ type Props = {
   label?: string;
   onPress: () => void;
   elevation?: number;
-  theme: ReadTheme;
+  theme: Theme;
   style?: StyleProp<ViewStyle>;
 } & PressableProps &
   IconSlot;
@@ -82,25 +82,25 @@ const FAB: React.FC<React.PropsWithChildren<Props>> = ({
   onPress,
   elevation = 0,
   style,
-  theme: { colors, typography },
+  theme: { colors, disabledOpacity, roundness, typography },
   ...rest
 }) => {
   let backgroundColor, borderColor, textColor, borderWidth;
-  const buttonColor = colorOverride || colors.branding.primary;
+  const buttonColor = colorOverride || colors.primary;
 
   if (type === "standard" || type === "extended" || type === "fixed") {
     backgroundColor = buttonColor;
 
     if (disabled) {
-      textColor = color(colors.background.brand).alpha(0.5).rgb().string();
+      textColor = color(colors.surface).alpha(disabledOpacity).rgb().string();
     } else {
-      textColor = colors.background.brand;
+      textColor = colors.surface;
     }
   } else {
     backgroundColor = "transparent";
 
     if (disabled) {
-      textColor = color(buttonColor).alpha(0.5).rgb().string();
+      textColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
     } else {
       textColor = buttonColor;
     }
@@ -108,7 +108,7 @@ const FAB: React.FC<React.PropsWithChildren<Props>> = ({
 
   if (type === "outline") {
     if (disabled) {
-      borderColor = color(buttonColor).alpha(0.5).rgb().string();
+      borderColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
     } else {
       borderColor = buttonColor;
     }
@@ -122,7 +122,7 @@ const FAB: React.FC<React.PropsWithChildren<Props>> = ({
     backgroundColor,
     borderColor,
     borderWidth,
-    borderRadius: 8,
+    borderRadius: roundness,
     alignItems: "center",
     justifyContent: "center",
   };

package/src/deprecated-components/FAB.js

@@ -1,11 +1,11 @@
 import * as React from "react";
 import { View, StyleSheet, Pressable, ActivityIndicator, Platform, } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 /**
  * @deprecated DEPRECATED
  */
 const FAB = ({ onPress, disabled, loading, iconName = "MaterialIcons/add", style, theme, iconColor, bgColor, size = 50, Icon, ...props }) => {
-    const backgroundColor = bgColor || theme.colors.branding.primary;
+    const backgroundColor = bgColor || theme.colors.primary;
     const color = iconColor || "#FFF";
     return (React.createElement(View, { style: [
             {

package/src/deprecated-components/FAB.js.map

@@ -1 +1 @@
-{"version":3,"file":"FAB.js","sourceRoot":"","sources":["FAB.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,IAAI,EACJ,UAAU,EACV,SAAS,EACT,iBAAiB,EAIjB,QAAQ,GACT,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAiB5C;;GAEG;AACH,MAAM,GAAG,GAA6C,CAAC,EACrD,OAAO,EACP,QAAQ,EACR,OAAO,EACP,QAAQ,GAAG,mBAAmB,EAC9B,KAAK,EACL,KAAK,EACL,SAAS,EACT,OAAO,EACP,IAAI,GAAG,EAAE,EACT,IAAI,EACJ,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,eAAe,GAAG,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjE,MAAM,KAAK,GAAG,SAAS,IAAI,MAAM,CAAC;IAElC,OAAO,CACL,oBAAC,IAAI,IACH,KAAK,EAAE;YACL;gBACE,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,IAAI,GAAG,CAAC;gBACtB,QAAQ,EAAE,QAAQ;aACnB;YACD,KAAK;SACN;QAED,oBAAC,SAAS,IACR,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,IAAI,QAAQ,EAC7B,cAAc,EAAE;gBACd,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,IAAI,GAAG,CAAC;aACjB,EACD,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;gBACrB,OAAO;oBACL,MAAM,CAAC,MAAM;oBACb;wBACE,OAAO,EAAE,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBACvC,KAAK,EAAE,IAAI;wBACX,MAAM,EAAE,IAAI;wBACZ,YAAY,EAAE,IAAI,GAAG,CAAC;wBACtB,eAAe;qBAChB;iBACF,CAAC;YACJ,CAAC,KACG,KAAK;YAET,oBAAC,IAAI,QACF,OAAO,CAAC,CAAC,CAAC,CACT,oBAAC,iBAAiB,IAChB,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAC9D,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EACpC,KAAK,EAAE,KAAK,GACZ,CACH,CAAC,CAAC,CAAC,CACF,oBAAC,IAAI,IAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAI,CACnD,CACI,CACG,CACP,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE;QACN,eAAe,EAAE,SAAS;QAC1B,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;QACpB,GAAG,QAAQ,CAAC,MAAM,CAAC;YACjB,GAAG,EAAE;gBACH,MAAM,EAAE,SAAS;gBACjB,UAAU,EAAE,MAAM;aACnB;SACF,CAAC;KACH;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"FAB.js","sourceRoot":"","sources":["FAB.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,IAAI,EACJ,UAAU,EACV,SAAS,EACT,iBAAiB,EAIjB,QAAQ,GACT,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAiBvC;;GAEG;AACH,MAAM,GAAG,GAA6C,CAAC,EACrD,OAAO,EACP,QAAQ,EACR,OAAO,EACP,QAAQ,GAAG,mBAAmB,EAC9B,KAAK,EACL,KAAK,EACL,SAAS,EACT,OAAO,EACP,IAAI,GAAG,EAAE,EACT,IAAI,EACJ,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,eAAe,GAAG,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IACxD,MAAM,KAAK,GAAG,SAAS,IAAI,MAAM,CAAC;IAElC,OAAO,CACL,oBAAC,IAAI,IACH,KAAK,EAAE;YACL;gBACE,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,IAAI,GAAG,CAAC;gBACtB,QAAQ,EAAE,QAAQ;aACnB;YACD,KAAK;SACN;QAED,oBAAC,SAAS,IACR,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,IAAI,QAAQ,EAC7B,cAAc,EAAE;gBACd,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,IAAI,GAAG,CAAC;aACjB,EACD,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;gBACrB,OAAO;oBACL,MAAM,CAAC,MAAM;oBACb;wBACE,OAAO,EAAE,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBACvC,KAAK,EAAE,IAAI;wBACX,MAAM,EAAE,IAAI;wBACZ,YAAY,EAAE,IAAI,GAAG,CAAC;wBACtB,eAAe;qBAChB;iBACF,CAAC;YACJ,CAAC,KACG,KAAK;YAET,oBAAC,IAAI,QACF,OAAO,CAAC,CAAC,CAAC,CACT,oBAAC,iBAAiB,IAChB,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAC9D,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EACpC,KAAK,EAAE,KAAK,GACZ,CACH,CAAC,CAAC,CAAC,CACF,oBAAC,IAAI,IAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAI,CACnD,CACI,CACG,CACP,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE;QACN,eAAe,EAAE,SAAS;QAC1B,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;QACpB,GAAG,QAAQ,CAAC,MAAM,CAAC;YACjB,GAAG,EAAE;gBACH,MAAM,EAAE,SAAS;gBACjB,UAAU,EAAE,MAAM;aACnB;SACF,CAAC;KACH;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC,GAAG,CAAC,CAAC"}

package/src/deprecated-components/FAB.tsx

@@ -9,8 +9,8 @@ import {
   PressableProps,
   Platform,
 } from "react-native";
-import { withTheme } from "@draftbit/theme";
-import type { ReadTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
+import type { Theme } from "../styles/DefaultTheme";
 import type { IconSlot } from "../interfaces/Icon";
 
 type Props = {
@@ -21,7 +21,7 @@ type Props = {
   iconColor?: string;
   iconName?: string;
   onPress: () => void;
-  theme: ReadTheme;
+  theme: Theme;
   style?: StyleProp<ViewStyle>;
 } & PressableProps &
   IconSlot;
@@ -42,7 +42,7 @@ const FAB: React.FC<React.PropsWithChildren<Props>> = ({
   Icon,
   ...props
 }) => {
-  const backgroundColor = bgColor || theme.colors.branding.primary;
+  const backgroundColor = bgColor || theme.colors.primary;
   const color = iconColor || "#FFF";
 
   return (

package/src/deprecated-components/FieldSearchBarFull.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { View, TextInput, StyleSheet, } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import Config from "../components/Config";
 /**
  * @deprecated DEPRECATED
@@ -38,11 +38,11 @@ const FieldSearchBarFull = ({ showIcon, Icon, icon = "search", placeholder = "",
         }
     };
     return (React.createElement(View, { style: [styles.container, style] },
-        showIcon && (React.createElement(Icon, { name: icon, size: Config.fieldSearchBarFullIconSize, color: focused ? colors.branding.primary : colors.foreground.brand })),
+        showIcon && (React.createElement(Icon, { name: icon, size: Config.fieldSearchBarFullIconSize, color: focused ? colors.primary : colors.light })),
         React.createElement(View, { style: { marginLeft: showIcon ? 12 : 0, flex: 1 } },
-            React.createElement(TextInput, { clearButtonMode: "while-editing", placeholder: placeholder, value: internalValue, onBlur: onBlur, onFocus: onFocus, onChangeText: handleChangeText, onSubmitEditing: onSubmit, placeholderTextColor: colors.foreground.brand, style: [
+            React.createElement(TextInput, { clearButtonMode: "while-editing", placeholder: placeholder, value: internalValue, onBlur: onBlur, onFocus: onFocus, onChangeText: handleChangeText, onSubmitEditing: onSubmit, placeholderTextColor: colors.light, style: [
                     {
-                        color: colors.text.medium,
+                        color: colors.medium,
                     },
                     typeStyles,
                 ] }))));

package/src/deprecated-components/FieldSearchBarFull.js.map

@@ -1 +1 @@
-{"version":3,"file":"FieldSearchBarFull.js","sourceRoot":"","sources":["FieldSearchBarFull.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"FieldSearchBarFull.js","sourceRoot":"","sources":["FieldSearchBarFull.tsx"],"names":[],"mappings":"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"}

package/src/deprecated-components/FieldSearchBarFull.tsx

@@ -8,8 +8,8 @@ import {
   NativeSyntheticEvent,
   TextInputSubmitEditingEventData,
 } from "react-native";
-import { withTheme } from "@draftbit/theme";
-import type { ReadTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
+import type { Theme } from "../styles/DefaultTheme";
 import type { IconSlot } from "../interfaces/Icon";
 import Config from "../components/Config";
 
@@ -18,7 +18,7 @@ type Props = {
   icon?: string;
   placeholder?: string;
   style?: StyleProp<ViewStyle>;
-  theme: ReadTheme;
+  theme: Theme;
   onChange?: (text: string) => void;
   onSubmit?: (e: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void;
   value?: string;
@@ -94,7 +94,7 @@ const FieldSearchBarFull: React.FC<React.PropsWithChildren<Props>> = ({
         <Icon
           name={icon}
           size={Config.fieldSearchBarFullIconSize}
-          color={focused ? colors.branding.primary : colors.foreground.brand}
+          color={focused ? colors.primary : colors.light}
         />
       )}
       <View style={{ marginLeft: showIcon ? 12 : 0, flex: 1 }}>
@@ -106,10 +106,10 @@ const FieldSearchBarFull: React.FC<React.PropsWithChildren<Props>> = ({
           onFocus={onFocus}
           onChangeText={handleChangeText}
           onSubmitEditing={onSubmit}
-          placeholderTextColor={colors.foreground.brand}
+          placeholderTextColor={colors.light}
           style={[
             {
-              color: colors.text.medium,
+              color: colors.medium,
             },
             typeStyles,
           ]}

package/src/deprecated-components/ProgressCircle.js

@@ -1,14 +1,14 @@
 import * as React from "react";
 import { Text } from "react-native";
 import AnimatedCircularProgress from "./AnimatedCircularProgress";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 /**
  * @deprecated DEPRECATED
  */
 const ProgressCircle = ({ progress = 0.5, style, color = "primary", size = 100, showsText = true, unfilledColor, strokeCap = "butt", textStyle, thickness = 1, theme, }) => {
     const progressNum = Math.round(progress * 100);
-    const tintColor = color || theme.colors.branding.primary;
-    const backgroundColor = unfilledColor || theme.colors.branding.secondary;
+    const tintColor = color || theme.colors.primary;
+    const backgroundColor = unfilledColor || theme.colors.secondary;
     return (React.createElement(AnimatedCircularProgress, { size: size, width: thickness, backgroundWidth: thickness, fill: progressNum, tintColor: tintColor, backgroundColor: backgroundColor, rotation: 0, lineCap: strokeCap, style: style }, (fill) => showsText ? (React.createElement(Text, { style: [{ fontSize: size * 0.275, color: tintColor }, textStyle] },
         Math.round(fill),
         "%")) : null));

package/src/deprecated-components/ProgressCircle.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProgressCircle.js","sourceRoot":"","sources":["ProgressCircle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAmC,MAAM,cAAc,CAAC;AACrE,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAgB5C;;GAEG;AACH,MAAM,cAAc,GAA6C,CAAC,EAChE,QAAQ,GAAG,GAAG,EACd,KAAK,EACL,KAAK,GAAG,SAAS,EACjB,IAAI,GAAG,GAAG,EACV,SAAS,GAAG,IAAI,EAChB,aAAa,EACb,SAAS,GAAG,MAAM,EAClB,SAAS,EACT,SAAS,GAAG,CAAC,EACb,KAAK,GACN,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;IAE/C,MAAM,SAAS,GAAG,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzD,MAAM,eAAe,GAAG,aAAa,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;IAEzE,OAAO,CACL,oBAAC,wBAAwB,IACvB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,SAAS,EAChB,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,CAAC,EACX,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,IAGX,CAAC,IAAI,EAAE,EAAE,CACR,SAAS,CAAC,CAAC,CAAC,CACV,oBAAC,IAAI,IACH,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,GAAG,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC;QAE/D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACZ,CACR,CAAC,CAAC,CAAC,IAAI,CAEe,CAC5B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,cAAc,CAAC,CAAC"}
+{"version":3,"file":"ProgressCircle.js","sourceRoot":"","sources":["ProgressCircle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAmC,MAAM,cAAc,CAAC;AACrE,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAiBvC;;GAEG;AACH,MAAM,cAAc,GAA6C,CAAC,EAChE,QAAQ,GAAG,GAAG,EACd,KAAK,EACL,KAAK,GAAG,SAAS,EACjB,IAAI,GAAG,GAAG,EACV,SAAS,GAAG,IAAI,EAChB,aAAa,EACb,SAAS,GAAG,MAAM,EAClB,SAAS,EACT,SAAS,GAAG,CAAC,EACb,KAAK,GACN,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;IAE/C,MAAM,SAAS,GAAG,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IAChD,MAAM,eAAe,GAAG,aAAa,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC;IAEhE,OAAO,CACL,oBAAC,wBAAwB,IACvB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,SAAS,EAChB,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,CAAC,EACX,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,IAGX,CAAC,IAAI,EAAE,EAAE,CACR,SAAS,CAAC,CAAC,CAAC,CACV,oBAAC,IAAI,IACH,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,GAAG,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC;QAE/D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACZ,CACR,CAAC,CAAC,CAAC,IAAI,CAEe,CAC5B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,cAAc,CAAC,CAAC"}

package/src/deprecated-components/ProgressCircle.tsx

@@ -1,20 +1,21 @@
 import * as React from "react";
 import { Text, StyleProp, ViewStyle, TextStyle } from "react-native";
 import AnimatedCircularProgress from "./AnimatedCircularProgress";
-import { withTheme } from "@draftbit/theme";
-import type { ReadTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
+import themeT from "../styles/DefaultTheme";
+import { colorTypes } from "@draftbit/types";
 
 type Props = {
   progress?: number;
   style?: StyleProp<ViewStyle>;
-  color?: string;
+  color?: colorTypes;
   size?: number;
   showsText?: boolean;
-  unfilledColor?: string;
+  unfilledColor?: colorTypes;
   strokeCap?: "butt" | "square" | "round" | undefined;
   textStyle?: StyleProp<TextStyle>;
   thickness?: number;
-  theme: ReadTheme;
+  theme: typeof themeT;
 };
 
 /**
@@ -34,8 +35,8 @@ const ProgressCircle: React.FC<React.PropsWithChildren<Props>> = ({
 }) => {
   const progressNum = Math.round(progress * 100);
 
-  const tintColor = color || theme.colors.branding.primary;
-  const backgroundColor = unfilledColor || theme.colors.branding.secondary;
+  const tintColor = color || theme.colors.primary;
+  const backgroundColor = unfilledColor || theme.colors.secondary;
 
   return (
     <AnimatedCircularProgress