@draftbit/core 46.4.4-e6ab40.2 → 46.4.4-f71daf.2

package/lib/commonjs/components/Checkbox/CheckboxRow.js

@@ -4,24 +4,39 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Direction = void 0;
+
 var React = _interopRequireWildcard(require("react"));
+
 var _reactNative = require("react-native");
+
 var _lodash = require("lodash");
+
 var _utilities = require("../../utilities");
+
 var _hooks = require("../../hooks");
+
 var _Text = _interopRequireDefault(require("../Text"));
+
 var _Touchable = _interopRequireDefault(require("../Touchable"));
+
 var _Checkbox = _interopRequireDefault(require("./Checkbox"));
+
 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); }
+
 let Direction;
 exports.Direction = Direction;
+
 (function (Direction) {
   Direction["Row"] = "row";
   Direction["RowReverse"] = "row-reverse";
 })(Direction || (exports.Direction = Direction = {}));
+
 const renderLabel = (value, labelStyle, textStyle) => {
   if ((0, _lodash.isString)(value)) {
     return /*#__PURE__*/React.createElement(_Text.default, {
@@ -31,6 +46,7 @@ const renderLabel = (value, labelStyle, textStyle) => {
     return /*#__PURE__*/React.createElement(React.Fragment, null, value);
   }
 };
+
 const CheckboxRow = _ref => {
   let {
     label = "Label",
@@ -58,27 +74,30 @@ const CheckboxRow = _ref => {
     if (status != null) {
       setInternalValue(status);
     }
-  }, [status]);
-
-  // This special logic is to handle weird APIs like Airtable that return
+  }, [status]); // This special logic is to handle weird APIs like Airtable that return
   // true or undefined for a boolean
+
   const previousDefaultValue = (0, _hooks.usePrevious)(defaultValue);
   React.useEffect(() => {
     if (defaultValue !== previousDefaultValue) {
       setInternalValue(Boolean(defaultValue));
     }
   }, [defaultValue, previousDefaultValue]);
+
   const handlePress = () => {
     const newValue = !internalValue;
     setInternalValue(newValue);
     onPress === null || onPress === void 0 ? void 0 : onPress(newValue);
+
     if (newValue) {
       onCheck === null || onCheck === void 0 ? void 0 : onCheck();
     }
+
     if (!newValue) {
       onUncheck === null || onUncheck === void 0 ? void 0 : onUncheck();
     }
   };
+
   const {
     textStyles,
     viewStyles
@@ -106,6 +125,7 @@ const CheckboxRow = _ref => {
     size: size
   }));
 };
+
 const styles = _reactNative.StyleSheet.create({
   mainParent: {
     alignItems: "center",
@@ -125,6 +145,6 @@ const styles = _reactNative.StyleSheet.create({
     flex: 3
   }
 });
+
 var _default = CheckboxRow;
-exports.default = _default;
-//# sourceMappingURL=CheckboxRow.js.map
+exports.default = _default;

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

@@ -5,20 +5,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.checkboxGroupContext = exports.Direction = void 0;
 exports.useCheckboxGroupContext = useCheckboxGroupContext;
+
 var _react = require("react");
+
 let Direction;
 exports.Direction = Direction;
+
 (function (Direction) {
   Direction["Horizontal"] = "horizontal";
   Direction["Vertical"] = "vertical";
 })(Direction || (exports.Direction = Direction = {}));
+
 const checkboxGroupContext = /*#__PURE__*/(0, _react.createContext)({
   onValueChange: () => {},
   values: [],
   direction: undefined
 });
 exports.checkboxGroupContext = checkboxGroupContext;
+
 function useCheckboxGroupContext() {
   return (0, _react.useContext)(checkboxGroupContext);
-}
-//# sourceMappingURL=context.js.map
+}

package/lib/commonjs/components/Checkbox/index.js

@@ -21,8 +21,11 @@ Object.defineProperty(exports, "CheckboxRow", {
     return _CheckboxRow.default;
   }
 });
+
 var _Checkbox = _interopRequireDefault(require("./Checkbox"));
+
 var _CheckboxGroup = _interopRequireDefault(require("./CheckboxGroup"));
+
 var _CheckboxRow = _interopRequireDefault(require("./CheckboxRow"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-//# sourceMappingURL=index.js.map
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/commonjs/components/CircleImage.js

@@ -4,13 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var React = _interopRequireWildcard(require("react"));
+
 var _reactNative = require("react-native");
+
 var _Config = _interopRequireDefault(require("./Config"));
+
 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 CircleImage = _ref => {
   let {
     source = _Config.default.placeholderImageURL,
@@ -31,6 +39,6 @@ const CircleImage = _ref => {
     resizeMode: "cover"
   }, props));
 };
+
 var _default = CircleImage;
-exports.default = _default;
-//# sourceMappingURL=CircleImage.js.map
+exports.default = _default;

package/lib/commonjs/components/CircularProgress.js

@@ -4,16 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _react = _interopRequireDefault(require("react"));
+
 var _reactNative = require("react-native");
+
 var _reactNativeSvg = require("react-native-svg");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 class CircularProgress extends _react.default.Component {
   constructor() {
     super(...arguments);
+
     _defineProperty(this, "polarToCartesian", (centerX, centerY, radius, angleInDegrees) => {
       var angleInRadians = (angleInDegrees - 90) * Math.PI / 180.0;
       return {
@@ -21,6 +26,7 @@ class CircularProgress extends _react.default.Component {
         y: centerY + radius * Math.sin(angleInRadians)
       };
     });
+
     _defineProperty(this, "circlePath", (x, y, radius, startAngle, endAngle) => {
       var start = this.polarToCartesian(x, y, radius, endAngle * 0.9999);
       var end = this.polarToCartesian(x, y, radius, startAngle);
@@ -28,8 +34,10 @@ class CircularProgress extends _react.default.Component {
       var d = ["M", start.x, start.y, "A", radius, radius, 0, largeArcFlag, 0, end.x, end.y];
       return d.join(" ");
     });
+
     _defineProperty(this, "clampFill", fill => Math.min(100, Math.max(0, fill)));
   }
+
   render() {
     const {
       size,
@@ -107,7 +115,8 @@ class CircularProgress extends _react.default.Component {
       style: localChildrenContainerStyle
     }, children(fill)));
   }
+
 }
+
 var _default = CircularProgress;
-exports.default = _default;
-//# sourceMappingURL=CircularProgress.js.map
+exports.default = _default;

package/lib/commonjs/components/Config.js

@@ -4,38 +4,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _reactNative = require("react-native");
+
 const getWindowDimensions = () => {
   const {
     width,
     height
   } = _reactNative.Dimensions.get("window");
+
   return {
     windowWidth: width,
     windowHeight: height
   };
 };
+
 const {
   windowWidth,
   windowHeight
 } = getWindowDimensions();
+
 const getFilters = options => {
   const {
     width,
     height
   } = options;
   const filters = ["c_scale", "q_auto", "dpr_auto"];
-  if (width) filters.push(`w_${width}`);
-  if (height) filters.push(`h_${height}`);
+  if (width) filters.push("w_".concat(width));
+  if (height) filters.push("h_".concat(height));
   return filters.join(",");
 };
+
 const buildImageUrl = (options, name) => {
   const filters = getFilters(options);
-  return ["https://res.cloudinary.com/altos/image/upload", filters, `${name}.png`].join("/");
+  return ["https://res.cloudinary.com/altos/image/upload", filters, "".concat(name, ".png")].join("/");
 };
+
 const getExtension = () => {
   return _reactNative.Platform.OS === "web" ? ".svg" : ".png";
 };
+
 var _default = {
   windowWidth,
   windowHeight,
@@ -74,8 +82,7 @@ var _default = {
   fieldSearchBarFullIconSize: 24,
   stepperButtonSize: 40,
   radioButtonSize: 24,
-  topSafeAreaViewHeight: 0
-  // topSafeAreaViewHeight: Platform.OS === "android" ? Constants.statusBarHeight : 0
+  topSafeAreaViewHeight: 0 // topSafeAreaViewHeight: Platform.OS === "android" ? Constants.statusBarHeight : 0
+
 };
-exports.default = _default;
-//# sourceMappingURL=Config.js.map
+exports.default = _default;

package/lib/commonjs/components/Container.js

@@ -4,13 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var React = _interopRequireWildcard(require("react"));
+
 var _reactNative = require("react-native");
+
 var _theming = require("../theming");
+
 var _Elevation = _interopRequireDefault(require("./Elevation"));
+
 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 Container = _ref => {
   let {
     useThemeGutterPadding,
@@ -72,10 +82,9 @@ const Container = _ref => {
   };
   const Wrap = elevation ? _Elevation.default : _reactNative.View;
   if (elevation) containerStyle.elevation = elevation;
-  return /*#__PURE__*/React.createElement(Wrap, {
-    style: [containerStyle, style],
-    ...rest
-  }, backgroundImage ? /*#__PURE__*/React.createElement(_reactNative.ImageBackground, {
+  return /*#__PURE__*/React.createElement(Wrap, _extends({
+    style: [containerStyle, style]
+  }, rest), backgroundImage ? /*#__PURE__*/React.createElement(_reactNative.ImageBackground, {
     source: typeof backgroundImage === "string" ? {
       uri: backgroundImage
     } : backgroundImage,
@@ -89,17 +98,7 @@ const Container = _ref => {
     style: innerStyle
   }, children));
 };
+
 var _default = (0, _theming.withTheme)(Container);
-exports.default = _default;
-//# sourceMappingURL=Container.js.map   style: {
-      flex: 1
-    }
-  }, /*#__PURE__*/React.createElement(_reactNative.View, {
-    style: innerStyle
-  }, children)) : /*#__PURE__*/React.createElement(_reactNative.View, {
-    style: innerStyle
-  }, children));
-};
-var _default = (0, _theming.withTheme)(Container);
-exports.default = _default;
-//# sourceMappingURL=Container.js.map
+
+exports.default = _default;

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

@@ -4,23 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var React = _interopRequireWildcard(require("react"));
+
 var _reactNative = require("react-native");
+
 var _reactNativeSafeAreaContext = require("react-native-safe-area-context");
+
 var _dateformat = _interopRequireDefault(require("dateformat"));
+
 var _theming = require("../../theming");
+
 var _Portal = _interopRequireDefault(require("../Portal/Portal"));
+
 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); }
+
 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 AnimatedText = _reactNative.Animated.createAnimatedComponent(_reactNative.Text);
+
 const FOCUS_ANIMATION_DURATION = 150;
 const BLUR_ANIMATION_DURATION = 180;
 const ICON_SIZE = 24;
 const MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+
 const DatePicker = _ref => {
   let {
     Icon,
@@ -42,7 +57,11 @@ const DatePicker = _ref => {
     rightIconName,
     leftIconMode = "inset",
     label,
+    labelSize,
+    labelColor,
     placeholder,
+    borderColor: inputBorderColor,
+    borderColorActive: inputBorderColorActive,
     ...props
   } = _ref;
   const [value, setValue] = React.useState(date || defaultValue);
@@ -59,50 +78,59 @@ const DatePicker = _ref => {
     measured: false,
     width: 0
   });
+  const {
+    viewStyles,
+    textStyles
+  } = (0, _utilities.extractStyles)(style);
+
   const getValidDate = () => {
     if (!value) {
       return new Date();
     }
+
     return typeof (value === null || value === void 0 ? void 0 : value.getMonth) === "function" ? value : new Date();
   };
+
   const formatDate = () => {
     if (!value) return "";
     let newDate = getValidDate();
     if (format) return (0, _dateformat.default)(newDate, format);
+
     if (mode === "time") {
-      return `${newDate.toLocaleTimeString()}`;
+      return "".concat(newDate.toLocaleTimeString());
     }
+
     if (mode === "datetime") {
-      return `${newDate.toLocaleString()}`;
+      return "".concat(newDate.toLocaleString());
     }
-    return `${MONTHS[newDate.getMonth()]} ${newDate.getDate()}, ${newDate.getFullYear()}`;
+
+    return "".concat(MONTHS[newDate.getMonth()], " ").concat(newDate.getDate(), ", ").concat(newDate.getFullYear());
   };
+
   const toggleVisibility = async () => {
     setPickerVisible(!pickerVisible);
     focused ? _handleBlur() : _handleFocus();
   };
-  const insets = (0, _reactNativeSafeAreaContext.useSafeAreaInsets)();
 
-  // const _restoreLabel = () =>
+  const insets = (0, _reactNativeSafeAreaContext.useSafeAreaInsets)(); // const _restoreLabel = () =>
   //   Animated.timing(labeled, {
   //     toValue: 1,
   //     duration: FOCUS_ANIMATION_DURATION,
   //     useNativeDriver: true,
   //   }).start();
-
   // const _minmizeLabel = () =>
   //   Animated.timing(labeled, {
   //     toValue: 0,
   //     duration: BLUR_ANIMATION_DURATION,
   //     useNativeDriver: true,
   //   }).start();
-
   // const _showPlaceholder = () =>
   //   setTimeout(() => setPlaceholder1(placeholder || ""), 50);
 
   const _hidePlaceholder = () => {
     setPlaceholder1("");
   };
+
   React.useEffect(() => {
     setValue(date);
   }, [date]);
@@ -125,34 +153,42 @@ const DatePicker = _ref => {
   }, [value, focused, placeholder1, labeled]);
   React.useEffect(() => {
     const _showPlaceholder = () => setTimeout(() => setPlaceholder1(placeholder || ""), 50);
+
     if (focused || !label) {
       _showPlaceholder();
     } else {
       _hidePlaceholder();
     }
+
     return () => {
       clearTimeout(_showPlaceholder());
     };
   }, [focused, label, placeholder]);
+
   const _handleFocus = () => {
     if (disabled) {
       return;
     }
+
     setFocused(true);
   };
+
   const _handleBlur = () => {
     if (disabled) {
       return;
     }
+
     setFocused(false);
   };
+
   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.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;
+
   if (disabled) {
     activeColor = colors.light;
     placeholderColor = colors.light;
@@ -160,11 +196,12 @@ const DatePicker = _ref => {
     underlineColor = "transparent";
     backgroundColor = colors.divider;
   } else {
-    activeColor = colors.primary;
-    placeholderColor = borderColor = colors.light;
-    underlineColor = colors.light;
+    activeColor = inputBorderColorActive || colors.primary;
+    placeholderColor = inputBorderColor || colors.light;
+    underlineColor = inputBorderColor || colors.light;
     backgroundColor = colors.background;
   }
+
   const {
     lineHeight,
     ...subtitle1
@@ -177,6 +214,7 @@ const DatePicker = _ref => {
     ...subtitle1,
     height: lineHeight
   };
+
   if (type === "underline") {
     containerStyle = {
       borderTopLeftRadius: roundness,
@@ -196,15 +234,19 @@ const DatePicker = _ref => {
     };
     inputStyle.paddingHorizontal = 12;
   }
+
   if (leftIconName && leftIconMode === "outset") {
     containerStyle.marginLeft = ICON_SIZE + 8;
   }
+
   let leftIconColor;
+
   if (focused) {
     leftIconColor = colors.primary;
   } else {
     leftIconColor = colors.light;
   }
+
   const leftIconProps = {
     size: 24,
     color: leftIconColor,
@@ -214,9 +256,9 @@ const DatePicker = _ref => {
     position: "absolute",
     marginTop: type === "solid" ? leftIconMode === "inset" ? MINIMIZED_LABEL_FONT_SIZE + 4 : 16 : leftIconMode === "outset" ? 16 : 0
   };
-  const labelStyle = {
-    ...typography.subtitle1,
+  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
@@ -240,9 +282,7 @@ const DatePicker = _ref => {
   };
   const inputStyles = [styles.input, inputStyle, type === "solid" ? {
     marginHorizontal: 12
-  } : {}];
-
-  // const render = (props) => <NativeTextInput {...props} />;
+  } : {}]; // const render = (props) => <NativeTextInput {...props} />;
 
   return /*#__PURE__*/React.createElement(_reactNative.View, {
     style: [styles.container, style]
@@ -253,12 +293,12 @@ const DatePicker = _ref => {
     pointerEvents: "none"
   }, /*#__PURE__*/React.createElement(_reactNative.View, {
     style: [styles.container, style]
-  }, leftIconName && leftIconMode === "outset" ? /*#__PURE__*/React.createElement(Icon, _extends({}, leftIconProps, {
+  }, leftIconName && leftIconMode === "outset" ? /*#__PURE__*/React.createElement(Icon, { ...leftIconProps,
     style: leftIconStyle
-  })) : null, /*#__PURE__*/React.createElement(_reactNative.View, {
+  }) : null, /*#__PURE__*/React.createElement(_reactNative.View, {
     style: [containerStyle, style ? {
       height: style.height
-    } : {}]
+    } : {}, viewStyles]
   }, type === "underline" ?
   /*#__PURE__*/
   // When type === 'flat', render an underline
@@ -277,8 +317,7 @@ const DatePicker = _ref => {
   React.createElement(_reactNative.View, {
     pointerEvents: "none",
     style: [_reactNative.StyleSheet.absoluteFill, {
-      opacity:
-      // Hide the label in minimized state until we measure its width
+      opacity: // Hide the label in minimized state until we measure its width
       date || focused ? labelLayout.measured ? 1 : 0 : 1
     }]
   }, /*#__PURE__*/React.createElement(AnimatedText, {
@@ -289,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]
@@ -300,16 +339,15 @@ const DatePicker = _ref => {
     style: [styles.placeholder, type === "solid" ? {
       paddingHorizontal: 12
     } : {}, labelStyle, {
-      color: placeholderColor,
+      color: labelColor || placeholderColor,
       opacity: hasActiveOutline ? labeled : 1
     }],
     numberOfLines: 1
-  }, label)) : null, leftIconName && leftIconMode === "inset" ? /*#__PURE__*/React.createElement(Icon, _extends({}, leftIconProps, {
-    style: {
-      ...leftIconStyle,
+  }, label)) : null, leftIconName && leftIconMode === "inset" ? /*#__PURE__*/React.createElement(Icon, { ...leftIconProps,
+    style: { ...leftIconStyle,
       marginLeft: type === "solid" ? 16 : 0
     }
-  })) : null, /*#__PURE__*/React.createElement(_reactNative.TextInput, _extends({
+  }) : null, /*#__PURE__*/React.createElement(_reactNative.TextInput, {
     value: formatDate(),
     placeholder: label ? placeholder1 : placeholder,
     editable: !disabled,
@@ -318,8 +356,9 @@ const DatePicker = _ref => {
     onFocus: _handleFocus,
     onBlur: _handleBlur,
     underlineColorAndroid: "transparent",
-    style: inputStyles
-  }, props))), rightIconName ? /*#__PURE__*/React.createElement(Icon, {
+    style: [inputStyles, textStyles],
+    ...props
+  })), rightIconName ? /*#__PURE__*/React.createElement(Icon, {
     name: rightIconName,
     size: ICON_SIZE,
     color: colors.light,
@@ -351,6 +390,7 @@ const DatePicker = _ref => {
     }
   })))));
 };
+
 const styles = _reactNative.StyleSheet.create({
   container: {
     alignSelf: "stretch"
@@ -390,6 +430,7 @@ const styles = _reactNative.StyleSheet.create({
     alignSelf: "flex-end"
   }
 });
+
 var _default = (0, _theming.withTheme)(DatePicker);
-exports.default = _default;
-//# sourceMappingURL=DatePicker.js.map
+
+exports.default = _default;