@draftbit/core 49.5.2-ff55cf.2 → 49.5.2

package/src/components/SimpleStyleScrollables/SimpleStyleMasonryFlashList.tsx

@@ -1,28 +1,38 @@
 import React from "react";
 import { MasonryFlashList } from "@shopify/flash-list";
-import type { MasonryFlashListProps, ContentStyle } from "@shopify/flash-list";
+import type {
+  MasonryFlashListProps,
+  ContentStyle,
+  MasonryFlashListRef,
+} from "@shopify/flash-list";
 import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 
 /**
  * A MasonryFlashList wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
-const SimpleStyleMasonryFlashList = <T extends any>({
-  style: styleProp,
-  data,
-  ...rest
-}: Omit<MasonryFlashListProps<T>, "contentContainerStyle">) => {
-  const { style, contentContainerStyle } =
-    useSplitContentContainerStyles(styleProp);
+const SimpleStyleMasonryFlashList = React.forwardRef(
+  <T extends any>(
+    {
+      style: styleProp,
+      data,
+      ...rest
+    }: Omit<MasonryFlashListProps<T>, "contentContainerStyle">,
+    ref: React.Ref<MasonryFlashListRef<any>>
+  ) => {
+    const { style, contentContainerStyle } =
+      useSplitContentContainerStyles(styleProp);
 
-  return (
-    <MasonryFlashList
-      style={style}
-      contentContainerStyle={contentContainerStyle as ContentStyle}
-      data={data}
-      {...rest}
-    />
-  );
-};
+    return (
+      <MasonryFlashList
+        ref={ref as any}
+        style={style}
+        contentContainerStyle={contentContainerStyle as ContentStyle}
+        data={data}
+        {...rest}
+      />
+    );
+  }
+);
 
 export default SimpleStyleMasonryFlashList;

package/src/components/SimpleStyleScrollables/SimpleStyleScrollView.js

@@ -5,9 +5,9 @@ import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
  * A ScrollView wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
-const SimpleStyleScrollView = ({ style: styleProp, ...rest }) => {
+const SimpleStyleScrollView = React.forwardRef(({ style: styleProp, ...rest }, ref) => {
     const { style, contentContainerStyle } = useSplitContentContainerStyles(styleProp);
-    return (React.createElement(ScrollView, { style: style, contentContainerStyle: contentContainerStyle, ...rest }));
-};
+    return (React.createElement(ScrollView, { ref: ref, style: style, contentContainerStyle: contentContainerStyle, ...rest }));
+});
 export default SimpleStyleScrollView;
 //# sourceMappingURL=SimpleStyleScrollView.js.map

package/src/components/SimpleStyleScrollables/SimpleStyleScrollView.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleStyleScrollView.js","sourceRoot":"","sources":["SimpleStyleScrollView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,qBAAqB,GAEvB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpC,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAE5C,OAAO,CACL,oBAAC,UAAU,IACT,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"SimpleStyleScrollView.js","sourceRoot":"","sources":["SimpleStyleScrollView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,qBAAqB,GAAG,KAAK,CAAC,UAAU,CAC5C,CACE,EACE,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EACwC,EACjD,GAA0B,EAC1B,EAAE;IACF,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAE5C,OAAO,CACL,oBAAC,UAAU,IACT,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,qBAAqB,CAAC"}

package/src/components/SimpleStyleScrollables/SimpleStyleScrollView.tsx

@@ -7,19 +7,26 @@ import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
  * A ScrollView wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
-const SimpleStyleScrollView: React.FC<
-  Omit<ScrollViewProps, "contentContainerStyle">
-> = ({ style: styleProp, ...rest }) => {
-  const { style, contentContainerStyle } =
-    useSplitContentContainerStyles(styleProp);
+const SimpleStyleScrollView = React.forwardRef(
+  (
+    {
+      style: styleProp,
+      ...rest
+    }: Omit<ScrollViewProps, "contentContainerStyle">,
+    ref: React.Ref<ScrollView>
+  ) => {
+    const { style, contentContainerStyle } =
+      useSplitContentContainerStyles(styleProp);
 
-  return (
-    <ScrollView
-      style={style}
-      contentContainerStyle={contentContainerStyle}
-      {...rest}
-    />
-  );
-};
+    return (
+      <ScrollView
+        ref={ref}
+        style={style}
+        contentContainerStyle={contentContainerStyle}
+        {...rest}
+      />
+    );
+  }
+);
 
 export default SimpleStyleScrollView;

package/src/components/SimpleStyleScrollables/SimpleStyleSectionList.js

@@ -5,11 +5,11 @@ import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
  * A SectionList wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
-const SimpleStyleSectionList = ({ style: styleProp, data, ...rest }) => {
+const SimpleStyleSectionList = React.forwardRef(({ style: styleProp, data, ...rest }, ref) => {
     const { style, contentContainerStyle } = useSplitContentContainerStyles(styleProp);
     return (
     //@ts-ignore contentContainerStyle has different types for FlashList and FlatList implmentations and confuses TS
-    React.createElement(SectionList, { style: style, contentContainerStyle: contentContainerStyle, data: data, ...rest }));
-};
+    React.createElement(SectionList, { ref: ref, style: style, contentContainerStyle: contentContainerStyle, data: data, ...rest }));
+});
 export default SimpleStyleSectionList;
 //# sourceMappingURL=SimpleStyleSectionList.js.map

package/src/components/SimpleStyleScrollables/SimpleStyleSectionList.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleStyleSectionList.js","sourceRoot":"","sources":["SimpleStyleSectionList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAK7C,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,sBAAsB,GAAG,CAAmC,EAChE,KAAK,EAAE,SAAS,EAChB,IAAI,EACJ,GAAG,IAAI,EAIR,EAAE,EAAE;IACH,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAE5C,OAAO;IACL,gHAAgH;IAChH,oBAAC,WAAW,IACV,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,IAAI,KACN,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"SimpleStyleSectionList.js","sourceRoot":"","sources":["SimpleStyleSectionList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAK7C,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAI9E;;;GAGG;AACH,MAAM,sBAAsB,GAAG,KAAK,CAAC,UAAU,CAC7C,CACE,EACE,KAAK,EAAE,SAAS,EAChB,IAAI,EACJ,GAAG,IAAI,EAIR,EACD,GAAyC,EACzC,EAAE;IACF,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAE5C,OAAO;IACL,gHAAgH;IAChH,oBAAC,WAAW,IACV,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,IAAI,KACN,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,sBAAsB,CAAC"}

package/src/components/SimpleStyleScrollables/SimpleStyleSectionList.tsx

@@ -5,31 +5,39 @@ import type {
   FlashListSectionListProps,
 } from "../SectionList";
 import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
+import { FlatList } from "react-native-gesture-handler";
+import { FlashList } from "@shopify/flash-list";
 
 /**
  * A SectionList wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
-const SimpleStyleSectionList = <T extends { [key: string]: any }>({
-  style: styleProp,
-  data,
-  ...rest
-}: Omit<
-  FlatListSectionListProps<T> | FlashListSectionListProps<T>,
-  "contentContainerStyle"
->) => {
-  const { style, contentContainerStyle } =
-    useSplitContentContainerStyles(styleProp);
+const SimpleStyleSectionList = React.forwardRef(
+  <T extends { [key: string]: any }>(
+    {
+      style: styleProp,
+      data,
+      ...rest
+    }: Omit<
+      FlatListSectionListProps<T> | FlashListSectionListProps<T>,
+      "contentContainerStyle"
+    >,
+    ref: React.Ref<FlatList | FlashList<any>>
+  ) => {
+    const { style, contentContainerStyle } =
+      useSplitContentContainerStyles(styleProp);
 
-  return (
-    //@ts-ignore contentContainerStyle has different types for FlashList and FlatList implmentations and confuses TS
-    <SectionList
-      style={style}
-      contentContainerStyle={contentContainerStyle}
-      data={data}
-      {...rest}
-    />
-  );
-};
+    return (
+      //@ts-ignore contentContainerStyle has different types for FlashList and FlatList implmentations and confuses TS
+      <SectionList
+        ref={ref}
+        style={style}
+        contentContainerStyle={contentContainerStyle}
+        data={data}
+        {...rest}
+      />
+    );
+  }
+);
 
 export default SimpleStyleSectionList;

package/src/components/SimpleStyleScrollables/SimpleStyleSwipeableList.js

@@ -5,11 +5,11 @@ import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
  * A SwipeableList wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
-const SimpleStyleSwipeableList = ({ style: styleProp, data, ...rest }) => {
+const SimpleStyleSwipeableList = React.forwardRef(({ style: styleProp, data, ...rest }, ref) => {
     const { style, contentContainerStyle } = useSplitContentContainerStyles(styleProp);
     return (
     //@ts-ignore contentContainerStyle has different types for FlashList and FlatList implmentations and confuses TS
-    React.createElement(SwipeableList, { style: style, contentContainerStyle: contentContainerStyle, data: data, ...rest }));
-};
+    React.createElement(SwipeableList, { ref: ref, style: style, contentContainerStyle: contentContainerStyle, data: data, ...rest }));
+});
 export default SimpleStyleSwipeableList;
 //# sourceMappingURL=SimpleStyleSwipeableList.js.map

package/src/components/SimpleStyleScrollables/SimpleStyleSwipeableList.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleStyleSwipeableList.js","sourceRoot":"","sources":["SimpleStyleSwipeableList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKjD,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,wBAAwB,GAAG,CAAmC,EAClE,KAAK,EAAE,SAAS,EAChB,IAAI,EACJ,GAAG,IAAI,EAIR,EAAE,EAAE;IACH,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAE5C,OAAO;IACL,gHAAgH;IAChH,oBAAC,aAAa,IACZ,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,IAAI,KACN,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"SimpleStyleSwipeableList.js","sourceRoot":"","sources":["SimpleStyleSwipeableList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKjD,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAI9E;;;GAGG;AACH,MAAM,wBAAwB,GAAG,KAAK,CAAC,UAAU,CAC/C,CACE,EACE,KAAK,EAAE,SAAS,EAChB,IAAI,EACJ,GAAG,IAAI,EAIR,EACD,GAAyC,EACzC,EAAE;IACF,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAE5C,OAAO;IACL,gHAAgH;IAChH,oBAAC,aAAa,IACZ,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,IAAI,KACN,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,wBAAwB,CAAC"}

package/src/components/SimpleStyleScrollables/SimpleStyleSwipeableList.tsx

@@ -5,31 +5,39 @@ import type {
   FlatListSwipeableListProps,
 } from "../SwipeableItem";
 import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
+import { FlatList } from "react-native-gesture-handler";
+import { FlashList } from "@shopify/flash-list";
 
 /**
  * A SwipeableList wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
-const SimpleStyleSwipeableList = <T extends { [key: string]: any }>({
-  style: styleProp,
-  data,
-  ...rest
-}: Omit<
-  FlashListSwipeableListProps<T> | FlatListSwipeableListProps<T>,
-  "contentContainerStyle"
->) => {
-  const { style, contentContainerStyle } =
-    useSplitContentContainerStyles(styleProp);
+const SimpleStyleSwipeableList = React.forwardRef(
+  <T extends { [key: string]: any }>(
+    {
+      style: styleProp,
+      data,
+      ...rest
+    }: Omit<
+      FlashListSwipeableListProps<T> | FlatListSwipeableListProps<T>,
+      "contentContainerStyle"
+    >,
+    ref: React.Ref<FlatList | FlashList<any>>
+  ) => {
+    const { style, contentContainerStyle } =
+      useSplitContentContainerStyles(styleProp);
 
-  return (
-    //@ts-ignore contentContainerStyle has different types for FlashList and FlatList implmentations and confuses TS
-    <SwipeableList
-      style={style}
-      contentContainerStyle={contentContainerStyle}
-      data={data}
-      {...rest}
-    />
-  );
-};
+    return (
+      //@ts-ignore contentContainerStyle has different types for FlashList and FlatList implmentations and confuses TS
+      <SwipeableList
+        ref={ref}
+        style={style}
+        contentContainerStyle={contentContainerStyle}
+        data={data}
+        {...rest}
+      />
+    );
+  }
+);
 
 export default SimpleStyleSwipeableList;

package/src/components/Slider.js

@@ -3,7 +3,7 @@ import { View, StyleSheet, Platform } from "react-native";
 import NativeSlider from "@react-native-community/slider";
 import isNumber from "lodash.isnumber";
 import toNumber from "lodash.tonumber";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 function maybeParseValue(value) {
     if (value === undefined) {
         return undefined;
@@ -52,11 +52,11 @@ function Slider({ Icon, leftIcon, rightIcon, leftIconColor, rightIconColor, valu
             setInternalValue(defaultValue);
         }
     }, [defaultValue]);
-    const minTrackColor = minimumTrackTintColor || theme.colors.branding.primary;
-    const maxTrackColor = maximumTrackTintColor || theme.colors.foreground.light;
-    const thumbColor = thumbTintColor || theme.colors.branding.primary;
-    const leftIconThemeColor = leftIconColor || theme.colors.text.light;
-    const rightIconThemeColor = rightIconColor || theme.colors.text.light;
+    const minTrackColor = minimumTrackTintColor || theme.colors.primary;
+    const maxTrackColor = maximumTrackTintColor || theme.colors.light;
+    const thumbColor = thumbTintColor || theme.colors.primary;
+    const leftIconThemeColor = leftIconColor || theme.colors.light;
+    const rightIconThemeColor = rightIconColor || theme.colors.light;
     const parsedValue = maybeParseValue(internalValue);
     const handleSlidingComplete = (newValue) => {
         setInternalValue(newValue);

package/src/components/Slider.js.map

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

package/src/components/Slider.tsx

@@ -4,8 +4,8 @@ import NativeSlider from "@react-native-community/slider";
 import isNumber from "lodash.isnumber";
 import toNumber from "lodash.tonumber";
 
-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";
 
 export type Props = {
@@ -24,7 +24,7 @@ export type Props = {
   maximumValue: number;
   step: number;
   onValueChange?: (value: number) => void;
-  theme: ReadTheme;
+  theme: Theme;
 } & IconSlot;
 
 function maybeParseValue(value: any) {
@@ -104,12 +104,12 @@ function Slider({
     }
   }, [defaultValue]);
 
-  const minTrackColor = minimumTrackTintColor || theme.colors.branding.primary;
-  const maxTrackColor = maximumTrackTintColor || theme.colors.foreground.light;
-  const thumbColor = thumbTintColor || theme.colors.branding.primary;
+  const minTrackColor = minimumTrackTintColor || theme.colors.primary;
+  const maxTrackColor = maximumTrackTintColor || theme.colors.light;
+  const thumbColor = thumbTintColor || theme.colors.primary;
 
-  const leftIconThemeColor = leftIconColor || theme.colors.text.light;
-  const rightIconThemeColor = rightIconColor || theme.colors.text.light;
+  const leftIconThemeColor = leftIconColor || theme.colors.light;
+  const rightIconThemeColor = rightIconColor || theme.colors.light;
 
   const parsedValue = maybeParseValue(internalValue);
 

package/src/components/StarRating.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { View, StyleSheet, Pressable, } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 const StarRating = ({ Icon, starSize = 16, maxStars = 5, rating = 0, defaultValue, isEditable = false, activeColor, inactiveColor, style, onPress, ...rest }) => {
     const [localRating, setLocalRating] = React.useState(rating || defaultValue || 0);
     React.useEffect(() => {

package/src/components/StarRating.js.map

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

package/src/components/StarRating.tsx

@@ -6,8 +6,8 @@ import {
   ViewStyle,
   Pressable,
 } from "react-native";
-import { withTheme } from "@draftbit/theme";
-import type { ReadTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
+import type { Theme } from "../styles/DefaultTheme";
 import type { IconSlot } from "../interfaces/Icon";
 
 type Props = {
@@ -18,7 +18,7 @@ type Props = {
   isEditable?: boolean;
   activeColor?: string;
   inactiveColor?: string;
-  theme: ReadTheme;
+  theme: Theme;
   style?: StyleProp<ViewStyle>;
   onPress?: (newValue: number) => void;
 } & IconSlot;

package/src/components/Stepper.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { View, Text } from "react-native";
 import { isNumber } from "lodash";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
 import IconButton from "./IconButton";
 import { extractStyles } from "../utilities";
 const Stepper = ({ min = -Infinity, max = Infinity, value: valueProp, defaultValue, style, iconSize = 24, iconColor, onChange, theme: { colors, typography }, Icon, }) => {
@@ -27,12 +27,11 @@ const Stepper = ({ min = -Infinity, max = Infinity, value: valueProp, defaultVal
     return (React.createElement(View, { style: [{ flexDirection: "row" }, viewStyles] },
         React.createElement(IconButton, { Icon: Icon, icon: "MaterialIcons/remove", onPress: () => handlePlusOrMinus("minus"), size: iconSize, color: iconColor, disabled: value === min, style: { opacity: value === min ? 0.5 : 1 } }),
         React.createElement(Text, { style: [
-                { color: colors.text.strong },
                 typography.body1,
                 {
                     textAlign: "center",
                     alignSelf: "center",
-                    color: colors.text.medium,
+                    color: colors.medium,
                     marginHorizontal: 8,
                 },
                 textStyles,

package/src/components/Stepper.js.map

@@ -1 +1 @@
-{"version":3,"file":"Stepper.js","sourceRoot":"","sources":["Stepper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAM,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAmC,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAc7C,MAAM,OAAO,GAAc,CAAC,EAC1B,GAAG,GAAG,CAAC,QAAQ,EACf,GAAG,GAAG,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,YAAY,EACZ,KAAK,EACL,QAAQ,GAAG,EAAE,EACb,SAAS,EACT,QAAQ,EACR,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAC7B,IAAI,GACL,EAAE,EAAE;IACH,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,CAAC,CAAC,CAAC;IAEtD,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,QAAQ,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,CAAC;IAE9E,MAAM,iBAAiB,GAAG,CAAC,IAAsB,EAAE,EAAE;QACnD,MAAM,QAAQ,GAAG,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QAEzD,IAAI,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1B,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,QAAQ,CAAC,CAAC;SACtB;IACH,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IACE,SAAS,IAAI,IAAI;YACjB,QAAQ,CAAC,SAAS,CAAC;YACnB,SAAS,KAAK,KAAK;YACnB,YAAY,CAAC,SAAS,CAAC,EACvB;YACA,QAAQ,CAAC,SAAS,CAAC,CAAC;SACrB;QACD,uDAAuD;IACzD,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,UAAU,CAAC;QACjD,oBAAC,UAAU,IACT,IAAI,EAAE,IAAI,EACV,IAAI,EAAC,sBAAsB,EAC3B,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,EACzC,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,KAAK,KAAK,GAAG,EACvB,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAC3C;QAEF,oBAAC,IAAI,IACH,KAAK,EAAE;gBACL,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC7B,UAAU,CAAC,KAAK;gBAChB;oBACE,SAAS,EAAE,QAAQ;oBACnB,SAAS,EAAE,QAAQ;oBACnB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM;oBACzB,gBAAgB,EAAE,CAAC;iBACpB;gBACD,UAAU;aACX,IAEA,KAAK,CACD;QAEP,oBAAC,UAAU,IACT,IAAI,EAAE,IAAI,EACV,IAAI,EAAC,mBAAmB,EACxB,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,EACxC,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,KAAK,KAAK,GAAG,EACvB,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAC3C,CACG,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"Stepper.js","sourceRoot":"","sources":["Stepper.tsx"],"names":[],"mappings":"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"}

package/src/components/Stepper.tsx

@@ -2,8 +2,8 @@ import React, { FC, useEffect, useState } from "react";
 import { View, Text, StyleProp, ViewStyle, TextStyle } from "react-native";
 import { isNumber } from "lodash";
 
-import { withTheme } from "@draftbit/theme";
-import type { ReadTheme } from "@draftbit/theme";
+import { withTheme } from "../theming";
+import type { Theme } from "../styles/DefaultTheme";
 import type { IconSlot } from "../interfaces/Icon";
 import IconButton from "./IconButton";
 import { extractStyles } from "../utilities";
@@ -17,7 +17,7 @@ type Props = {
   iconSize: number;
   iconColor?: string;
   onChange?: (value: number) => void;
-  theme: ReadTheme;
+  theme: Theme;
 } & IconSlot;
 
 const Stepper: FC<Props> = ({
@@ -72,12 +72,11 @@ const Stepper: FC<Props> = ({
 
       <Text
         style={[
-          { color: colors.text.strong },
           typography.body1,
           {
             textAlign: "center",
             alignSelf: "center",
-            color: colors.text.medium,
+            color: colors.medium,
             marginHorizontal: 8,
           },
           textStyles,

package/src/components/Surface.js

@@ -1,23 +1,30 @@
 /* Copied from https://github.com/callstack/react-native-paper/blob/main/src/components/Surface.tsx */
 import * as React from "react";
 import { Animated, StyleSheet, } from "react-native";
-import { withTheme } from "@draftbit/theme";
+import shadow from "../styles/shadow";
+import overlay from "../styles/overlay";
+import { withTheme } from "../theming";
 const Surface = ({ elevation: propElevation, style, theme, children, ...rest }) => {
     const { elevation: styleElevation = 3, backgroundColor, ...restStyle } = (StyleSheet.flatten(style) || {});
-    const { colors } = theme;
+    const { dark: isDarkTheme, mode, colors } = theme;
     const elevation = propElevation !== null && propElevation !== void 0 ? propElevation : styleElevation;
+    const evalationStyles = elevation ? shadow(elevation) : {};
     const getBackgroundColor = () => {
         if (backgroundColor) {
             return backgroundColor;
         }
+        else if (isDarkTheme && mode === "adaptive") {
+            return overlay(elevation, colors.surface);
+        }
         else {
-            return colors.background.brand;
+            return colors.surface;
         }
     };
     return (React.createElement(Animated.View, { ...rest, style: [
             {
                 backgroundColor: getBackgroundColor(),
                 elevation,
+                ...evalationStyles,
                 ...restStyle,
             },
         ] }, children));

package/src/components/Surface.js.map

@@ -1 +1 @@
-{"version":3,"file":"Surface.js","sourceRoot":"","sources":["Surface.tsx"],"names":[],"mappings":"AAAA,sGAAsG;AACtG,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,QAAQ,EACR,UAAU,GAIX,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAS5C,MAAM,OAAO,GAA6C,CAAC,EACzD,SAAS,EAAE,aAAa,EACxB,KAAK,EACL,KAAK,EACL,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,EACJ,SAAS,EAAE,cAAc,GAAG,CAAC,EAC7B,eAAe,EACf,GAAG,SAAS,EACb,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAc,CAAC;IAEnD,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAEzB,MAAM,SAAS,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,cAAc,CAAC;IAElD,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC9B,IAAI,eAAe,EAAE;YACnB,OAAO,eAAe,CAAC;SACxB;aAAM;YACL,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;SAChC;IACH,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,QAAQ,CAAC,IAAI,OACR,IAAI,EACR,KAAK,EAAE;YACL;gBACE,eAAe,EAAE,kBAAkB,EAAE;gBACrC,SAAS;gBACT,GAAG,SAAS;aACb;SACF,IAEA,QAAQ,CACK,CACjB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"Surface.js","sourceRoot":"","sources":["Surface.tsx"],"names":[],"mappings":"AAAA,sGAAsG;AACtG,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,QAAQ,EACR,UAAU,GAIX,MAAM,cAAc,CAAC;AAEtB,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AASvC,MAAM,OAAO,GAA6C,CAAC,EACzD,SAAS,EAAE,aAAa,EACxB,KAAK,EACL,KAAK,EACL,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,EACJ,SAAS,EAAE,cAAc,GAAG,CAAC,EAC7B,eAAe,EACf,GAAG,SAAS,EACb,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAc,CAAC;IAEnD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAElD,MAAM,SAAS,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,cAAc,CAAC;IAElD,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE3D,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC9B,IAAI,eAAe,EAAE;YACnB,OAAO,eAAe,CAAC;SACxB;aAAM,IAAI,WAAW,IAAI,IAAI,KAAK,UAAU,EAAE;YAC7C,OAAO,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;SAC3C;aAAM;YACL,OAAO,MAAM,CAAC,OAAO,CAAC;SACvB;IACH,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,QAAQ,CAAC,IAAI,OACR,IAAI,EACR,KAAK,EAAE;YACL;gBACE,eAAe,EAAE,kBAAkB,EAAE;gBACrC,SAAS;gBACT,GAAG,eAAe;gBAClB,GAAG,SAAS;aACb;SACF,IAEA,QAAQ,CACK,CACjB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,OAAO,CAAC,CAAC"}

package/src/components/Surface.tsx

@@ -8,13 +8,15 @@ import {
   ViewStyle,
 } from "react-native";
 
-import { withTheme } from "@draftbit/theme";
-import type { ReadTheme } from "@draftbit/theme";
+import shadow from "../styles/shadow";
+import overlay from "../styles/overlay";
+import { withTheme } from "../theming";
+import type { Theme } from "../styles/DefaultTheme";
 
 type Props = {
   elevation?: number;
   style?: StyleProp<ViewStyle>;
-  theme: ReadTheme;
+  theme: Theme;
 } & ViewProps;
 
 const Surface: React.FC<React.PropsWithChildren<Props>> = ({
@@ -30,15 +32,19 @@ const Surface: React.FC<React.PropsWithChildren<Props>> = ({
     ...restStyle
   } = (StyleSheet.flatten(style) || {}) as ViewStyle;
 
-  const { colors } = theme;
+  const { dark: isDarkTheme, mode, colors } = theme;
 
   const elevation = propElevation ?? styleElevation;
 
+  const evalationStyles = elevation ? shadow(elevation) : {};
+
   const getBackgroundColor = () => {
     if (backgroundColor) {
       return backgroundColor;
+    } else if (isDarkTheme && mode === "adaptive") {
+      return overlay(elevation, colors.surface);
     } else {
-      return colors.background.brand;
+      return colors.surface;
     }
   };
 
@@ -49,6 +55,7 @@ const Surface: React.FC<React.PropsWithChildren<Props>> = ({
         {
           backgroundColor: getBackgroundColor(),
           elevation,
+          ...evalationStyles,
           ...restStyle,
         },
       ]}

package/src/components/SwipeableItem/SwipeableItem.js

@@ -3,7 +3,7 @@ import { View, StyleSheet, Text, } from "react-native";
 import Pressable from "../Pressable";
 import { extractBorderAndMarginStyles, extractEffectStyles, extractFlexItemStyles, extractPositionStyles, extractSizeStyles, extractStyles, flattenReactFragments, } from "../../utilities";
 import { SwipeRow } from "react-native-swipe-list-view";
-import { withTheme } from "@draftbit/theme";
+import { withTheme } from "../../theming";
 import SwipeableItemButton from "./SwipeableItemButton";
 import { SwipeableListContext } from "./SwipeableList";
 import { leftSwipeToSwipeableItemBehindItem, rightSwipeToSwipeableItemBehindItem, extractLeftSwipeProps, extractRightSwipeProps, } from "./SwipeableItemCommon";
@@ -59,15 +59,10 @@ const SwipeableItem = ({ theme, style, children: childrenProp, Icon, closeOnPres
             }
         }, style: [
             styles.buttonContainer,
-            {
-                backgroundColor: item.backgroundColor || theme.colors.branding.primary,
-            },
+            { backgroundColor: item.backgroundColor || theme.colors.primary },
         ] },
-        item.icon && (React.createElement(Icon, { name: item.icon, size: item.iconSize || 25, color: item.color || theme.colors.background.brand })),
-        item.title && (React.createElement(Text, { style: [
-                textStyles,
-                { color: item.color || theme.colors.background.brand },
-            ] }, item.title))));
+        item.icon && (React.createElement(Icon, { name: item.icon, size: item.iconSize || 25, color: item.color || theme.colors.surface })),
+        item.title && (React.createElement(Text, { style: [textStyles, { color: item.color || theme.colors.surface }] }, item.title))));
     const defaultLeftOpenValue = componentWidth ? componentWidth / 2 : 0;
     const defaultRightOpenValue = componentWidth ? -componentWidth / 2 : 0;
     return (React.createElement(View, { onLayout: (event) => {
@@ -89,7 +84,7 @@ const SwipeableItem = ({ theme, style, children: childrenProp, Icon, closeOnPres
             React.createElement(View, { style: [
                     styles.surfaceContainer,
                     {
-                        backgroundColor: theme.colors.background.brand,
+                        backgroundColor: theme.colors.background,
                     },
                     surfaceContainerStyles,
                 ] }, remainingChildren))));