ferns-ui 0.26.0 → 0.26.2

package/src/DateTimeField.ios.tsx

@@ -1,9 +1,10 @@
 import DateTimePicker from "@react-native-community/datetimepicker";
 import moment from "moment-timezone";
-import React, {ReactElement} from "react";
+import React, {ReactElement, useMemo, useState} from "react";
+import {TextInput} from "react-native";
 
-import {Box} from "./Box";
 import {DateTimeFieldProps} from "./Common";
+import {Unifier} from "./Unifier";
 import {WithLabel} from "./WithLabel";
 
 export const DateTimeField = ({
@@ -12,29 +13,70 @@ export const DateTimeField = ({
   onChange,
   errorMessage,
   errorMessageColor,
+  dateFormat,
+  pickerType = "inline",
+  label,
 }: DateTimeFieldProps): ReactElement => {
+  const [showPicker, setShowPicker] = useState(false);
+
+  const defaultFormat = useMemo(() => {
+    if (dateFormat) {
+      return dateFormat;
+    } else {
+      if (mode === "date") {
+        return "MMMM Do YYYY";
+      } else if (mode === "time") {
+        return "h:mm a";
+      } else {
+        return "MMMM Do YYYY, h:mm a";
+      }
+    }
+  }, [mode, dateFormat]);
+
   return (
-    <WithLabel
-      label={errorMessage}
-      labelColor={errorMessageColor || "red"}
-      labelPlacement="after"
-      labelSize="sm"
-    >
-      <WithLabel>
-        <Box maxWidth={300}>
+    <WithLabel label={label} labelSize="lg">
+      <WithLabel
+        label={errorMessage}
+        labelColor={errorMessageColor || "red"}
+        labelPlacement="after"
+        labelSize="sm"
+      >
+        <TextInput
+          inputMode="none"
+          style={{
+            flex: 1,
+            paddingTop: 10,
+            paddingRight: 10,
+            paddingBottom: 10,
+            paddingLeft: 10,
+            height: 40,
+            width: "100%",
+            color: Unifier.theme.darkGray,
+            fontFamily: Unifier.theme.primaryFont,
+            borderWidth: 1,
+          }}
+          value={moment(value).format(defaultFormat)}
+          onPressIn={() => {
+            setShowPicker(!showPicker);
+          }}
+        />
+
+        {showPicker && (
           <DateTimePicker
-            display="spinner"
+            accentColor={Unifier.theme.primary}
+            display={pickerType}
             mode={mode}
+            style={{alignSelf: "flex-start"}}
             testID="dateTimePicker"
             value={moment(value).toDate()}
             onChange={(event: any, date: any) => {
               if (!date) {
                 return;
               }
-              onChange(value);
+              onChange(date);
             }}
           />
-        </Box>
+        )}
       </WithLabel>
     </WithLabel>
   );

package/src/DateTimeField.tsx

@@ -4,7 +4,7 @@ import DateTimePickerWeb from "react-datetime-picker";
 import TimePicker from "react-time-picker";
 
 import {Box} from "./Box";
-import {DateTimeFieldProps} from "./Common";
+import {DateTimeFieldProps, WithChildren} from "./Common";
 import {WithLabel} from "./WithLabel";
 
 export const DateTimeField = ({
@@ -13,7 +13,7 @@ export const DateTimeField = ({
   onChange,
   errorMessage,
   errorMessageColor,
-}: DateTimeFieldProps): ReactElement => {
+}: WithChildren<DateTimeFieldProps>): ReactElement => {
   return (
     <WithLabel
       label={errorMessage}

package/src/Field.tsx

@@ -2,7 +2,7 @@ import React from "react";
 
 import {Box} from "./Box";
 import {CheckBox} from "./CheckBox";
-import {AddressInterface, FieldWithLabelsProps, TextFieldType} from "./Common";
+import {AddressInterface, FieldWithLabelsProps, ReactChildren, TextFieldType} from "./Common";
 import {USSTATESLIST} from "./Constants";
 import {CustomSelect} from "./CustomSelect";
 import {FieldWithLabels} from "./FieldWithLabels";
@@ -66,11 +66,11 @@ export const Field = ({
     onChange(switchValue);
   };
 
-  const renderField = () => {
+  const renderField = (): ReactChildren => {
     if (type === "select") {
       if (!options) {
         console.error("Field with type=select require options");
-        return null;
+        return undefined;
       }
       return (
         <SelectList
@@ -85,7 +85,7 @@ export const Field = ({
     } else if (type === "multiselect") {
       if (!options) {
         console.error("Field with type=multiselect require options");
-        return null;
+        return undefined;
       }
       return (
         <Box width="100%">

package/src/Mask.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 import {View} from "react-native";
 
-import {MaskProps} from "./Common";
+import {MaskProps, ReactChildren} from "./Common";
 
-export function Mask(props: MaskProps): React.ReactElement | null {
+export function Mask(props: MaskProps): ReactChildren {
   if (props.shape === "rounded") {
     return <View style={{overflow: "hidden", borderRadius: 12}}>{props.children}</View>;
   } else if (props.shape === "circle") {

package/src/MediaQuery.ts

@@ -26,3 +26,17 @@ export function mediaQueryLargerThan(size: "xs" | "sm" | "md" | "lg"): boolean {
   }
   return false;
 }
+
+export function mediaQuerySmallerThan(size: "xs" | "sm" | "md" | "lg"): boolean {
+  const media = mediaQuery();
+  if (size === "lg") {
+    return true;
+  } else if (size === "md") {
+    return ["xs", "sm", "md"].includes(media);
+  } else if (size === "sm") {
+    return ["xs", "sm"].includes(media);
+  } else if (size === "xs") {
+    return ["xs"].includes(media);
+  }
+  return false;
+}

package/src/Page.tsx

@@ -97,7 +97,6 @@ export class Page extends React.Component<PageProps, {}> {
           padding={this.props.padding !== undefined ? this.props.padding : 2}
           scroll={this.props.scroll === undefined ? true : this.props.scroll}
           width="100%"
-          // color="ligh"
         >
           {this.renderHeader()}
           {this.props.loading === true && (

package/src/SegmentedControl.tsx

@@ -27,7 +27,7 @@ export const SegmentedControl = ({
   }
 
   if (!multiselect && selectedItemIndexes?.length && selectedItemIndexes?.length > 1) {
-    console.warn("Muliple selections not allowed without multiselect flag");
+    console.warn("Multiple selections not allowed without multiselect flag");
     return null;
   }
 
@@ -49,7 +49,7 @@ export const SegmentedControl = ({
       display="flex"
       height={40}
       justifyContent="between"
-      padding={1}
+      // padding={1}
       rounding={3}
       width="100%"
     >
@@ -58,7 +58,7 @@ export const SegmentedControl = ({
           key={index}
           color={isTabActive(index)}
           height="100%"
-          paddingX={2}
+          // paddingX={2}
           rounding={3}
           width={`${100 / items.length}%`}
         >

package/src/SelectList.tsx

@@ -30,18 +30,25 @@ export function SelectList({
   labelColor,
   style,
   placeholder,
+  disabled,
 }: SelectListProps) {
   const withLabelProps = {label, labelColor};
 
+  let backgroundColor = style?.backgroundColor || Unifier.theme.white;
+  if (disabled) {
+    backgroundColor = Unifier.theme.lightGray;
+  }
+
   return (
     <WithLabel {...withLabelProps}>
       <RNPickerSelect
-        // Icon only needed for iOs, web and android use default icons
         Icon={() => {
+          // Icon only needed for iOS, web and android use default icons
           return Platform.OS === "ios" ? (
             <Icon color="darkGray" name="angle-down" size="md" />
           ) : null;
         }}
+        disabled={disabled}
         items={options}
         placeholder={placeholder ? {label: placeholder, value: ""} : {}}
         style={{
@@ -54,7 +61,7 @@ export function SelectList({
             borderColor: style?.borderColor || Unifier.theme.gray,
             borderWidth: style?.borderWidth || 1,
             borderRadius: style?.borderRadius || 5,
-            backgroundColor: style?.backgroundColor || Unifier.theme.white,
+            backgroundColor,
           },
           inputIOS: {
             paddingVertical: 12,

package/src/SplitPage.native.tsx

@@ -0,0 +1,156 @@
+// TODO: Update SplitPage native to have desktop UX for tablet sized screens
+import React, {Children, useCallback, useEffect, useState} from "react";
+import {Dimensions, ListRenderItemInfo, View} from "react-native";
+import {SwiperFlatList} from "react-native-swiper-flatlist";
+
+import {Box} from "./Box";
+import {SplitPageProps} from "./Common";
+import {FlatList} from "./FlatList";
+import {IconButton} from "./IconButton";
+import {Spinner} from "./Spinner";
+import {Unifier} from "./Unifier";
+
+export const SplitPage = ({
+  children,
+  loading = false,
+  color,
+  keyboardOffset,
+  renderListViewItem,
+  renderListViewHeader,
+  renderContent,
+  onSelectionChange = () => {},
+  listViewData,
+  listViewExtraData,
+  bottomNavBarHeight,
+  showItemList,
+}: SplitPageProps) => {
+  const [selectedId, setSelectedId] = useState<number | undefined>(undefined);
+
+  const elementArray = Children.toArray(children);
+  const {width} = Dimensions.get("window");
+
+  const onItemSelect = useCallback(
+    (item: ListRenderItemInfo<any>) => {
+      setSelectedId(item.index);
+      onSelectionChange(item);
+    },
+    [onSelectionChange]
+  );
+
+  const onItemDeselect = useCallback(() => {
+    setSelectedId(undefined);
+    onSelectionChange(undefined);
+  }, [onSelectionChange]);
+
+  useEffect(() => {
+    if (showItemList) {
+      onItemDeselect();
+    }
+  }, [showItemList, onItemDeselect]);
+
+  if (!children && !renderContent) {
+    console.warn("A child node is required");
+    return null;
+  }
+
+  const renderItem = (itemInfo: ListRenderItemInfo<any>) => {
+    return (
+      <Box
+        onClick={() => {
+          Unifier.utils.haptic();
+          onItemSelect(itemInfo);
+        }}
+      >
+        {renderListViewItem(itemInfo)}
+      </Box>
+    );
+  };
+
+  const renderList = () => {
+    if (selectedId !== undefined) {
+      return null;
+    }
+
+    return (
+      <View
+        style={{
+          width: "100%",
+          maxWidth: "100%",
+          flexGrow: 1,
+          flexShrink: 0,
+          display: "flex",
+          flexDirection: "column",
+          paddingBottom: bottomNavBarHeight,
+        }}
+      >
+        {renderListViewHeader && renderListViewHeader()}
+        <FlatList
+          data={listViewData}
+          extraData={listViewExtraData}
+          keyExtractor={(item) => item.id}
+          renderItem={renderItem}
+        />
+      </View>
+    );
+  };
+
+  const renderListContent = () => {
+    if (selectedId === undefined) {
+      return null;
+    }
+    return (
+      <Box flex="grow" padding={2}>
+        <Box width="100%">
+          <IconButton
+            accessibilityLabel="close"
+            icon="times"
+            iconColor="darkGray"
+            onClick={() => onItemDeselect()}
+          />
+        </Box>
+        {renderContent && renderContent(selectedId)}
+      </Box>
+    );
+  };
+
+  const renderChildrenContent = () => {
+    if (selectedId === undefined) {
+      return null;
+    }
+    return (
+      <SwiperFlatList
+        nestedScrollEnabled
+        renderAll
+        showPagination={elementArray.length > 1}
+        style={{width: "100%"}}
+      >
+        {elementArray.map((element, i) => {
+          return (
+            <View
+              key={i}
+              style={{width, height: elementArray.length > 1 ? "95%" : "100%", padding: 4}}
+            >
+              {element}
+            </View>
+          );
+        })}
+      </SwiperFlatList>
+    );
+  };
+
+  const renderMainContent = renderContent ? renderListContent() : renderChildrenContent();
+
+  return (
+    <Box
+      avoidKeyboard
+      color={color || "lightGray"}
+      flex="grow"
+      height="100%"
+      keyboardOffset={keyboardOffset}
+      width="100%"
+    >
+      {loading === true && <Spinner color={Unifier.theme.darkGray as any} size="md" />}
+      {selectedId === undefined ? renderList() : renderMainContent}
+    </Box>
+  );
+};

package/src/SplitPage.tsx

@@ -1,8 +1,9 @@
-import React, {Children, ReactChild, ReactElement, useState} from "react";
-import {ListRenderItemInfo, ScrollView, View} from "react-native";
+import React, {Children, useCallback, useEffect, useState} from "react";
+import {Dimensions, ListRenderItemInfo, ScrollView, View} from "react-native";
+import {SwiperFlatList} from "react-native-swiper-flatlist";
 
 import {Box} from "./Box";
-import {Color, SPACING} from "./Common";
+import {SplitPageProps} from "./Common";
 import {FlatList} from "./FlatList";
 import {IconButton} from "./IconButton";
 import {mediaQueryLargerThan} from "./MediaQuery";
@@ -10,24 +11,6 @@ import {SegmentedControl} from "./SegmentedControl";
 import {Spinner} from "./Spinner";
 import {Unifier} from "./Unifier";
 
-interface SplitPageProps {
-  children?: ReactChild | ReactChild[] | null;
-  tabs?: string[];
-  // TODO: figure out navigation
-  navigation?: any;
-  loading?: boolean;
-  color?: Color;
-  keyboardOffset?: number;
-  renderListViewItem: (itemInfo: ListRenderItemInfo<any>) => ReactElement | null;
-  renderListViewHeader?: () => ReactElement | null;
-  renderContent?: (index?: number) => ReactElement | ReactElement[] | null;
-  listViewData: any[];
-  listViewExtraData?: any;
-  listViewWidth?: number;
-  renderChild?: () => ReactChild;
-  selectLimit?: number;
-}
-
 // A component for rendering a list on one side and a details view on the right for large screens,
 // and a scrollable list where clicking an item takes you the details view.
 export const SplitPage = ({
@@ -39,16 +22,41 @@ export const SplitPage = ({
   renderListViewItem,
   renderListViewHeader,
   renderContent,
+  onSelectionChange = () => {},
   listViewData,
   listViewExtraData,
   listViewWidth,
+  bottomNavBarHeight,
+  showItemList,
   selectLimit,
 }: SplitPageProps) => {
   const [selectedId, setSelectedId] = useState<number | undefined>(undefined);
   const [activeTabs, setActiveTabs] = useState<number[]>(tabs.length > 2 ? [0, 1] : []);
+  const {width} = Dimensions.get("window");
+
+  const isMobileDevice = !mediaQueryLargerThan("sm");
 
   const elementArray = Children.toArray(children);
 
+  const onItemSelect = useCallback(
+    (item: ListRenderItemInfo<any>) => {
+      setSelectedId(item.index);
+      onSelectionChange(item);
+    },
+    [onSelectionChange]
+  );
+
+  const onItemDeselect = useCallback(() => {
+    setSelectedId(undefined);
+    onSelectionChange(undefined);
+  }, [onSelectionChange]);
+
+  useEffect(() => {
+    if (showItemList) {
+      onItemDeselect();
+    }
+  }, [showItemList, onItemDeselect]);
+
   if (!children && !renderContent) {
     console.warn("A child node is required");
     return null;
@@ -63,7 +71,7 @@ export const SplitPage = ({
     return (
       <Box
         onClick={() => {
-          setSelectedId(itemInfo.index);
+          onItemSelect(itemInfo);
         }}
       >
         {renderListViewItem(itemInfo)}
@@ -72,19 +80,14 @@ export const SplitPage = ({
   };
 
   const renderList = () => {
-    if (!mediaQueryLargerThan("sm") && selectedId) {
-      return null;
-    }
     return (
       <View
         style={{
-          width: mediaQueryLargerThan("sm") ? listViewWidth ?? 300 : "100%",
-          maxWidth: mediaQueryLargerThan("sm") ? listViewWidth ?? 300 : "100%",
+          width: listViewWidth ?? 300,
+          maxWidth: listViewWidth ?? 300,
           flexGrow: 1,
           flexShrink: 0,
           display: "flex",
-          paddingTop: "12px",
-          paddingBottom: "12px",
           flexDirection: "column",
         }}
       >
@@ -102,16 +105,6 @@ export const SplitPage = ({
   const renderListContent = () => {
     return (
       <Box flex="grow" padding={2}>
-        {!mediaQueryLargerThan("sm") && (
-          <Box width="100%">
-            <IconButton
-              accessibilityLabel="close"
-              icon="times"
-              iconColor="darkGray"
-              onClick={() => setSelectedId(undefined)}
-            />
-          </Box>
-        )}
         {renderContent && renderContent(selectedId)}
       </Box>
     );
@@ -128,7 +121,7 @@ export const SplitPage = ({
             alignItems: "center",
           }}
         >
-          <Box paddingX={4} paddingY={2} width="100%">
+          <Box marginBottom={4} paddingX={4} width="100%">
             <SegmentedControl
               items={tabs}
               multiselect
@@ -143,10 +136,10 @@ export const SplitPage = ({
             direction="row"
             flex="grow"
             height="100%"
-            paddingX={2}
+            paddingX={4}
             width={activeTabs.length > 1 ? "100%" : "60%"}
           >
-            {activeTabs.map((tabIndex) => {
+            {activeTabs.map((tabIndex, i) => {
               return (
                 <ScrollView
                   key={tabIndex}
@@ -156,8 +149,9 @@ export const SplitPage = ({
                   style={{
                     flex: 1,
                     width: "60%",
-                    padding: 3 * SPACING,
                     height: "100%",
+                    paddingRight: i ? 0 : 16,
+                    paddingLeft: i ? 16 : 0,
                   }}
                 >
                   {elementArray[tabIndex]}
@@ -180,7 +174,6 @@ export const SplitPage = ({
                 style={{
                   flex: 1,
                   width: "60%",
-                  padding: 3 * SPACING,
                   height: "100%",
                 }}
               >
@@ -193,21 +186,117 @@ export const SplitPage = ({
     }
   };
 
+  const renderMobileList = () => {
+    if (isMobileDevice && selectedId !== undefined) {
+      return null;
+    }
+
+    return (
+      <View
+        style={{
+          width: "100%",
+          maxWidth: "100%",
+          height: "100%",
+          flexGrow: 1,
+          flexShrink: 0,
+          display: "flex",
+          flexDirection: "column",
+        }}
+      >
+        {renderListViewHeader && renderListViewHeader()}
+        <FlatList
+          data={listViewData}
+          extraData={listViewExtraData}
+          keyExtractor={(item) => item.id}
+          nestedScrollEnabled
+          renderItem={renderItem}
+        />
+      </View>
+    );
+  };
+
+  const renderMobileListContent = () => {
+    if (isMobileDevice && selectedId === undefined) {
+      return null;
+    }
+
+    return (
+      <Box flex="grow" padding={2}>
+        {isMobileDevice && (
+          <Box width="100%">
+            <IconButton
+              accessibilityLabel="close"
+              icon="times"
+              iconColor="darkGray"
+              onClick={() => onItemDeselect()}
+            />
+          </Box>
+        )}
+        {renderContent && renderContent(selectedId)}
+      </Box>
+    );
+  };
+
+  const renderMobileChildrenContent = () => {
+    if (selectedId === undefined) {
+      return null;
+    }
+    return (
+      <SwiperFlatList
+        nestedScrollEnabled
+        paginationStyle={{justifyContent: "center", width: "95%"}}
+        renderAll
+        showPagination
+        style={{width: "100%"}}
+      >
+        {elementArray.map((element, i) => {
+          return (
+            <View
+              key={i}
+              style={{
+                width: width - 8,
+                padding: 4,
+                height: elementArray.length > 1 ? "90vh" : "100vh",
+                paddingBottom: bottomNavBarHeight,
+              }}
+            >
+              {element}
+            </View>
+          );
+        })}
+      </SwiperFlatList>
+    );
+  };
+
+  const renderSplitPage = () => {
+    return (
+      <>
+        {renderList()}
+        {renderContent ? renderListContent() : renderChildrenContent()}
+      </>
+    );
+  };
+
+  const renderMobileSplitPage = () => {
+    const renderMainContent = renderContent
+      ? renderMobileListContent()
+      : renderMobileChildrenContent();
+    return selectedId === undefined ? renderMobileList() : renderMainContent;
+  };
+
   return (
     <Box
       avoidKeyboard
       color={color || "lightGray"}
       direction="row"
       display="flex"
-      flex="grow"
       height="100%"
       keyboardOffset={keyboardOffset}
       padding={2}
       width="100%"
     >
       {loading === true && <Spinner color={Unifier.theme.darkGray as any} size="md" />}
-      {renderList()}
-      {renderContent ? renderListContent() : renderChildrenContent()}
+      {Boolean(isMobileDevice) ? renderMobileSplitPage() : renderSplitPage()}
     </Box>
   );
 };