@draftbit/core 46.8.1-2ae5b7.2 → 46.8.1-51e99b.2

package/lib/commonjs/components/Accordion/AccordionItem.js

@@ -12,7 +12,6 @@ var _theming = require("../../theming");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const AccordionItem = _ref => {
   let {
     Icon,
@@ -27,9 +26,10 @@ const AccordionItem = _ref => {
     textStyles,
     viewStyles
   } = (0, _utilities.extractStyles)(style);
-  return /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({
-    style: [styles.container, viewStyles]
-  }, rest), /*#__PURE__*/React.createElement(_reactNative.View, {
+  return /*#__PURE__*/React.createElement(_reactNative.Pressable, {
+    style: [styles.container, viewStyles],
+    ...rest
+  }, /*#__PURE__*/React.createElement(_reactNative.View, {
     style: styles.row
   }, icon ? /*#__PURE__*/React.createElement(Icon, {
     name: icon,
@@ -61,4 +61,23 @@ const styles = _reactNative.StyleSheet.create({
   }
 });
 var _default = (0, _theming.withTheme)(AccordionItem);
+exports.default = _default;.StyleSheet.create({
+  container: {
+    padding: 8
+  },
+  row: {
+    flexDirection: "row",
+    alignItems: "center",
+    paddingLeft: 8
+  },
+  item: {
+    marginVertical: 6,
+    paddingLeft: 8
+  },
+  content: {
+    flex: 1,
+    justifyContent: "center"
+  }
+});
+var _default = (0, _theming.withTheme)(AccordionItem);
 exports.default = _default;

package/lib/commonjs/components/DeckSwiper/DeckSwiper.js

@@ -17,47 +17,13 @@ const DeckSwiper = _ref => {
     verticalEnabled = true,
     horizontalEnabled = true,
     visibleCardCount = 1,
-    data,
-    keyExtractor,
-    renderItem,
     style,
     children
   } = _ref;
-  //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 lazily render. Either remove them entirley or include both");
-  }
-  if (data && renderItem && children) {
-    console.warn("'children' of DeckSwiper ignored due to usage of 'data' and 'renderItem'");
-  }
   const childrenArray = _react.default.useMemo(() => _react.default.Children.toArray(children), [children]);
 
   // an array of indices based on children count
   const cardsFillerData = _react.default.useMemo(() => Array.from(Array(childrenArray.length).keys()), [childrenArray]);
-  const cardsData = data || cardsFillerData;
-  const renderCard = (card, index) => {
-    if (renderItem) {
-      return renderItem({
-        item: card,
-        index
-      });
-    } else {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, childrenArray[index]);
-    }
-  };
-  const renderFirstCard = () => {
-    if (cardsData.length) {
-      return renderCard(cardsData[0], 0);
-    }
-    return undefined;
-  };
-  const cardKeyExtractor = card => {
-    if (keyExtractor) {
-      return keyExtractor(card);
-    } else {
-      return card === null || card === void 0 ? void 0 : card.toString();
-    }
-  };
 
   /**
    * By default react-native-deck-swiper positions everything with absolute position.
@@ -71,10 +37,10 @@ const DeckSwiper = _ref => {
 
   return /*#__PURE__*/_react.default.createElement(_reactNative.View, null, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
     style: styles.containerHeightFiller
-  }, renderFirstCard()), /*#__PURE__*/_react.default.createElement(_reactNativeDeckSwiper.default, {
-    cards: cardsData,
-    renderCard: renderCard,
-    keyExtractor: cardKeyExtractor,
+  }, childrenArray.length && childrenArray[0]), /*#__PURE__*/_react.default.createElement(_reactNativeDeckSwiper.default, {
+    cards: cardsFillerData,
+    renderCard: (_, i) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, childrenArray[i]),
+    keyExtractor: card => card === null || card === void 0 ? void 0 : card.toString(),
     containerStyle: _reactNative.StyleSheet.flatten([styles.cardsContainer, style]),
     cardStyle: styles.card,
     onSwiped: onIndexChanged,

package/lib/commonjs/components/Picker/Picker.js

@@ -46,6 +46,9 @@ const isWeb = _reactNative.Platform.OS === "web";
 const unstyledColor = "rgba(165, 173, 183, 1)";
 const disabledColor = "rgb(240, 240, 240)";
 const errorColor = "rgba(255, 69, 100, 1)";
+
+//Empty string for 'value' is treated as a non-value
+//reason: Draftbit uses empty string as initial value for string state*/
 const Picker = _ref => {
   var _find$label, _find;
   let {
@@ -76,12 +79,12 @@ const Picker = _ref => {
     setPickerVisible(!pickerVisible);
   };
   React.useEffect(() => {
-    if (value != null) {
+    if (value != null && value !== "") {
       setInternalValue(value);
     }
   }, [value]);
   React.useEffect(() => {
-    if (defaultValue != null) {
+    if (defaultValue != null && defaultValue !== "") {
       setInternalValue(defaultValue);
     }
   }, [defaultValue]);
@@ -96,11 +99,7 @@ const Picker = _ref => {
       _reactNative.Keyboard.dismiss();
     }
   }, [pickerVisible, autoDismissKeyboard]);
-  const normalizedOptions = normalizeOptions(options);
-  const pickerOptions = placeholder ? [{
-    value: placeholder,
-    label: placeholder
-  }, ...normalizedOptions] : normalizedOptions;
+  const pickerOptions = normalizeOptions(options);
   const {
     viewStyles,
     textStyles
@@ -200,10 +199,10 @@ const Picker = _ref => {
     } : {})
   };
   const handleValueChange = (newValue, itemIndex) => {
-    if (!placeholder || itemIndex > 0) {
+    if (newValue !== "") {
       onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(newValue, itemIndex);
+      setInternalValue(newValue);
     }
-    setInternalValue(newValue);
   };
   return (
     /*#__PURE__*/

package/lib/commonjs/components/ScreenContainer.js

@@ -12,6 +12,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ScreenContainer(_ref) {
+  var _StyleSheet$flatten;
   let {
     scrollable = false,
     hasSafeArea = false,
@@ -22,7 +23,7 @@ function ScreenContainer(_ref) {
     children,
     ...rest
   } = _ref;
-  const backgroundColor = theme.colors.background;
+  const backgroundColor = ((_StyleSheet$flatten = _reactNative.StyleSheet.flatten(style)) === null || _StyleSheet$flatten === void 0 ? void 0 : _StyleSheet$flatten.backgroundColor) || theme.colors.background;
   const edges = ["left", "right"];
   if (hasSafeArea || hasTopSafeArea) {
     edges.push("top");

package/lib/commonjs/constants.js

@@ -12,4 +12,4 @@ const APPROX_STATUSBAR_HEIGHT = _reactNative.Platform.select({
   android: DEFAULT_STATUSBAR_HEIGHT_EXPO,
   ios: _reactNative.Platform.Version < 11 ? DEFAULT_STATUSBAR_HEIGHT_EXPO : 0
 });
-exports.APPROX_STATUSBAR_HEIGHT = APPROX_STATUSBAR_HEIGHT;AR_HEIGHT;
+exports.APPROX_STATUSBAR_HEIGHT = APPROX_STATUSBAR_HEIGHT;

package/lib/commonjs/styles/overlay.js

@@ -15,6 +15,7 @@ function overlay(elevation) {
   let surfaceColor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _DarkTheme.default.colors.surface;
   if (isAnimatedValue(elevation)) {
     const inputRange = [0, 1, 2, 3, 8, 24];
+
     // @ts-expect-error: TS doesn't seem to refine the type correctly
     return elevation.interpolate({
       inputRange,
@@ -23,6 +24,7 @@ function overlay(elevation) {
       })
     });
   }
+
   // @ts-expect-error: TS doesn't seem to refine the type correctly
   return calculateColor(surfaceColor, elevation);
 }
@@ -63,4 +65,4 @@ const elevationOverlayTransparency = {
   22: 15.72,
   23: 15.84,
   24: 16
-};};
+};

package/lib/module/components/DeckSwiper/DeckSwiper.js

@@ -10,47 +10,13 @@ const DeckSwiper = _ref => {
     verticalEnabled = true,
     horizontalEnabled = true,
     visibleCardCount = 1,
-    data,
-    keyExtractor,
-    renderItem,
     style,
     children
   } = _ref;
-  //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 lazily render. Either remove them entirley or include both");
-  }
-  if (data && renderItem && children) {
-    console.warn("'children' of DeckSwiper ignored due to usage of 'data' and 'renderItem'");
-  }
   const childrenArray = React.useMemo(() => React.Children.toArray(children), [children]);
 
   // an array of indices based on children count
   const cardsFillerData = React.useMemo(() => Array.from(Array(childrenArray.length).keys()), [childrenArray]);
-  const cardsData = data || cardsFillerData;
-  const renderCard = (card, index) => {
-    if (renderItem) {
-      return renderItem({
-        item: card,
-        index
-      });
-    } else {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, childrenArray[index]);
-    }
-  };
-  const renderFirstCard = () => {
-    if (cardsData.length) {
-      return renderCard(cardsData[0], 0);
-    }
-    return undefined;
-  };
-  const cardKeyExtractor = card => {
-    if (keyExtractor) {
-      return keyExtractor(card);
-    } else {
-      return card === null || card === void 0 ? void 0 : card.toString();
-    }
-  };
 
   /**
    * By default react-native-deck-swiper positions everything with absolute position.
@@ -64,10 +30,10 @@ const DeckSwiper = _ref => {
 
   return /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(View, {
     style: styles.containerHeightFiller
-  }, renderFirstCard()), /*#__PURE__*/React.createElement(DeckSwiperComponent, {
-    cards: cardsData,
-    renderCard: renderCard,
-    keyExtractor: cardKeyExtractor,
+  }, childrenArray.length && childrenArray[0]), /*#__PURE__*/React.createElement(DeckSwiperComponent, {
+    cards: cardsFillerData,
+    renderCard: (_, i) => /*#__PURE__*/React.createElement(React.Fragment, null, childrenArray[i]),
+    keyExtractor: card => card === null || card === void 0 ? void 0 : card.toString(),
     containerStyle: StyleSheet.flatten([styles.cardsContainer, style]),
     cardStyle: styles.card,
     onSwiped: onIndexChanged,

package/lib/module/components/Picker/Picker.js

@@ -37,6 +37,9 @@ const isWeb = Platform.OS === "web";
 const unstyledColor = "rgba(165, 173, 183, 1)";
 const disabledColor = "rgb(240, 240, 240)";
 const errorColor = "rgba(255, 69, 100, 1)";
+
+//Empty string for 'value' is treated as a non-value
+//reason: Draftbit uses empty string as initial value for string state*/
 const Picker = _ref => {
   var _find$label, _find;
   let {
@@ -67,12 +70,12 @@ const Picker = _ref => {
     setPickerVisible(!pickerVisible);
   };
   React.useEffect(() => {
-    if (value != null) {
+    if (value != null && value !== "") {
       setInternalValue(value);
     }
   }, [value]);
   React.useEffect(() => {
-    if (defaultValue != null) {
+    if (defaultValue != null && defaultValue !== "") {
       setInternalValue(defaultValue);
     }
   }, [defaultValue]);
@@ -87,11 +90,7 @@ const Picker = _ref => {
       Keyboard.dismiss();
     }
   }, [pickerVisible, autoDismissKeyboard]);
-  const normalizedOptions = normalizeOptions(options);
-  const pickerOptions = placeholder ? [{
-    value: placeholder,
-    label: placeholder
-  }, ...normalizedOptions] : normalizedOptions;
+  const pickerOptions = normalizeOptions(options);
   const {
     viewStyles,
     textStyles
@@ -191,10 +190,10 @@ const Picker = _ref => {
     } : {})
   };
   const handleValueChange = (newValue, itemIndex) => {
-    if (!placeholder || itemIndex > 0) {
+    if (newValue !== "") {
       onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(newValue, itemIndex);
+      setInternalValue(newValue);
     }
-    setInternalValue(newValue);
   };
   return (
     /*#__PURE__*/

package/lib/module/components/ScreenContainer.js

@@ -4,6 +4,7 @@ import { StyleSheet, ScrollView, View } from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { withTheme } from "../theming";
 function ScreenContainer(_ref) {
+  var _StyleSheet$flatten;
   let {
     scrollable = false,
     hasSafeArea = false,
@@ -14,7 +15,7 @@ function ScreenContainer(_ref) {
     children,
     ...rest
   } = _ref;
-  const backgroundColor = theme.colors.background;
+  const backgroundColor = ((_StyleSheet$flatten = StyleSheet.flatten(style)) === null || _StyleSheet$flatten === void 0 ? void 0 : _StyleSheet$flatten.backgroundColor) || theme.colors.background;
   const edges = ["left", "right"];
   if (hasSafeArea || hasTopSafeArea) {
     edges.push("top");

package/lib/typescript/src/components/DeckSwiper/DeckSwiper.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 import { StyleProp, ViewStyle } from "react-native";
-export interface DeckSwiperProps<T> {
+export interface DeckSwiperProps {
     onIndexChanged?: (index: number) => void;
     onEndReached?: () => void;
     startCardIndex?: number;
@@ -8,14 +8,8 @@ export interface DeckSwiperProps<T> {
     verticalEnabled?: boolean;
     horizontalEnabled?: boolean;
     visibleCardCount?: number;
-    data?: Array<T>;
-    keyExtractor?: (item: T) => string;
-    renderItem?: ({ item, index }: {
-        item: T;
-        index: number;
-    }) => JSX.Element;
     style?: StyleProp<ViewStyle>;
 }
-declare const DeckSwiper: <T extends object>({ onIndexChanged, onEndReached, startCardIndex, infiniteSwiping, verticalEnabled, horizontalEnabled, visibleCardCount, data, keyExtractor, renderItem, style, children, }: React.PropsWithChildren<DeckSwiperProps<T>>) => JSX.Element;
+declare const DeckSwiper: React.FC<React.PropsWithChildren<DeckSwiperProps>>;
 export default DeckSwiper;
 //# sourceMappingURL=DeckSwiper.d.ts.map

package/lib/typescript/src/components/DeckSwiper/DeckSwiper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeckSwiper.d.ts","sourceRoot":"","sources":["../../../../../src/components/DeckSwiper/DeckSwiper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAoB,MAAM,cAAc,CAAC;AAGtE,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAChB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,CAAC;IACnC,UAAU,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1E,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,QAAA,MAAM,UAAU,2PAoGf,CAAC;AAiBF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"DeckSwiper.d.ts","sourceRoot":"","sources":["../../../../../src/components/DeckSwiper/DeckSwiper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAoB,MAAM,cAAc,CAAC;AAGtE,MAAM,WAAW,eAAe;IAC9B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,CA6DlE,CAAC;AAiBF,eAAe,UAAU,CAAC"}

package/lib/typescript/src/components/DeckSwiper/DeckSwiperCard.d.ts

@@ -3,10 +3,11 @@ import { StyleProp, ViewStyle } from "react-native";
 import type { Theme } from "../../styles/DefaultTheme";
 export interface DeckSwiperCardProps {
     style?: StyleProp<ViewStyle>;
+    children: React.ReactNode;
     theme: Theme;
 }
-declare const _default: React.ComponentType<import("@draftbit/react-theme-provider").$Without<React.PropsWithChildren<DeckSwiperCardProps>, "theme"> & {
+declare const _default: React.ComponentType<import("@draftbit/react-theme-provider").$Without<DeckSwiperCardProps, "theme"> & {
     theme?: import("@draftbit/react-theme-provider").$DeepPartial<any> | undefined;
-}> & import("@draftbit/react-theme-provider/typings/hoist-non-react-statics").NonReactStatics<React.ComponentType<React.PropsWithChildren<DeckSwiperCardProps>> & React.FC<React.PropsWithChildren<DeckSwiperCardProps>>, {}>;
+}> & import("@draftbit/react-theme-provider/typings/hoist-non-react-statics").NonReactStatics<React.ComponentType<DeckSwiperCardProps> & React.FC<DeckSwiperCardProps>, {}>;
 export default _default;
 //# sourceMappingURL=DeckSwiperCard.d.ts.map

package/lib/typescript/src/components/DeckSwiper/DeckSwiperCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeckSwiperCard.d.ts","sourceRoot":"","sources":["../../../../../src/components/DeckSwiper/DeckSwiperCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAoB,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAGvD,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,KAAK,EAAE,KAAK,CAAC;CACd;;;;AA6BD,wBAAyC"}
+{"version":3,"file":"DeckSwiperCard.d.ts","sourceRoot":"","sources":["../../../../../src/components/DeckSwiper/DeckSwiperCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAoB,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAGvD,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC;CACd;;;;AA+BD,wBAAyC"}

package/lib/typescript/src/components/Picker/Picker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Picker.d.ts","sourceRoot":"","sources":["../../../../../src/components/Picker/Picker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAKL,SAAS,EACT,SAAS,EAGV,MAAM,cAAc,CAAC;AAStB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAQtD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oBAAY,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAAC;IACnC,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;;;;AA2aF,wBAAiC"}
+{"version":3,"file":"Picker.d.ts","sourceRoot":"","sources":["../../../../../src/components/Picker/Picker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAKL,SAAS,EACT,SAAS,EAGV,MAAM,cAAc,CAAC;AAStB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAQtD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oBAAY,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAAC;IACnC,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;;;;AAyaF,wBAAiC"}

package/lib/typescript/src/components/ScreenContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScreenContainer.d.ts","sourceRoot":"","sources":["../../../../src/components/ScreenContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAGL,SAAS,EACT,SAAS,EAEV,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAEpD,aAAK,oBAAoB,GAAG;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,iBAAS,eAAe,CAAC,EACvB,UAAkB,EAClB,WAAmB,EACnB,iBAAyB,EACzB,cAAsB,EACtB,KAAK,EACL,KAAK,EACL,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,oBAAoB,eAwCtB;;;;AAYD,wBAA0C"}
+{"version":3,"file":"ScreenContainer.d.ts","sourceRoot":"","sources":["../../../../src/components/ScreenContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAGL,SAAS,EACT,SAAS,EAEV,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAEpD,aAAK,oBAAoB,GAAG;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,iBAAS,eAAe,CAAC,EACvB,UAAkB,EAClB,WAAmB,EACnB,iBAAyB,EACzB,cAAsB,EACtB,KAAK,EACL,KAAK,EACL,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,oBAAoB,eAyCtB;;;;AAYD,wBAA0C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.8.1-2ae5b7.2+2ae5b77",
+  "version": "46.8.1-51e99b.2+51e99b7",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^46.8.1-2ae5b7.2+2ae5b77",
+    "@draftbit/types": "^46.8.1-51e99b.2+51e99b7",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.2.3",
@@ -92,5 +92,5 @@
       ]
     ]
   },
-  "gitHead": "2ae5b7790dbc8b74522107d35a88801b9c7a5c89"
+  "gitHead": "51e99b7793aa55d2311507fe4fa965c16eab5bd5"
 }

package/src/components/DeckSwiper/DeckSwiper.js

@@ -1,40 +1,10 @@
 import React from "react";
 import { StyleSheet, View } from "react-native";
 import DeckSwiperComponent from "react-native-deck-swiper";
-const DeckSwiper = ({ onIndexChanged, onEndReached, startCardIndex = 0, infiniteSwiping = false, verticalEnabled = true, horizontalEnabled = true, visibleCardCount = 1, data, keyExtractor, renderItem, style, children, }) => {
-    //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 lazily render. Either remove them entirley or include both");
-    }
-    if (data && renderItem && children) {
-        console.warn("'children' of DeckSwiper ignored due to usage of 'data' and 'renderItem'");
-    }
+const DeckSwiper = ({ onIndexChanged, onEndReached, startCardIndex = 0, infiniteSwiping = false, verticalEnabled = true, horizontalEnabled = true, visibleCardCount = 1, style, children, }) => {
     const childrenArray = React.useMemo(() => React.Children.toArray(children), [children]);
     // an array of indices based on children count
     const cardsFillerData = React.useMemo(() => Array.from(Array(childrenArray.length).keys()), [childrenArray]);
-    const cardsData = data || cardsFillerData;
-    const renderCard = (card, index) => {
-        if (renderItem) {
-            return renderItem({ item: card, index });
-        }
-        else {
-            return React.createElement(React.Fragment, null, childrenArray[index]);
-        }
-    };
-    const renderFirstCard = () => {
-        if (cardsData.length) {
-            return renderCard(cardsData[0], 0);
-        }
-        return undefined;
-    };
-    const cardKeyExtractor = (card) => {
-        if (keyExtractor) {
-            return keyExtractor(card);
-        }
-        else {
-            return card === null || card === void 0 ? void 0 : card.toString();
-        }
-    };
     /**
      * By default react-native-deck-swiper positions everything with absolute position.
      * To overcome this, it is wrapped in a View to be able to add the component in any layout structure.
@@ -45,8 +15,8 @@ const DeckSwiper = ({ onIndexChanged, onEndReached, startCardIndex = 0, infinite
      * This effectivley makes the default height of the container be the height of the first card.
      */
     return (React.createElement(View, null,
-        React.createElement(View, { style: styles.containerHeightFiller }, renderFirstCard()),
-        React.createElement(DeckSwiperComponent, { cards: cardsData, renderCard: renderCard, keyExtractor: cardKeyExtractor, containerStyle: StyleSheet.flatten([styles.cardsContainer, style]), cardStyle: styles.card, onSwiped: onIndexChanged, onSwipedAll: onEndReached, cardIndex: startCardIndex, infinite: infiniteSwiping, verticalSwipe: verticalEnabled, horizontalSwipe: horizontalEnabled, showSecondCard: visibleCardCount > 1, stackSize: visibleCardCount, backgroundColor: "transparent", cardVerticalMargin: 0, cardHorizontalMargin: 0 })));
+        React.createElement(View, { style: styles.containerHeightFiller }, childrenArray.length && childrenArray[0]),
+        React.createElement(DeckSwiperComponent, { cards: cardsFillerData, renderCard: (_, i) => React.createElement(React.Fragment, null, childrenArray[i]), keyExtractor: (card) => card === null || card === void 0 ? void 0 : card.toString(), containerStyle: StyleSheet.flatten([styles.cardsContainer, style]), cardStyle: styles.card, onSwiped: onIndexChanged, onSwipedAll: onEndReached, cardIndex: startCardIndex, infinite: infiniteSwiping, verticalSwipe: verticalEnabled, horizontalSwipe: horizontalEnabled, showSecondCard: visibleCardCount > 1, stackSize: visibleCardCount, backgroundColor: "transparent", cardVerticalMargin: 0, cardHorizontalMargin: 0 })));
 };
 const styles = StyleSheet.create({
     cardsContainer: {

package/src/components/DeckSwiper/DeckSwiper.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { StyleProp, ViewStyle, StyleSheet, View } from "react-native";
 import DeckSwiperComponent from "react-native-deck-swiper";
 
-export interface DeckSwiperProps<T> {
+export interface DeckSwiperProps {
   onIndexChanged?: (index: number) => void;
   onEndReached?: () => void;
   startCardIndex?: number;
@@ -10,13 +10,10 @@ export interface DeckSwiperProps<T> {
   verticalEnabled?: boolean;
   horizontalEnabled?: boolean;
   visibleCardCount?: number;
-  data?: Array<T>;
-  keyExtractor?: (item: T) => string;
-  renderItem?: ({ item, index }: { item: T; index: number }) => JSX.Element;
   style?: StyleProp<ViewStyle>;
 }
 
-const DeckSwiper = <T extends object>({
+const DeckSwiper: React.FC<React.PropsWithChildren<DeckSwiperProps>> = ({
   onIndexChanged,
   onEndReached,
   startCardIndex = 0,
@@ -24,25 +21,9 @@ const DeckSwiper = <T extends object>({
   verticalEnabled = true,
   horizontalEnabled = true,
   visibleCardCount = 1,
-  data,
-  keyExtractor,
-  renderItem,
   style,
   children,
-}: React.PropsWithChildren<DeckSwiperProps<T>>) => {
-  //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 lazily render. Either remove them entirley or include both"
-    );
-  }
-
-  if (data && renderItem && children) {
-    console.warn(
-      "'children' of DeckSwiper ignored due to usage of 'data' and 'renderItem'"
-    );
-  }
-
+}) => {
   const childrenArray = React.useMemo(
     () => React.Children.toArray(children),
     [children]
@@ -54,31 +35,6 @@ const DeckSwiper = <T extends object>({
     [childrenArray]
   );
 
-  const cardsData = data || cardsFillerData;
-
-  const renderCard = (card: any, index: number): JSX.Element => {
-    if (renderItem) {
-      return renderItem({ item: card, index });
-    } else {
-      return <>{childrenArray[index]}</>;
-    }
-  };
-
-  const renderFirstCard = (): JSX.Element | undefined => {
-    if (cardsData.length) {
-      return renderCard(cardsData[0], 0);
-    }
-    return undefined;
-  };
-
-  const cardKeyExtractor = (card: any) => {
-    if (keyExtractor) {
-      return keyExtractor(card);
-    } else {
-      return card?.toString();
-    }
-  };
-
   /**
    * By default react-native-deck-swiper positions everything with absolute position.
    * To overcome this, it is wrapped in a View to be able to add the component in any layout structure.
@@ -91,11 +47,13 @@ const DeckSwiper = <T extends object>({
 
   return (
     <View>
-      <View style={styles.containerHeightFiller}>{renderFirstCard()}</View>
+      <View style={styles.containerHeightFiller}>
+        {childrenArray.length && childrenArray[0]}
+      </View>
       <DeckSwiperComponent
-        cards={cardsData as any[]}
-        renderCard={renderCard}
-        keyExtractor={cardKeyExtractor}
+        cards={cardsFillerData}
+        renderCard={(_, i) => <>{childrenArray[i]}</>}
+        keyExtractor={(card) => card?.toString()}
         containerStyle={
           StyleSheet.flatten([styles.cardsContainer, style]) as
             | object

package/src/components/DeckSwiper/DeckSwiperCard.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { View, StyleSheet } from "react-native";
 import { withTheme } from "../../theming";
-const DeckSwiperCard = ({ style, children, theme }) => (React.createElement(View, { style: [
+const DeckSwiperCard = ({ style, children, theme, }) => (React.createElement(View, { style: [
         styles.card,
         {
             backgroundColor: theme.colors.background,

package/src/components/DeckSwiper/DeckSwiperCard.tsx

@@ -5,12 +5,15 @@ import { withTheme } from "../../theming";
 
 export interface DeckSwiperCardProps {
   style?: StyleProp<ViewStyle>;
+  children: React.ReactNode;
   theme: Theme;
 }
 
-const DeckSwiperCard: React.FC<
-  React.PropsWithChildren<DeckSwiperCardProps>
-> = ({ style, children, theme }) => (
+const DeckSwiperCard: React.FC<DeckSwiperCardProps> = ({
+  style,
+  children,
+  theme,
+}) => (
   <View
     style={[
       styles.card,

package/src/components/Picker/Picker.js

@@ -36,6 +36,8 @@ const isWeb = Platform.OS === "web";
 const unstyledColor = "rgba(165, 173, 183, 1)";
 const disabledColor = "rgb(240, 240, 240)";
 const errorColor = "rgba(255, 69, 100, 1)";
+//Empty string for 'value' is treated as a non-value
+//reason: Draftbit uses empty string as initial value for string state*/
 const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style, placeholder, value, disabled = false, assistiveText, label, iconColor = unstyledColor, iconSize = 24, leftIconMode = "inset", leftIconName, placeholderTextColor = unstyledColor, rightIconName, type = "solid", autoDismissKeyboard = true, }) => {
     var _a, _b;
     const androidPickerRef = React.useRef(undefined);
@@ -45,12 +47,12 @@ const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style,
         setPickerVisible(!pickerVisible);
     };
     React.useEffect(() => {
-        if (value != null) {
+        if (value != null && value !== "") {
             setInternalValue(value);
         }
     }, [value]);
     React.useEffect(() => {
-        if (defaultValue != null) {
+        if (defaultValue != null && defaultValue !== "") {
             setInternalValue(defaultValue);
         }
     }, [defaultValue]);
@@ -65,10 +67,7 @@ const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style,
             Keyboard.dismiss();
         }
     }, [pickerVisible, autoDismissKeyboard]);
-    const normalizedOptions = normalizeOptions(options);
-    const pickerOptions = placeholder
-        ? [{ value: placeholder, label: placeholder }, ...normalizedOptions]
-        : normalizedOptions;
+    const pickerOptions = normalizeOptions(options);
     const { viewStyles, textStyles } = extractStyles(style);
     const additionalBorderStyles = ["backgroundColor"];
     const additionalMarginStyles = [
@@ -163,10 +162,10 @@ const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style,
         ...(disabled ? { color: unstyledColor } : {}),
     };
     const handleValueChange = (newValue, itemIndex) => {
-        if (!placeholder || itemIndex > 0) {
+        if (newValue !== "") {
             onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(newValue, itemIndex);
+            setInternalValue(newValue);
         }
-        setInternalValue(newValue);
     };
     return (
     /* marginsContainer */

package/src/components/Picker/Picker.tsx

@@ -92,6 +92,8 @@ const unstyledColor = "rgba(165, 173, 183, 1)";
 const disabledColor = "rgb(240, 240, 240)";
 const errorColor = "rgba(255, 69, 100, 1)";
 
+//Empty string for 'value' is treated as a non-value
+//reason: Draftbit uses empty string as initial value for string state*/
 const Picker: React.FC<PickerProps> = ({
   error,
   options = [],
@@ -126,13 +128,13 @@ const Picker: React.FC<PickerProps> = ({
   };
 
   React.useEffect(() => {
-    if (value != null) {
+    if (value != null && value !== "") {
       setInternalValue(value);
     }
   }, [value]);
 
   React.useEffect(() => {
-    if (defaultValue != null) {
+    if (defaultValue != null && defaultValue !== "") {
       setInternalValue(defaultValue);
     }
   }, [defaultValue]);
@@ -149,11 +151,7 @@ const Picker: React.FC<PickerProps> = ({
     }
   }, [pickerVisible, autoDismissKeyboard]);
 
-  const normalizedOptions = normalizeOptions(options);
-
-  const pickerOptions = placeholder
-    ? [{ value: placeholder, label: placeholder }, ...normalizedOptions]
-    : normalizedOptions;
+  const pickerOptions = normalizeOptions(options);
 
   const { viewStyles, textStyles } = extractStyles(style);
 
@@ -304,10 +302,10 @@ const Picker: React.FC<PickerProps> = ({
   };
 
   const handleValueChange = (newValue: string, itemIndex: number) => {
-    if (!placeholder || itemIndex > 0) {
+    if (newValue !== "") {
       onValueChange?.(newValue, itemIndex);
+      setInternalValue(newValue);
     }
-    setInternalValue(newValue);
   };
 
   return (

package/src/components/ScreenContainer.js

@@ -3,7 +3,8 @@ import { StyleSheet, ScrollView, View, } from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { withTheme } from "../theming";
 function ScreenContainer({ scrollable = false, hasSafeArea = false, hasBottomSafeArea = false, hasTopSafeArea = false, theme, style, children, ...rest }) {
-    const backgroundColor = theme.colors.background;
+    var _a;
+    const backgroundColor = ((_a = StyleSheet.flatten(style)) === null || _a === void 0 ? void 0 : _a.backgroundColor) || theme.colors.background;
     const edges = ["left", "right"];
     if (hasSafeArea || hasTopSafeArea) {
         edges.push("top");

package/src/components/ScreenContainer.tsx

@@ -31,7 +31,8 @@ function ScreenContainer({
   children,
   ...rest
 }: ScreenContainerProps) {
-  const backgroundColor = theme.colors.background;
+  const backgroundColor =
+    StyleSheet.flatten(style)?.backgroundColor || theme.colors.background;
 
   const edges: Edge[] = ["left", "right"];
   if (hasSafeArea || hasTopSafeArea) {