@draftbit/core 46.4.4-1da4cc.2 → 46.4.4-1df217.2

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

@@ -213,7 +213,8 @@ const DatePicker = _ref => {
     paddingLeft: leftIconName && leftIconMode === "inset" ? ICON_SIZE + (type === "solid" ? 16 : 12) : 0,
     paddingRight: rightIconName ? ICON_SIZE + 16 + 4 : 12,
     ...subtitle1,
-    height: lineHeight
+    height: lineHeight,
+    ...textStyles
   };
 
   if (type === "underline") {
@@ -284,10 +285,10 @@ const DatePicker = _ref => {
   };
   const inputStyles = [styles.input, inputStyle, type === "solid" ? {
     marginHorizontal: 12
-  } : {}, textStyles, style]; // const render = (props) => <NativeTextInput {...props} />;
+  } : {}, textStyles]; // const render = (props) => <NativeTextInput {...props} />;
 
   return /*#__PURE__*/React.createElement(_reactNative.View, {
-    style: [styles.container, style]
+    style: [styles.container]
   }, /*#__PURE__*/React.createElement(_Touchable.default, {
     disabled: disabled,
     onPress: toggleVisibility
@@ -298,7 +299,7 @@ const DatePicker = _ref => {
   }, leftIconName && leftIconMode === "outset" ? /*#__PURE__*/React.createElement(Icon, _extends({}, leftIconProps, {
     style: leftIconStyle
   })) : null, /*#__PURE__*/React.createElement(_reactNative.View, {
-    style: [containerStyle, style]
+    style: [containerStyle]
   }, type === "underline" ?
   /*#__PURE__*/
   // When type === 'flat', render an underline
@@ -356,7 +357,7 @@ const DatePicker = _ref => {
     onFocus: _handleFocus,
     onBlur: _handleBlur,
     underlineColorAndroid: "transparent",
-    style: inputStyles
+    style: [inputStyles, textStyles]
   }, props))), rightIconName ? /*#__PURE__*/React.createElement(Icon, {
     name: rightIconName,
     size: ICON_SIZE,

package/lib/commonjs/components/RadioButton/RadioButtonFieldGroup.js

@@ -17,8 +17,6 @@ var _RadioButtonGroup = _interopRequireDefault(require("./RadioButtonGroup"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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 RadioButtonFieldGroup = _ref => {
   let {
     label,
@@ -35,6 +33,17 @@ const RadioButtonFieldGroup = _ref => {
       fontSize: theme.typography.headline4.fontSize,
       color: theme.typography.headline4.color
     }, labelStyle]
+  }, label), /*#__PURE__*/_react.default.createElement(_RadioButtonGroup.default, {
+    theme: theme,
+    ...rest
+  }, children));
+};
+
+var _default = (0, _theming.withTheme)(RadioButtonFieldGroup);
+
+exports.default = _default;   fontSize: theme.typography.headline4.fontSize,
+      color: theme.typography.headline4.color
+    }, labelStyle]
   }, label), /*#__PURE__*/_react.default.createElement(_RadioButtonGroup.default, _extends({
     theme: theme
   }, rest), children));

package/lib/commonjs/constants.js

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

package/lib/module/components/AspectRatio.js

@@ -1,5 +1,3 @@
-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 React from "react";
 import { View, StyleSheet } from "react-native";
 
@@ -32,7 +30,7 @@ const AspectRatio = props => {
     }
   }
 
-  return /*#__PURE__*/React.createElement(View, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(View, { ...props,
     style: style,
     onLayout: _ref => {
       let {
@@ -42,7 +40,7 @@ const AspectRatio = props => {
       } = _ref;
       return setLayout(l);
     }
-  }), props.children);
+  }, props.children);
 };
 
 export default AspectRatio;

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

@@ -190,7 +190,8 @@ const DatePicker = _ref => {
     paddingLeft: leftIconName && leftIconMode === "inset" ? ICON_SIZE + (type === "solid" ? 16 : 12) : 0,
     paddingRight: rightIconName ? ICON_SIZE + 16 + 4 : 12,
     ...subtitle1,
-    height: lineHeight
+    height: lineHeight,
+    ...textStyles
   };
 
   if (type === "underline") {
@@ -261,10 +262,10 @@ const DatePicker = _ref => {
   };
   const inputStyles = [styles.input, inputStyle, type === "solid" ? {
     marginHorizontal: 12
-  } : {}, textStyles, style]; // const render = (props) => <NativeTextInput {...props} />;
+  } : {}, textStyles]; // const render = (props) => <NativeTextInput {...props} />;
 
   return /*#__PURE__*/React.createElement(View, {
-    style: [styles.container, style]
+    style: [styles.container]
   }, /*#__PURE__*/React.createElement(Touchable, {
     disabled: disabled,
     onPress: toggleVisibility
@@ -275,7 +276,7 @@ const DatePicker = _ref => {
   }, leftIconName && leftIconMode === "outset" ? /*#__PURE__*/React.createElement(Icon, _extends({}, leftIconProps, {
     style: leftIconStyle
   })) : null, /*#__PURE__*/React.createElement(View, {
-    style: [containerStyle, style]
+    style: [containerStyle]
   }, type === "underline" ?
   /*#__PURE__*/
   // When type === 'flat', render an underline
@@ -333,7 +334,7 @@ const DatePicker = _ref => {
     onFocus: _handleFocus,
     onBlur: _handleBlur,
     underlineColorAndroid: "transparent",
-    style: inputStyles
+    style: [inputStyles, textStyles]
   }, props))), rightIconName ? /*#__PURE__*/React.createElement(Icon, {
     name: rightIconName,
     size: ICON_SIZE,

package/lib/module/components/Switch.js

@@ -1,5 +1,3 @@
-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 { Switch as NativeSwitch } from "react-native";
 import { withTheme } from "../theming";
@@ -39,23 +37,24 @@ function Switch(_ref) {
       setChecked(Boolean(defaultValue));
     }
   }, [defaultValue, previousDefaultValue]);
-  return /*#__PURE__*/React.createElement(NativeSwitch, _extends({
+  return /*#__PURE__*/React.createElement(NativeSwitch, {
     value: checked,
     disabled: disabled,
     trackColor: {
       false: inactiveTrackThemeColor,
       true: activeTrackThemeColor
     },
-    thumbColor: value ? activeThumbThemeColor : inactiveThumbThemeColor // @ts-ignore react-native-web only
-    ,
+    thumbColor: value ? activeThumbThemeColor : inactiveThumbThemeColor,
+    // @ts-ignore react-native-web only
     activeThumbColor: activeThumbThemeColor,
     ios_backgroundColor: inactiveTrackThemeColor,
     style: style,
     onValueChange: bool => {
       setChecked(bool);
       onValueChange && onValueChange(bool);
-    }
-  }, rest));
+    },
+    ...rest
+  });
 }
 
 function Row(_ref2) {
@@ -85,7 +84,7 @@ function Row(_ref2) {
       setChecked(defaultValue);
     }
   }, [defaultValue]);
-  return /*#__PURE__*/React.createElement(FormRow, _extends({
+  return /*#__PURE__*/React.createElement(FormRow, {
     disabled: disabled,
     onPress: () => {
       setChecked(!checked);
@@ -93,8 +92,9 @@ function Row(_ref2) {
     },
     label: label,
     direction: direction,
-    style: style
-  }, rest), /*#__PURE__*/React.createElement(Switch, {
+    style: style,
+    ...rest
+  }, /*#__PURE__*/React.createElement(Switch, {
     theme: theme,
     value: checked,
     disabled: disabled,
@@ -106,6 +106,19 @@ function Row(_ref2) {
   }));
 }
 
+const SwitchRow = withTheme(Row);
+export { SwitchRow };
+export default withTheme(Switch);me,
+    value: checked,
+    disabled: disabled,
+    onValueChange: onValueChange,
+    activeTrackColor: activeTrackColor,
+    inactiveTrackColor: inactiveTrackColor,
+    activeThumbColor: activeThumbColor,
+    inactiveThumbColor: inactiveThumbColor
+  }));
+}
+
 const SwitchRow = withTheme(Row);
 export { SwitchRow };
 export default withTheme(Switch);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.4.4-1da4cc.2+1da4ccf",
+  "version": "46.4.4-1df217.2+1df217c",
   "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.4.4-1da4cc.2+1da4ccf",
+    "@draftbit/types": "^46.4.4-1df217.2+1df217c",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.2.3",
@@ -91,5 +91,5 @@
       ]
     ]
   },
-  "gitHead": "1da4ccf361a58e4c67eb6f67b4cb59fcac93d62c"
+  "gitHead": "1df217cc90554e290ea4eb2c1d9082ccd8d0bdb0"
 }

package/src/components/DatePicker/DatePicker.js

@@ -157,6 +157,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
         paddingRight: rightIconName ? ICON_SIZE + 16 + 4 : 12,
         ...subtitle1,
         height: lineHeight,
+        ...textStyles,
     };
     if (type === "underline") {
         containerStyle = {
@@ -252,15 +253,14 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
         inputStyle,
         type === "solid" ? { marginHorizontal: 12 } : {},
         textStyles,
-        style,
     ];
     // const render = (props) => <NativeTextInput {...props} />;
-    return (React.createElement(View, { style: [styles.container, style] },
+    return (React.createElement(View, { style: [styles.container] },
         React.createElement(Touchable, { disabled: disabled, onPress: toggleVisibility },
             React.createElement(View, { pointerEvents: "none" },
                 React.createElement(View, { style: [styles.container] },
                     leftIconName && leftIconMode === "outset" ? (React.createElement(Icon, { ...leftIconProps, style: leftIconStyle })) : null,
-                    React.createElement(View, { style: [containerStyle, style] },
+                    React.createElement(View, { style: [containerStyle] },
                         type === "underline" ? (
                         // When type === 'flat', render an underline
                         React.createElement(Animated.View, { style: [
@@ -310,7 +310,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
                                 ...leftIconStyle,
                                 marginLeft: type === "solid" ? 16 : 0,
                             } })) : null,
-                        React.createElement(NativeTextInput, { value: formatDate(), placeholder: label ? placeholder1 : placeholder, editable: !disabled, placeholderTextColor: placeholderColor, selectionColor: activeColor, onFocus: _handleFocus, onBlur: _handleBlur, underlineColorAndroid: "transparent", style: inputStyles, ...props })),
+                        React.createElement(NativeTextInput, { value: formatDate(), placeholder: label ? placeholder1 : placeholder, editable: !disabled, placeholderTextColor: placeholderColor, selectionColor: activeColor, onFocus: _handleFocus, onBlur: _handleBlur, underlineColorAndroid: "transparent", style: [inputStyles, textStyles], ...props })),
                     rightIconName ? (React.createElement(Icon, { name: rightIconName, size: ICON_SIZE, color: colors.light, style: {
                             position: "absolute",
                             right: 16,

package/src/components/DatePicker/DatePicker.tsx

@@ -265,6 +265,7 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
     paddingRight: rightIconName ? ICON_SIZE + 16 + 4 : 12,
     ...subtitle1,
     height: lineHeight,
+    ...textStyles,
   };
 
   if (type === "underline") {
@@ -368,20 +369,19 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
     inputStyle,
     type === "solid" ? { marginHorizontal: 12 } : {},
     textStyles,
-    style,
   ];
 
   // const render = (props) => <NativeTextInput {...props} />;
 
   return (
-    <View style={[styles.container, style]}>
+    <View style={[styles.container]}>
       <Touchable disabled={disabled} onPress={toggleVisibility}>
         <View pointerEvents="none">
           <View style={[styles.container]}>
             {leftIconName && leftIconMode === "outset" ? (
               <Icon {...leftIconProps} style={leftIconStyle} />
             ) : null}
-            <View style={[containerStyle, style]}>
+            <View style={[containerStyle]}>
               {type === "underline" ? (
                 // When type === 'flat', render an underline
                 <Animated.View
@@ -469,7 +469,7 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
                 onFocus={_handleFocus}
                 onBlur={_handleBlur}
                 underlineColorAndroid={"transparent"}
-                style={inputStyles}
+                style={[inputStyles, textStyles]}
                 {...props}
               />
             </View>