@draftbit/core 44.2.1-e53c90.0 → 44.2.2

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

@@ -1,11 +1,35 @@
 import * as React from "react";
-import { PickerComponentProps, PickerOption } from "./PickerTypes";
-declare type Props = PickerComponentProps & {
+import { ViewStyle, StyleProp } from "react-native";
+import type { Theme } from "../../styles/DefaultTheme";
+import type { IconSlot } from "../../interfaces/Icon";
+export interface PickerOption {
+    value: string;
+    label: string;
+}
+export declare type PickerProps = {
+    error?: any;
     placeholder?: string;
+    disabled?: boolean;
+    style?: StyleProp<ViewStyle> & {
+        height?: number;
+    };
     value?: string;
     options: PickerOption[] | string[];
+    onValueChange: (value: string, index: number) => void;
+    defaultValue?: string;
+    assistiveText?: string;
+    label?: string;
+    iconColor?: string;
+    iconSize?: number;
+    leftIconMode?: "inset" | "outset";
+    leftIconName?: string;
+    placeholderTextColor?: string;
+    rightIconName?: string;
+    type?: "solid" | "underline";
+    theme: Theme;
+    Icon: IconSlot["Icon"];
 };
-declare const _default: React.ComponentType<import("@draftbit/react-theme-provider").$Without<Props, "theme"> & {
+declare const _default: React.ComponentType<import("@draftbit/react-theme-provider").$Without<PickerProps, "theme"> & {
     theme?: import("@draftbit/react-theme-provider").$DeepPartial<any> | undefined;
-}> & import("@draftbit/react-theme-provider/typings/hoist-non-react-statics").NonReactStatics<React.ComponentType<Props> & React.FC<Props>, {}>;
+}> & import("@draftbit/react-theme-provider/typings/hoist-non-react-statics").NonReactStatics<React.ComponentType<PickerProps> & React.FC<PickerProps>, {}>;
 export default _default;

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

@@ -18,6 +18,27 @@ export declare const SEED_DATA: {
             required: boolean;
             group: string;
         };
+        iconSize: {
+            group: string;
+            label: string;
+            description: string;
+            editable: boolean;
+            required: boolean;
+            formType: string;
+            propType: string;
+            defaultValue: number;
+            options: number[];
+        };
+        iconColor: {
+            group: string;
+            label: string;
+            description: string;
+            editable: boolean;
+            required: boolean;
+            defaultValue: null;
+            formType: string;
+            propType: string;
+        };
         label: {
             group: string;
             label: string;

package/lib/typescript/src/utilities.d.ts

@@ -1,8 +1,15 @@
+/// <reference types="lodash" />
 import { StyleProp, TextStyle } from "react-native";
 export declare function extractStyles(style: StyleProp<any>): {
     viewStyles: any;
     textStyles: TextStyle;
 };
+export declare const borderStyleNames: string[];
+export declare const marginStyleNames: string[];
+export declare function extractBorderAndMarginStyles(style: StyleProp<any>, additionalBorderStyles?: string[], additionalMarginStyles?: string[]): {
+    borderStyles: import("lodash").Dictionary<any>;
+    marginStyles: import("lodash").Dictionary<any>;
+};
 /**
  * Merges a style object on top of another style object. In React Native,
  * keys with undefined values in a style object will still override styles

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "44.2.1-e53c90.0+e53c90f0",
+  "version": "44.2.2",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -45,7 +45,7 @@
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.1.12",
-    "@react-native-picker/picker": "2.2.1",
+    "@react-native-picker/picker": "2.4.1",
     "color": "^3.1.2",
     "date-fns": "^2.16.1",
     "dateformat": "^3.0.3",
@@ -78,5 +78,5 @@
       ]
     ]
   },
-  "gitHead": "e53c90f036fa70a877f267a4bca32c37b3cf3b42"
+  "gitHead": "277c7239f03d659053b557456bc5970792bd51ca"
 }

package/src/components/Picker/Picker.js

@@ -1,29 +1,47 @@
 import * as React from "react";
+import { View, StyleSheet, Text, Platform, Dimensions, } from "react-native";
+import { omit, pickBy, identity, isObject } from "lodash";
+import { SafeAreaView } from "react-native-safe-area-context";
+import { Picker as NativePicker } from "@react-native-picker/picker";
 import { withTheme } from "../../theming";
-//@ts-ignore
-import PickerComponent from "./PickerComponent"; //unable to find file due to using .android/.web/.ios
+import Portal from "../Portal/Portal";
+import Button from "../DeprecatedButton";
+import Touchable from "../Touchable";
+import { extractStyles, extractBorderAndMarginStyles, borderStyleNames, marginStyleNames, } from "../../utilities";
 function normalizeOptions(options) {
     if (options.length === 0) {
         return [];
     }
-    if (typeof options[0] === "string") {
+    if (typeof options[0] === ("string" || "number")) {
         return options.map((option) => ({
-            label: option,
+            label: String(option),
             value: String(option),
         }));
     }
-    if (options[0].label && options[0].value) {
+    if (isObject(options[0]) &&
+        options[0].value !== null &&
+        options[0].label !== null) {
         return options.map((option) => {
             return {
-                label: option.label,
+                label: String(option.label),
                 value: String(option.value),
             };
         });
     }
     throw new Error('Picker options must be either an array of strings or array of { "label": string; "value": string; } objects.');
 }
-const Picker = ({ options = [], placeholder, onValueChange: onValueChangeOverride, value, defaultValue, ...props }) => {
+const { width: deviceWidth, height: deviceHeight } = Dimensions.get("screen");
+const isIos = Platform.OS === "ios";
+const unstyledColor = "rgba(165, 173, 183, 1)";
+const disabledColor = "rgb(240, 240, 240)";
+const errorColor = "rgba(255, 69, 100, 1)";
+const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style, placeholder, value, disabled = false, theme, assistiveText, label, iconColor = unstyledColor, iconSize = 24, leftIconMode = "inset", leftIconName, placeholderTextColor = unstyledColor, rightIconName, type = "solid", }) => {
+    const androidPickerRef = React.useRef(undefined);
     const [internalValue, setInternalValue] = React.useState(value || defaultValue);
+    const [pickerVisible, setPickerVisible] = React.useState(false);
+    const togglePickerVisible = () => {
+        setPickerVisible(!pickerVisible);
+    };
     React.useEffect(() => {
         if (value != null) {
             setInternalValue(value);
@@ -34,23 +52,215 @@ const Picker = ({ options = [], placeholder, onValueChange: onValueChangeOverrid
             setInternalValue(defaultValue);
         }
     }, [defaultValue]);
-    const onValueChange = React.useCallback((itemValue, itemIndex) => {
-        if (placeholder && itemIndex === 0) {
-            return;
+    React.useEffect(() => {
+        if (pickerVisible && androidPickerRef.current) {
+            androidPickerRef?.current?.focus();
         }
-        onValueChangeOverride &&
-            onValueChangeOverride(String(itemValue), itemIndex);
-    }, [placeholder, onValueChangeOverride]);
+    }, [pickerVisible, androidPickerRef]);
     const normalizedOptions = normalizeOptions(options);
     const pickerOptions = placeholder
         ? [{ value: placeholder, label: placeholder }, ...normalizedOptions]
         : normalizedOptions;
+    const { colors } = theme;
+    const { viewStyles, textStyles } = extractStyles(style);
+    const additionalBorderStyles = ["backgroundColor"];
+    const additionalMarginStyles = [
+        "bottom",
+        "height",
+        "left",
+        "maxHeight",
+        "maxWidth",
+        "minHeight",
+        "minWidth",
+        "overflow",
+        "position",
+        "right",
+        "top",
+        "width",
+        "zIndex",
+    ];
+    const { borderStyles: extractedBorderStyles, marginStyles: extractedMarginStyles, } = extractBorderAndMarginStyles(viewStyles, additionalBorderStyles, additionalMarginStyles);
+    const borderStyles = {
+        ...{
+            ...(type === "solid"
+                ? {
+                    borderTopLeftRadius: 5,
+                    borderTopRightRadius: 5,
+                    borderBottomRightRadius: 5,
+                    borderBottomLeftRadius: 5,
+                    borderTopWidth: 1,
+                    borderRightWidth: 1,
+                    borderLeftWidth: 1,
+                }
+                : {}),
+            borderBottomWidth: 1,
+            borderColor: unstyledColor,
+            borderStyle: "solid",
+        },
+        ...extractedBorderStyles,
+        ...(error ? { borderColor: errorColor } : {}),
+        ...(disabled
+            ? { borderColor: "transparent", backgroundColor: disabledColor }
+            : {}),
+    };
+    const marginStyles = {
+        height: 60,
+        ...extractedMarginStyles,
+    };
+    const stylesWithoutBordersAndMargins = omit(viewStyles, [
+        ...borderStyleNames,
+        ...marginStyleNames,
+        ...additionalBorderStyles,
+        ...additionalMarginStyles,
+    ]);
+    const selectedLabel = internalValue &&
+        (pickerOptions.find((option) => option.value === internalValue)?.label ??
+            internalValue);
+    const labelText = label ? (React.createElement(Text, { style: {
+            textAlign: textStyles.textAlign,
+            color: unstyledColor,
+            fontSize: 12,
+            paddingBottom: 4,
+        } }, label)) : null;
+    const leftIconOutset = leftIconMode === "outset";
+    const leftIcon = leftIconName ? (React.createElement(Icon, { name: leftIconName, color: disabled ? unstyledColor : iconColor, size: iconSize, style: {
+            marginRight: 4,
+            marginLeft: 4,
+        } })) : null;
+    const rightIcon = rightIconName ? (React.createElement(Icon, { name: rightIconName, color: disabled ? unstyledColor : iconColor, size: iconSize, style: {
+            marginRight: -10,
+            marginLeft: 8,
+        } })) : null;
+    const textAlign = textStyles?.textAlign;
+    const calculateLeftPadding = () => {
+        if (leftIconOutset) {
+            if (textAlign === "center") {
+                return iconSize - Math.abs(8 - iconSize);
+            }
+            return iconSize + 8;
+        }
+        return 0;
+    };
+    const assistiveTextLabel = assistiveText ? (React.createElement(Text, { style: {
+            textAlign,
+            width: "100%",
+            paddingLeft: calculateLeftPadding(),
+            color: unstyledColor,
+            fontSize: 12,
+            paddingTop: 4,
+        } }, assistiveText)) : null;
+    const primaryTextStyle = {
+        color: unstyledColor,
+        fontSize: 14,
+        ...pickBy(textStyles, identity),
+        ...(placeholder === internalValue ? { color: placeholderTextColor } : {}),
+        ...(disabled ? { color: unstyledColor } : {}),
+    };
     const handleValueChange = (newValue, itemIndex) => {
-        setInternalValue(newValue);
-        if (onValueChange) {
-            onValueChange(newValue, itemIndex);
+        if (!placeholder || itemIndex > 0) {
+            onValueChange?.(newValue, itemIndex);
         }
+        setInternalValue(newValue);
     };
-    return (React.createElement(PickerComponent, { ...props, selectedValue: String(internalValue), placeholder: placeholder, options: pickerOptions, onValueChange: handleValueChange }));
+    return (
+    /* marginsContainer */
+    React.createElement(View, { style: [styles.marginsContainer, marginStyles] },
+        React.createElement(Touchable, { disabled: disabled, onPress: togglePickerVisible, style: styles.touchableContainer },
+            React.createElement(View, { pointerEvents: "none", style: [
+                    styles.outsetContainer,
+                    stylesWithoutBordersAndMargins,
+                    !leftIconOutset ? borderStyles : {},
+                ] },
+                leftIcon,
+                React.createElement(View, { style: [
+                        styles.insetContainer,
+                        leftIconOutset ? borderStyles : {},
+                    ] },
+                    React.createElement(View, { style: styles.primaryTextContainer },
+                        labelText,
+                        React.createElement(Text, { style: primaryTextStyle }, String(selectedLabel ?? placeholder))),
+                    rightIcon)),
+            assistiveTextLabel),
+        isIos && pickerVisible ? (React.createElement(Portal, null,
+            React.createElement(View, { style: [
+                    styles.iosPicker,
+                    {
+                        backgroundColor: colors.divider,
+                    },
+                ] },
+                React.createElement(SafeAreaView, { style: styles.iosSafeArea },
+                    React.createElement(Button, { Icon: Icon, type: "text", onPress: togglePickerVisible, style: styles.iosButton }, "Close"),
+                    React.createElement(NativePicker, { style: styles.iosNativePicker, selectedValue: internalValue, onValueChange: handleValueChange }, pickerOptions.map((option) => (React.createElement(NativePicker.Item, { label: option.label, value: option.value, key: option.value })))))))) : null,
+        !isIos && pickerVisible ? (React.createElement(NativePicker, { enabled: pickerVisible, selectedValue: internalValue, onValueChange: handleValueChange, style: styles.nonIosPicker, ref: androidPickerRef, onBlur: () => setPickerVisible(false) }, pickerOptions.map((option) => (React.createElement(NativePicker.Item, { label: option.label, value: option.value, key: option.value }))))) : null));
 };
 export default withTheme(Picker);
+const styles = StyleSheet.create({
+    marginsContainer: {
+        alignSelf: "stretch",
+        alignItems: "center",
+        width: "100%",
+        maxWidth: deviceWidth,
+    },
+    touchableContainer: {
+        flex: 1,
+        height: "100%",
+        width: "100%",
+        alignSelf: "stretch",
+        alignItems: "center",
+    },
+    outsetContainer: {
+        flex: 1,
+        height: "100%",
+        width: "100%",
+        flexDirection: "row",
+        alignItems: "center",
+        justifyContent: "space-between",
+    },
+    insetContainer: {
+        flex: 1,
+        height: "100%",
+        width: "100%",
+        flexDirection: "row",
+        alignItems: "center",
+        justifyContent: "space-between",
+        paddingLeft: 12,
+        paddingRight: 12,
+    },
+    primaryTextContainer: {
+        flex: 1,
+    },
+    iosPicker: {
+        position: "absolute",
+        bottom: 0,
+        left: 0,
+        right: 0,
+        flexDirection: "row",
+        justifyContent: "center",
+        width: "100%",
+        maxWidth: deviceWidth,
+        maxHeight: deviceHeight,
+    },
+    iosSafeArea: {
+        backgroundColor: "white",
+        flexDirection: "column",
+        width: "100%",
+        maxWidth: deviceWidth,
+    },
+    iosButton: {
+        alignSelf: "flex-end",
+    },
+    iosNativePicker: {
+        backgroundColor: "white",
+    },
+    nonIosPicker: {
+        opacity: 0,
+        position: "absolute",
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+        width: "100%",
+        maxWidth: deviceWidth,
+        maxHeight: deviceHeight,
+    },
+});