envoc-form 4.0.1-10 → 4.0.1-11

package/src/Input/InputGroup.tsx

@@ -1,18 +1,22 @@
 import React, { ChangeEventHandler, LegacyRef } from 'react';
 import classNames from 'classnames';
 import { InjectedFieldProps } from '../Field/InjectedFieldProps';
-import Group, { GroupProps } from '../Group';
 import { FormDefaults } from '../FormDefaults';
+import Group, { GroupProps } from '../Group';
 
 export interface InputGroupProps<TValue>
   extends InjectedFieldProps<TValue>,
     Omit<
       React.HTMLProps<HTMLInputElement>,
-      keyof InjectedFieldProps<any> | 'children' | 'className' | 'label'
+      | keyof InjectedFieldProps<any>
+      | 'children'
+      | 'className'
+      | 'label'
+      | 'value'
     >,
     Omit<GroupProps, keyof InjectedFieldProps<any> | 'children'> {
   onChange: ChangeEventHandler<HTMLInputElement>;
-  value: string | number;
+  value: string | number | null | undefined;
   icon?: React.ReactNode;
 }
 
@@ -49,7 +53,7 @@ function InputGroup<TValue>(
       <input
         {...input}
         {...rest}
-        value={value}
+        value={value ?? ''}
         onChange={onChange}
         ref={ref}
         className={classNames(

package/src/Input/MoneyInputGroup.tsx

@@ -5,7 +5,7 @@ import { FormDefaults } from '../FormDefaults';
 
 export interface MoneyInputGroupProps
   extends Omit<
-    InputGroupProps<number | undefined>,
+    InputGroupProps<number | undefined | null>,
     'onChange' | 'type' | 'value'
   > {
   parseFunc?: typeof parseInt | typeof parseFloat;

package/src/Input/NumberInputGroup.tsx

@@ -5,7 +5,7 @@ import { FormDefaults } from '../FormDefaults';
 
 export interface NumberInputGroupProps
   extends Omit<
-    InputGroupProps<number | undefined>,
+    InputGroupProps<number | undefined | null>,
     'onChange' | 'type' | 'value'
   > {
   parseFunc?: typeof parseInt | typeof parseFloat;

package/src/Input/StringInputGroup.tsx

@@ -5,7 +5,7 @@ import { FormDefaults } from '../FormDefaults';
 
 export interface StringInputGroupProps
   extends Omit<
-    InputGroupProps<string | undefined>,
+    InputGroupProps<string | undefined | null>,
     'onChange' | 'type' | 'value'
   > {
   type?:
@@ -33,7 +33,7 @@ function StringInputGroup(
         className,
         FormDefaults.cssClassPrefix + 'string-group'
       )}
-      value={input.value || ''}
+      value={input.value ?? ''}
       onChange={(e) => {
         if (!e.target.value) {
           input.onChange(undefined);

package/src/Normalization/normalizers.ts

@@ -1,4 +1,4 @@
-export const phoneNumber = (value: string | undefined) => {
+export const phoneNumber = (value: string | undefined | null) => {
   if (!value) {
     return undefined;
   }
@@ -30,7 +30,7 @@ export const phoneNumber = (value: string | undefined) => {
   return onlyNums;
 };
 
-export const zipCode = (value: string | undefined) => {
+export const zipCode = (value: string | undefined | null) => {
   if (!value) {
     return undefined;
   }

package/src/Select/BooleanSelectGroup.tsx

@@ -13,7 +13,7 @@ const booleanOptions: SelectOption<boolean>[] = [
 ];
 
 export interface BooleanSelectGroupProps
-  extends Omit<SelectGroupPropsHelper<boolean>, 'options'> {
+  extends Omit<SelectGroupPropsHelper<boolean | undefined | null>, 'options'> {
   options?: SelectOption<boolean>[];
 }
 export function BooleanSelectGroup(props: BooleanSelectGroupProps) {

package/src/Select/NumberSelectGroup.tsx

@@ -2,13 +2,13 @@ import SelectGroup from './SelectGroup';
 import { SelectGroupPropsHelper } from './SelectGroupPropsHelper';
 
 export interface MultiNumberSelectGroupProps
-  extends SelectGroupPropsHelper<number[]> {}
+  extends SelectGroupPropsHelper<number[] | undefined | null> {}
 export function MultiNumberSelectGroup(props: MultiNumberSelectGroupProps) {
   return <SelectGroup multiple={true} {...props} />;
 }
 
 export interface SingleNumberSelectGroupProps
-  extends SelectGroupPropsHelper<number> {}
+  extends SelectGroupPropsHelper<number | undefined | null> {}
 export function SingleNumberSelectGroup(props: SingleNumberSelectGroupProps) {
   return <SelectGroup multiple={false} {...props} />;
 }

package/src/Select/SelectGroup.tsx

@@ -1,8 +1,8 @@
 import { default as ReactSelect } from 'react-select';
 import classNames from 'classnames';
 import { InjectedFieldProps } from '../Field/InjectedFieldProps';
-import Group, { GroupProps } from '../Group';
 import { FormDefaults } from '../FormDefaults';
+import Group, { GroupProps } from '../Group';
 
 export interface SelectOption<TValue> {
   value: (TValue extends Array<infer P> ? P : TValue) | undefined;
@@ -23,7 +23,7 @@ interface OptionsUseServiceResult<TValue> {
 }
 
 export interface SelectGroupProps<TValue>
-  extends InjectedFieldProps<TValue | undefined>,
+  extends InjectedFieldProps<TValue | undefined | null>,
     Omit<GroupProps, 'input' | 'meta' | 'children'> {
   // allows for "useService" or other handles to control the data - including cache
   // TODO: do we still want a version of select that has a "url" or maybe a promise func or something?

package/src/SubmitFormButton.tsx

@@ -8,6 +8,7 @@ export interface SubmitFormButtonProps
   allowPristineSubmit?: boolean;
   children?: React.ReactNode;
 }
+
 function SubmitFormButton(
   {
     allowPristineSubmit,
@@ -47,4 +48,4 @@ function SubmitFormButton(
 
 export default React.forwardRef(
   SubmitFormButton
-) as React.ComponentType<SubmitFormButtonProps>;
+) as React.FunctionComponent<SubmitFormButtonProps>;

package/src/TextArea/TextAreaGroup.tsx

@@ -1,11 +1,11 @@
 import React, { LegacyRef } from 'react';
 import classNames from 'classnames';
 import { InjectedFieldProps } from '../Field/InjectedFieldProps';
-import Group, { GroupProps } from '../Group';
 import { FormDefaults } from '../FormDefaults';
+import Group, { GroupProps } from '../Group';
 
 export interface TextAreaGroupProps
-  extends InjectedFieldProps<string | undefined>,
+  extends InjectedFieldProps<string | undefined | null>,
     Omit<
       React.HTMLProps<HTMLTextAreaElement>,
       keyof InjectedFieldProps<any> | 'children' | 'className' | 'label'
@@ -45,7 +45,7 @@ function TextAreaGroup(
       <textarea
         {...input}
         {...rest}
-        value={input.value}
+        value={input.value ?? ''}
         onChange={(val) => input.onChange(val.target.value)}
         ref={ref}
         className={classNames(

package/src/Validation/validators.ts

@@ -10,12 +10,13 @@ export const required = (value: any) =>
     : 'Required';
 
 //asserts that the value is a certain number of characters. numbers are coerced to a string
-export const length = (len: number) => (value: string | number | undefined) => {
-  const hasError = getLengthOfValue(value) !== len;
-  return !hasError ? undefined : `Length must be ${len}`;
-};
+export const length =
+  (len: number) => (value: string | number | undefined | null) => {
+    const hasError = getLengthOfValue(value) !== len;
+    return !hasError ? undefined : `Length must be ${len}`;
+  };
 
-export const integer = (val: string | number | undefined) => {
+export const integer = (val: string | number | undefined | null) => {
   if (!val) {
     return undefined;
   }
@@ -25,35 +26,35 @@ export const integer = (val: string | number | undefined) => {
 };
 
 export const maxLength =
-  (len: number) => (value: string | number | undefined) => {
+  (len: number) => (value: string | number | undefined | null) => {
     const hasError = getLengthOfValue(value) > len;
     return !hasError ? undefined : `Maximum length ${len} exceeded`;
   };
 
 export const maxCount =
-  (count: number) => (value: { isDeleted?: boolean }[] | undefined) => {
+  (count: number) => (value: { isDeleted?: boolean }[] | undefined | null) => {
     const hasError =
       !!value && value.filter((x) => !x.isDeleted).length > count;
     return !hasError ? undefined : `Should not have more than ${count}`;
   };
 
 export const minCount =
-  (count: number) => (value: { isDeleted?: boolean }[] | undefined) => {
+  (count: number) => (value: { isDeleted?: boolean }[] | undefined | null) => {
     const hasError = !value || value.filter((x) => !x.isDeleted).length < count;
     return !hasError ? undefined : `Should have at least ${count}`;
   };
 
-export const maxValue = (max: number) => (value: number | undefined) => {
+export const maxValue = (max: number) => (value: number | undefined | null) => {
   const hasError = !!value && value > max;
   return !hasError ? undefined : `Maximum value ${max} exceeded`;
 };
 
-export const minValue = (min: number) => (value: number | undefined) => {
+export const minValue = (min: number) => (value: number | undefined | null) => {
   const hasError = !value || value < min;
   return !hasError ? undefined : `Minimum value ${min} not met`;
 };
 
-export const zipCode = (value: string | undefined) => {
+export const zipCode = (value: string | undefined | null) => {
   return value && !/^[0-9]{5}(?:-[0-9]{4})?$/.test(value)
     ? 'Invalid ZIP Code'
     : undefined;
@@ -73,7 +74,10 @@ export const any =
     );
   };
 
-function getLengthOfValue(value: string | number | undefined) {
+function getLengthOfValue(value: string | number | undefined | null) {
+  if (value === null) {
+    return 0;
+  }
   switch (typeof value) {
     case 'undefined':
       return 0;

package/src/__Tests__/FormTestBase.tsx

@@ -1,7 +1,7 @@
 import '@testing-library/jest-dom/extend-expect';
 import { HashRouter } from 'react-router-dom';
-import { ValidatedApiResult } from 'Validation/ValidatedApiResult';
-import { Form, FormBuilderProp } from '../../src';
+import { Form, FormBuilderProp } from '../';
+import { ValidatedApiResult } from '../Validation/ValidatedApiResult';
 
 interface FormTestBaseProps<TForm extends object> {
   children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;

package/src/index.ts

@@ -16,7 +16,7 @@ export type { ConfirmDeleteFormProps } from './ConfirmDeleteForm/ConfirmDeleteFo
 
 // Date
 export { default as DatePickerGroup } from './DatePicker/DatePickerGroup';
-export type { DatePickerGroupProps as DatePickerGroupProps } from './DatePicker/DatePickerGroup';
+export type { DatePickerGroupProps } from './DatePicker/DatePickerGroup';
 export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGroup';
 
 export type { DatePickerHelper } from './DatePicker/DatePickerHelper';
@@ -68,17 +68,17 @@ export type {
 } from './Form/ServerErrorContext';
 
 export { default as FormActions } from './FormActions';
-export type { FormActionsProps as FormActionsProps } from './FormActions';
+export type { FormActionsProps } from './FormActions';
 
 export { default as StandardFormActions } from './StandardFormActions';
-export type { StandardFormActionsProps as StandardFormActionsProps } from './StandardFormActions';
+export type { StandardFormActionsProps } from './StandardFormActions';
 
 // FormDefaults
 export { FormDefaults } from './FormDefaults';
 
 // Input
 export { default as Group } from './Group';
-export type { GroupProps as GroupProps } from './Group';
+export type { GroupProps } from './Group';
 
 export { default as IconInputGroup } from './Input/IconInputGroup';
 export type { IconInputGroupProps } from './Input/IconInputGroup';