@draftbit/core 46.4.4-9a666e.2 → 46.4.4-b0ea41.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;
   }
 
@@ -250,6 +259,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 +283,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]
@@ -319,7 +329,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 +340,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/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/mappings/DatePicker.js

@@ -18,6 +18,12 @@ const SEED_DATA_PROPS = {
     required: true,
     group: _types.GROUPS.data
   },
+  labelSize: (0, _types.createNumberProp)({
+    label: "Label Size"
+  }),
+  labelColor: (0, _types.createColorProp)({
+    label: "Label Color"
+  }),
   mode: {
     label: "Mode",
     description: "Choose between date, time and datetime",
@@ -29,6 +35,12 @@ const SEED_DATA_PROPS = {
     options: ["date", "time", "datetime"],
     group: _types.GROUPS.basic
   },
+  borderColor: (0, _types.createColorProp)({
+    label: "Border Color"
+  }),
+  borderColorActive: (0, _types.createColorProp)({
+    label: "Border Color"
+  }),
   format: {
     label: "Format",
     description: "Create an output format for the date.",
@@ -145,6 +157,7 @@ const SEED_DATA = [{
   category: _types.COMPONENT_TYPES.input,
   layout: null,
   triggers: [_types.Triggers.OnDateChange],
+  StylesPanelSections: [_types.StylesPanelSections.Background, _types.StylesPanelSections.Borders, _types.StylesPanelSections.MarginsAndPaddings, _types.StylesPanelSections.Position, _types.StylesPanelSections.Size, _types.StylesPanelSections.Typography],
   props: { ...SEED_DATA_PROPS,
     type: {
       label: "Appearance",

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/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;
   }
 
@@ -228,6 +236,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 +260,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]
@@ -297,7 +306,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 +317,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/module/components/Text.js

@@ -11,10 +11,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() {
@@ -23,7 +27,7 @@ class Text extends React.Component {
       ...rest
     } = this.props;
     const writingDirection = I18nManager.isRTL ? "rtl" : "ltr";
-    return /*#__PURE__*/React.createElement(NativeText, _extends({}, rest, {
+    return /*#__PURE__*/React.createElement(NativeText, _extends({}, rest, this.state.nativeProps, {
       ref: c => {
         this._root = c;
       },

package/lib/module/components/TextField.js

@@ -16,6 +16,7 @@ class TextField extends React.Component {
     super(...arguments);
 
     _defineProperty(this, "state", {
+      nativeProps: {},
       labeled: new Animated.Value(this.props.value || this.props.error ? 0 : 1),
       focused: false,
       placeholder: this.props.error ? this.props.placeholder : "",
@@ -146,7 +147,9 @@ class TextField extends React.Component {
    * @internal
    */
   setNativeProps(args) {
-    return this._root && this._root.setNativeProps(args);
+    this.setState(state => ({ ...state,
+      nativeState: args || {}
+    }));
   }
 
   isFocused() {
@@ -426,6 +429,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/module/mappings/DatePicker.js

@@ -1,4 +1,4 @@
-import { COMPONENT_TYPES, FORM_TYPES, PROP_TYPES, FIELD_NAME, GROUPS, Triggers } from "@draftbit/types";
+import { COMPONENT_TYPES, FORM_TYPES, PROP_TYPES, FIELD_NAME, GROUPS, Triggers, StylesPanelSections, createNumberProp, createColorProp } from "@draftbit/types";
 const SEED_DATA_PROPS = {
   label: {
     label: "Label",
@@ -10,6 +10,12 @@ const SEED_DATA_PROPS = {
     required: true,
     group: GROUPS.data
   },
+  labelSize: createNumberProp({
+    label: "Label Size"
+  }),
+  labelColor: createColorProp({
+    label: "Label Color"
+  }),
   mode: {
     label: "Mode",
     description: "Choose between date, time and datetime",
@@ -21,6 +27,12 @@ const SEED_DATA_PROPS = {
     options: ["date", "time", "datetime"],
     group: GROUPS.basic
   },
+  borderColor: createColorProp({
+    label: "Border Color"
+  }),
+  borderColorActive: createColorProp({
+    label: "Border Color"
+  }),
   format: {
     label: "Format",
     description: "Create an output format for the date.",
@@ -137,6 +149,7 @@ export const SEED_DATA = [{
   category: COMPONENT_TYPES.input,
   layout: null,
   triggers: [Triggers.OnDateChange],
+  StylesPanelSections: [StylesPanelSections.Background, StylesPanelSections.Borders, StylesPanelSections.MarginsAndPaddings, StylesPanelSections.Position, StylesPanelSections.Size, StylesPanelSections.Typography],
   props: { ...SEED_DATA_PROPS,
     type: {
       label: "Appearance",

package/lib/module/mappings/TextField.js

@@ -16,7 +16,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: FORM_TYPES.flatArray,
     propType: PROP_TYPES.STRING

package/lib/module/mappings/TextInput.js

@@ -94,7 +94,7 @@ export 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: FORM_TYPES.flatArray,
       propType: PROP_TYPES.STRING

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

@@ -15,10 +15,14 @@ declare type Props = {
     mode?: "date" | "time" | "datetime";
     type?: "solid" | "underline";
     label?: string;
+    labelSize?: number;
+    labelColor: string;
     placeholder?: string;
     leftIconName?: string;
     leftIconMode?: "outset" | "inset";
     rightIconName?: string;
+    borderColor?: string;
+    borderColorActive?: string;
 } & IconSlot & TextInputProps;
 declare const _default: React.ComponentType<import("@draftbit/react-theme-provider").$Without<React.PropsWithChildren<Props>, "theme"> & {
     theme?: import("@draftbit/react-theme-provider").$DeepPartial<any> | undefined;

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

@@ -6,7 +6,8 @@ declare type Props = {
 } & TextProps;
 declare class Text extends React.Component<Props> {
     _root: any;
-    setNativeProps(args: TextProps): any;
+    state: any;
+    setNativeProps(args: TextProps): void;
     render(): JSX.Element;
 }
 export declare const BaseLink: ({ style, theme, title, ...props }: any) => JSX.Element;

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

@@ -27,6 +27,7 @@ export declare type Props = {
     }) => React.ReactNode;
 } & TextInputProps & IconSlot;
 interface State {
+    nativeProps: any;
     labeled: Animated.Value;
     focused?: boolean;
     placeholder?: string | undefined;
@@ -57,7 +58,7 @@ declare class TextField extends React.Component<Props, State> {
     /**
      * @internal
      */
-    setNativeProps(args: Props): void | undefined;
+    setNativeProps(args: Props): void;
     isFocused(): boolean | undefined;
     clear(): void | undefined;
     focus(): void | undefined;

package/lib/typescript/src/mappings/DatePicker.d.ts

@@ -5,6 +5,7 @@ export declare const SEED_DATA: {
     category: string;
     layout: null;
     triggers: string[];
+    StylesPanelSections: string[];
     props: {
         type: {
             label: string;
@@ -27,6 +28,27 @@ export declare const SEED_DATA: {
             required: boolean;
             group: string;
         };
+        labelSize: {
+            label: string;
+            description: string;
+            formType: string;
+            propType: string;
+            group: string;
+            defaultValue: null;
+            editable: boolean;
+            required: boolean;
+            step: number;
+        };
+        labelColor: {
+            group: string;
+            label: string;
+            description: string;
+            editable: boolean;
+            required: boolean;
+            defaultValue: null;
+            formType: string;
+            propType: string;
+        };
         mode: {
             label: string;
             description: string;
@@ -38,6 +60,26 @@ export declare const SEED_DATA: {
             options: string[];
             group: string;
         };
+        borderColor: {
+            group: string;
+            label: string;
+            description: string;
+            editable: boolean;
+            required: boolean;
+            defaultValue: null;
+            formType: string;
+            propType: string;
+        };
+        borderColorActive: {
+            group: string;
+            label: string;
+            description: string;
+            editable: boolean;
+            required: boolean;
+            defaultValue: null;
+            formType: string;
+            propType: string;
+        };
         format: {
             label: string;
             description: string;

package/lib/typescript/src/mappings/TextField.d.ts

@@ -64,7 +64,7 @@ export declare const SEED_DATA: ({
             description: string;
             editable: boolean;
             required: boolean;
-            defaultValue: null;
+            defaultValue: string;
             options: string[];
             formType: string;
             propType: string;
@@ -371,7 +371,7 @@ export declare const SEED_DATA: ({
             description: string;
             editable: boolean;
             required: boolean;
-            defaultValue: null;
+            defaultValue: string;
             options: string[];
             formType: string;
             propType: string;

package/lib/typescript/src/mappings/TextInput.d.ts

@@ -229,7 +229,7 @@ export declare const SEED_DATA: {
             description: string;
             editable: boolean;
             required: boolean;
-            defaultValue: null;
+            defaultValue: string;
             options: string[];
             formType: string;
             propType: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.4.4-9a666e.2+9a666e4",
+  "version": "46.4.4-b0ea41.2+b0ea41d",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -41,8 +41,7 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^46.4.4-9a666e.2+9a666e4",
-    "@expo/html-elements": "^0.2.0",
+    "@draftbit/types": "^46.4.4-b0ea41.2+b0ea41d",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.2.3",
@@ -82,5 +81,5 @@
       ]
     ]
   },
-  "gitHead": "9a666e4ecef86b3d4122a10d5b0efd540f7cdb2b"
+  "gitHead": "b0ea41d429e4cf53d2c6e344789e11c79c488833"
 }

package/src/components/DatePicker/DatePicker.js

@@ -6,6 +6,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;
@@ -24,7 +25,7 @@ const MONTHS = [
     "November",
     "December",
 ];
-const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disabledOpacity }, date, onDateChange = () => { }, defaultValue, disabled = false, mode = "date", format, type = "underline", leftIconName, rightIconName, leftIconMode = "inset", label, placeholder, ...props }) => {
+const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disabledOpacity }, date, onDateChange = () => { }, defaultValue, disabled = false, mode = "date", format, type = "underline", leftIconName, rightIconName, leftIconMode = "inset", label, labelSize, labelColor, placeholder, borderColor: inputBorderColor, borderColorActive: inputBorderColorActive, ...props }) => {
     const [value, setValue] = React.useState(date || defaultValue);
     React.useEffect(() => {
         if (defaultValue != null) {
@@ -36,6 +37,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
     const [placeholder1, setPlaceholder1] = React.useState("");
     const [focused, setFocused] = React.useState(false);
     const [labelLayout, setLabelLayout] = React.useState({ measured: false, width: 0 });
+    const { textStyles } = extractStyles(style);
     const getValidDate = () => {
         if (!value) {
             return new Date();
@@ -125,8 +127,10 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
     };
     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;
@@ -138,9 +142,9 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
         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;
     }
     const { lineHeight, ...subtitle1 } = typography.subtitle1;
@@ -202,6 +206,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
     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,
@@ -245,6 +250,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
         styles.input,
         inputStyle,
         type === "solid" ? { marginHorizontal: 12 } : {},
+        textStyles,
     ];
     // const render = (props) => <NativeTextInput {...props} />;
     return (React.createElement(View, { style: [styles.container, style] },
@@ -282,7 +288,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
                                     type === "solid" ? { paddingHorizontal: 12 } : {},
                                     labelStyle,
                                     {
-                                        color: colors.light,
+                                        color: labelColor || colors.light,
                                         opacity: labeled.interpolate({
                                             inputRange: [0, 1],
                                             outputRange: [hasActiveOutline ? 1 : 0, 0],
@@ -294,7 +300,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
                                     type === "solid" ? { paddingHorizontal: 12 } : {},
                                     labelStyle,
                                     {
-                                        color: placeholderColor,
+                                        color: labelColor || placeholder,
                                         opacity: hasActiveOutline ? labeled : 1,
                                     },
                                 ], numberOfLines: 1 }, label))) : null,