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

package/src/components/SwipeableItem/SwipeableList.tsx

@@ -26,37 +26,52 @@ export const SwipeableListContext =
     onStopSwiping: () => {},
   });
 
-const SwipeableList = <T extends object>({
-  disableScrollWhenSwiping = true,
-  listComponent = "FlatList",
-  ...rest
-}: FlashListSwipeableListProps<T> | FlatListSwipeableListProps<T>) => {
-  const [isSwiping, setIsSwiping] = React.useState(false);
-
-  const onStartSwiping = () => {
-    setIsSwiping(true);
-  };
-
-  const onStopSwiping = () => {
-    setIsSwiping(false);
-  };
-
-  rest.scrollEnabled = disableScrollWhenSwiping ? !isSwiping : true;
-
-  const renderListComponent = () => {
-    switch (listComponent) {
-      case "FlatList":
-        return <FlatList {...(rest as FlatListProps<T>)} />;
-      case "FlashList":
-        return <FlashList {...(rest as FlashListProps<T>)} />;
-    }
-  };
-
-  return (
-    <SwipeableListContext.Provider value={{ onStartSwiping, onStopSwiping }}>
-      <>{renderListComponent()}</>
-    </SwipeableListContext.Provider>
-  );
-};
+const SwipeableList = React.forwardRef(
+  <T extends object>(
+    {
+      disableScrollWhenSwiping = true,
+      listComponent = "FlatList",
+      ...rest
+    }: FlashListSwipeableListProps<T> | FlatListSwipeableListProps<T>,
+    ref: React.Ref<FlatList | FlashList<any>>
+  ) => {
+    const [isSwiping, setIsSwiping] = React.useState(false);
+
+    const onStartSwiping = () => {
+      setIsSwiping(true);
+    };
+
+    const onStopSwiping = () => {
+      setIsSwiping(false);
+    };
+
+    rest.scrollEnabled = disableScrollWhenSwiping ? !isSwiping : true;
+
+    const renderListComponent = () => {
+      switch (listComponent) {
+        case "FlatList":
+          return (
+            <FlatList
+              ref={ref as React.Ref<FlatList>}
+              {...(rest as FlatListProps<T>)}
+            />
+          );
+        case "FlashList":
+          return (
+            <FlashList
+              ref={ref as React.Ref<FlashList<T>>}
+              {...(rest as FlashListProps<T>)}
+            />
+          );
+      }
+    };
+
+    return (
+      <SwipeableListContext.Provider value={{ onStartSwiping, onStopSwiping }}>
+        <>{renderListComponent()}</>
+      </SwipeableListContext.Provider>
+    );
+  }
+);
 
 export default SwipeableList;

package/src/components/Swiper/Swiper.js

@@ -1,8 +1,7 @@
-import { withTheme } from "@draftbit/theme";
 import React from "react";
 import { View } from "react-native";
 import SwiperComponent from "react-native-web-swiper";
-const Swiper = ({ theme, vertical = false, loop = false, timeout = 0, from = 0, prevTitle = "", nextTitle = "", prevTitleColor, nextTitleColor, dotsTouchable = true, dotColor = theme.colors.foreground.brand, dotActiveColor = theme.colors.branding.primary, data, keyExtractor, renderItem, children: childrenProp, onIndexChanged: onIndexChangedProp, onSwipe, onSwipedNext, onSwipedPrevious, minDistanceForAction, minDistanceToCapture, style, }) => {
+const Swiper = ({ vertical = false, loop = false, timeout = 0, from = 0, prevTitle = "", nextTitle = "", prevTitleColor, nextTitleColor, dotsTouchable = true, dotColor, dotActiveColor, data, keyExtractor, renderItem, children: childrenProp, onIndexChanged: onIndexChangedProp, onSwipe, onSwipedNext, onSwipedPrevious, minDistanceForAction, minDistanceToCapture, style, }) => {
     var _a;
     const [currentIndex, setCurrentIndex] = React.useState(0);
     const numberOfItems = (_a = data === null || data === void 0 ? void 0 : data.length) !== null && _a !== void 0 ? _a : React.Children.count(childrenProp);
@@ -71,5 +70,5 @@ const Swiper = ({ theme, vertical = false, loop = false, timeout = 0, from = 0,
                     : {}),
             } }, children)));
 };
-export default withTheme(Swiper);
+export default Swiper;
 //# sourceMappingURL=Swiper.js.map

package/src/components/Swiper/Swiper.js.map

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

package/src/components/Swiper/Swiper.tsx

@@ -1,4 +1,3 @@
-import { ReadTheme, withTheme } from "@draftbit/theme";
 import React from "react";
 import { View, StyleProp, ViewStyle } from "react-native";
 import SwiperComponent from "react-native-web-swiper";
@@ -26,11 +25,9 @@ export interface SwiperProps<T> {
   onIndexChanged?: (index: number) => void;
   minDistanceForAction?: number;
   minDistanceToCapture?: number;
-  theme: ReadTheme;
 }
 
 const Swiper = ({
-  theme,
   vertical = false,
   loop = false,
   timeout = 0,
@@ -40,8 +37,8 @@ const Swiper = ({
   prevTitleColor,
   nextTitleColor,
   dotsTouchable = true,
-  dotColor = theme.colors.foreground.brand,
-  dotActiveColor = theme.colors.branding.primary,
+  dotColor,
+  dotActiveColor,
   data,
   keyExtractor,
   renderItem,
@@ -148,4 +145,4 @@ const Swiper = ({
   );
 };
 
-export default withTheme(Swiper);
+export default Swiper;

package/src/components/Switch.js

@@ -1,10 +1,11 @@
 import * as React from "react";
 import { Switch as NativeSwitch, } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import FormRow from "./FormRow";
+import { RowDirection } from "@draftbit/types";
 import { usePrevious } from "../hooks";
 function Switch({ value, defaultValue, disabled, onValueChange, activeTrackColor, inactiveTrackColor, activeThumbColor, inactiveThumbColor, theme, style, ...rest }) {
-    const activeTrackThemeColor = activeTrackColor || theme.colors.branding.primary;
+    const activeTrackThemeColor = activeTrackColor || theme.colors.primary;
     const inactiveTrackThemeColor = inactiveTrackColor || "#EEE";
     const activeThumbThemeColor = activeThumbColor || "#FFF";
     const inactiveThumbThemeColor = inactiveThumbColor || "#FFF";
@@ -32,7 +33,7 @@ function Switch({ value, defaultValue, disabled, onValueChange, activeTrackColor
             onValueChange && onValueChange(bool);
         }, ...rest }));
 }
-function Row({ label = "Label", direction = "row", style, value, defaultValue, disabled, onValueChange, activeTrackColor, inactiveTrackColor, activeThumbColor, inactiveThumbColor, theme, ...rest }) {
+function Row({ label = "Label", direction = RowDirection.Row, style, value, defaultValue, disabled, onValueChange, activeTrackColor, inactiveTrackColor, activeThumbColor, inactiveThumbColor, theme, ...rest }) {
     const [checked, setChecked] = React.useState(value != null ? value : defaultValue);
     React.useEffect(() => {
         if (value != null) {

package/src/components/Switch.js.map

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

package/src/components/Switch.tsx

@@ -5,9 +5,10 @@ import {
   StyleProp,
   ViewStyle,
 } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import FormRow from "./FormRow";
-import type { ReadTheme } from "@draftbit/theme";
+import { RowDirection } from "@draftbit/types";
+import type { Theme } from "../styles/DefaultTheme";
 import { usePrevious } from "../hooks";
 
 type Props = {
@@ -15,7 +16,7 @@ type Props = {
   disabled?: boolean;
   onValueChange?: (value: boolean) => void;
   defaultValue?: boolean;
-  theme: ReadTheme;
+  theme: Theme;
   activeTrackColor: string;
   inactiveTrackColor: string;
   activeThumbColor: string;
@@ -35,8 +36,7 @@ function Switch({
   style,
   ...rest
 }: Props) {
-  const activeTrackThemeColor =
-    activeTrackColor || theme.colors.branding.primary;
+  const activeTrackThemeColor = activeTrackColor || theme.colors.primary;
   const inactiveTrackThemeColor = inactiveTrackColor || "#EEE";
 
   const activeThumbThemeColor = activeThumbColor || "#FFF";
@@ -83,13 +83,13 @@ function Switch({
 
 type RowProps = {
   label: string;
-  direction: "row" | "column";
+  direction: RowDirection;
   style?: StyleProp<ViewStyle>;
 };
 
 function Row({
   label = "Label",
-  direction = "row",
+  direction = RowDirection.Row,
   style,
   value,
   defaultValue,

package/src/components/TabView/TabView.js

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { TabView, TabBar, } from "react-native-tab-view";
 import TabViewItem from "./TabViewItem";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../../theming";
 import { flattenReactFragments, extractStyles } from "../../utilities";
 const TabViewComponent = ({ Icon, onIndexChanged, onEndReached, initialTabIndex = 0, tabBarPosition, keyboardDismissMode, swipeEnabled, scrollEnabled, activeColor, inactiveColor, pressColor, indicatorColor, tabsBackgroundColor, iconSize = 16, style, theme, children: childrenProp, }) => {
     const [index, setIndex] = React.useState(initialTabIndex);
@@ -30,10 +30,10 @@ const TabViewComponent = ({ Icon, onIndexChanged, onEndReached, initialTabIndex
         }
     };
     const renderTabBar = (props) => {
-        return (React.createElement(TabBar, { ...props, activeColor: activeColor || theme.colors.branding.primary, inactiveColor: inactiveColor || "rgb(200,200,200)", pressColor: pressColor || theme.colors.branding.primary, scrollEnabled: scrollEnabled, indicatorStyle: {
-                backgroundColor: indicatorColor || theme.colors.branding.primary,
+        return (React.createElement(TabBar, { ...props, activeColor: activeColor || theme.colors.primary, inactiveColor: inactiveColor || "rgb(200,200,200)", pressColor: pressColor || theme.colors.primary, scrollEnabled: scrollEnabled, indicatorStyle: {
+                backgroundColor: indicatorColor || theme.colors.primary,
             }, labelStyle: [{ textTransform: "none" }, textStyles], renderIcon: ({ route, color }) => (route === null || route === void 0 ? void 0 : route.icon) ? (React.createElement(Icon, { name: route.icon, color: color, size: iconSize })) : null, style: {
-                backgroundColor: tabsBackgroundColor || theme.colors.background.brand,
+                backgroundColor: tabsBackgroundColor || theme.colors.background,
             } }));
     };
     const renderScene = ({ route }) => {

package/src/components/TabView/TabView.js.map

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

package/src/components/TabView/TabView.tsx

@@ -10,8 +10,8 @@ import {
 
 import TabViewItem from "./TabViewItem";
 import type { IconSlot } from "../../interfaces/Icon";
-import { withTheme } from "@draftbit/theme";
-import type { ReadTheme } from "@draftbit/theme";
+import { withTheme } from "../../theming";
+import type { Theme } from "../../styles/DefaultTheme";
 import { flattenReactFragments, extractStyles } from "../../utilities";
 
 type SceneProps = SceneRendererProps & {
@@ -38,7 +38,7 @@ type TabViewProps = {
   tabsBackgroundColor?: string;
   iconSize?: number;
   style?: StyleProp<ViewStyle | TextStyle>;
-  theme: ReadTheme;
+  theme: Theme;
 } & IconSlot;
 
 const TabViewComponent: React.FC<React.PropsWithChildren<TabViewProps>> = ({
@@ -104,12 +104,12 @@ const TabViewComponent: React.FC<React.PropsWithChildren<TabViewProps>> = ({
     return (
       <TabBar
         {...props}
-        activeColor={activeColor || theme.colors.branding.primary}
+        activeColor={activeColor || theme.colors.primary}
         inactiveColor={inactiveColor || "rgb(200,200,200)"}
-        pressColor={pressColor || theme.colors.branding.primary}
+        pressColor={pressColor || theme.colors.primary}
         scrollEnabled={scrollEnabled}
         indicatorStyle={{
-          backgroundColor: indicatorColor || theme.colors.branding.primary,
+          backgroundColor: indicatorColor || theme.colors.primary,
         }}
         labelStyle={[{ textTransform: "none" }, textStyles]}
         renderIcon={({ route, color }) =>
@@ -118,7 +118,7 @@ const TabViewComponent: React.FC<React.PropsWithChildren<TabViewProps>> = ({
           ) : null
         }
         style={{
-          backgroundColor: tabsBackgroundColor || theme.colors.background.brand,
+          backgroundColor: tabsBackgroundColor || theme.colors.background,
         }}
       />
     );

package/src/components/Table/Table.js

@@ -1,8 +1,8 @@
 import React from "react";
 import { ScrollView, View, StyleSheet, } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../../theming";
 import { generateBorderStyles, TableStyleContext, } from "./TableCommon";
-const Table = ({ theme, borderWidth = 1, borderColor = theme.colors.border.brand, borderStyle = "solid", drawTopBorder = true, drawBottomBorder = false, drawStartBorder = false, drawEndBorder = false, cellVerticalPadding = 10, cellHorizontalPadding = 10, data, keyExtractor, renderItem, children: childrenProp, style, ...rest }) => {
+const Table = ({ theme, borderWidth = 1, borderColor = theme.colors.divider, borderStyle = "solid", drawTopBorder = true, drawBottomBorder = false, drawStartBorder = false, drawEndBorder = false, cellVerticalPadding = 10, cellHorizontalPadding = 10, data, keyExtractor, renderItem, children: childrenProp, style, ...rest }) => {
     //Both 'renderItem' and 'data' are optional to allow direct children. But if one is included, both need to be included
     if ((data && !renderItem) || (renderItem && !data)) {
         throw new Error("'renderItem' and 'data' need to both be provided to render from 'data'. Either remove them entirley or include both");

package/src/components/Table/Table.js.map

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

package/src/components/Table/Table.tsx

@@ -7,8 +7,8 @@ import {
   StyleSheet,
   ScrollViewProps,
 } from "react-native";
-import type { ReadTheme } from "@draftbit/theme";
-import { withTheme } from "@draftbit/theme";
+import { Theme } from "../../styles/DefaultTheme";
+import { withTheme } from "../../theming";
 import {
   generateBorderStyles,
   TableProps,
@@ -21,13 +21,13 @@ export interface Props<T> extends TableProps, ScrollViewProps {
   keyExtractor?: (item: T, index: number) => string;
   renderItem?: ({ item, index }: { item: T; index: number }) => JSX.Element;
   style?: StyleProp<ViewStyle>;
-  theme: ReadTheme;
+  theme: Theme;
 }
 
 const Table = <T extends object>({
   theme,
   borderWidth = 1,
-  borderColor = theme.colors.border.brand,
+  borderColor = theme.colors.divider,
   borderStyle = "solid",
   drawTopBorder = true,
   drawBottomBorder = false,

package/src/components/Table/TableRow.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { View, StyleSheet } from "react-native";
 import { generateBorderStyles, TableStyleContext, } from "./TableCommon";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../../theming";
 import Pressable from "../Pressable";
 const TableRow = ({ borderWidth, borderColor, borderStyle, drawTopBorder = false, drawBottomBorder = true, drawStartBorder = true, drawEndBorder = false, cellVerticalPadding, cellHorizontalPadding, isTableHeader = false, children, onPress, style, theme, }) => {
     const parentContextValue = React.useContext(TableStyleContext);
@@ -26,9 +26,7 @@ const TableRow = ({ borderWidth, borderColor, borderStyle, drawTopBorder = false
     return (React.createElement(TableStyleContext.Provider, { value: contextValue },
         React.createElement(ContainerComponent, { onPress: onPress, style: [
                 borderViewStyle,
-                isTableHeader
-                    ? { backgroundColor: theme.colors.branding.primary }
-                    : {},
+                isTableHeader ? { backgroundColor: theme.colors.primary } : {},
                 style,
                 styles.cellsContainer,
             ] }, children)));

package/src/components/Table/TableRow.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableRow.js","sourceRoot":"","sources":["TableRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAwB,UAAU,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EACL,oBAAoB,EAEpB,iBAAiB,GAElB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,SAAS,MAAM,cAAc,CAAC;AASrC,MAAM,QAAQ,GAA6C,CAAC,EAC1D,WAAW,EACX,WAAW,EACX,WAAW,EACX,aAAa,GAAG,KAAK,EACrB,gBAAgB,GAAG,IAAI,EACvB,eAAe,GAAG,IAAI,EACtB,aAAa,GAAG,KAAK,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,aAAa,GAAG,KAAK,EACrB,QAAQ,EACR,OAAO,EACP,KAAK,EACL,KAAK,GACN,EAAE,EAAE;IACH,MAAM,kBAAkB,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAE/D,uGAAuG;IACvG,MAAM,YAAY,GAAoB;QACpC,WAAW,EAAE,WAAW,IAAI,kBAAkB,CAAC,WAAW;QAC1D,WAAW,EAAE,WAAW,IAAI,kBAAkB,CAAC,WAAW;QAC1D,WAAW,EAAE,WAAW,IAAI,kBAAkB,CAAC,WAAW;QAC1D,qBAAqB,EACnB,qBAAqB,IAAI,kBAAkB,CAAC,qBAAqB;QACnE,mBAAmB,EACjB,mBAAmB,IAAI,kBAAkB,CAAC,mBAAmB;KAChE,CAAC;IAEF,MAAM,eAAe,GAAG,oBAAoB,CAAC;QAC3C,WAAW,EAAE,YAAY,CAAC,WAAW;QACrC,WAAW,EAAE,YAAY,CAAC,WAAW;QACrC,WAAW,EAAE,YAAY,CAAC,WAAW;QACrC,aAAa;QACb,gBAAgB;QAChB,eAAe;QACf,aAAa;KACd,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACtD,OAAO,CACL,oBAAC,iBAAiB,CAAC,QAAQ,IAAC,KAAK,EAAE,YAAY;QAC7C,oBAAC,kBAAkB,IACjB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE;gBACL,eAAe;gBACf,aAAa;oBACX,CAAC,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE;oBACpD,CAAC,CAAC,EAAE;gBACN,KAAK;gBACL,MAAM,CAAC,cAAc;aACtB,IAEA,QAAQ,CACU,CACM,CAC9B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,cAAc,EAAE;QACd,aAAa,EAAE,KAAK;KACrB;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"TableRow.js","sourceRoot":"","sources":["TableRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAwB,UAAU,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EACL,oBAAoB,EAEpB,iBAAiB,GAElB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,SAAS,MAAM,cAAc,CAAC;AASrC,MAAM,QAAQ,GAA6C,CAAC,EAC1D,WAAW,EACX,WAAW,EACX,WAAW,EACX,aAAa,GAAG,KAAK,EACrB,gBAAgB,GAAG,IAAI,EACvB,eAAe,GAAG,IAAI,EACtB,aAAa,GAAG,KAAK,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,aAAa,GAAG,KAAK,EACrB,QAAQ,EACR,OAAO,EACP,KAAK,EACL,KAAK,GACN,EAAE,EAAE;IACH,MAAM,kBAAkB,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAE/D,uGAAuG;IACvG,MAAM,YAAY,GAAoB;QACpC,WAAW,EAAE,WAAW,IAAI,kBAAkB,CAAC,WAAW;QAC1D,WAAW,EAAE,WAAW,IAAI,kBAAkB,CAAC,WAAW;QAC1D,WAAW,EAAE,WAAW,IAAI,kBAAkB,CAAC,WAAW;QAC1D,qBAAqB,EACnB,qBAAqB,IAAI,kBAAkB,CAAC,qBAAqB;QACnE,mBAAmB,EACjB,mBAAmB,IAAI,kBAAkB,CAAC,mBAAmB;KAChE,CAAC;IAEF,MAAM,eAAe,GAAG,oBAAoB,CAAC;QAC3C,WAAW,EAAE,YAAY,CAAC,WAAW;QACrC,WAAW,EAAE,YAAY,CAAC,WAAW;QACrC,WAAW,EAAE,YAAY,CAAC,WAAW;QACrC,aAAa;QACb,gBAAgB;QAChB,eAAe;QACf,aAAa;KACd,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACtD,OAAO,CACL,oBAAC,iBAAiB,CAAC,QAAQ,IAAC,KAAK,EAAE,YAAY;QAC7C,oBAAC,kBAAkB,IACjB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE;gBACL,eAAe;gBACf,aAAa,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE;gBAC9D,KAAK;gBACL,MAAM,CAAC,cAAc;aACtB,IAEA,QAAQ,CACU,CACM,CAC9B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,cAAc,EAAE;QACd,aAAa,EAAE,KAAK;KACrB;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC,QAAQ,CAAC,CAAC"}

package/src/components/Table/TableRow.tsx

@@ -6,15 +6,15 @@ import {
   TableStyleContext,
   TableStyleProps,
 } from "./TableCommon";
-import type { ReadTheme } from "@draftbit/theme";
-import { withTheme } from "@draftbit/theme";
+import { Theme } from "../../styles/DefaultTheme";
+import { withTheme } from "../../theming";
 import Pressable from "../Pressable";
 
 export interface Props extends TableProps {
   onPress?: () => void;
   isTableHeader?: boolean;
   style?: StyleProp<ViewStyle>;
-  theme: ReadTheme;
+  theme: Theme;
 }
 
 const TableRow: React.FC<React.PropsWithChildren<Props>> = ({
@@ -63,9 +63,7 @@ const TableRow: React.FC<React.PropsWithChildren<Props>> = ({
         onPress={onPress}
         style={[
           borderViewStyle,
-          isTableHeader
-            ? { backgroundColor: theme.colors.branding.primary }
-            : {},
+          isTableHeader ? { backgroundColor: theme.colors.primary } : {},
           style,
           styles.cellsContainer,
         ]}

package/src/components/Text.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { Text as NativeText, I18nManager } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 class Text extends React.Component {
     render() {
         const { style, ...rest } = this.props;
@@ -17,7 +17,7 @@ class Text extends React.Component {
     }
 }
 export const BaseLink = ({ style, theme, title, ...props }) => {
-    return (React.createElement(Text, { hitSlop: 8, style: [{ color: theme.colors.branding.primary }, style], theme: theme, ...props }, title));
+    return (React.createElement(Text, { hitSlop: 8, style: [{ color: theme.colors.primary }, style], theme: theme, ...props }, title));
 };
 const Link = withTheme(BaseLink);
 export { Link };

package/src/components/Text.js.map

@@ -1 +1 @@
-{"version":3,"file":"Text.js","sourceRoot":"","sources":["Text.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,WAAW,EAAa,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO5C,MAAM,IAAK,SAAQ,KAAK,CAAC,SAAgB;IAGvC,MAAM;QACJ,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAE3D,OAAO,CACL,oBAAC,UAAU,OACL,IAAI,EACR,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE;gBACT,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;YACjB,CAAC,EACD,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE,MAAM;oBACjB,gBAAgB;iBACjB;gBACD,KAAK;aACN,GACD,CACH,CAAC;IACJ,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,EACvB,KAAK,EACL,KAAK,EACL,KAAK,EACL,GAAG,KAAK,EACJ,EAAe,EAAE;IACrB,OAAO,CACL,oBAAC,IAAI,IACH,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,EACxD,KAAK,EAAE,KAAK,KACR,KAAK,IAER,KAAK,CACD,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,IAAI,GAAQ,SAAS,CAAC,QAAQ,CAAC,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,CAAC;AAEhB,eAAe,SAAS,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"Text.js","sourceRoot":"","sources":["Text.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,WAAW,EAAa,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAOvC,MAAM,IAAK,SAAQ,KAAK,CAAC,SAAgB;IAGvC,MAAM;QACJ,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAE3D,OAAO,CACL,oBAAC,UAAU,OACL,IAAI,EACR,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE;gBACT,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;YACjB,CAAC,EACD,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE,MAAM;oBACjB,gBAAgB;iBACjB;gBACD,KAAK;aACN,GACD,CACH,CAAC;IACJ,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,EACvB,KAAK,EACL,KAAK,EACL,KAAK,EACL,GAAG,KAAK,EACJ,EAAe,EAAE;IACrB,OAAO,CACL,oBAAC,IAAI,IACH,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,EAC/C,KAAK,EAAE,KAAK,KACR,KAAK,IAER,KAAK,CACD,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,IAAI,GAAQ,SAAS,CAAC,QAAQ,CAAC,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,CAAC;AAEhB,eAAe,SAAS,CAAC,IAAI,CAAC,CAAC"}

package/src/components/Text.tsx

@@ -1,10 +1,10 @@
 import * as React from "react";
 import { Text as NativeText, I18nManager, TextProps } from "react-native";
-import { withTheme } from "@draftbit/theme";
-import type { ReadTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
+import type { Theme } from "../styles/DefaultTheme";
 
 type Props = {
-  theme: ReadTheme;
+  theme: Theme;
 } & TextProps;
 
 class Text extends React.Component<Props> {
@@ -41,7 +41,7 @@ export const BaseLink = ({
   return (
     <Text
       hitSlop={8}
-      style={[{ color: theme.colors.branding.primary }, style]}
+      style={[{ color: theme.colors.primary }, style]}
       theme={theme}
       {...props}
     >

package/src/components/TextField.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { View, Animated, StyleSheet, Text, I18nManager, Platform, } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import { applyStyles, extractStyles } from "../utilities";
 import TextInput from "./TextInput";
 const AnimatedText = Animated.createAnimatedComponent(Text);
@@ -131,26 +131,25 @@ class TextField extends React.Component {
         return this._root && this._root.blur();
     }
     render() {
-        const { theme, Icon, type = "underline", disabled = false, editable = true, label, error = false, leftIconName, leftIconMode, rightIconName, iconColor, iconSize, assistiveText, underlineColor: underlineColorProp, activeBorderColor: activeBorderColorProp = theme.colors.branding.primary, multiline = false, numberOfLines = 4, style, render = (props) => React.createElement(TextInput, { ...props }), ...rest } = this.props;
-        const { colors, typography } = theme;
+        const { theme: { colors, typography, roundness, disabledOpacity }, Icon, type = "underline", disabled = false, editable = true, label, error = false, leftIconName, leftIconMode, rightIconName, iconColor, iconSize, assistiveText, underlineColor: underlineColorProp, activeBorderColor: activeBorderColorProp = colors.primary, multiline = false, numberOfLines = 4, style, render = (props) => React.createElement(TextInput, { ...props }), ...rest } = this.props;
         const MINIMIZED_LABEL_Y_OFFSET = -(typography.caption.lineHeight + 4);
         const OUTLINE_MINIMIZED_LABEL_Y_OFFSET = -(16 * 0.5 + 4);
         const MAXIMIZED_LABEL_FONT_SIZE = typography.subtitle1.fontSize;
         const MINIMIZED_LABEL_FONT_SIZE = typography.caption.fontSize;
         const hasActiveOutline = this.state.focused || error;
         let inputTextColor, activeColor, underlineColor, borderColor, placeholderColor, containerStyle, backgroundColor, inputStyle;
-        inputTextColor = colors.text.strong;
+        inputTextColor = colors.strong;
         if (disabled) {
-            activeColor = colors.text.light;
-            placeholderColor = colors.text.light;
+            activeColor = colors.light;
+            placeholderColor = colors.light;
             borderColor = "transparent";
             underlineColor = "transparent";
-            backgroundColor = colors.border.brand;
+            backgroundColor = colors.divider;
         }
         else {
-            activeColor = error ? colors.text.danger : activeBorderColorProp;
-            placeholderColor = borderColor = colors.text.light;
-            underlineColor = underlineColorProp || colors.text.light;
+            activeColor = error ? colors.error : activeBorderColorProp;
+            placeholderColor = borderColor = colors.light;
+            underlineColor = underlineColorProp || colors.light;
             backgroundColor = colors.background;
         }
         if (rest.placeholderTextColor) {
@@ -165,14 +164,13 @@ class TextField extends React.Component {
             ...subtitle1,
         };
         if (!multiline) {
-            //@ts-ignore
             inputStyle.height = lineHeight;
         }
         let assistiveTextLeftMargin;
         if (type === "underline") {
             containerStyle = {
-                borderTopLeftRadius: 8,
-                borderTopRightRadius: 8,
+                borderTopLeftRadius: roundness,
+                borderTopRightRadius: roundness,
                 paddingBottom: 12,
                 marginTop: 16,
             };
@@ -185,12 +183,12 @@ class TextField extends React.Component {
         }
         else {
             containerStyle = {
-                borderRadius: 8,
+                borderRadius: roundness,
                 borderColor: hasActiveOutline ? activeColor : borderColor,
                 borderWidth: 1,
                 paddingTop: label ? 16 * 1.5 : 16,
                 paddingBottom: label ? 16 * 0.5 : 16,
-                opacity: disabled ? 0.5 : 1,
+                opacity: disabled ? disabledOpacity : 1,
                 backgroundColor,
             };
             if (leftIconName && leftIconMode === "inset") {
@@ -211,13 +209,13 @@ class TextField extends React.Component {
             leftIconColor = iconColor;
         }
         else if (error) {
-            leftIconColor = colors.text.danger;
+            leftIconColor = colors.error;
         }
         else if (this.state.focused) {
-            leftIconColor = colors.branding.primary;
+            leftIconColor = colors.primary;
         }
         else {
-            leftIconColor = colors.text.light;
+            leftIconColor = colors.light;
         }
         const labelStyle = {
             ...typography.subtitle1,
@@ -291,7 +289,7 @@ class TextField extends React.Component {
                         {
                             backgroundColor: bgColor ||
                                 (error
-                                    ? colors.background.danger
+                                    ? colors.error
                                     : this.state.focused
                                         ? activeColor
                                         : underlineColor),
@@ -358,19 +356,19 @@ class TextField extends React.Component {
                     ...rest,
                     value: this.state.value,
                 })),
-            leftIconName ? (React.createElement(Icon, { size: iconSize || ICON_SIZE, color: leftIconColor || colors.text.light, name: leftIconName, style: {
+            leftIconName ? (React.createElement(Icon, { size: iconSize || ICON_SIZE, color: leftIconColor || colors.light, name: leftIconName, style: {
                     position: "absolute",
                     left: leftIconMode === "inset" && type === "solid" ? 16 : 0,
                     marginTop: type === "solid" ? MINIMIZED_LABEL_FONT_SIZE + 4 : 16,
                 } })) : null,
-            rightIconName ? (React.createElement(Icon, { name: rightIconName, size: iconSize || ICON_SIZE, color: iconColor || colors.text.light, style: {
+            rightIconName ? (React.createElement(Icon, { name: rightIconName, size: iconSize || ICON_SIZE, color: iconColor || colors.light, style: {
                     position: "absolute",
                     right: 16,
                     marginTop: type === "solid" ? MINIMIZED_LABEL_FONT_SIZE + 4 : 16,
                 } })) : null,
             assistiveText ? (React.createElement(Text, { style: [
                     {
-                        color: error ? colors.text.danger : colors.text.light,
+                        color: error ? colors.error : colors.light,
                         marginTop: 8,
                         marginLeft: assistiveTextLeftMargin,
                     },