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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "49.5.2-ace73d.2+ace73d0",
+  "version": "49.5.2-e8f32c.2+e8f32cf",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/src/index.d.ts",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/theme": "^49.5.2-ace73d.2+ace73d0",
+    "@draftbit/types": "^49.5.2-e8f32c.2+e8f32cf",
     "@expo/vector-icons": "^13.0.0",
     "@gorhom/bottom-sheet": "5.0.0-alpha.7",
     "@material-ui/core": "^4.11.0",
@@ -49,7 +49,7 @@
     "@react-native-community/slider": "4.4.2",
     "@react-native-picker/picker": "2.4.10",
     "@shopify/flash-list": "1.4.3",
-    "color": "^4.2.3",
+    "color": "^3.1.2",
     "date-fns": "^2.16.1",
     "dateformat": "^3.0.3",
     "expo-av": "~13.4.1",
@@ -71,6 +71,7 @@
     "react-native-svg": "13.10.0",
     "react-native-swipe-list-view": "^3.2.9",
     "react-native-tab-view": "^3.4.0",
+    "react-native-typography": "^1.4.1",
     "react-native-web-swiper": "^2.2.3",
     "react-native-youtube-iframe": "^2.2.2",
     "react-youtube": "^10.1.0",
@@ -115,5 +116,5 @@
     ],
     "testEnvironment": "node"
   },
-  "gitHead": "ace73d0a0ed25ceccb66b025adff934761aba142"
+  "gitHead": "e8f32cf626996cc9442250d7929a97d82c93eaf5"
 }

package/src/Provider.js

@@ -1,10 +1,10 @@
-import React from "react";
+import * as React from "react";
+import { ThemeProvider } from "./theming";
 import PortalHost from "./components/Portal/PortalHost";
-import { ThemeProvider } from "@draftbit/theme";
 export default class Provider extends React.Component {
     render() {
-        return (React.createElement(ThemeProvider, { themes: this.props.themes, breakpoints: this.props.breakpoints, initialThemeName: this.props.initialThemeName },
-            React.createElement(PortalHost, null, this.props.children)));
+        return (React.createElement(PortalHost, null,
+            React.createElement(ThemeProvider, { theme: this.props.theme }, this.props.children)));
     }
 }
 //# sourceMappingURL=Provider.js.map

package/src/Provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"Provider.js","sourceRoot":"","sources":["Provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,UAAU,MAAM,gCAAgC,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAShD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK,CAAC,SAAwB;IAClE,MAAM;QACJ,OAAO,CACL,oBAAC,aAAa,IACZ,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EACzB,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EACnC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB;YAE7C,oBAAC,UAAU,QAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAc,CAChC,CACjB,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"Provider.js","sourceRoot":"","sources":["Provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,UAAU,MAAM,gCAAgC,CAAC;AAQxD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK,CAAC,SAAgB;IAC1D,MAAM;QACJ,OAAO,CACL,oBAAC,UAAU;YAET,oBAAC,aAAa,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,IACnC,IAAI,CAAC,KAAK,CAAC,QAAQ,CACN,CACL,CACd,CAAC;IACJ,CAAC;CACF"}

package/src/Provider.tsx

@@ -1,25 +1,22 @@
-import React from "react";
+import * as React from "react";
+import { ThemeProvider } from "./theming";
 import PortalHost from "./components/Portal/PortalHost";
-import type { ValidatedTheme, Breakpoints } from "@draftbit/theme";
-import { ThemeProvider } from "@draftbit/theme";
+import { Theme } from "@draftbit/types";
 
-type ProviderProps = {
-  themes: ValidatedTheme[];
-  breakpoints: Breakpoints;
-  initialThemeName: string;
+type Props = {
   children: React.ReactNode;
+  theme?: Theme;
 };
 
-export default class Provider extends React.Component<ProviderProps> {
+export default class Provider extends React.Component<Props> {
   render() {
     return (
-      <ThemeProvider
-        themes={this.props.themes}
-        breakpoints={this.props.breakpoints}
-        initialThemeName={this.props.initialThemeName}
-      >
-        <PortalHost>{this.props.children}</PortalHost>
-      </ThemeProvider>
+      <PortalHost>
+        {/* @ts-ignore */}
+        <ThemeProvider theme={this.props.theme}>
+          {this.props.children}
+        </ThemeProvider>
+      </PortalHost>
     );
   }
 }

package/src/components/AccordionGroup.js

@@ -1,13 +1,13 @@
 import * as React from "react";
 import { View, StyleSheet, Pressable, } from "react-native";
 import Text from "./Text";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import { extractStyles } from "../utilities";
 const AccordionGroup = ({ label, expanded: expandedProp = false, openColor, closedColor, caretColor: caretColorProp, caretSize = 24, icon, iconSize = 24, style, children, theme, Icon, }) => {
     const [expanded, setExpanded] = React.useState(expandedProp);
     const { textStyles, viewStyles } = extractStyles(style);
-    const expandedColor = openColor || theme.colors.branding.primary;
-    const collapsedColor = closedColor || theme.colors.branding.primary;
+    const expandedColor = openColor || theme.colors.primary;
+    const collapsedColor = closedColor || theme.colors.primary;
     const labelColor = expanded ? expandedColor : collapsedColor;
     const caretColor = caretColorProp || labelColor;
     const handlePressAction = () => {

package/src/components/AccordionGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccordionGroup.js","sourceRoot":"","sources":["AccordionGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,IAAI,EACJ,UAAU,EAGV,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAgB7C,MAAM,cAAc,GAAG,CAAC,EACtB,KAAK,EACL,QAAQ,EAAE,YAAY,GAAG,KAAK,EAC9B,SAAS,EACT,WAAW,EACX,UAAU,EAAE,cAAc,EAC1B,SAAS,GAAG,EAAE,EACd,IAAI,EACJ,QAAQ,GAAG,EAAE,EACb,KAAK,EACL,QAAQ,EACR,KAAK,EACL,IAAI,GACgB,EAAE,EAAE;IACxB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,YAAY,CAAC,CAAC;IACtE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjE,MAAM,cAAc,GAAG,WAAW,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IACpE,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC;IAC7D,MAAM,UAAU,GAAG,cAAc,IAAI,UAAU,CAAC;IAEhD,MAAM,iBAAiB,GAAG,GAAG,EAAE;QAC7B,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,OAAO,CACL;QACE,oBAAC,SAAS,IACR,KAAK,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,EAC/B,OAAO,EAAE,iBAAiB,EAC1B,iBAAiB,EAAC,QAAQ;YAEzB,IAAI,CAAC,CAAC,CAAC,CACN,oBAAC,IAAI,IACH,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,MAAM,CAAC,IAAI,GAClB,CACH,CAAC,CAAC,CAAC,IAAI;YACR,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,OAAO;gBACzB,oBAAC,IAAI,IACH,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE;wBACL,UAAU;wBACV;4BACE,KAAK,EAAE,UAAU;yBAClB;qBACF,IAEA,KAAK,CACD,CACF;YACP,oBAAC,IAAI,IACH,IAAI,EACF,QAAQ;oBACN,CAAC,CAAC,iCAAiC;oBACnC,CAAC,CAAC,mCAAmC,EAEzC,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,SAAS,GACf,CACQ;QACX,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAC1B,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,GAAG,EAAE;QACH,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;KACrB;IACD,OAAO,EAAE;QACP,IAAI,EAAE,CAAC;QACP,cAAc,EAAE,QAAQ;KACzB;IACD,IAAI,EAAE;QACJ,WAAW,EAAE,CAAC;KACf;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC,cAAc,CAAC,CAAC"}
+{"version":3,"file":"AccordionGroup.js","sourceRoot":"","sources":["AccordionGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,IAAI,EACJ,UAAU,EAGV,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAgB7C,MAAM,cAAc,GAAG,CAAC,EACtB,KAAK,EACL,QAAQ,EAAE,YAAY,GAAG,KAAK,EAC9B,SAAS,EACT,WAAW,EACX,UAAU,EAAE,cAAc,EAC1B,SAAS,GAAG,EAAE,EACd,IAAI,EACJ,QAAQ,GAAG,EAAE,EACb,KAAK,EACL,QAAQ,EACR,KAAK,EACL,IAAI,GACgB,EAAE,EAAE;IACxB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,YAAY,CAAC,CAAC;IACtE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IACxD,MAAM,cAAc,GAAG,WAAW,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IAC3D,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC;IAC7D,MAAM,UAAU,GAAG,cAAc,IAAI,UAAU,CAAC;IAEhD,MAAM,iBAAiB,GAAG,GAAG,EAAE;QAC7B,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,OAAO,CACL;QACE,oBAAC,SAAS,IACR,KAAK,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,EAC/B,OAAO,EAAE,iBAAiB,EAC1B,iBAAiB,EAAC,QAAQ;YAEzB,IAAI,CAAC,CAAC,CAAC,CACN,oBAAC,IAAI,IACH,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,MAAM,CAAC,IAAI,GAClB,CACH,CAAC,CAAC,CAAC,IAAI;YACR,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,OAAO;gBACzB,oBAAC,IAAI,IACH,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE;wBACL,UAAU;wBACV;4BACE,KAAK,EAAE,UAAU;yBAClB;qBACF,IAEA,KAAK,CACD,CACF;YACP,oBAAC,IAAI,IACH,IAAI,EACF,QAAQ;oBACN,CAAC,CAAC,iCAAiC;oBACnC,CAAC,CAAC,mCAAmC,EAEzC,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,SAAS,GACf,CACQ;QACX,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAC1B,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,GAAG,EAAE;QACH,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;KACrB;IACD,OAAO,EAAE;QACP,IAAI,EAAE,CAAC;QACP,cAAc,EAAE,QAAQ;KACzB;IACD,IAAI,EAAE;QACJ,WAAW,EAAE,CAAC;KACf;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC,cAAc,CAAC,CAAC"}

package/src/components/AccordionGroup.tsx

@@ -7,9 +7,9 @@ import {
   Pressable,
 } from "react-native";
 import Text from "./Text";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import type { IconSlot } from "../interfaces/Icon";
-import type { ReadTheme } from "@draftbit/theme";
+import type { Theme } from "../styles/DefaultTheme";
 import { extractStyles } from "../utilities";
 
 type AccordionGroupProps = {
@@ -23,7 +23,7 @@ type AccordionGroupProps = {
   iconSize?: number;
   style?: StyleProp<TextStyle>;
   children?: React.ReactNode;
-  theme: ReadTheme;
+  theme: Theme;
 } & IconSlot;
 
 const AccordionGroup = ({
@@ -42,8 +42,8 @@ const AccordionGroup = ({
 }: AccordionGroupProps) => {
   const [expanded, setExpanded] = React.useState<boolean>(expandedProp);
   const { textStyles, viewStyles } = extractStyles(style);
-  const expandedColor = openColor || theme.colors.branding.primary;
-  const collapsedColor = closedColor || theme.colors.branding.primary;
+  const expandedColor = openColor || theme.colors.primary;
+  const collapsedColor = closedColor || theme.colors.primary;
   const labelColor = expanded ? expandedColor : collapsedColor;
   const caretColor = caretColorProp || labelColor;
 

package/src/components/BottomSheet/BottomSheet.js

@@ -1,14 +1,14 @@
 import React from "react";
 import { StyleSheet, Dimensions, } from "react-native";
 import BottomSheetComponent, { BottomSheetScrollView, } from "@gorhom/bottom-sheet";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../../theming";
 import { useDeepCompareMemo } from "../../utilities";
 const windowHeight = Dimensions.get("window").height;
 // Clarification:
 // Input of snap points is sorted top -> bottom where each value represents distance from top
 // Implementation using `@gorhom/bottom-sheet` is sorted bottom -> top where each value represents distance from bottom
-const BottomSheet = React.forwardRef(({ theme, snapPoints: snapPointsProp, topSnapPosition = "10%", middleSnapPosition = "50%", bottomSnapPosition = "80%", initialSnapIndex, initialSnapPosition = "bottom", showHandle = true, handleColor = theme.colors.border.brand, topBorderRadius = 20, borderWidth = 1, borderColor = theme.colors.border.brand, onSettle, style, children, ...rest }, ref) => {
-    const backgroundColor = (style === null || style === void 0 ? void 0 : style.backgroundColor) || theme.colors.background.brand;
+const BottomSheet = React.forwardRef(({ theme, snapPoints: snapPointsProp, topSnapPosition = "10%", middleSnapPosition = "50%", bottomSnapPosition = "80%", initialSnapIndex, initialSnapPosition = "bottom", showHandle = true, handleColor = theme.colors.divider, topBorderRadius = 20, borderWidth = 1, borderColor = theme.colors.divider, onSettle, style, children, ...rest }, ref) => {
+    const backgroundColor = (style === null || style === void 0 ? void 0 : style.backgroundColor) || theme.colors.background;
     const snapPoints = snapPointsProp !== null && snapPointsProp !== void 0 ? snapPointsProp : [
         topSnapPosition,
         middleSnapPosition,
@@ -25,7 +25,7 @@ const BottomSheet = React.forwardRef(({ theme, snapPoints: snapPointsProp, topSn
                 return 2;
         }
     };
-    return (React.createElement(BottomSheetComponent, { ref: ref, snapPoints: mappedSnapPoints, index: initialSnapIndex !== undefined
+    return (React.createElement(BottomSheetComponent, { ref: ref, snapPoints: mappedSnapPoints, index: initialSnapIndex != undefined
             ? mappedSnapPoints.length - initialSnapIndex - 1
             : getSnapIndexFromPosition(initialSnapPosition), handleIndicatorStyle: [
             { backgroundColor: handleColor },

package/src/components/BottomSheet/BottomSheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"BottomSheet.js","sourceRoot":"","sources":["BottomSheet.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,UAAU,EAIV,UAAU,GACX,MAAM,cAAc,CAAC;AAEtB,OAAO,oBAAoB,EAAE,EAC3B,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAIrD,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;AAyBrD,iBAAiB;AACjB,6FAA6F;AAC7F,uHAAuH;AACvH,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAClC,CACE,EACE,KAAK,EACL,UAAU,EAAE,cAAc,EAC1B,eAAe,GAAG,KAAK,EACvB,kBAAkB,GAAG,KAAK,EAC1B,kBAAkB,GAAG,KAAK,EAC1B,gBAAgB,EAChB,mBAAmB,GAAG,QAAQ,EAC9B,UAAU,GAAG,IAAI,EACjB,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EACvC,eAAe,GAAG,EAAE,EACpB,WAAW,GAAG,CAAC,EACf,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EACvC,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,GAAG,IAAI,EACR,EACD,GAAG,EACH,EAAE;IACF,MAAM,eAAe,GACnB,CAAC,KAAmB,aAAnB,KAAK,uBAAL,KAAK,CAAgB,eAAe,KAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;IAEzE,MAAM,UAAU,GAAG,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI;QACnC,eAAe;QACf,kBAAkB;QAClB,kBAAkB;KACnB,CAAC;IAEF,MAAM,gBAAgB,GAAG,kBAAkB,CACzC,GAAG,EAAE,CAAC,qCAAqC,CAAC,UAAU,CAAC,EACvD,UAAU,CACX,CAAC;IAEF,MAAM,wBAAwB,GAAG,CAAC,QAAsB,EAAE,EAAE;QAC1D,QAAQ,QAAQ,EAAE;YAChB,KAAK,QAAQ;gBACX,OAAO,CAAC,CAAC;YACX,KAAK,QAAQ;gBACX,OAAO,CAAC,CAAC;YACX,KAAK,KAAK;gBACR,OAAO,CAAC,CAAC;SACZ;IACH,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,oBAAoB,IACnB,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EACH,gBAAgB,KAAK,SAAS;YAC5B,CAAC,CAAC,gBAAgB,CAAC,MAAM,GAAG,gBAAgB,GAAG,CAAC;YAChD,CAAC,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,EAEnD,oBAAoB,EAAE;YACpB,EAAE,eAAe,EAAE,WAAW,EAAE;YAChC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;SACvC,EACD,eAAe,EAAE;YACf,eAAe;YACf,mBAAmB,EAAE,eAAe;YACpC,oBAAoB,EAAE,eAAe;YACrC,WAAW;YACX,WAAW;SACZ,EACD,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,gBAAgB,CAAC,MAAM,GAAG,KAAK,GAAG,CAAC,CAAC;QAEpE,oBAAC,qBAAqB,IACpB,qBAAqB,EAAE,CAAC,MAAM,CAAC,qBAAqB,EAAE,KAAK,CAAC,KACxD,IAAI,IAEP,QAAQ,CACa,CACH,CACxB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,6FAA6F;AAC7F,SAAS,qCAAqC,CAC5C,UAA+B;IAE/B,qGAAqG;IACrG,MAAM,kBAAkB,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;IAErD,oHAAoH;IACpH,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACtC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,aAAa,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAClD,IAAI,aAAa,KAAK,SAAS,EAAE;gBAC/B,OAAO,GAAG,GAAG,GAAG,aAAa,GAAG,CAAC;aAClC;YACD,OAAO,KAAK,CAAC;SACd;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,OAAO,YAAY,GAAG,KAAK,CAAC;SAC7B;aAAM;YACL,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,aAAqB;IACjD,MAAM,YAAY,GAAG,SAAS,CAAC;IAC/B,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAClD,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE;QACnB,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;YACzB,OAAO,aAAa,CAAC;SACtB;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,qBAAqB,EAAE;QACrB,iBAAiB,EAAE,EAAE;QACrB,eAAe,EAAE,EAAE;KACpB;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"BottomSheet.js","sourceRoot":"","sources":["BottomSheet.tsx"],"names":[],"mappings":"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"}

package/src/components/BottomSheet/BottomSheet.tsx

@@ -10,8 +10,8 @@ import {
 import BottomSheetComponent, {
   BottomSheetScrollView,
 } from "@gorhom/bottom-sheet";
-import type { ReadTheme } from "@draftbit/theme";
-import { withTheme } from "@draftbit/theme";
+import type { Theme } from "../../styles/DefaultTheme";
+import { withTheme } from "../../theming";
 import { useDeepCompareMemo } from "../../utilities";
 
 type SnapPosition = "top" | "middle" | "bottom";
@@ -38,7 +38,7 @@ export interface BottomSheetProps extends ScrollViewProps {
   borderColor?: string;
   onSettle?: (index: number) => void;
   style?: StyleProp<ViewStyle>;
-  theme: ReadTheme;
+  theme: Theme;
 }
 
 // Clarification:
@@ -55,10 +55,10 @@ const BottomSheet = React.forwardRef<BottomSheetComponent, BottomSheetProps>(
       initialSnapIndex,
       initialSnapPosition = "bottom",
       showHandle = true,
-      handleColor = theme.colors.border.brand,
+      handleColor = theme.colors.divider,
       topBorderRadius = 20,
       borderWidth = 1,
-      borderColor = theme.colors.border.brand,
+      borderColor = theme.colors.divider,
       onSettle,
       style,
       children,
@@ -67,7 +67,7 @@ const BottomSheet = React.forwardRef<BottomSheetComponent, BottomSheetProps>(
     ref
   ) => {
     const backgroundColor =
-      (style as ViewStyle)?.backgroundColor || theme.colors.background.brand;
+      (style as ViewStyle)?.backgroundColor || theme.colors.background;
 
     const snapPoints = snapPointsProp ?? [
       topSnapPosition,
@@ -96,7 +96,7 @@ const BottomSheet = React.forwardRef<BottomSheetComponent, BottomSheetProps>(
         ref={ref}
         snapPoints={mappedSnapPoints}
         index={
-          initialSnapIndex !== undefined
+          initialSnapIndex != undefined
             ? mappedSnapPoints.length - initialSnapIndex - 1
             : getSnapIndexFromPosition(initialSnapPosition)
         }

package/src/components/Button.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { Text, Pressable, Platform, StyleSheet, ActivityIndicator, } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 const CONSTANTS = {
     baseHeight: 42,
     borderRadius: 4,
@@ -45,10 +45,9 @@ function Base({ Icon, icon, iconPosition = "left", iconSize = CONSTANTS.icon, ti
 const Solid = ({ style, theme, ...props }) => {
     return (React.createElement(Base, { style: [
             {
-                //@ts-ignore
                 color: "#FFF",
-                borderRadius: 8,
-                backgroundColor: theme.colors.branding.primary,
+                borderRadius: theme.roundness,
+                backgroundColor: theme.colors.primary,
             },
             style,
         ], ...props }));
@@ -64,10 +63,9 @@ const Outline = ({ style, theme, ...props }) => {
     return (React.createElement(Base, { style: [
             styles.outline,
             {
-                borderRadius: 8,
-                borderColor: theme.colors.branding.primary,
-                //@ts-ignore
-                color: theme.colors.branding.primary,
+                borderRadius: theme.roundness,
+                borderColor: theme.colors.primary,
+                color: theme.colors.primary,
             },
             style,
         ], ...props }));

package/src/components/Button.js.map

@@ -1 +1 @@
-{"version":3,"file":"Button.js","sourceRoot":"","sources":["Button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,IAAI,EACJ,SAAS,EAET,QAAQ,EACR,UAAU,EAEV,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,MAAM,SAAS,GAAG;IAChB,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,CAAC;IACf,OAAO,EAAE,CAAC;IACV,IAAI,EAAE,EAAE;CACT,CAAC;AAmCF,SAAS,IAAI,CAAC,EACZ,IAAI,EACJ,IAAI,EACJ,YAAY,GAAG,MAAM,EACrB,QAAQ,GAAG,SAAS,CAAC,IAAI,EACzB,KAAK,EACL,OAAO,EACP,QAAQ,EACR,KAAK,EACL,aAAa,GAAG,GAAG,EACnB,eAAe,GAAG,GAAG,EACrB,GAAG,KAAK,EACE;IACV,MAAM,EACJ,KAAK,EACL,UAAU,EACV,UAAU,EACV,QAAQ,EACR,UAAU,EACV,aAAa,EACb,aAAa,EACb,SAAS,EACT,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,GAAG,YAAY,EAChB,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,IAAK,EAAgB,CAAC,CAAC;IAEnD,MAAM,WAAW,GAAc;QAC7B,KAAK;QACL,UAAU;QACV,UAAU;QACV,QAAQ;QACR,UAAU;QACV,aAAa;QACb,aAAa;QACb,SAAS;QACT,kBAAkB;QAClB,mBAAmB;QACnB,mBAAmB;KACpB,CAAC;IAEF,IAAI,SAAS,KAAK,MAAM,EAAE;QACxB,YAAY,CAAC,cAAc,GAAG,YAAY,CAAC;KAC5C;IAED,IAAI,SAAS,KAAK,OAAO,EAAE;QACzB,YAAY,CAAC,cAAc,GAAG,UAAU,CAAC;KAC1C;IAED,OAAO,CACL,oBAAC,SAAS,IACR,QAAQ,EAAE,QAAQ,IAAI,OAAO,EAC7B,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YACrB,OAAO;gBACL,MAAM,CAAC,IAAI;gBACX;oBACE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;iBAClE;gBACD,YAAY;aACb,CAAC;QACJ,CAAC,KACG,KAAK;QAER,OAAO,CAAC,CAAC,CAAC,CACT,oBAAC,iBAAiB,IAAC,IAAI,EAAC,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,GAAI,CACxE,CAAC,CAAC,CAAC,IAAI;QACP,YAAY,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAC7C,oBAAC,IAAI,IACH,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAe,EACtB,KAAK,EAAE,MAAM,CAAC,IAAI,EAClB,IAAI,EAAE,QAAQ,GACd,CACH,CAAC,CAAC,CAAC,IAAI;QACR,oBAAC,IAAI,IAAC,KAAK,EAAE,WAAW,IAAG,KAAK,CAAQ;QACvC,YAAY,KAAK,OAAO,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAC9C,oBAAC,IAAI,IACH,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAe,EACtB,KAAK,EAAE,MAAM,CAAC,IAAI,EAClB,IAAI,EAAE,QAAQ,GACd,CACH,CAAC,CAAC,CAAC,IAAI,CACE,CACb,CAAC;AACJ,CAAC;AAED,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,EAAS,EAAe,EAAE;IAC/D,OAAO,CACL,oBAAC,IAAI,IACH,KAAK,EAAE;YACL;gBACE,YAAY;gBACZ,KAAK,EAAE,MAAM;gBACb,YAAY,EAAE,CAAC;gBACf,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO;aAC/C;YACD,KAAK;SACN,KACG,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,GAAQ,SAAS,CAAC,KAAK,CAAC,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,CAAC;AAEvB,MAAM,MAAM,GAAQ,SAAS,CAAC,KAAK,CAAC,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB,MAAM,OAAO,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,EAAS,EAAe,EAAE;IACjE,OAAO,CACL,oBAAC,IAAI,IACH,KAAK,EAAE;YACL,MAAM,CAAC,OAAO;YACd;gBACE,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO;gBAC1C,YAAY;gBACZ,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO;aACrC;YACD,KAAK;SACN,KACG,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,aAAa,GAAQ,SAAS,CAAC,OAAO,CAAC,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,QAAQ,EAAE,UAAU;QACpB,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;QACxB,SAAS,EAAE,SAAS,CAAC,UAAU;QAC/B,iBAAiB,EAAE,EAAE;QACrB,UAAU,EAAE,QAAQ;QACpB,UAAU,EAAE,KAAK;QACjB,GAAG,QAAQ,CAAC,MAAM,CAAC;YACjB,GAAG,EAAE;gBACH,MAAM,EAAE,SAAS;gBACjB,UAAU,EAAE,MAAM;aACnB;SACF,CAAC;KACH;IACD,OAAO,EAAE;QACP,eAAe,EAAE,aAAa;QAC9B,WAAW,EAAE,CAAC;KACf;IACD,IAAI,EAAE;QACJ,eAAe,EAAE,aAAa;QAC9B,OAAO,EAAE,CAAC;QACV,SAAS,EAAE,SAAS;KACrB;IACD,OAAO,EAAE;QACP,WAAW,EAAE,CAAC;KACf;IACD,IAAI,EAAE;QACJ,GAAG,QAAQ,CAAC,MAAM,CAAC;YACjB,GAAG,EAAE;gBACH,SAAS,EAAE,CAAC;gBACZ,WAAW,EAAE,CAAC;gBACd,SAAS,EAAE,QAAQ;aACpB;YACD,OAAO,EAAE;gBACP,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,CAAC;gBACd,SAAS,EAAE,QAAQ;aACpB;SACF,CAAC;KACH;CACF,CAAC,CAAC"}
+{"version":3,"file":"Button.js","sourceRoot":"","sources":["Button.tsx"],"names":[],"mappings":"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"}

package/src/components/Button.tsx

@@ -8,8 +8,10 @@ import {
   TextStyle,
   ActivityIndicator,
 } 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";
 
 const CONSTANTS = {
@@ -48,7 +50,7 @@ type Props = {
   delayLongPress?: number;
   hitSlop?: number;
   icon?: string;
-  theme: ReadTheme;
+  theme: Theme;
 } & PressableProps &
   IconSlot;
 
@@ -145,10 +147,9 @@ const Solid = ({ style, theme, ...props }: Props): JSX.Element => {
     <Base
       style={[
         {
-          //@ts-ignore
           color: "#FFF",
-          borderRadius: 8,
-          backgroundColor: theme.colors.branding.primary,
+          borderRadius: theme.roundness,
+          backgroundColor: theme.colors.primary,
         },
         style,
       ]}
@@ -172,10 +173,9 @@ const Outline = ({ style, theme, ...props }: Props): JSX.Element => {
       style={[
         styles.outline,
         {
-          borderRadius: 8,
-          borderColor: theme.colors.branding.primary,
-          //@ts-ignore
-          color: theme.colors.branding.primary,
+          borderRadius: theme.roundness,
+          borderColor: theme.colors.primary,
+          color: theme.colors.primary,
         },
         style,
       ]}

package/src/components/Checkbox/Checkbox.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { View, StyleSheet, Pressable, } from "react-native";
-import { useTheme } from "@draftbit/theme";
+import { useTheme } from "../../theming";
 import { usePrevious } from "../../hooks";
 const Checkbox = ({ Icon, status, disabled = false, onPress, onCheck, onUncheck, color, uncheckedColor, defaultValue, checkedIcon = "MaterialCommunityIcons/checkbox-marked", uncheckedIcon = "MaterialCommunityIcons/checkbox-blank-outline", size = 24, style, ...rest }) => {
     const [internalValue, setInternalValue] = React.useState(status || defaultValue || false);
@@ -19,8 +19,8 @@ const Checkbox = ({ Icon, status, disabled = false, onPress, onCheck, onUncheck,
     }, [defaultValue, previousDefaultValue]);
     const { colors } = useTheme();
     const checkboxColor = internalValue
-        ? color || colors.branding.primary
-        : uncheckedColor || colors.branding.primary;
+        ? color || colors.primary
+        : uncheckedColor || colors.primary;
     const handlePress = () => {
         const newValue = !internalValue;
         setInternalValue(newValue);

package/src/components/Checkbox/Checkbox.js.map

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

package/src/components/Checkbox/Checkbox.tsx

@@ -7,7 +7,7 @@ import {
   StyleProp,
   ViewStyle,
 } from "react-native";
-import { useTheme } from "@draftbit/theme";
+import { useTheme } from "../../theming";
 import type { IconSlot } from "../../interfaces/Icon";
 
 import { usePrevious } from "../../hooks";
@@ -66,8 +66,8 @@ const Checkbox: React.FC<CheckboxProps & PressableProps & IconSlot> = ({
   const { colors } = useTheme();
 
   const checkboxColor = internalValue
-    ? color || colors.branding.primary
-    : uncheckedColor || colors.branding.primary;
+    ? color || colors.primary
+    : uncheckedColor || colors.primary;
 
   const handlePress = () => {
     const newValue = !internalValue;

package/src/components/Checkbox/CheckboxRow.js

@@ -5,7 +5,6 @@ import { extractStyles } from "../../utilities";
 import { usePrevious } from "../../hooks";
 import Text from "../Text";
 import Checkbox from "./Checkbox";
-import { withTheme } from "@draftbit/theme";
 export var Direction;
 (function (Direction) {
     Direction["Row"] = "row";
@@ -19,7 +18,7 @@ const renderLabel = (value, labelStyle, textStyle) => {
         return React.createElement(React.Fragment, null, value);
     }
 };
-const CheckboxRow = ({ label = "Label", labelStyle, labelContainerStyle, checkboxStyle, direction = Direction.Row, Icon, status, disabled = false, onPress, onCheck, onUncheck, color, uncheckedColor, defaultValue, checkedIcon, uncheckedIcon, size, style, theme, ...rest }) => {
+const CheckboxRow = ({ label = "Label", labelStyle, labelContainerStyle, checkboxStyle, direction = Direction.Row, Icon, status, disabled = false, onPress, onCheck, onUncheck, color, uncheckedColor, defaultValue, checkedIcon, uncheckedIcon, size, style, ...rest }) => {
     const [internalValue, setInternalValue] = React.useState(status || defaultValue || false);
     React.useEffect(() => {
         if (status != null) {
@@ -53,7 +52,7 @@ const CheckboxRow = ({ label = "Label", labelStyle, labelContainerStyle, checkbo
                     alignItems: direction === Direction.Row ? "flex-start" : "flex-end",
                 },
                 labelContainerStyle,
-            ] }, renderLabel(label, labelStyle, StyleSheet.flatten([{ color: theme.colors.text.strong }, textStyles]))),
+            ] }, renderLabel(label, textStyles, labelStyle)),
         React.createElement(Checkbox, { Icon: Icon, status: internalValue, style: checkboxStyle, disabled: disabled, onPress: handlePress, color: color, uncheckedColor: uncheckedColor, checkedIcon: checkedIcon, uncheckedIcon: uncheckedIcon, size: size })));
 };
 const styles = StyleSheet.create({
@@ -75,5 +74,5 @@ const styles = StyleSheet.create({
         flex: 3,
     },
 });
-export default withTheme(CheckboxRow);
+export default CheckboxRow;
 //# sourceMappingURL=CheckboxRow.js.map

package/src/components/Checkbox/CheckboxRow.js.map

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

package/src/components/Checkbox/CheckboxRow.tsx

@@ -15,7 +15,6 @@ import { extractStyles } from "../../utilities";
 import { usePrevious } from "../../hooks";
 import Text from "../Text";
 import Checkbox, { CheckboxProps } from "./Checkbox";
-import { ReadTheme, withTheme } from "@draftbit/theme";
 
 export enum Direction {
   Row = "row",
@@ -28,7 +27,6 @@ export interface CheckboxRowProps extends CheckboxProps {
   labelContainerStyle: StyleProp<ViewStyle>;
   checkboxStyle?: StyleProp<ViewStyle>;
   direction?: Direction;
-  theme: ReadTheme;
 }
 
 const renderLabel = (
@@ -62,7 +60,6 @@ const CheckboxRow: React.FC<CheckboxRowProps & IconSlot> = ({
   uncheckedIcon,
   size,
   style,
-  theme,
   ...rest
 }) => {
   const [internalValue, setInternalValue] = React.useState<boolean>(
@@ -118,11 +115,7 @@ const CheckboxRow: React.FC<CheckboxRowProps & IconSlot> = ({
           labelContainerStyle,
         ]}
       >
-        {renderLabel(
-          label,
-          labelStyle,
-          StyleSheet.flatten([{ color: theme.colors.text.strong }, textStyles])
-        )}
+        {renderLabel(label, textStyles, labelStyle)}
       </View>
 
       <Checkbox
@@ -161,4 +154,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default withTheme(CheckboxRow);
+export default CheckboxRow;

package/src/components/DatePicker/DatePicker.js

@@ -3,7 +3,7 @@ import { View, Animated, Text, StyleSheet, I18nManager, TextInput as NativeTextI
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import omit from "lodash.omit";
 import dateFormat from "dateformat";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../../theming";
 import Portal from "../Portal/Portal";
 import Touchable from "../Touchable";
 import DateTimePicker from "./DatePickerComponent";
@@ -26,8 +26,8 @@ const MONTHS = [
     "November",
     "December",
 ];
-const DatePicker = ({ Icon, style, theme: { colors, typography }, date, onDateChange = () => { }, defaultValue, disabled = false, mode = "date", format, type = "underline", leftIconName, rightIconName, leftIconMode = "inset", label, labelSize, labelColor, placeholder, borderColor: inputBorderColor, borderColorActive: inputBorderColorActive, autoDismissKeyboard = true, minimumDate, maximumDate, hideLabel = false, ...props }) => {
-    var _a, _b, _c, _d, _e;
+const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disabledOpacity }, date, onDateChange = () => { }, defaultValue, disabled = false, mode = "date", format, type = "underline", leftIconName, rightIconName, leftIconMode = "inset", label, labelSize, labelColor, placeholder, borderColor: inputBorderColor, borderColorActive: inputBorderColorActive, autoDismissKeyboard = true, minimumDate, maximumDate, hideLabel = false, ...props }) => {
+    var _a, _b;
     const [value, setValue] = React.useState(parseDate(date) || parseDate(defaultValue));
     React.useEffect(() => {
         if (defaultValue != null) {
@@ -139,21 +139,21 @@ const DatePicker = ({ Icon, style, theme: { colors, typography }, date, onDateCh
         ? labelSize
         : typography.caption.fontSize;
     const hasActiveOutline = focused;
-    let inputTextColor, activeColor, underlineColor, borderColor = (_b = (_a = viewStyles.borderColor) !== null && _a !== void 0 ? _a : inputBorderColor) !== null && _b !== void 0 ? _b : colors.text.strong, placeholderColor, containerStyle, backgroundColor, inputStyle;
-    inputTextColor = colors.text.strong;
+    const propOrStyleBorderColor = (_a = viewStyles.borderColor) !== null && _a !== void 0 ? _a : inputBorderColor;
+    let inputTextColor, activeColor, underlineColor, borderColor = propOrStyleBorderColor, placeholderColor, containerStyle, backgroundColor, inputStyle;
+    inputTextColor = colors.strong;
     if (disabled) {
-        activeColor = colors.border.brand;
-        placeholderColor = colors.text.light;
+        activeColor = colors.light;
+        placeholderColor = colors.light;
         borderColor = "transparent";
         underlineColor = "transparent";
-        backgroundColor = colors.border.brand;
+        backgroundColor = colors.divider;
     }
     else {
-        activeColor = inputBorderColorActive || colors.branding.primary;
-        placeholderColor = colors.text.light;
-        underlineColor =
-            (_d = (_c = viewStyles.borderColor) !== null && _c !== void 0 ? _c : inputBorderColor) !== null && _d !== void 0 ? _d : colors.border.brand;
-        backgroundColor = colors.background.brand;
+        activeColor = inputBorderColorActive || colors.primary;
+        placeholderColor = colors.light;
+        underlineColor = propOrStyleBorderColor || colors.light;
+        backgroundColor = colors.background;
     }
     const { lineHeight, ...subtitle1 } = typography.subtitle1;
     inputStyle = {
@@ -168,23 +168,22 @@ const DatePicker = ({ Icon, style, theme: { colors, typography }, date, onDateCh
     };
     if (type === "underline") {
         containerStyle = {
-            borderTopLeftRadius: 8,
-            borderTopRightRadius: 8,
+            borderTopLeftRadius: roundness,
+            borderTopRightRadius: roundness,
             paddingBottom: 12,
             marginTop: 16,
         };
     }
     else {
         containerStyle = {
-            borderRadius: 8,
+            borderRadius: roundness,
             borderColor: hasActiveOutline ? activeColor : borderColor,
-            borderWidth: (_e = viewStyles.borderWidth) !== null && _e !== void 0 ? _e : 1,
+            borderWidth: (_b = viewStyles.borderWidth) !== null && _b !== void 0 ? _b : 1,
             paddingTop: labeled && !hideLabel ? 16 * 1.5 : 16,
             paddingBottom: labeled && !hideLabel ? 16 * 0.5 : 16,
-            opacity: disabled ? 0.5 : 1,
+            opacity: disabled ? disabledOpacity : 1,
             backgroundColor,
         };
-        //@ts-ignore
         inputStyle.paddingHorizontal = 12;
     }
     if (leftIconName && leftIconMode === "outset") {
@@ -192,10 +191,10 @@ const DatePicker = ({ Icon, style, theme: { colors, typography }, date, onDateCh
     }
     let leftIconColor;
     if (focused) {
-        leftIconColor = colors.branding.primary;
+        leftIconColor = colors.primary;
     }
     else {
-        leftIconColor = colors.text.light;
+        leftIconColor = colors.light;
     }
     const leftIconProps = {
         size: 24,
@@ -312,7 +311,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography }, date, onDateCh
                                     type === "solid" ? { paddingHorizontal: 12 } : {},
                                     labelStyle,
                                     {
-                                        color: labelColor || colors.text.light,
+                                        color: labelColor || colors.light,
                                         opacity: labeled.interpolate({
                                             inputRange: [0, 1],
                                             outputRange: [hasActiveOutline ? 1 : 0, 0],
@@ -333,7 +332,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography }, date, onDateCh
                                 marginLeft: type === "solid" ? 16 : 0,
                             } })) : null,
                         React.createElement(NativeTextInput, { value: formatDate(), placeholder: label && !hideLabel ? placeholder1 : placeholder, editable: !disabled, placeholderTextColor: placeholderColor, selectionColor: activeColor, onFocus: _handleFocus, onBlur: _handleBlur, underlineColorAndroid: "transparent", style: [inputStyles, textStyles], ...props })),
-                    rightIconName ? (React.createElement(Icon, { name: rightIconName, size: ICON_SIZE, color: colors.text.light, style: {
+                    rightIconName ? (React.createElement(Icon, { name: rightIconName, size: ICON_SIZE, color: colors.light, style: {
                             position: "absolute",
                             right: 16,
                             marginTop: type === "solid" ? MINIMIZED_LABEL_FONT_SIZE + 4 : 16,
@@ -342,7 +341,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography }, date, onDateCh
             React.createElement(View, { style: [
                     styles.picker,
                     {
-                        backgroundColor: colors.border.brand,
+                        backgroundColor: colors.divider,
                     },
                 ] },
                 React.createElement(View, { style: [