ferns-ui 0.26.0 → 0.26.2

package/src/TapToEdit.tsx

@@ -8,6 +8,29 @@ import {Field, FieldProps} from "./Field";
 import {Icon} from "./Icon";
 import {Text} from "./Text";
 
+export function formatAddress(address: any): string {
+  let city = "";
+  if (address?.city) {
+    city = address?.state || address.zipcode ? `${address.city}, ` : `${address.city}`;
+  }
+
+  let state = "";
+  if (address?.state) {
+    state = address?.zipcode ? `${address.state} ` : `${address.state}`;
+  }
+
+  const zip = address?.zipcode || "";
+
+  const addressLineOne = address?.address1 ?? "";
+  const addressLineTwo = address?.address2 ?? "";
+  const addressLineThree = `${city}${state}${zip}`;
+
+  // Only add new lines if lines before and after are not empty to avoid awkward whitespace
+  return `${addressLineOne}${
+    addressLineOne && (addressLineTwo || addressLineThree) ? `\n` : ""
+  }${addressLineTwo}${addressLineTwo && addressLineThree ? `\n` : ""}${addressLineThree}`;
+}
+
 export interface TapToEditProps extends Omit<FieldProps, "onChange" | "value"> {
   title: string;
   value: any;
@@ -113,29 +136,15 @@ export const TapToEdit = ({
         displayValue = value.join(", ");
       } else if (fieldProps?.type === "url") {
         // Show only the domain, full links are likely too long.
-        const url = new URL(value);
-        displayValue = url?.hostname ?? value;
-      } else if (fieldProps?.type === "address") {
-        let city = "";
-        if (value?.city) {
-          city = value?.state || value.zipcode ? `${value.city}, ` : `${value.city}`;
-        }
-
-        let state = "";
-        if (value?.state) {
-          state = value?.zipcode ? `${value.state} ` : `${value.state}`;
+        try {
+          const url = new URL(value);
+          displayValue = url?.hostname ?? value;
+        } catch (e) {
+          console.debug(`Invalid URL: ${value}`);
+          displayValue = value;
         }
-
-        const zip = value?.zipcode || "";
-
-        const addressLineOne = value?.address1 ?? "";
-        const addressLineTwo = value?.address2 ?? "";
-        const addressLineThree = `${city}${state}${zip}`;
-
-        // Only add new lines if lines before and after are not empty to avoid awkward whitespace
-        displayValue = `${addressLineOne}${
-          addressLineOne && (addressLineTwo || addressLineThree) ? `\n` : ""
-        }${addressLineTwo}${addressLineTwo && addressLineThree ? `\n` : ""}${addressLineThree}`;
+      } else if (fieldProps?.type === "address") {
+        displayValue = formatAddress(value);
       }
     }
 

package/src/TextField.tsx

@@ -1,6 +1,6 @@
 import {AsYouType} from "libphonenumber-js";
 import moment from "moment-timezone";
-import React, {ReactElement, useState} from "react";
+import React, {ReactElement, useCallback, useMemo, useState} from "react";
 import {ActivityIndicator, KeyboardTypeOptions, Platform, TextInput, View} from "react-native";
 import {Calendar} from "react-native-calendars";
 
@@ -168,7 +168,7 @@ export function TextField({
     borderColor = Unifier.theme.gray;
   }
 
-  const getHeight = () => {
+  const getHeight = useCallback(() => {
     if (grow) {
       return Math.max(40, height);
     } else if (multiline) {
@@ -176,7 +176,29 @@ export function TextField({
     } else {
       return 40;
     }
-  };
+  }, [grow, height, multiline]);
+
+  const defaultTextInputStyles = useMemo(() => {
+    const defaultStyles = {
+      flex: 1,
+      paddingTop: 10,
+      paddingRight: 10,
+      paddingBottom: 10,
+      paddingLeft: 0,
+      height: getHeight(),
+      width: "100%",
+      color: Unifier.theme.darkGray,
+      fontFamily: Unifier.theme.primaryFont,
+      ...style,
+    };
+
+    if (Platform.OS === "web") {
+      defaultStyles.outline = 0;
+    }
+
+    return defaultStyles;
+  }, [getHeight, style]);
+
   const isHandledByModal =
     type === "date" || type === "numberRange" || type === "decimalRange" || type === "height";
 
@@ -269,20 +291,7 @@ export function TextField({
               placeholderTextColor={Unifier.theme.gray}
               returnKeyType={type === "number" || type === "decimal" ? "done" : returnKeyType}
               secureTextEntry={type === "password"}
-              style={{
-                flex: 1,
-                paddingTop: 10,
-                paddingRight: 10,
-                paddingBottom: 10,
-                paddingLeft: 0,
-                height: getHeight(),
-                width: "100%",
-                color: Unifier.theme.darkGray,
-                fontFamily: Unifier.theme.primaryFont,
-                // Remove border in web.
-                outlineWidth: 0,
-                ...style,
-              }}
+              style={defaultTextInputStyles}
               // For react-native-autofocus
               textContentType={textContentType}
               underlineColorAndroid="transparent"

package/src/Utilities.tsx

@@ -4,14 +4,12 @@ import get from "lodash/get";
 
 export function mergeInlineStyles(inlineStyle?: any, newStyle?: any) {
   const inline = get(inlineStyle, "__style");
-  const dangerouslySetInlineStyle = {
+  return {
     __style: {
       ...inline,
       ...newStyle,
     },
   };
-
-  return dangerouslySetInlineStyle;
 }
 
 /*

package/src/WithLabel.tsx

@@ -1,11 +1,11 @@
 import React from "react";
 
 import {Box} from "./Box";
-import {AllColors, JustifyContent, TextSize} from "./Common";
+import {AllColors, JustifyContent, ReactChildren, TextSize} from "./Common";
 import {Text} from "./Text";
 
 export interface WithLabelProps {
-  children: React.ReactNode;
+  children?: ReactChildren;
   show?: boolean;
   label?: string;
   labelInline?: boolean;
@@ -24,7 +24,10 @@ export function WithLabel({
   labelColor,
   show,
   children,
-}: WithLabelProps) {
+}: WithLabelProps): React.ReactElement | null {
+  if (!children) {
+    return null;
+  }
   return (
     <Box
       direction={labelInline ? "row" : "column"}

package/src/index.tsx

@@ -1,5 +1,6 @@
 export * from "./Constants";
 export * from "./Common";
+export * from "./MediaQuery";
 export * from "./ActionSheet";
 export * from "./Avatar";
 export * from "./Badge";
@@ -69,7 +70,7 @@ interface Insets {
   right?: number;
 }
 
-// Lifted from react-native-navigatino
+// Lifted from react-native-navigation
 // import {Options} from "./Options";
 export interface LayoutComponent<P = {}> {
   /**
@@ -453,7 +454,7 @@ export interface OptionsTopBarTitle {
     passProps?: object;
   };
   /**
-   * Top Bar title height in densitiy pixels
+   * Top Bar title height in density pixels
    * #### (Android specific)
    */
   height?: number;
@@ -496,7 +497,7 @@ export interface OptionsTopBarBackButton {
    */
   icon?: ImageRequireSource;
   /**
-   * Weither the back button is visible or not
+   * Whether the back button is visible or not
    * @default true
    */
   visible?: boolean;
@@ -1005,14 +1006,14 @@ export interface OverlayOptions {
    */
   interceptTouchOutside?: boolean;
   /**
-   * Control wether this Overlay should handle Keyboard events.
+   * Control whether this Overlay should handle Keyboard events.
    * Set this to true if your Overlay contains a TextInput.
    */
   handleKeyboardEvents?: boolean;
 }
 export interface ModalOptions {
   /**
-   * Control wether this modal should be dismiss using swipe gesture when the modalPresentationStyle = 'pageSheet'
+   * Control whether this modal should be dismiss using swipe gesture when the modalPresentationStyle = 'pageSheet'
    * #### (iOS specific)
    */
   swipeToDismiss?: boolean;