@draftbit/core 44.1.14 → 44.1.15

package/src/components/Picker/PickerComponent.ios.tsx

@@ -1,89 +1,142 @@
 import * as React from "react";
-import { View, StyleSheet, Dimensions } from "react-native";
+import { View, StyleSheet } from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
+import omit from "lodash.omit";
+
 import { Picker as NativePicker } from "@react-native-picker/picker";
 
-import type { IconSlot } from "../../interfaces/Icon";
+import { withTheme } from "../../theming";
+
 import Portal from "../Portal/Portal";
 import Button from "../DeprecatedButton";
-import { PickerOption } from "./Picker";
-
-const { width: deviceWidth, height: deviceHeight } = Dimensions.get("screen");
-
-interface PickerComponentProps {
-  Icon: IconSlot["Icon"];
-  androidPickerRef: React.RefObject<any>;
-  togglePickerVisible: () => void;
-  pickerOptions: PickerOption[];
-  internalValue: string | undefined;
-  handleValueChange: (newValue: string, itemIndex: number) => void;
-}
+import TextField from "../TextField";
+import Touchable from "../Touchable";
+import { PickerComponentProps } from "./PickerTypes";
+import { extractStyles } from "../../utilities";
+import type { IconSlot } from "../../interfaces/Icon";
 
-export const PickerComponent: React.FC<PickerComponentProps> = ({
+const Picker: React.FC<PickerComponentProps & IconSlot> = ({
   Icon,
-  togglePickerVisible,
-  pickerOptions,
-  internalValue,
-  handleValueChange,
+  style,
+  options,
+  placeholder,
+  selectedValue,
+  disabled = false,
+  onValueChange = () => {},
+  theme: { colors },
+  ...props
 }) => {
-  return (
-    <Portal>
-      <View style={styles.iosPicker}>
-        <SafeAreaView style={styles.iosSafeArea}>
-          <Button
-            Icon={Icon}
-            type="text"
-            onPress={togglePickerVisible}
-            style={styles.iosButton}
-          >
-            {"Close"}
-          </Button>
+  const {
+    viewStyles: {
+      borderRadius, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderWidth, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderTopWidth, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderRightWidth, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderBottomWidth, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderLeftWidth, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderColor, // eslint-disable-line @typescript-eslint/no-unused-vars
+      backgroundColor, // eslint-disable-line @typescript-eslint/no-unused-vars
+      padding, // eslint-disable-line @typescript-eslint/no-unused-vars
+      paddingTop, // eslint-disable-line @typescript-eslint/no-unused-vars
+      paddingRight, // eslint-disable-line @typescript-eslint/no-unused-vars
+      paddingBottom, // eslint-disable-line @typescript-eslint/no-unused-vars
+      paddingLeft, // eslint-disable-line @typescript-eslint/no-unused-vars
+      ...viewStyles
+    },
+  } = extractStyles(style);
+
+  const textField = React.useRef<typeof TextField | undefined>(undefined);
+  const [pickerVisible, setIsPickerVisible] = React.useState(false);
 
-          <NativePicker
-            style={styles.iosNativePicker}
-            selectedValue={internalValue}
-            onValueChange={handleValueChange}
-          >
-            {(pickerOptions as unknown as PickerOption[]).map((option) => (
-              <NativePicker.Item
-                label={option.label}
-                value={option.value}
-                key={option.value}
-              />
-            ))}
-          </NativePicker>
-        </SafeAreaView>
-      </View>
-    </Portal>
+  const toggleVisibility = () => {
+    setIsPickerVisible(!pickerVisible);
+    // @ts-ignore
+    textField.current.toggleFocus(); // cannot determine if method exists due to component being wrapped in a withTheme()
+  };
+
+  const stylesWithoutMargin =
+    style &&
+    omit(StyleSheet.flatten(style), [
+      "margin",
+      "marginTop",
+      "marginRight",
+      "marginBottom",
+      "marginLeft",
+    ]);
+
+  const selectedLabel =
+    selectedValue &&
+    (options.find((o) => o.value === selectedValue)?.label ?? selectedValue);
+
+  return (
+    <View style={[styles.container, viewStyles]}>
+      <Touchable disabled={disabled} onPress={toggleVisibility}>
+        <TextField
+          {...props}
+          value={String(selectedLabel)}
+          placeholder={placeholder}
+          // @ts-ignore
+          ref={textField} // cannot determine if ref is of correct type due to component being wrapped in a withTheme()
+          disabled={disabled}
+          pointerEvents="none"
+          // @ts-expect-error
+          style={stylesWithoutMargin}
+          Icon={Icon}
+        />
+      </Touchable>
+      {pickerVisible && (
+        <Portal>
+          <View style={[styles.picker, { backgroundColor: colors.divider }]}>
+            <SafeAreaView style={styles.pickerContainer}>
+              <Button
+                Icon={Icon}
+                type="text"
+                onPress={toggleVisibility}
+                style={styles.closeButton}
+              >
+                Close
+              </Button>
+              <NativePicker
+                style={{ backgroundColor: "white" }}
+                selectedValue={selectedValue}
+                onValueChange={onValueChange}
+              >
+                {options.map((o: any) => (
+                  <NativePicker.Item
+                    label={o.label}
+                    value={o.value}
+                    key={o.value}
+                  />
+                ))}
+              </NativePicker>
+            </SafeAreaView>
+          </View>
+        </Portal>
+      )}
+    </View>
   );
 };
 
 const styles = StyleSheet.create({
-  iosPicker: {
+  container: {
+    alignSelf: "stretch",
+  },
+  picker: {
     position: "absolute",
     bottom: 0,
     left: 0,
     right: 0,
     flexDirection: "row",
     justifyContent: "center",
-    width: deviceWidth, // TODO
-    maxWidth: deviceWidth,
-    maxHeight: deviceHeight,
-    backgroundColor: "green", // TODO
-    // backgroundColor: "rgba(255, 255, 255, 1)",
   },
-  iosSafeArea: {
-    backgroundColor: "yellow",
-    // backgroundColor: "white",// TODO
+  pickerContainer: {
+    backgroundColor: "white",
     flexDirection: "column",
-    width: deviceWidth,
-    maxWidth: deviceWidth,
+    width: "100%",
   },
-  iosButton: {
+  closeButton: {
     alignSelf: "flex-end",
   },
-  iosNativePicker: {
-    //backgroundColor: "white",// TODO
-    backgroundColor: "red",
-  },
 });
+
+export default withTheme(Picker);

package/src/components/Picker/PickerComponent.web.tsx

@@ -1,59 +1,117 @@
 import * as React from "react";
-import { StyleSheet, Dimensions } from "react-native";
-
+import { View, StyleSheet } from "react-native";
 import { Picker as NativePicker } from "@react-native-picker/picker";
+import omit from "lodash.omit";
+import { withTheme } from "../../theming";
+import { extractStyles } from "../../utilities";
+
+import TextField from "../TextField";
+import Touchable from "../Touchable";
+import { PickerComponentProps } from "./PickerTypes";
 
-import type { IconSlot } from "../../interfaces/Icon";
+const Picker: React.FC<PickerComponentProps> = ({
+  style,
+  options,
+  placeholder,
+  selectedValue,
+  disabled = false,
+  onValueChange: onValueChangeOverride = () => {},
+  ...props
+}) => {
+  const {
+    viewStyles: {
+      borderRadius, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderWidth, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderTopWidth, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderRightWidth, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderBottomWidth, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderLeftWidth, // eslint-disable-line @typescript-eslint/no-unused-vars
+      borderColor, // eslint-disable-line @typescript-eslint/no-unused-vars
+      backgroundColor, // eslint-disable-line @typescript-eslint/no-unused-vars
+      padding, // eslint-disable-line @typescript-eslint/no-unused-vars
+      paddingTop, // eslint-disable-line @typescript-eslint/no-unused-vars
+      paddingRight, // eslint-disable-line @typescript-eslint/no-unused-vars
+      paddingBottom, // eslint-disable-line @typescript-eslint/no-unused-vars
+      paddingLeft, // eslint-disable-line @typescript-eslint/no-unused-vars
+      ...viewStyles
+    },
+  } = extractStyles(style);
 
-import { PickerOption } from "./Picker";
+  const textField = React.useRef<typeof TextField | undefined>(undefined);
 
-const { width: deviceWidth, height: deviceHeight } = Dimensions.get("screen");
+  const onValueChange = (itemValue: string, itemIndex: number) => {
+    toggleFocus();
+    onValueChangeOverride(itemValue, itemIndex);
+  };
 
-interface PickerComponentProps {
-  Icon: IconSlot["Icon"];
-  androidPickerRef: React.RefObject<any>;
-  togglePickerVisible: () => void;
-  pickerOptions: PickerOption[];
-  internalValue: string | undefined;
-  handleValueChange: (newValue: string, itemIndex: number) => void;
-}
+  const toggleFocus = () => {
+    if (!disabled) {
+      // @ts-ignore
+      textField.current.toggleFocus(); // cannot determine if method exists due to component being wrapped in a withTheme()
+    }
+  };
+
+  const stylesWithoutMargin =
+    style &&
+    omit(StyleSheet.flatten(style), [
+      "margin",
+      "marginTop",
+      "marginRight",
+      "marginBottom",
+      "marginLeft",
+    ]);
+
+  const selectedLabel =
+    selectedValue &&
+    (options.find((o) => o.value === selectedValue)?.label ?? selectedValue);
 
-export const PickerComponent: React.FC<PickerComponentProps> = ({
-  androidPickerRef,
-  togglePickerVisible,
-  pickerOptions,
-  internalValue,
-  handleValueChange,
-}) => {
   return (
-    <NativePicker
-      selectedValue={internalValue}
-      onValueChange={handleValueChange}
-      style={styles.nonIosPicker}
-      ref={androidPickerRef}
-      onBlur={togglePickerVisible}
+    <Touchable
+      disabled={disabled}
+      onPress={toggleFocus}
+      style={[styles.container, viewStyles]}
     >
-      {(pickerOptions as unknown as PickerOption[]).map((option) => (
-        <NativePicker.Item
-          label={option.label}
-          value={option.value}
-          key={option.value}
-        />
-      ))}
-    </NativePicker>
+      <View>
+        <NativePicker
+          enabled={!disabled}
+          selectedValue={selectedValue}
+          onValueChange={onValueChange}
+          style={{
+            flex: 1,
+            opacity: 0,
+            position: "absolute",
+            top: 0,
+            left: 0,
+            right: 0,
+            bottom: 0,
+            width: "100%",
+          }}
+        >
+          {options.map((o) => (
+            <NativePicker.Item label={o.label} value={o.value} key={o.value} />
+          ))}
+        </NativePicker>
+        <View pointerEvents="none">
+          <TextField
+            {...props}
+            value={selectedLabel}
+            placeholder={placeholder}
+            // @ts-ignore
+            ref={textField} // cannot determine if ref is of correct type due to component being wrapped in a withTheme()
+            disabled={disabled}
+            // @ts-expect-error
+            style={stylesWithoutMargin}
+          />
+        </View>
+      </View>
+    </Touchable>
   );
 };
 
 const styles = StyleSheet.create({
-  nonIosPicker: {
-    opacity: 0,
-    position: "absolute",
-    top: 0,
-    left: 0,
-    right: 0,
-    bottom: 0,
-    width: "100%",
-    maxWidth: deviceWidth,
-    maxHeight: deviceHeight,
+  container: {
+    alignSelf: "stretch",
   },
 });
+
+export default withTheme(Picker);

package/src/components/Picker/PickerTypes.ts

@@ -0,0 +1,18 @@
+import { ViewStyle } from "react-native";
+import { StyleProp } from "react-native";
+import { Props as TextFieldProps } from "../TextField";
+
+export interface PickerOption {
+  value: string;
+  label: string;
+}
+
+export interface PickerComponentProps extends TextFieldProps {
+  style?: StyleProp<ViewStyle> & { height?: number };
+  options: PickerOption[];
+  placeholder?: string;
+  selectedValue: string;
+  disabled?: boolean;
+  onValueChange?: (value: string, index: number) => void;
+  defaultValue?: string;
+}