@draftbit/core 46.4.4-970ba7.2 → 46.4.4-9d4d9a.2

package/lib/commonjs/components/DatePicker/DatePicker.js

@@ -21,6 +21,8 @@ var _Touchable = _interopRequireDefault(require("../Touchable"));
 
 var _DatePickerComponent = _interopRequireDefault(require("./DatePickerComponent"));
 
+var _utilities = require("../../utilities");
+
 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); }
@@ -57,7 +59,11 @@ const DatePicker = _ref => {
     rightIconName,
     leftIconMode = "inset",
     label,
+    labelSize,
+    labelColor,
     placeholder,
+    borderColor: inputBorderColor,
+    borderColorActive: inputBorderColorActive,
     ...props
   } = _ref;
   const [value, setValue] = React.useState(date || defaultValue);
@@ -74,6 +80,9 @@ const DatePicker = _ref => {
     measured: false,
     width: 0
   });
+  const {
+    textStyles
+  } = (0, _utilities.extractStyles)(style);
 
   const getValidDate = () => {
     if (!value) {
@@ -175,8 +184,8 @@ const DatePicker = _ref => {
 
   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 MAXIMIZED_LABEL_FONT_SIZE = (textStyles === null || textStyles === void 0 ? void 0 : textStyles.fontSize) || typography.subtitle1.fontSize;
+  const MINIMIZED_LABEL_FONT_SIZE = labelSize ? labelSize : typography.caption.fontSize;
   const hasActiveOutline = focused;
   let inputTextColor, activeColor, underlineColor, borderColor, placeholderColor, containerStyle, backgroundColor, inputStyle;
   inputTextColor = colors.strong;
@@ -188,9 +197,9 @@ const DatePicker = _ref => {
     underlineColor = "transparent";
     backgroundColor = colors.divider;
   } else {
-    activeColor = colors.primary;
-    placeholderColor = borderColor = colors.light;
-    underlineColor = colors.light;
+    activeColor = inputBorderColorActive || colors.primary;
+    placeholderColor = borderColor = inputBorderColor || colors.light;
+    underlineColor = inputBorderColor || colors.light;
     backgroundColor = colors.background;
   }
 
@@ -212,7 +221,8 @@ const DatePicker = _ref => {
       borderTopLeftRadius: roundness,
       borderTopRightRadius: roundness,
       paddingBottom: 12,
-      marginTop: 16
+      marginTop: 16,
+      backgroundColor
     };
   } else {
     containerStyle = {
@@ -250,6 +260,7 @@ const DatePicker = _ref => {
   };
   const labelStyle = { ...typography.subtitle1,
     top: type === "solid" ? 16 : 0,
+    fontFamily: textStyles === null || textStyles === void 0 ? void 0 : textStyles.fontFamily,
     left: leftIconName && leftIconMode === "inset" ? ICON_SIZE + (type === "solid" ? 16 : 12) : 0,
     transform: [{
       // Move label to top
@@ -273,7 +284,7 @@ const DatePicker = _ref => {
   };
   const inputStyles = [styles.input, inputStyle, type === "solid" ? {
     marginHorizontal: 12
-  } : {}]; // const render = (props) => <NativeTextInput {...props} />;
+  } : {}, textStyles]; // const render = (props) => <NativeTextInput {...props} />;
 
   return /*#__PURE__*/React.createElement(_reactNative.View, {
     style: [styles.container, style]
@@ -283,13 +294,11 @@ const DatePicker = _ref => {
   }, /*#__PURE__*/React.createElement(_reactNative.View, {
     pointerEvents: "none"
   }, /*#__PURE__*/React.createElement(_reactNative.View, {
-    style: [styles.container, style]
+    style: [styles.container]
   }, leftIconName && leftIconMode === "outset" ? /*#__PURE__*/React.createElement(Icon, _extends({}, leftIconProps, {
     style: leftIconStyle
   })) : null, /*#__PURE__*/React.createElement(_reactNative.View, {
-    style: [containerStyle, style ? {
-      height: style.height
-    } : {}]
+    style: [containerStyle, style]
   }, type === "underline" ?
   /*#__PURE__*/
   // When type === 'flat', render an underline
@@ -319,7 +328,7 @@ const DatePicker = _ref => {
     style: [styles.placeholder, type === "solid" ? {
       paddingHorizontal: 12
     } : {}, labelStyle, {
-      color: colors.light,
+      color: labelColor || colors.light,
       opacity: labeled.interpolate({
         inputRange: [0, 1],
         outputRange: [hasActiveOutline ? 1 : 0, 0]
@@ -330,7 +339,7 @@ const DatePicker = _ref => {
     style: [styles.placeholder, type === "solid" ? {
       paddingHorizontal: 12
     } : {}, labelStyle, {
-      color: placeholderColor,
+      color: labelColor || placeholder,
       opacity: hasActiveOutline ? labeled : 1
     }],
     numberOfLines: 1

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

@@ -284,10 +284,6 @@ const Picker = _ref => {
   );
 };
 
-var _default = (0, _theming.withTheme)(Picker);
-
-exports.default = _default;
-
 const styles = _reactNative.StyleSheet.create({
   marginsContainer: {
     alignSelf: "stretch",
@@ -357,4 +353,8 @@ const styles = _reactNative.StyleSheet.create({
     maxWidth: deviceWidth,
     maxHeight: deviceHeight
   }
-});
+});
+
+var _default = (0, _theming.withTheme)(Picker);
+
+exports.default = _default;

package/lib/commonjs/components/Stepper.js

@@ -15,6 +15,8 @@ var _theming = require("../theming");
 
 var _IconButton = _interopRequireDefault(require("./IconButton"));
 
+var _utilities = require("../utilities");
+
 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); }
@@ -28,7 +30,6 @@ const Stepper = _ref => {
     value: valueProp,
     defaultValue,
     style,
-    typeStyle,
     iconSize = 24,
     iconColor,
     onChange,
@@ -38,6 +39,10 @@ const Stepper = _ref => {
     },
     Icon
   } = _ref;
+  const {
+    viewStyles,
+    textStyles
+  } = (0, _utilities.extractStyles)(style);
   const [value, setValue] = (0, _react.useState)(defaultValue !== null && defaultValue !== void 0 ? defaultValue : 0);
 
   const isValidValue = valueArg => valueArg >= min && valueArg <= max;
@@ -60,7 +65,7 @@ const Stepper = _ref => {
   return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
     style: [{
       flexDirection: "row"
-    }, style]
+    }, viewStyles]
   }, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
     Icon: Icon,
     icon: "MaterialIcons/remove",
@@ -77,7 +82,7 @@ const Stepper = _ref => {
       alignSelf: "center",
       color: colors.medium,
       marginHorizontal: 8
-    }, typeStyle]
+    }, textStyles]
   }, value), /*#__PURE__*/_react.default.createElement(_IconButton.default, {
     Icon: Icon,
     icon: "MaterialIcons/add",

package/lib/commonjs/components/Text.js

@@ -24,10 +24,14 @@ class Text extends React.Component {
     super(...arguments);
 
     _defineProperty(this, "_root", void 0);
+
+    _defineProperty(this, "state", {
+      nativeProps: {}
+    });
   }
 
   setNativeProps(args) {
-    return this._root && this._root.setNativeProps(args);
+    this.state.nativeProps = args || {};
   }
 
   render() {
@@ -36,7 +40,7 @@ class Text extends React.Component {
       ...rest
     } = this.props;
     const writingDirection = _reactNative.I18nManager.isRTL ? "rtl" : "ltr";
-    return /*#__PURE__*/React.createElement(_reactNative.Text, _extends({}, rest, {
+    return /*#__PURE__*/React.createElement(_reactNative.Text, _extends({}, rest, this.state.nativeProps, {
       ref: c => {
         this._root = c;
       },

package/lib/commonjs/components/TextField.js

@@ -32,6 +32,7 @@ class TextField extends React.Component {
     super(...arguments);
 
     _defineProperty(this, "state", {
+      nativeProps: {},
       labeled: new _reactNative.Animated.Value(this.props.value || this.props.error ? 0 : 1),
       focused: false,
       placeholder: this.props.error ? this.props.placeholder : "",
@@ -162,7 +163,9 @@ class TextField extends React.Component {
    * @internal
    */
   setNativeProps(args) {
-    return this._root && this._root.setNativeProps(args);
+    this.setState(state => ({ ...state,
+      nativeState: args || {}
+    }));
   }
 
   isFocused() {
@@ -444,6 +447,7 @@ class TextField extends React.Component {
       underlineColorAndroid: "transparent",
       style: inputStyles,
       ...rest,
+      ...this.state.nativeProps,
       value: this.state.value
     })), rightIconName ? /*#__PURE__*/React.createElement(Icon, {
       name: rightIconName,

package/lib/commonjs/index.js

@@ -3,76 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  injectIcon: true,
-  withTheme: true,
-  ThemeProvider: true,
-  Provider: true,
-  DefaultTheme: true,
-  Link: true,
-  Banner: true,
-  Button: true,
-  ButtonSolid: true,
-  ButtonOutline: true,
-  Avatar: true,
-  CircleImage: true,
-  AvatarEdit: true,
-  Card: true,
-  Carousel: true,
-  Checkbox: true,
-  CheckboxGroup: true,
-  CheckboxRow: true,
-  Container: true,
-  Divider: true,
-  FAB: true,
-  FieldSearchBarFull: true,
-  IconButton: true,
-  Image: true,
-  SVG: true,
-  NumberInput: true,
-  ScreenContainer: true,
-  StarRating: true,
-  Surface: true,
-  Switch: true,
-  SwitchRow: true,
-  TextField: true,
-  ToggleButton: true,
-  Touchable: true,
-  AccordionGroup: true,
-  AccordionItem: true,
-  ActionSheet: true,
-  ActionSheetItem: true,
-  ActionSheetCancel: true,
-  Swiper: true,
-  SwiperItem: true,
-  Center: true,
-  Circle: true,
-  Square: true,
-  Row: true,
-  Stack: true,
-  Spacer: true,
-  RadioButton: true,
-  RadioButtonGroup: true,
-  RadioButtonRow: true,
-  RadioButtonFieldGroup: true,
-  CardBlock: true,
-  CardContainer: true,
-  CardContainerRating: true,
-  CardInline: true,
-  DatePicker: true,
-  HeaderLarge: true,
-  HeaderMedium: true,
-  HeaderOverline: true,
-  Picker: true,
-  ProgressBar: true,
-  ProgressCircle: true,
-  RowBodyIcon: true,
-  RowHeadlineImageCaption: true,
-  RowHeadlineImageIcon: true,
-  Slider: true,
-  Stepper: true,
-  useAuthState: true
-};
 Object.defineProperty(exports, "AccordionGroup", {
   enumerable: true,
   get: function () {
@@ -546,20 +476,6 @@ var _Layout = require("./components/Layout");
 
 var _index = require("./components/RadioButton/index");
 
-var _htmlElements = require("@expo/html-elements");
-
-Object.keys(_htmlElements).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _htmlElements[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _htmlElements[key];
-    }
-  });
-});
-
 var _CardBlock = _interopRequireDefault(require("./components/CardBlock"));
 
 var _CardContainer = _interopRequireDefault(require("./components/CardContainer"));

package/lib/commonjs/mappings/AudioPlayer.js

@@ -12,7 +12,17 @@ const SEED_DATA = {
   tag: "AudioPlayer",
   description: "Given a source URL, plays sounds & audio!",
   category: _types.COMPONENT_TYPES.media,
-  layout: {},
+  stylesPanelSections: [_types.StylesPanelSections.Typography, _types.StylesPanelSections.Background, _types.StylesPanelSections.Borders, _types.StylesPanelSections.Size, _types.StylesPanelSections.MarginsAndPaddings, _types.StylesPanelSections.Position],
+  layout: {
+    backgroundColor: "#eee",
+    paddingLeft: 16,
+    paddingRight: 16,
+    paddingTop: 8,
+    paddingBottom: 8,
+    borderRadius: 24,
+    flexDirection: "row",
+    alignItems: "center"
+  },
   props: {
     source: {
       group: _types.GROUPS.data,
@@ -23,7 +33,27 @@ const SEED_DATA = {
       defaultValue: "https://static.draftbit.com/audio/intro-to-draftbit-audio.mp3",
       formType: _types.FORM_TYPES.sourceUrl,
       propType: _types.PROP_TYPES.OBJECT
-    }
+    },
+    sliderColor: (0, _types.createColorProp)({
+      label: "Thumb Color",
+      defaultValue: "strong"
+    }),
+    completedTrackColor: (0, _types.createColorProp)({
+      label: "Completed Track Color",
+      defaultValue: "background"
+    }),
+    remainingTrackColor: (0, _types.createColorProp)({
+      label: "Remaining Track Color",
+      defaultValue: "light"
+    }),
+    trackThumbSize: (0, _types.createNumberProp)({
+      label: "Thumb Size",
+      defaultValue: 24
+    }),
+    playIconColor: (0, _types.createColorProp)({
+      label: "Play Icon Color",
+      defaultValue: "strong"
+    })
   }
 };
 exports.SEED_DATA = SEED_DATA;

package/lib/commonjs/mappings/DatePicker.js

@@ -18,6 +18,16 @@ const SEED_DATA_PROPS = {
     required: true,
     group: _types.GROUPS.data
   },
+  labelSize: (0, _types.createNumberProp)({
+    label: "Label Font Size",
+    group: _types.GROUPS.basic,
+    description: "Label font size",
+    editable: true,
+    defaultValue: null
+  }),
+  labelColor: (0, _types.createColorProp)({
+    label: "Label Color"
+  }),
   mode: {
     label: "Mode",
     description: "Choose between date, time and datetime",
@@ -29,6 +39,12 @@ const SEED_DATA_PROPS = {
     options: ["date", "time", "datetime"],
     group: _types.GROUPS.basic
   },
+  borderColor: (0, _types.createColorProp)({
+    label: "Default Border Color"
+  }),
+  borderColorActive: (0, _types.createColorProp)({
+    label: "Active Border Color"
+  }),
   format: {
     label: "Format",
     description: "Create an output format for the date.",
@@ -37,7 +53,7 @@ const SEED_DATA_PROPS = {
     formType: _types.FORM_TYPES.string,
     propType: _types.PROP_TYPES.STRING,
     defaultValue: null,
-    group: _types.GROUPS.basic
+    group: _types.GROUPS.data
   },
   assistiveText: {
     label: "Assistive text",
@@ -47,7 +63,7 @@ const SEED_DATA_PROPS = {
     defaultValue: null,
     editable: true,
     required: false,
-    group: _types.GROUPS.basic
+    group: _types.GROUPS.data
   },
   // locale: {
   //   label: "Locale",
@@ -89,7 +105,7 @@ const SEED_DATA_PROPS = {
     defaultValue: false,
     editable: true,
     required: false,
-    group: _types.GROUPS.basic
+    group: _types.GROUPS.data
   },
   // error: {
   //   label: "Error",
@@ -145,6 +161,7 @@ const SEED_DATA = [{
   category: _types.COMPONENT_TYPES.input,
   layout: null,
   triggers: [_types.Triggers.OnDateChange],
+  StylesPanelSections: [_types.StylesPanelSections.Typography, _types.StylesPanelSections.Background, _types.StylesPanelSections.Borders, _types.StylesPanelSections.MarginsAndPaddings, _types.StylesPanelSections.Position, _types.StylesPanelSections.Size],
   props: { ...SEED_DATA_PROPS,
     type: {
       label: "Appearance",

package/lib/commonjs/mappings/Stepper.js

@@ -12,7 +12,7 @@ const SEED_DATA = [{
   tag: "Stepper",
   description: "A component used to control the quantity of something",
   category: _types.COMPONENT_TYPES.control,
-  stylesPanelSections: _types.BLOCK_STYLES_SECTIONS,
+  stylesPanelSections: [_types.StylesPanelSections.Typography, ..._types.BLOCK_STYLES_SECTIONS],
   layout: {},
   triggers: [_types.Triggers.OnChange],
   props: {

package/lib/commonjs/mappings/TextField.js

@@ -24,7 +24,7 @@ const SEED_DATA_PROPS = {
     description: "Can automatically capitalize sentences, words, and characters (Default: none).",
     editable: true,
     required: false,
-    defaultValue: null,
+    defaultValue: "none",
     options: ["none", "sentences", "words", "characters"],
     formType: _types.FORM_TYPES.flatArray,
     propType: _types.PROP_TYPES.STRING

package/lib/commonjs/mappings/TextInput.js

@@ -103,7 +103,7 @@ const SEED_DATA = [{
       description: "Can automatically capitalize sentences, words, and characters (Default: none).",
       editable: true,
       required: false,
-      defaultValue: null,
+      defaultValue: "none",
       options: ["none", "sentences", "words", "characters"],
       formType: _types.FORM_TYPES.flatArray,
       propType: _types.PROP_TYPES.STRING

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

@@ -1,3 +1,5 @@
+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); }
+
 import * as React from "react";
 import { Pressable, StyleSheet, View } from "react-native";
 import Text from "../Text";
@@ -18,10 +20,9 @@ const AccordionItem = _ref => {
     textStyles,
     viewStyles
   } = extractStyles(style);
-  return /*#__PURE__*/React.createElement(Pressable, {
-    style: [styles.container, viewStyles],
-    ...rest
-  }, /*#__PURE__*/React.createElement(View, {
+  return /*#__PURE__*/React.createElement(Pressable, _extends({
+    style: [styles.container, viewStyles]
+  }, rest), /*#__PURE__*/React.createElement(View, {
     style: styles.row
   }, icon ? /*#__PURE__*/React.createElement(Icon, {
     name: icon,
@@ -35,28 +36,6 @@ const AccordionItem = _ref => {
   }, label))));
 };
 
-const styles = StyleSheet.create({
-  container: {
-    padding: 8
-  },
-  row: {
-    flexDirection: "row",
-    alignItems: "center",
-    paddingLeft: 8
-  },
-  item: {
-    marginVertical: 6,
-    paddingLeft: 8
-  },
-  content: {
-    flex: 1,
-    justifyContent: "center"
-  }
-});
-export default withTheme(AccordionItem);xtStyles
-  }, label))));
-};
-
 const styles = StyleSheet.create({
   container: {
     padding: 8

package/lib/module/components/Checkbox/context.js

@@ -1,5 +1,5 @@
 import { createContext, useContext } from "react";
-export let Direction;
+export var Direction;
 
 (function (Direction) {
   Direction["Horizontal"] = "horizontal";

package/lib/module/components/DatePicker/DatePicker.js

@@ -8,6 +8,7 @@ import { withTheme } from "../../theming";
 import Portal from "../Portal/Portal";
 import Touchable from "../Touchable";
 import DateTimePicker from "./DatePickerComponent";
+import { extractStyles } from "../../utilities";
 const AnimatedText = Animated.createAnimatedComponent(Text);
 const FOCUS_ANIMATION_DURATION = 150;
 const BLUR_ANIMATION_DURATION = 180;
@@ -35,7 +36,11 @@ const DatePicker = _ref => {
     rightIconName,
     leftIconMode = "inset",
     label,
+    labelSize,
+    labelColor,
     placeholder,
+    borderColor: inputBorderColor,
+    borderColorActive: inputBorderColorActive,
     ...props
   } = _ref;
   const [value, setValue] = React.useState(date || defaultValue);
@@ -52,6 +57,9 @@ const DatePicker = _ref => {
     measured: false,
     width: 0
   });
+  const {
+    textStyles
+  } = extractStyles(style);
 
   const getValidDate = () => {
     if (!value) {
@@ -153,8 +161,8 @@ const DatePicker = _ref => {
 
   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 MAXIMIZED_LABEL_FONT_SIZE = (textStyles === null || textStyles === void 0 ? void 0 : textStyles.fontSize) || typography.subtitle1.fontSize;
+  const MINIMIZED_LABEL_FONT_SIZE = labelSize ? labelSize : typography.caption.fontSize;
   const hasActiveOutline = focused;
   let inputTextColor, activeColor, underlineColor, borderColor, placeholderColor, containerStyle, backgroundColor, inputStyle;
   inputTextColor = colors.strong;
@@ -166,9 +174,9 @@ const DatePicker = _ref => {
     underlineColor = "transparent";
     backgroundColor = colors.divider;
   } else {
-    activeColor = colors.primary;
-    placeholderColor = borderColor = colors.light;
-    underlineColor = colors.light;
+    activeColor = inputBorderColorActive || colors.primary;
+    placeholderColor = borderColor = inputBorderColor || colors.light;
+    underlineColor = inputBorderColor || colors.light;
     backgroundColor = colors.background;
   }
 
@@ -190,7 +198,8 @@ const DatePicker = _ref => {
       borderTopLeftRadius: roundness,
       borderTopRightRadius: roundness,
       paddingBottom: 12,
-      marginTop: 16
+      marginTop: 16,
+      backgroundColor
     };
   } else {
     containerStyle = {
@@ -228,6 +237,7 @@ const DatePicker = _ref => {
   };
   const labelStyle = { ...typography.subtitle1,
     top: type === "solid" ? 16 : 0,
+    fontFamily: textStyles === null || textStyles === void 0 ? void 0 : textStyles.fontFamily,
     left: leftIconName && leftIconMode === "inset" ? ICON_SIZE + (type === "solid" ? 16 : 12) : 0,
     transform: [{
       // Move label to top
@@ -251,7 +261,7 @@ const DatePicker = _ref => {
   };
   const inputStyles = [styles.input, inputStyle, type === "solid" ? {
     marginHorizontal: 12
-  } : {}]; // const render = (props) => <NativeTextInput {...props} />;
+  } : {}, textStyles]; // const render = (props) => <NativeTextInput {...props} />;
 
   return /*#__PURE__*/React.createElement(View, {
     style: [styles.container, style]
@@ -261,13 +271,11 @@ const DatePicker = _ref => {
   }, /*#__PURE__*/React.createElement(View, {
     pointerEvents: "none"
   }, /*#__PURE__*/React.createElement(View, {
-    style: [styles.container, style]
+    style: [styles.container]
   }, leftIconName && leftIconMode === "outset" ? /*#__PURE__*/React.createElement(Icon, _extends({}, leftIconProps, {
     style: leftIconStyle
   })) : null, /*#__PURE__*/React.createElement(View, {
-    style: [containerStyle, style ? {
-      height: style.height
-    } : {}]
+    style: [containerStyle, style]
   }, type === "underline" ?
   /*#__PURE__*/
   // When type === 'flat', render an underline
@@ -297,7 +305,7 @@ const DatePicker = _ref => {
     style: [styles.placeholder, type === "solid" ? {
       paddingHorizontal: 12
     } : {}, labelStyle, {
-      color: colors.light,
+      color: labelColor || colors.light,
       opacity: labeled.interpolate({
         inputRange: [0, 1],
         outputRange: [hasActiveOutline ? 1 : 0, 0]
@@ -308,7 +316,7 @@ const DatePicker = _ref => {
     style: [styles.placeholder, type === "solid" ? {
       paddingHorizontal: 12
     } : {}, labelStyle, {
-      color: placeholderColor,
+      color: labelColor || placeholder,
       opacity: hasActiveOutline ? labeled : 1
     }],
     numberOfLines: 1