@draftbit/core 50.1.2 → 50.1.3-46a10c.2

package/src/deprecated-components/AccordionItem.tsx

@@ -10,15 +10,15 @@ import {
 import Text from "../components/Text";
 import type { IconSlot } from "../interfaces/Icon";
 import { extractStyles } from "../utilities";
-import { withTheme } from "../theming";
-import type { Theme } from "../styles/DefaultTheme";
+import { withTheme } from "@draftbit/theme";
+import type { ReadTheme } from "@draftbit/theme";
 
 type Props = {
   icon?: string;
   label: string;
   iconColor?: string;
   style?: StyleProp<ViewStyle>;
-  theme: Theme;
+  theme: ReadTheme;
 } & IconSlot;
 
 /**
@@ -42,7 +42,7 @@ const AccordionItem = ({
           <Icon
             name={icon}
             size={24}
-            color={iconColor || theme.colors.primary}
+            color={iconColor || theme.colors.branding.primary}
           />
         ) : null}
         <View style={[styles.item, styles.content]}>

package/src/deprecated-components/AvatarEdit.js

@@ -2,15 +2,15 @@ import * as React from "react";
 import { View } from "react-native";
 import Touchable from "../components/Touchable";
 import CircleImage from "./CircleImage";
-import { withTheme } from "../theming";
+import { withTheme } from "@draftbit/theme";
 /**
  * @deprecated DEPRECATED
  */
 const AvatarEdit = ({ Icon, image, size = 80, onPress = () => { }, style, theme, ...rest }) => {
     const colorStyles = {
-        editBackgroundColor: theme.colors.primary,
-        editIconColor: theme.colors.surface,
-        editBorderColor: theme.colors.surface,
+        editBackgroundColor: theme.colors.branding.primary,
+        editIconColor: theme.colors.background.brand,
+        editBorderColor: theme.colors.background.brand,
     };
     const dimensions = {
         width: size,

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

@@ -1 +1 @@
-{"version":3,"file":"AvatarEdit.js","sourceRoot":"","sources":["AvatarEdit.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAA6C,MAAM,cAAc,CAAC;AAC/E,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAavC;;GAEG;AACH,MAAM,UAAU,GAA6C,CAAC,EAC5D,IAAI,EACJ,KAAK,EACL,IAAI,GAAG,EAAE,EACT,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,EAClB,KAAK,EACL,KAAK,EACL,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,WAAW,GAAG;QAClB,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO;QACzC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO;QACnC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO;KACtC,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;KACb,CAAC;IAEF,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,KAAM,IAAI;QACxC,oBAAC,SAAS,IAAC,OAAO,EAAE,OAAO;YACzB,oBAAC,WAAW,IAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAI;YAC1C,oBAAC,IAAI,IACH,KAAK,EAAE;oBACL,QAAQ,EAAE,UAAU;oBACpB,GAAG,EAAE,CAAC,CAAC;oBACP,KAAK,EAAE,CAAC,CAAC;oBACT,WAAW,EAAE,WAAW,CAAC,eAAe;oBACxC,eAAe,EAAE,WAAW,CAAC,mBAAmB;oBAChD,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;oBAC7B,OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;iBACzB;gBAED,oBAAC,IAAI,IACH,IAAI,EAAC,oBAAoB,EACzB,KAAK,EAAE,WAAW,CAAC,aAAa,EAChC,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,GACrB,CACG,CACG,CACP,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"AvatarEdit.js","sourceRoot":"","sources":["AvatarEdit.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAA6C,MAAM,cAAc,CAAC;AAC/E,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAa5C;;GAEG;AACH,MAAM,UAAU,GAA6C,CAAC,EAC5D,IAAI,EACJ,KAAK,EACL,IAAI,GAAG,EAAE,EACT,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,EAClB,KAAK,EACL,KAAK,EACL,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,WAAW,GAAG;QAClB,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO;QAClD,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK;QAC5C,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK;KAC/C,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;KACb,CAAC;IAEF,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,KAAM,IAAI;QACxC,oBAAC,SAAS,IAAC,OAAO,EAAE,OAAO;YACzB,oBAAC,WAAW,IAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAI;YAC1C,oBAAC,IAAI,IACH,KAAK,EAAE;oBACL,QAAQ,EAAE,UAAU;oBACpB,GAAG,EAAE,CAAC,CAAC;oBACP,KAAK,EAAE,CAAC,CAAC;oBACT,WAAW,EAAE,WAAW,CAAC,eAAe;oBACxC,eAAe,EAAE,WAAW,CAAC,mBAAmB;oBAChD,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;oBAC7B,OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;iBACzB;gBAED,oBAAC,IAAI,IACH,IAAI,EAAC,oBAAoB,EACzB,KAAK,EAAE,WAAW,CAAC,aAAa,EAChC,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,GACrB,CACG,CACG,CACP,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,UAAU,CAAC,CAAC"}

package/src/deprecated-components/AvatarEdit.tsx

@@ -2,9 +2,9 @@ import * as React from "react";
 import { View, ImageSourcePropType, StyleProp, ViewStyle } from "react-native";
 import Touchable from "../components/Touchable";
 import CircleImage from "./CircleImage";
-import { withTheme } from "../theming";
+import { withTheme } from "@draftbit/theme";
 
-import type { Theme } from "../styles/DefaultTheme";
+import type { ReadTheme } from "@draftbit/theme";
 import type { IconSlot } from "../interfaces/Icon";
 
 type Props = {
@@ -12,7 +12,7 @@ type Props = {
   size?: number;
   onPress?: () => void;
   style?: StyleProp<ViewStyle>;
-  theme: Theme;
+  theme: ReadTheme;
 } & IconSlot;
 
 /**
@@ -28,9 +28,9 @@ const AvatarEdit: React.FC<React.PropsWithChildren<Props>> = ({
   ...rest
 }) => {
   const colorStyles = {
-    editBackgroundColor: theme.colors.primary,
-    editIconColor: theme.colors.surface,
-    editBorderColor: theme.colors.surface,
+    editBackgroundColor: theme.colors.branding.primary,
+    editIconColor: theme.colors.background.brand,
+    editBorderColor: theme.colors.background.brand,
   };
 
   const dimensions = {

package/src/deprecated-components/Banner.js

@@ -1,8 +1,7 @@
 import * as React from "react";
 import { Button, Text, View, StyleSheet, Animated, } from "react-native";
 import Surface from "../components/Surface";
-import shadow from "../styles/shadow";
-import { withTheme } from "../theming";
+import { withTheme } from "@draftbit/theme";
 const ELEVATION = 1;
 const DEFAULT_MAX_WIDTH = 960;
 /**
@@ -51,7 +50,7 @@ const Banner = ({ initiallyVisible = true, dismissable = true, icon, buttonColor
     // However we can't animated banner's height directly as it'll also resize the content inside
     const height = Animated.multiply(position, layout.height);
     const translateY = Animated.multiply(Animated.add(position, -1), layout.height);
-    return (React.createElement(Surface, { ...rest, style: [styles.container, shadow(ELEVATION), style] },
+    return (React.createElement(Surface, { ...rest, style: [styles.container, style] },
         React.createElement(View, { style: [styles.wrapper, contentStyle] },
             React.createElement(Animated.View, { style: { height } }),
             React.createElement(Animated.View, { onLayout: handleLayout, style: [
@@ -70,9 +69,9 @@ const Banner = ({ initiallyVisible = true, dismissable = true, icon, buttonColor
                 React.createElement(View, { style: [styles.content, { marginBottom: dismissable ? 0 : 16 }] },
                     icon ? (React.createElement(View, { style: styles.icon },
                         React.createElement(Icon, { name: icon, size: 40 }))) : null,
-                    React.createElement(Text, { style: [styles.message, { color: theme.colors.text }], accessibilityLiveRegion: visible ? "polite" : "none", accessibilityRole: "alert" }, content)),
+                    React.createElement(Text, { style: [styles.message, { color: theme.colors.text.normal }], accessibilityLiveRegion: visible ? "polite" : "none", accessibilityRole: "alert" }, content)),
                 dismissable ? (React.createElement(View, { style: styles.actions },
-                    React.createElement(Button, { color: buttonColor || theme.colors.primary, title: "Close", onPress: () => setVisible(false) }))) : null))));
+                    React.createElement(Button, { color: buttonColor || theme.colors.branding.primary, title: "Close", onPress: () => setVisible(false) }))) : null))));
 };
 const styles = StyleSheet.create({
     container: {

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

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

package/src/deprecated-components/Banner.tsx

@@ -10,9 +10,8 @@ import {
 } from "react-native";
 import Surface from "../components/Surface";
 import type { IconSlot } from "../interfaces/Icon";
-import shadow from "../styles/shadow";
-import { withTheme } from "../theming";
-import type { Theme } from "../styles/DefaultTheme";
+import { withTheme } from "@draftbit/theme";
+import type { ReadTheme } from "@draftbit/theme";
 
 const ELEVATION = 1;
 const DEFAULT_MAX_WIDTH = 960;
@@ -29,7 +28,7 @@ type Props = {
   /**
    * @optional
    */
-  theme: Theme;
+  theme: ReadTheme;
 } & IconSlot;
 
 type NativeEvent = {
@@ -115,10 +114,7 @@ const Banner: React.FC<React.PropsWithChildren<Props>> = ({
   );
 
   return (
-    <Surface
-      {...rest}
-      style={[styles.container, shadow(ELEVATION) as ViewStyle, style]}
-    >
+    <Surface {...rest} style={[styles.container, style]}>
       <View style={[styles.wrapper, contentStyle]}>
         <Animated.View style={{ height }} />
         <Animated.View
@@ -146,7 +142,7 @@ const Banner: React.FC<React.PropsWithChildren<Props>> = ({
               </View>
             ) : null}
             <Text
-              style={[styles.message, { color: theme.colors.text }]}
+              style={[styles.message, { color: theme.colors.text.normal }]}
               accessibilityLiveRegion={visible ? "polite" : "none"}
               accessibilityRole="alert"
             >
@@ -156,7 +152,7 @@ const Banner: React.FC<React.PropsWithChildren<Props>> = ({
           {dismissable ? (
             <View style={styles.actions}>
               <Button
-                color={buttonColor || theme.colors.primary}
+                color={buttonColor || theme.colors.branding.primary}
                 title="Close"
                 onPress={() => setVisible(false)}
               />

package/src/deprecated-components/Card.js

@@ -3,7 +3,7 @@ import { StyleSheet, View, Pressable, } from "react-native";
 import Image from "../components/Image";
 import Surface from "../components/Surface";
 import { Title, Subtitle, Caption } from "../components/Typography";
-import { withTheme } from "../theming";
+import { withTheme } from "@draftbit/theme";
 import Config from "../components/Config";
 const ICON_SIZE = Config.cardIconSize;
 const ICON_CONTAINER_SIZE = Config.cardIconSize * 2;
@@ -30,14 +30,14 @@ export const TopRightCircleIcon = withTheme(({ Icon, icon, theme, onPress, }) =>
                     },
                 ];
             } },
-            React.createElement(Icon, { name: icon, size: ICON_SIZE, color: theme.colors.surface }))));
+            React.createElement(Icon, { name: icon, size: ICON_SIZE, color: theme.colors.background.brand }))));
 });
 /**
  * @deprecated DEPRECATED
  */
 const Card = ({ Icon, image = Config.cardImageUrl, title, subtitle, description, textCentered, icon, aspectRatio = 1.5, elevation = 2, style, onPress, onPressIcon, titleStyle, subtitleStyle, descriptionStyle, theme, children, }) => {
     const { backgroundColor: bgColor, padding, ...styles } = StyleSheet.flatten(style || {});
-    const backgroundColor = bgColor ? bgColor : theme.colors.surface;
+    const backgroundColor = bgColor ? bgColor : theme.colors.background.brand;
     const innerPadding = padding ? padding : 12;
     return (React.createElement(Surface, { style: [{ elevation, backgroundColor }, styles] },
         React.createElement(Pressable, { disabled: !onPress, onPress: onPress, style: ({ pressed }) => {

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

@@ -1 +1 @@
-{"version":3,"file":"Card.js","sourceRoot":"","sources":["Card.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Card.js","sourceRoot":"","sources":["Card.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,UAAU,EACV,IAAI,EAKJ,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAK1C,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC;AACtC,MAAM,mBAAmB,GAAG,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC;AACpD,MAAM,sBAAsB,GAAG,MAAM,CAAC,YAAY,GAAG,CAAC,GAAG,CAAC,CAAC;AAC3D,MAAM,cAAc,GAAG,MAAM,CAAC,iBAAiB,CAAC;AAEhD,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CACzC,CAAC,EACC,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,OAAO,GAKG,EAAE,EAAE;IACd,OAAO,CACL,oBAAC,OAAO,IACN,KAAK,EAAE;YACL,cAAc,EAAE,QAAQ;YACxB,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,cAAc;YACzB,QAAQ,EAAE,UAAU;YACpB,GAAG,EAAE,EAAE;YACP,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,mBAAmB;YAC1B,MAAM,EAAE,mBAAmB;YAC3B,OAAO,EAAE,sBAAsB;YAC/B,YAAY,EAAE,mBAAmB;YACjC,eAAe,EAAE,oBAAoB;SACtC;QAED,oBAAC,SAAS,IACR,QAAQ,EAAE,CAAC,OAAO,EAClB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;gBACrB,OAAO;oBACL;wBACE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;qBAC3B;iBACF,CAAC;YACJ,CAAC;YAED,oBAAC,IAAI,IACH,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,GACpC,CACQ,CACJ,CACX,CAAC;AACJ,CAAC,CACF,CAAC;AAsBF;;GAEG;AACH,MAAM,IAAI,GAA6C,CAAC,EACtD,IAAI,EACJ,KAAK,GAAG,MAAM,CAAC,YAAY,EAC3B,KAAK,EACL,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,IAAI,EACJ,WAAW,GAAG,GAAG,EACjB,SAAS,GAAG,CAAC,EACb,KAAK,EACL,OAAO,EACP,WAAW,EACX,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,EACJ,eAAe,EAAE,OAAO,EACxB,OAAO,EACP,GAAG,MAAM,EACV,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IAEpC,MAAM,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;IAC1E,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAE5C,OAAO,CACL,oBAAC,OAAO,IAAC,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE,MAAM,CAAC;QACtD,oBAAC,SAAS,IACR,QAAQ,EAAE,CAAC,OAAO,EAClB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;gBACrB,OAAO;oBACL;wBACE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;qBAC3B;iBACF,CAAC;YACJ,CAAC;YAED,oBAAC,KAAK,IACJ,KAAK,EAAE,EAAE,WAAW,EAAE,EACtB,MAAM,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,EAC1D,UAAU,EAAC,OAAO,GAClB;YACF,oBAAC,IAAI,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE;gBACpC,oBAAC,IAAI,IAAC,KAAK,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,EAAE;oBAChE,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAClC,oBAAC,KAAK,IAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,GAAI,CAC1C,CAAC,CAAC,CAAC,IAAI;oBACP,QAAQ,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAC3C,oBAAC,QAAQ,IAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,GAAI,CACnD,CAAC,CAAC,CAAC,IAAI;oBACP,WAAW,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CACpD,oBAAC,IAAI,IAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;wBAC3B,oBAAC,OAAO,IAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,gBAAgB,GAAI,CAClD,CACR,CAAC,CAAC,CAAC,IAAI;oBACP,QAAQ,CACJ,CACF;YACN,IAAI,CAAC,CAAC,CAAC,CACN,oBAAC,kBAAkB,IAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,GAAI,CACrE,CAAC,CAAC,CAAC,IAAI,CACE,CACJ,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,IAAI,CAAC,CAAC"}

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 "../theming";
+import { withTheme } from "@draftbit/theme";
 import Config from "../components/Config";
 
-import type { Theme } from "../styles/DefaultTheme";
+import type { ReadTheme } from "@draftbit/theme";
 import type { IconSlot } from "../interfaces/Icon";
 
 const ICON_SIZE = Config.cardIconSize;
@@ -31,7 +31,7 @@ export const TopRightCircleIcon = withTheme(
     onPress,
   }: {
     icon: string;
-    theme: Theme;
+    theme: ReadTheme;
     onPress?: () => void;
   } & IconSlot) => {
     return (
@@ -61,7 +61,11 @@ export const TopRightCircleIcon = withTheme(
             ];
           }}
         >
-          <Icon name={icon} size={ICON_SIZE} color={theme.colors.surface} />
+          <Icon
+            name={icon}
+            size={ICON_SIZE}
+            color={theme.colors.background.brand}
+          />
         </Pressable>
       </Surface>
     );
@@ -78,7 +82,7 @@ type Props = {
   aspectRatio?: number;
   elevation?: number;
   numColumns?: number;
-  theme: Theme;
+  theme: ReadTheme;
   titleStyle?: StyleProp<TextStyle>;
   subtitleStyle?: StyleProp<TextStyle>;
   descriptionStyle?: StyleProp<TextStyle>;
@@ -116,7 +120,7 @@ const Card: React.FC<React.PropsWithChildren<Props>> = ({
     ...styles
   } = StyleSheet.flatten(style || {});
 
-  const backgroundColor = bgColor ? bgColor : theme.colors.surface;
+  const backgroundColor = bgColor ? bgColor : theme.colors.background.brand;
   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 { Theme } from "../styles/DefaultTheme";
+import type { ReadTheme } from "@draftbit/theme";
 import {
   checkboxGroupContext,
   Direction,
@@ -11,7 +11,7 @@ export interface CheckboxGroupProps {
   style?: StyleProp<ViewStyle>;
   values: string[];
   onValueChange: (value: string, selected: boolean) => void;
-  theme: Theme;
+  theme: ReadTheme;
   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 "../theming";
+import { withTheme } from "@draftbit/theme";
 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,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"}
+{"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"}

package/src/deprecated-components/Container.tsx

@@ -7,10 +7,10 @@ import {
   StyleSheet,
   ViewStyle,
 } from "react-native";
-import { withTheme } from "../theming";
+import { withTheme } from "@draftbit/theme";
 
 import Elevation from "../components/Elevation";
-import type { Theme } from "../styles/DefaultTheme";
+import type { ReadTheme } from "@draftbit/theme";
 
 type ResizeModeType =
   | "cover"
@@ -21,7 +21,7 @@ type ResizeModeType =
   | undefined;
 
 type Props = {
-  theme: Theme;
+  theme: ReadTheme;
   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 "../theming";
+import { withTheme } from "@draftbit/theme";
 /**
  * @deprecated DEPRECATED
  */
-const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false, labelColor, color: colorOverride, children, onPress, elevation = 0, theme: { colors, disabledOpacity, roundness, typography }, ...rest }) => {
+const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false, labelColor, color: colorOverride, children, onPress, elevation = 0, theme: { colors, typography }, ...rest }) => {
     let backgroundColor, borderColor, textColor, borderWidth;
-    const buttonColor = colorOverride || colors.primary;
+    const buttonColor = colorOverride || colors.branding.primary;
     if (type === "solid") {
         backgroundColor = buttonColor;
         if (disabled) {
-            textColor = color(colors.surface).alpha(disabledOpacity).rgb().string();
+            textColor = color(colors.background.brand).alpha(0.5).rgb().string();
         }
         else {
-            textColor = labelColor || colors.surface;
+            textColor = labelColor || colors.background.brand;
         }
     }
     else {
         backgroundColor = "transparent";
         if (disabled) {
-            textColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
+            textColor = color(buttonColor).alpha(0.5).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(disabledOpacity).rgb().string();
+            borderColor = color(buttonColor).alpha(0.5).rgb().string();
         }
         else {
             borderColor = buttonColor;
@@ -45,7 +45,7 @@ const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false,
         backgroundColor,
         borderColor,
         borderWidth,
-        borderRadius: roundness,
+        borderRadius: 8,
     };
     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":"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"}

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

package/src/deprecated-components/DeprecatedCardWrapper.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { withTheme } from "../theming";
+import { withTheme } from "@draftbit/theme";
 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,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"}
+{"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"}

package/src/deprecated-components/DeprecatedCardWrapper.tsx

@@ -1,15 +1,15 @@
 import React from "react";
-import { withTheme } from "../theming";
+import { withTheme } from "@draftbit/theme";
 import Touchable from "../components/Touchable";
 import { StyleProp, ViewStyle } from "react-native";
-import theme from "../styles/DefaultTheme";
+import type { ReadTheme } from "@draftbit/theme";
 
 type Props = {
   numColumns?: number;
   children?: React.ReactNode;
   onPress?: () => void;
   style?: StyleProp<ViewStyle>;
-  theme: typeof theme;
+  theme: ReadTheme;
 };
 
 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 "../theming";
+import { withTheme } from "@draftbit/theme";
 /**
  * @deprecated DEPRECATED
  */
-const FAB = ({ Icon, icon, disabled = false, type = "solid", loading = false, color: colorOverride, label, onPress, elevation = 0, style, theme: { colors, disabledOpacity, roundness, typography }, ...rest }) => {
+const FAB = ({ Icon, icon, disabled = false, type = "solid", loading = false, color: colorOverride, label, onPress, elevation = 0, style, theme: { colors, typography }, ...rest }) => {
     let backgroundColor, borderColor, textColor, borderWidth;
-    const buttonColor = colorOverride || colors.primary;
+    const buttonColor = colorOverride || colors.branding.primary;
     if (type === "standard" || type === "extended" || type === "fixed") {
         backgroundColor = buttonColor;
         if (disabled) {
-            textColor = color(colors.surface).alpha(disabledOpacity).rgb().string();
+            textColor = color(colors.background.brand).alpha(0.5).rgb().string();
         }
         else {
-            textColor = colors.surface;
+            textColor = colors.background.brand;
         }
     }
     else {
         backgroundColor = "transparent";
         if (disabled) {
-            textColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
+            textColor = color(buttonColor).alpha(0.5).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(disabledOpacity).rgb().string();
+            borderColor = color(buttonColor).alpha(0.5).rgb().string();
         }
         else {
             borderColor = buttonColor;
@@ -46,7 +46,7 @@ const FAB = ({ Icon, icon, disabled = false, type = "solid", loading = false, co
         backgroundColor,
         borderColor,
         borderWidth,
-        borderRadius: roundness,
+        borderRadius: 8,
         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":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,iBAAiB,EACjB,IAAI,EACJ,UAAU,EAIV,SAAS,GAEV,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAuD5C;;GAEG;AACH,MAAM,GAAG,GAA6C,CAAC,EACrD,IAAI,EACJ,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,IAAI,GAAG,OAAO,EACd,OAAO,GAAG,KAAK,EACf,KAAK,EAAE,aAAa,EACpB,KAAK,EACL,OAAO,EACP,SAAS,GAAG,CAAC,EACb,KAAK,EACL,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAC7B,GAAG,IAAI,EACR,EAAE,EAAE;IACH,IAAI,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC;IACzD,MAAM,WAAW,GAAG,aAAa,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IAE7D,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,OAAO,EAAE;QAClE,eAAe,GAAG,WAAW,CAAC;QAE9B,IAAI,QAAQ,EAAE;YACZ,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;SACtE;aAAM;YACL,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;SACrC;KACF;SAAM;QACL,eAAe,GAAG,aAAa,CAAC;QAEhC,IAAI,QAAQ,EAAE;YACZ,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;SAC1D;aAAM;YACL,SAAS,GAAG,WAAW,CAAC;SACzB;KACF;IAED,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,IAAI,QAAQ,EAAE;YACZ,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;SAC5D;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,GAAyB;QACxC,eAAe;QACf,WAAW;QACX,WAAW;QACX,YAAY,EAAE,CAAC;QACf,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB,CAAC;IAEF,MAAM,YAAY,GAA2B,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAE1E,MAAM,YAAY,GAA2B,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE9D,MAAM,SAAS,GAAyB;QACtC,SAAS,EAAE,QAAQ;QACnB,KAAK,EAAE,SAAS;KACjB,CAAC;IAEF,MAAM,SAAS,GAA2B;QACxC,MAAM,CAAC,IAAI;QACX;YACE,KAAK,EAAE,MAAM,CAAC,cAAc;SAC7B;KACF,CAAC;IAEF,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,SAAS,EAAE;QAC7C,WAAW,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC;QACnC,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;QACpC,WAAW,CAAC,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC;QAElD,YAAY,CAAC,IAAI,CAAC;YAChB,KAAK,EAAE,MAAM,CAAC,OAAO;YACrB,MAAM,EAAE,MAAM,CAAC,OAAO;SACvB,CAAC,CAAC;KACJ;IAED,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,OAAO,EAAE;QAC3C,SAAS,CAAC,IAAI,CAAC;YACb,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,CAAC,CAAC;SAChB,CAAC,CAAC;QAEH,SAAS,CAAC,MAAM,GAAG,EAAE,CAAC;KACvB;IAED,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,YAAY,CAAC,IAAI,CAAC;YAChB,MAAM,EAAE,MAAM,CAAC,cAAc;YAC7B,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;KACJ;IAED,OAAO,CACL,oBAAC,SAAS,IAAC,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC;QACtC,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,YAAY;YAEnB,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;gBACP,KAAK,CAAC,CAAC,CAAC,CACP,oBAAC,IAAI,IAAC,aAAa,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,IAC1D,KAAK,CACD,CACR,CAAC,CAAC,CAAC,IAAI,CACH,CACG,CACF,CACb,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE;QACN,WAAW,EAAE,OAAO;KACrB;IACD,OAAO,EAAE;QACP,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB;IACD,IAAI,EAAE;QACJ,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;QACxB,KAAK,EAAE,MAAM,CAAC,cAAc;KAC7B;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,EAAE;QACV,YAAY,EAAE,CAAC;KAChB;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC,GAAG,CAAC,CAAC"}