@draftbit/core 48.4.5-facee4.2 → 48.4.6-959edf.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "48.4.5-facee4.2+facee4b",
+  "version": "48.4.6-959edf.2+959edf9",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/src/index.d.ts",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^48.4.5-facee4.2+facee4b",
+    "@draftbit/types": "^48.4.6-959edf.2+959edf9",
     "@expo/vector-icons": "^13.0.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
@@ -100,5 +100,5 @@
     ],
     "testEnvironment": "node"
   },
-  "gitHead": "facee4b47d7507fb356f4d58b407a8f0bb25d783"
+  "gitHead": "959edf9653df6734eb9616ce7d064861e5484057"
 }

package/src/components/BottomSheet/BottomSheet.js

@@ -2,7 +2,7 @@ import React from "react";
 import { StyleSheet, View, } from "react-native";
 import BottomSheetComponent from "./BottomSheetComponent";
 import { withTheme } from "../../theming";
-const BottomSheet = ({ theme, snapPoints: snapPointsProp, topSnapPosition = "10%", middleSnapPosition = "50%", bottomSnapPosition = "80%", initialSnapIndex, initialSnapPosition = "bottom", showHandle = true, handleColor = theme.colors.divider, topBorderRadius = 20, borderWidth = 1, borderColor = theme.colors.divider, onSettle, style, children, ...rest }) => {
+const BottomSheet = React.forwardRef(({ theme, snapPoints: snapPointsProp, topSnapPosition = "10%", middleSnapPosition = "50%", bottomSnapPosition = "80%", initialSnapIndex, initialSnapPosition = "bottom", showHandle = true, handleColor = theme.colors.divider, topBorderRadius = 20, borderWidth = 1, borderColor = theme.colors.divider, onSettle, style, children, ...rest }, ref) => {
     const backgroundColor = (style === null || style === void 0 ? void 0 : style.backgroundColor) || theme.colors.background;
     const snapPoints = snapPointsProp || [
         topSnapPosition,
@@ -20,7 +20,7 @@ const BottomSheet = ({ theme, snapPoints: snapPointsProp, topSnapPosition = "10%
         }
     };
     return (React.createElement(View, { style: styles.parentContainer, pointerEvents: "box-none" },
-        React.createElement(BottomSheetComponent, { componentType: "ScrollView", snapPoints: snapPoints, initialSnapIndex: initialSnapIndex !== null && initialSnapIndex !== void 0 ? initialSnapIndex : getSnapIndexFromPosition(initialSnapPosition), renderHandle: () => (React.createElement(React.Fragment, null, showHandle && (React.createElement(View, { style: [
+        React.createElement(BottomSheetComponent, { ref: ref, componentType: "ScrollView", snapPoints: snapPoints, initialSnapIndex: initialSnapIndex !== null && initialSnapIndex !== void 0 ? initialSnapIndex : getSnapIndexFromPosition(initialSnapPosition), renderHandle: () => (React.createElement(React.Fragment, null, showHandle && (React.createElement(View, { style: [
                     styles.handleContainer,
                     {
                         backgroundColor,
@@ -38,7 +38,7 @@ const BottomSheet = ({ theme, snapPoints: snapPointsProp, topSnapPosition = "10%
                     borderColor,
                 },
             ]), onSettle: onSettle, ...rest }, children)));
-};
+});
 const styles = StyleSheet.create({
     //Render on top of everything
     parentContainer: {

package/src/components/BottomSheet/BottomSheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"BottomSheet.js","sourceRoot":"","sources":["BottomSheet.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"BottomSheet.js","sourceRoot":"","sources":["BottomSheet.tsx"],"names":[],"mappings":"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"}

package/src/components/BottomSheet/BottomSheet.tsx

@@ -32,91 +32,100 @@ export interface BottomSheetProps extends ScrollViewProps {
   theme: Theme;
 }
 
-const BottomSheet: React.FC<React.PropsWithChildren<BottomSheetProps>> = ({
-  theme,
-  snapPoints: snapPointsProp,
-  topSnapPosition = "10%",
-  middleSnapPosition = "50%",
-  bottomSnapPosition = "80%",
-  initialSnapIndex,
-  initialSnapPosition = "bottom",
-  showHandle = true,
-  handleColor = theme.colors.divider,
-  topBorderRadius = 20,
-  borderWidth = 1,
-  borderColor = theme.colors.divider,
-  onSettle,
-  style,
-  children,
-  ...rest
-}) => {
-  const backgroundColor =
-    (style as ViewStyle)?.backgroundColor || theme.colors.background;
+const BottomSheet = React.forwardRef<
+  BottomSheetComponent<any>,
+  BottomSheetProps
+>(
+  (
+    {
+      theme,
+      snapPoints: snapPointsProp,
+      topSnapPosition = "10%",
+      middleSnapPosition = "50%",
+      bottomSnapPosition = "80%",
+      initialSnapIndex,
+      initialSnapPosition = "bottom",
+      showHandle = true,
+      handleColor = theme.colors.divider,
+      topBorderRadius = 20,
+      borderWidth = 1,
+      borderColor = theme.colors.divider,
+      onSettle,
+      style,
+      children,
+      ...rest
+    },
+    ref
+  ) => {
+    const backgroundColor =
+      (style as ViewStyle)?.backgroundColor || theme.colors.background;
 
-  const snapPoints = snapPointsProp || [
-    topSnapPosition,
-    middleSnapPosition,
-    bottomSnapPosition,
-  ];
+    const snapPoints = snapPointsProp || [
+      topSnapPosition,
+      middleSnapPosition,
+      bottomSnapPosition,
+    ];
 
-  const getSnapIndexFromPosition = (position: SnapPosition) => {
-    switch (position) {
-      case "top":
-        return 0;
-      case "middle":
-        return 1;
-      case "bottom":
-        return 2;
-    }
-  };
+    const getSnapIndexFromPosition = (position: SnapPosition) => {
+      switch (position) {
+        case "top":
+          return 0;
+        case "middle":
+          return 1;
+        case "bottom":
+          return 2;
+      }
+    };
 
-  return (
-    <View style={styles.parentContainer} pointerEvents="box-none">
-      <BottomSheetComponent
-        componentType="ScrollView"
-        snapPoints={snapPoints}
-        initialSnapIndex={
-          initialSnapIndex ?? getSnapIndexFromPosition(initialSnapPosition)
-        }
-        renderHandle={() => (
-          <>
-            {showHandle && (
-              <View
-                style={[
-                  styles.handleContainer,
-                  {
-                    backgroundColor,
-                    borderTopLeftRadius: topBorderRadius,
-                    borderTopRightRadius: topBorderRadius,
-                  },
-                ]}
-              >
+    return (
+      <View style={styles.parentContainer} pointerEvents="box-none">
+        <BottomSheetComponent
+          ref={ref}
+          componentType="ScrollView"
+          snapPoints={snapPoints}
+          initialSnapIndex={
+            initialSnapIndex ?? getSnapIndexFromPosition(initialSnapPosition)
+          }
+          renderHandle={() => (
+            <>
+              {showHandle && (
                 <View
-                  style={[styles.handle, { backgroundColor: handleColor }]}
-                />
-              </View>
-            )}
-          </>
-        )}
-        contentContainerStyle={[styles.contentContainerStyle, style]}
-        containerStyle={StyleSheet.flatten([
-          styles.containerStyle,
-          {
-            backgroundColor,
-            borderTopLeftRadius: topBorderRadius,
-            borderTopRightRadius: topBorderRadius,
-            borderWidth,
-            borderColor,
-          },
-        ])}
-        onSettle={onSettle}
-        {...rest}
-      >
-        {children}
-      </BottomSheetComponent>
-    </View>
-  );
-};
+                  style={[
+                    styles.handleContainer,
+                    {
+                      backgroundColor,
+                      borderTopLeftRadius: topBorderRadius,
+                      borderTopRightRadius: topBorderRadius,
+                    },
+                  ]}
+                >
+                  <View
+                    style={[styles.handle, { backgroundColor: handleColor }]}
+                  />
+                </View>
+              )}
+            </>
+          )}
+          contentContainerStyle={[styles.contentContainerStyle, style]}
+          containerStyle={StyleSheet.flatten([
+            styles.containerStyle,
+            {
+              backgroundColor,
+              borderTopLeftRadius: topBorderRadius,
+              borderTopRightRadius: topBorderRadius,
+              borderWidth,
+              borderColor,
+            },
+          ])}
+          onSettle={onSettle}
+          {...rest}
+        >
+          {children}
+        </BottomSheetComponent>
+      </View>
+    );
+  }
+);
 
 const styles = StyleSheet.create({
   //Render on top of everything

package/src/components/Picker/Picker.js

@@ -1,86 +1,255 @@
 import * as React from "react";
-import { View, StyleSheet, Platform, Keyboard, } from "react-native";
-import { isObject } from "lodash";
+import { View, StyleSheet, Text, Platform, Dimensions, Keyboard, } 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";
 import Portal from "../Portal/Portal";
-import { Button } from "../Button";
+import Button from "../../deprecated-components/DeprecatedButton";
 import Touchable from "../Touchable";
-import { extractBorderAndMarginStyles, extractSizeStyles, extractFlexItemStyles, extractPositionStyles, } from "../../utilities";
-import TextField from "../TextField";
-import omit from "lodash.omit";
+import { extractStyles, extractBorderAndMarginStyles, borderStyleNames, marginStyleNames, } from "../../utilities";
+function normalizeOptions(options) {
+    if (options.length === 0) {
+        return [];
+    }
+    if (typeof options[0] === ("string" || "number")) {
+        return options.map((option) => ({
+            label: String(option),
+            value: String(option),
+        }));
+    }
+    if (isObject(options[0]) &&
+        options[0].value !== null &&
+        options[0].label !== null) {
+        return options.map((option) => {
+            return {
+                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 { width: deviceWidth, height: deviceHeight } = Dimensions.get("screen");
 const isIos = Platform.OS === "ios";
 const isWeb = Platform.OS === "web";
-const Picker = ({ options: optionsProp = [], onValueChange, Icon, style, placeholder, value, disabled = false, autoDismissKeyboard = true, ...rest }) => {
-    var _a;
-    const pickerRef = React.useRef(null);
+const unstyledColor = "rgba(165, 173, 183, 1)";
+const disabledColor = "rgb(240, 240, 240)";
+const errorColor = "rgba(255, 69, 100, 1)";
+//Empty string for 'value' is treated as a non-value
+//reason: Draftbit uses empty string as initial value for string state*/
+const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style, placeholder, value, disabled = false, assistiveText, label, iconColor = unstyledColor, iconSize = 24, leftIconMode = "inset", leftIconName, placeholderTextColor = unstyledColor, rightIconName, type = "solid", autoDismissKeyboard = true, }) => {
+    var _a, _b;
+    const androidPickerRef = React.useRef(undefined);
+    const [internalValue, setInternalValue] = React.useState(value || defaultValue);
     const [pickerVisible, setPickerVisible] = React.useState(false);
-    const options = React.useMemo(() => {
-        const normalizedOptions = normalizeToPickerOptions(optionsProp);
-        // Underlying Picker component defaults selection to first element when value is not provided (or undefined)
-        // Placholder must be the 1st option in order to allow selection of the 'actual' 1st option
-        if (placeholder) {
-            return [{ label: placeholder, value: placeholder }, ...normalizedOptions];
-        }
-        else {
-            return normalizedOptions;
+    const togglePickerVisible = () => {
+        setPickerVisible(!pickerVisible);
+    };
+    React.useEffect(() => {
+        if (value != null && value !== "") {
+            setInternalValue(value);
         }
-    }, [placeholder, optionsProp]);
-    // When no placeholder is provided then first item should be marked selected to reflect underlying Picker internal state
-    if (!placeholder && options.length && !value && value !== options[0].value) {
-        onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(options[0].value);
-    }
-    const selectedLabel = ((_a = options.find((option) => option.value === String(value))) === null || _a === void 0 ? void 0 : _a.label) ||
-        value ||
-        placeholder;
-    const containerStyle = StyleSheet.flatten([
-        extractSizeStyles(style),
-        extractPositionStyles(style),
-        extractFlexItemStyles(style),
-        extractBorderAndMarginStyles(style).marginStyles,
-    ]);
-    const textFieldStyle = omit(style, Object.keys(containerStyle));
-    const renderNativePicker = () => (React.createElement(NativePicker, { ref: pickerRef, selectedValue: value, onValueChange: (newValue) => {
-            if (newValue !== placeholder) {
-                onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(newValue);
-            }
-            else if (newValue === placeholder) {
-                onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange("");
-            }
-        }, style: [
-            styles.nativePicker,
-            isIos ? styles.iosNativePicker : styles.nonIosPicker,
-        ], onBlur: () => setPickerVisible(false) }, options.map((option) => (React.createElement(NativePicker.Item, { label: option.label, value: option.value, key: option.value })))));
-    const renderPicker = () => {
-        if (isIos) {
-            return (React.createElement(Portal, null,
-                React.createElement(SafeAreaView, { style: styles.nativePicker },
-                    React.createElement(View, { style: styles.iosPickerContent },
-                        React.createElement(Button, { Icon: Icon, type: "text", onPress: () => setPickerVisible(!pickerVisible), style: styles.iosButton }, "Close"),
-                        renderNativePicker()))));
+        else if (value === "") {
+            setInternalValue(undefined);
         }
-        else {
-            return renderNativePicker();
+    }, [value]);
+    React.useEffect(() => {
+        if (defaultValue != null && defaultValue !== "") {
+            setInternalValue(defaultValue);
         }
-    };
+    }, [defaultValue]);
     React.useEffect(() => {
         var _a;
-        if (pickerVisible && pickerRef.current) {
-            (_a = pickerRef === null || pickerRef === void 0 ? void 0 : pickerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+        if (pickerVisible && androidPickerRef.current) {
+            (_a = androidPickerRef === null || androidPickerRef === void 0 ? void 0 : androidPickerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
         }
-    }, [pickerVisible, pickerRef]);
+    }, [pickerVisible, androidPickerRef]);
     React.useEffect(() => {
         if (pickerVisible && autoDismissKeyboard) {
             Keyboard.dismiss();
         }
     }, [pickerVisible, autoDismissKeyboard]);
-    return (React.createElement(View, { style: containerStyle },
-        React.createElement(Touchable, { disabled: disabled, onPress: () => setPickerVisible(!pickerVisible) },
-            React.createElement(TextField, { Icon: Icon, numberOfLines: 1, onChangeText: () => { }, value: String(selectedLabel !== null && selectedLabel !== void 0 ? selectedLabel : placeholder), editable: false, disabled: disabled, style: textFieldStyle, ...rest })),
-        (pickerVisible || isWeb) && renderPicker()));
+    const normalizedOptions = React.useMemo(() => normalizeOptions(options), [options]);
+    //Underlying Picker component defaults selection to first element when value is not provided (or undefined)
+    //Placholder must be the 1st option in order to allow selection of the 'actual' 1st option
+    const pickerOptions = React.useMemo(() => placeholder
+        ? [{ label: placeholder, value: placeholder }, ...normalizedOptions]
+        : normalizedOptions, [placeholder, normalizedOptions]);
+    //When no placeholder is provided then first item should be marked selected to reflect underlying Picker internal state
+    if (!placeholder &&
+        pickerOptions.length &&
+        !internalValue &&
+        internalValue !== pickerOptions[0].value //Prevent infinite state changes incase first value is falsy
+    ) {
+        onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(pickerOptions[0].value, 0);
+        setInternalValue(pickerOptions[0].value);
+    }
+    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 &&
+        ((_b = (_a = pickerOptions.find((option) => option.value === internalValue)) === null || _a === void 0 ? void 0 : _a.label) !== null && _b !== void 0 ? _b : 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 === null || textStyles === void 0 ? void 0 : 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) => {
+        if (newValue !== "" && newValue !== placeholder) {
+            onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(newValue, itemIndex);
+            setInternalValue(newValue);
+        }
+        else if (newValue === placeholder) {
+            onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange("", 0);
+            setInternalValue(undefined);
+        }
+    };
+    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 !== null && selectedLabel !== void 0 ? selectedLabel : placeholder))),
+                    rightIcon)),
+            assistiveTextLabel),
+        isIos && pickerVisible ? (React.createElement(Portal, null,
+            React.createElement(SafeAreaView, { style: styles.iosPicker },
+                React.createElement(View, { style: styles.iosPickerContent },
+                    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 || isWeb) ? (React.createElement(NativePicker, { enabled: !disabled, 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));
 };
 const styles = StyleSheet.create({
-    nativePicker: {
+    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,
@@ -88,11 +257,14 @@ const styles = StyleSheet.create({
         flexDirection: "row",
         justifyContent: "center",
         width: "100%",
+        maxWidth: deviceWidth,
+        maxHeight: deviceHeight,
         backgroundColor: "white",
     },
     iosPickerContent: {
         flexDirection: "column",
         width: "100%",
+        maxWidth: deviceWidth,
     },
     iosButton: {
         alignSelf: "flex-end",
@@ -102,28 +274,15 @@ const styles = StyleSheet.create({
     },
     nonIosPicker: {
         opacity: 0,
+        position: "absolute",
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+        width: "100%",
+        maxWidth: deviceWidth,
+        maxHeight: deviceHeight,
     },
 });
-function normalizeToPickerOptions(options) {
-    if (options.length === 0) {
-        return [];
-    }
-    const firstOption = options[0];
-    if (typeof firstOption === ("string" || "number")) {
-        return options.map((option) => ({
-            label: String(option),
-            value: String(option),
-        }));
-    }
-    if (isObject(firstOption) && firstOption.value && firstOption.label) {
-        return options.map((option) => {
-            return {
-                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.');
-}
-export default Picker;
+export default withTheme(Picker);
 //# sourceMappingURL=Picker.js.map

package/src/components/Picker/Picker.js.map

@@ -1 +1 @@
-{"version":3,"file":"Picker.js","sourceRoot":"","sources":["Picker.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Picker.js","sourceRoot":"","sources":["Picker.tsx"],"names":[],"mappings":"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"}