@draftbit/core 46.4.4-c5d4b3.2 → 46.4.4-caab07.0

package/src/components/DatePicker/DatePicker.tsx

@@ -23,6 +23,7 @@ import DateTimePicker from "./DatePickerComponent";
 
 import type { Theme } from "../../styles/DefaultTheme";
 import type { IconSlot } from "../../interfaces/Icon";
+import { extractStyles } from "../../utilities";
 
 const AnimatedText = Animated.createAnimatedComponent(Text);
 
@@ -47,10 +48,14 @@ 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;
 
@@ -84,7 +89,11 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
   rightIconName,
   leftIconMode = "inset",
   label,
+  labelSize,
+  labelColor,
   placeholder,
+  borderColor: inputBorderColor,
+  borderColorActive: inputBorderColorActive,
   ...props
 }) => {
   const [value, setValue] = React.useState<any>(date || defaultValue);
@@ -106,6 +115,8 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
     width: number;
   }>({ measured: false, width: 0 });
 
+  const { textStyles } = extractStyles(style);
+
   const getValidDate = (): Date => {
     if (!value) {
       return new Date();
@@ -211,8 +222,11 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
 
   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;
 
@@ -233,9 +247,9 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
     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;
   }
 
@@ -306,6 +320,7 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
   const labelStyle = {
     ...typography.subtitle1,
     top: type === "solid" ? 16 : 0,
+    fontFamily: textStyles?.fontFamily,
     left:
       leftIconName && leftIconMode === "inset"
         ? ICON_SIZE + (type === "solid" ? 16 : 12)
@@ -351,6 +366,7 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
     styles.input,
     inputStyle,
     type === "solid" ? { marginHorizontal: 12 } : {},
+    textStyles,
   ];
 
   // const render = (props) => <NativeTextInput {...props} />;
@@ -406,7 +422,7 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
                       type === "solid" ? { paddingHorizontal: 12 } : {},
                       labelStyle,
                       {
-                        color: colors.light,
+                        color: labelColor || colors.light,
                         opacity: labeled.interpolate({
                           inputRange: [0, 1],
                           outputRange: [hasActiveOutline ? 1 : 0, 0],
@@ -423,7 +439,7 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
                       type === "solid" ? { paddingHorizontal: 12 } : {},
                       labelStyle,
                       {
-                        color: placeholderColor,
+                        color: labelColor || placeholder,
                         opacity: hasActiveOutline ? labeled : 1,
                       },
                     ]}

package/src/components/DatePicker/DatePickerComponent.js

@@ -2,12 +2,26 @@ import React from "react";
 import { Platform } from "react-native";
 import DateTimePicker from "@react-native-community/datetimepicker";
 import DateTimePickerModal from "react-native-modal-datetime-picker";
-const DatePickerComponent = ({ value, onChange, mode, toggleVisibility, }) => {
-    return Platform.OS === "ios" || Platform.OS === "android" ? (React.createElement(DateTimePickerModal, { date: value, mode: mode, isVisible: true, display: Platform.OS === "ios" ? "spinner" : "default", onCancel: () => {
-            console.log("Picker cancelled before selecting anything.");
-            toggleVisibility();
-        }, onConfirm: (data) => {
-            onChange(null, data);
-        } })) : (React.createElement(DateTimePicker, { value: value, mode: mode, onChange: onChange, display: "default" }));
+const DatePickerComponent = ({ value, onChange, mode, toggleVisibility }) => {
+  return Platform.OS === "ios" || Platform.OS === "android"
+    ? React.createElement(DateTimePickerModal, {
+        date: value,
+        mode: mode,
+        isVisible: true,
+        display: Platform.OS === "ios" ? "spinner" : "default",
+        onCancel: () => {
+          console.log("Picker cancelled before selecting anything.");
+          toggleVisibility();
+        },
+        onConfirm: (data) => {
+          onChange(null, data);
+        },
+      })
+    : React.createElement(DateTimePicker, {
+        value: value,
+        mode: mode,
+        onChange: onChange,
+        display: "default",
+      });
 };
 export default DatePickerComponent;

package/src/components/DatePicker/DatePickerComponent.web.js

@@ -1,30 +1,56 @@
 import React from "react";
 import DateFnsUtils from "@date-io/date-fns";
-import { MuiPickersUtilsProvider, DatePicker, TimePicker, DateTimePicker, } from "@material-ui/pickers";
+import {
+  MuiPickersUtilsProvider,
+  DatePicker,
+  TimePicker,
+  DateTimePicker,
+} from "@material-ui/pickers";
 import { createMuiTheme, ThemeProvider } from "@material-ui/core/styles";
 import { withTheme } from "../../theming";
 import Theme from "../../styles/DefaultTheme";
-const DatePickerComponent = ({ value, onChange, mode, toggleVisibility, isVisible, theme, }) => {
-    const internalTheme = createMuiTheme({
-        palette: {
-            primary: {
-                main: theme.colors.primary || Theme.colors.primary,
-            },
-            secondary: {
-                main: theme.colors.secondary || Theme.colors.secondary,
-            },
+const DatePickerComponent = ({
+  value,
+  onChange,
+  mode,
+  toggleVisibility,
+  isVisible,
+  theme,
+}) => {
+  const internalTheme = createMuiTheme({
+    palette: {
+      primary: {
+        main: theme.colors.primary || Theme.colors.primary,
+      },
+      secondary: {
+        main: theme.colors.secondary || Theme.colors.secondary,
+      },
+    },
+  });
+  const Picker =
+    mode === "date"
+      ? DatePicker
+      : mode === "time"
+      ? TimePicker
+      : DateTimePicker;
+  return React.createElement(
+    MuiPickersUtilsProvider,
+    { utils: DateFnsUtils },
+    React.createElement(
+      ThemeProvider,
+      { theme: internalTheme },
+      React.createElement(Picker, {
+        value: value,
+        open: isVisible,
+        onChange: (d) => {
+          toggleVisibility();
+          onChange(null, d);
         },
-    });
-    const Picker = mode === "date"
-        ? DatePicker
-        : mode === "time"
-            ? TimePicker
-            : DateTimePicker;
-    return (React.createElement(MuiPickersUtilsProvider, { utils: DateFnsUtils },
-        React.createElement(ThemeProvider, { theme: internalTheme },
-            React.createElement(Picker, { value: value, open: isVisible, onChange: (d) => {
-                    toggleVisibility();
-                    onChange(null, d);
-                }, onClose: () => toggleVisibility(), variant: "dialog", TextFieldComponent: () => null }))));
+        onClose: () => toggleVisibility(),
+        variant: "dialog",
+        TextFieldComponent: () => null,
+      })
+    )
+  );
 };
 export default withTheme(DatePickerComponent);

package/src/components/DeprecatedButton.js

@@ -1,95 +1,149 @@
 import * as React from "react";
-import { ActivityIndicator, View, Text, StyleSheet, } from "react-native";
+import { ActivityIndicator, View, Text, StyleSheet } from "react-native";
 import color from "color";
 import Config from "./Config";
 import Touchable from "./Touchable";
 import Elevation from "./Elevation";
 import { withTheme } from "../theming";
-const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false, labelColor, color: colorOverride, children, onPress, elevation = 0, style, theme: { colors, disabledOpacity, roundness, typography }, ...rest }) => {
-    let backgroundColor, borderColor, textColor, borderWidth;
-    const buttonColor = colorOverride || colors.primary;
-    if (type === "solid") {
-        backgroundColor = buttonColor;
-        if (disabled) {
-            textColor = color(colors.surface).alpha(disabledOpacity).rgb().string();
-        }
-        else {
-            textColor = labelColor || colors.surface;
-        }
+const Button = ({
+  Icon,
+  icon,
+  disabled = false,
+  type = "solid",
+  loading = false,
+  labelColor,
+  color: colorOverride,
+  children,
+  onPress,
+  elevation = 0,
+  style,
+  theme: { colors, disabledOpacity, roundness, typography },
+  ...rest
+}) => {
+  let backgroundColor, borderColor, textColor, borderWidth;
+  const buttonColor = colorOverride || colors.primary;
+  if (type === "solid") {
+    backgroundColor = buttonColor;
+    if (disabled) {
+      textColor = color(colors.surface).alpha(disabledOpacity).rgb().string();
+    } else {
+      textColor = labelColor || colors.surface;
     }
-    else {
-        backgroundColor = "transparent";
-        if (disabled) {
-            textColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
-        }
-        else {
-            textColor = labelColor || buttonColor;
-        }
+  } else {
+    backgroundColor = "transparent";
+    if (disabled) {
+      textColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
+    } else {
+      textColor = labelColor || buttonColor;
     }
-    if (type === "outline") {
-        if (disabled) {
-            borderColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
-        }
-        else {
-            borderColor = buttonColor;
-        }
-        borderWidth = StyleSheet.hairlineWidth;
+  }
+  if (type === "outline") {
+    if (disabled) {
+      borderColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
+    } else {
+      borderColor = buttonColor;
     }
-    else {
-        borderColor = "transparent";
-        borderWidth = 0;
-    }
-    const buttonStyle = {
-        backgroundColor,
-        borderColor,
-        borderWidth,
-        borderRadius: roundness,
-    };
-    const textStyle = {
-        textAlign: "center",
-        color: textColor,
-        marginVertical: 16,
-        marginHorizontal: 16,
-    };
-    const iconStyle = [
-        styles.icon,
-        {
-            marginLeft: 16,
-            marginRight: -8,
-            width: Config.buttonIconSize,
-        },
-    ];
-    const { margin, marginEnd, marginTop, marginLeft, marginRight, marginBottom, marginHorizontal, marginVertical, ...innerStyles } = StyleSheet.flatten(style || {});
-    const margins = {
-        margin,
-        marginEnd,
-        marginTop,
-        marginLeft,
-        marginRight,
-        marginBottom,
-        marginHorizontal,
-        marginVertical,
-    };
-    return (React.createElement(Elevation, { style: { elevation, alignSelf: "stretch", ...margins } },
-        React.createElement(Touchable, { ...rest, onPress: onPress, accessibilityState: { disabled }, accessibilityRole: "button", disabled: disabled || loading, style: [styles.button, buttonStyle, innerStyles] },
-            React.createElement(View, { style: styles.content },
-                icon && loading !== true ? (React.createElement(View, { style: iconStyle },
-                    React.createElement(Icon, { name: icon, size: Config.buttonIconSize, color: textColor }))) : null,
-                loading ? (React.createElement(ActivityIndicator, { size: "small", color: textColor, style: iconStyle })) : null,
-                React.createElement(Text, { numberOfLines: 1, style: [textStyle, typography.button] }, children)))));
+    borderWidth = StyleSheet.hairlineWidth;
+  } else {
+    borderColor = "transparent";
+    borderWidth = 0;
+  }
+  const buttonStyle = {
+    backgroundColor,
+    borderColor,
+    borderWidth,
+    borderRadius: roundness,
+  };
+  const textStyle = {
+    textAlign: "center",
+    color: textColor,
+    marginVertical: 16,
+    marginHorizontal: 16,
+  };
+  const iconStyle = [
+    styles.icon,
+    {
+      marginLeft: 16,
+      marginRight: -8,
+      width: Config.buttonIconSize,
+    },
+  ];
+  const {
+    margin,
+    marginEnd,
+    marginTop,
+    marginLeft,
+    marginRight,
+    marginBottom,
+    marginHorizontal,
+    marginVertical,
+    ...innerStyles
+  } = StyleSheet.flatten(style || {});
+  const margins = {
+    margin,
+    marginEnd,
+    marginTop,
+    marginLeft,
+    marginRight,
+    marginBottom,
+    marginHorizontal,
+    marginVertical,
+  };
+  return React.createElement(
+    Elevation,
+    { style: { elevation, alignSelf: "stretch", ...margins } },
+    React.createElement(
+      Touchable,
+      {
+        ...rest,
+        onPress: onPress,
+        accessibilityState: { disabled },
+        accessibilityRole: "button",
+        disabled: disabled || loading,
+        style: [styles.button, buttonStyle, innerStyles],
+      },
+      React.createElement(
+        View,
+        { style: styles.content },
+        icon && loading !== true
+          ? React.createElement(
+              View,
+              { style: iconStyle },
+              React.createElement(Icon, {
+                name: icon,
+                size: Config.buttonIconSize,
+                color: textColor,
+              })
+            )
+          : null,
+        loading
+          ? React.createElement(ActivityIndicator, {
+              size: "small",
+              color: textColor,
+              style: iconStyle,
+            })
+          : null,
+        React.createElement(
+          Text,
+          { numberOfLines: 1, style: [textStyle, typography.button] },
+          children
+        )
+      )
+    )
+  );
 };
 const styles = StyleSheet.create({
-    button: {
-        minWidth: 64,
-        borderStyle: "solid",
-    },
-    content: {
-        flexDirection: "row",
-        alignItems: "center",
-        justifyContent: "center",
-    },
-    icon: {
-        width: Config.buttonIconSize,
-    },
+  button: {
+    minWidth: 64,
+    borderStyle: "solid",
+  },
+  content: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  icon: {
+    width: Config.buttonIconSize,
+  },
 });
 export default withTheme(Button);

package/src/components/DeprecatedCardWrapper.js

@@ -2,17 +2,26 @@ import React from "react";
 import { withTheme } from "../theming";
 import Touchable from "./Touchable";
 const getWidth = (numColumns) => {
-    switch (numColumns) {
-        case 1:
-            return "33%";
-        case 2:
-            return "50%";
-        default:
-            return "100%";
-    }
+  switch (numColumns) {
+    case 1:
+      return "33%";
+    case 2:
+      return "50%";
+    default:
+      return "100%";
+  }
 };
 const Card = ({ numColumns = 3, children, onPress, style, ...rest }) => {
-    const width = getWidth(numColumns);
-    return (React.createElement(Touchable, { disabled: !onPress, onPress: onPress, style: [style, { width }], ...rest }, children));
+  const width = getWidth(numColumns);
+  return React.createElement(
+    Touchable,
+    {
+      disabled: !onPress,
+      onPress: onPress,
+      style: [style, { width }],
+      ...rest,
+    },
+    children
+  );
 };
 export default withTheme(Card);