envoc-form 4.0.1-9 → 5.0.1

package/src/Select/__tests__/__snapshots__/BooleanSelectGroup.test.tsx.snap

@@ -32,28 +32,26 @@ exports[`BooleanSelectGroup has matching snapshot 1`] = `
           class="css-1f43avz-a11yText-A11yText"
         />
         <div
-          class="react-select__control css-1s2u09g-control"
+          class="react-select__control css-13cymwt-control"
         >
           <div
-            class="react-select__value-container css-dlobye-Component"
+            class="react-select__value-container css-16674sh-Component"
           >
             <div
-              class="react-select__placeholder css-14el2xx-placeholder"
+              class="react-select__placeholder css-1jqq78o-placeholder"
               id="react-select-3-placeholder"
             >
               Select...
             </div>
             <div
-              class="react-select__input-container css-1u4kn00-Component"
+              class="react-select__input-container css-d9r47t-Component"
               data-value=""
             >
               <input
                 aria-autocomplete="list"
-                aria-controls="react-select-3-listbox"
                 aria-describedby="react-select-3-placeholder"
                 aria-expanded="false"
                 aria-haspopup="true"
-                aria-owns="react-select-3-listbox"
                 autocapitalize="none"
                 autocomplete="off"
                 autocorrect="off"
@@ -72,11 +70,11 @@ exports[`BooleanSelectGroup has matching snapshot 1`] = `
             class="react-select__indicators css-ny0e4k-Component"
           >
             <span
-              class="react-select__indicator-separator css-1okebmr-indicatorSeparator"
+              class="react-select__indicator-separator css-1u9des2-indicatorSeparator"
             />
             <div
               aria-hidden="true"
-              class="react-select__indicator react-select__dropdown-indicator css-tlfecz-indicatorContainer"
+              class="react-select__indicator react-select__dropdown-indicator css-1xc3v61-indicatorContainer"
             >
               <svg
                 aria-hidden="true"

package/src/Select/__tests__/__snapshots__/NumberSelectGroup.test.tsx.snap

@@ -32,28 +32,26 @@ exports[`MultiNumberSelectGroup has matching snapshot 1`] = `
           class="css-1f43avz-a11yText-A11yText"
         />
         <div
-          class="react-select__control css-1s2u09g-control"
+          class="react-select__control css-13cymwt-control"
         >
           <div
-            class="react-select__value-container react-select__value-container--is-multi css-dlobye-Component"
+            class="react-select__value-container react-select__value-container--is-multi css-16674sh-Component"
           >
             <div
-              class="react-select__placeholder css-14el2xx-placeholder"
+              class="react-select__placeholder css-1jqq78o-placeholder"
               id="react-select-5-placeholder"
             >
               Select...
             </div>
             <div
-              class="react-select__input-container css-1u4kn00-Component"
+              class="react-select__input-container css-d9r47t-Component"
               data-value=""
             >
               <input
                 aria-autocomplete="list"
-                aria-controls="react-select-5-listbox"
                 aria-describedby="react-select-5-placeholder"
                 aria-expanded="false"
                 aria-haspopup="true"
-                aria-owns="react-select-5-listbox"
                 autocapitalize="none"
                 autocomplete="off"
                 autocorrect="off"
@@ -72,11 +70,11 @@ exports[`MultiNumberSelectGroup has matching snapshot 1`] = `
             class="react-select__indicators css-ny0e4k-Component"
           >
             <span
-              class="react-select__indicator-separator css-1okebmr-indicatorSeparator"
+              class="react-select__indicator-separator css-1u9des2-indicatorSeparator"
             />
             <div
               aria-hidden="true"
-              class="react-select__indicator react-select__dropdown-indicator css-tlfecz-indicatorContainer"
+              class="react-select__indicator react-select__dropdown-indicator css-1xc3v61-indicatorContainer"
             >
               <svg
                 aria-hidden="true"
@@ -131,28 +129,26 @@ exports[`SingleNumberSelectGroup has matching snapshot 1`] = `
           class="css-1f43avz-a11yText-A11yText"
         />
         <div
-          class="react-select__control css-1s2u09g-control"
+          class="react-select__control css-13cymwt-control"
         >
           <div
-            class="react-select__value-container css-dlobye-Component"
+            class="react-select__value-container css-16674sh-Component"
           >
             <div
-              class="react-select__placeholder css-14el2xx-placeholder"
+              class="react-select__placeholder css-1jqq78o-placeholder"
               id="react-select-3-placeholder"
             >
               Select...
             </div>
             <div
-              class="react-select__input-container css-1u4kn00-Component"
+              class="react-select__input-container css-d9r47t-Component"
               data-value=""
             >
               <input
                 aria-autocomplete="list"
-                aria-controls="react-select-3-listbox"
                 aria-describedby="react-select-3-placeholder"
                 aria-expanded="false"
                 aria-haspopup="true"
-                aria-owns="react-select-3-listbox"
                 autocapitalize="none"
                 autocomplete="off"
                 autocorrect="off"
@@ -171,11 +167,11 @@ exports[`SingleNumberSelectGroup has matching snapshot 1`] = `
             class="react-select__indicators css-ny0e4k-Component"
           >
             <span
-              class="react-select__indicator-separator css-1okebmr-indicatorSeparator"
+              class="react-select__indicator-separator css-1u9des2-indicatorSeparator"
             />
             <div
               aria-hidden="true"
-              class="react-select__indicator react-select__dropdown-indicator css-tlfecz-indicatorContainer"
+              class="react-select__indicator react-select__dropdown-indicator css-1xc3v61-indicatorContainer"
             >
               <svg
                 aria-hidden="true"

package/src/Select/__tests__/__snapshots__/StringSelectGroup.test.tsx.snap

@@ -32,28 +32,26 @@ exports[`MultiStringSelectGroup has matching snapshot 1`] = `
           class="css-1f43avz-a11yText-A11yText"
         />
         <div
-          class="react-select__control css-1s2u09g-control"
+          class="react-select__control css-13cymwt-control"
         >
           <div
-            class="react-select__value-container react-select__value-container--is-multi css-dlobye-Component"
+            class="react-select__value-container react-select__value-container--is-multi css-16674sh-Component"
           >
             <div
-              class="react-select__placeholder css-14el2xx-placeholder"
+              class="react-select__placeholder css-1jqq78o-placeholder"
               id="react-select-5-placeholder"
             >
               Select...
             </div>
             <div
-              class="react-select__input-container css-1u4kn00-Component"
+              class="react-select__input-container css-d9r47t-Component"
               data-value=""
             >
               <input
                 aria-autocomplete="list"
-                aria-controls="react-select-5-listbox"
                 aria-describedby="react-select-5-placeholder"
                 aria-expanded="false"
                 aria-haspopup="true"
-                aria-owns="react-select-5-listbox"
                 autocapitalize="none"
                 autocomplete="off"
                 autocorrect="off"
@@ -72,11 +70,11 @@ exports[`MultiStringSelectGroup has matching snapshot 1`] = `
             class="react-select__indicators css-ny0e4k-Component"
           >
             <span
-              class="react-select__indicator-separator css-1okebmr-indicatorSeparator"
+              class="react-select__indicator-separator css-1u9des2-indicatorSeparator"
             />
             <div
               aria-hidden="true"
-              class="react-select__indicator react-select__dropdown-indicator css-tlfecz-indicatorContainer"
+              class="react-select__indicator react-select__dropdown-indicator css-1xc3v61-indicatorContainer"
             >
               <svg
                 aria-hidden="true"
@@ -131,28 +129,26 @@ exports[`SingleStringSelectGroup has matching snapshot 1`] = `
           class="css-1f43avz-a11yText-A11yText"
         />
         <div
-          class="react-select__control css-1s2u09g-control"
+          class="react-select__control css-13cymwt-control"
         >
           <div
-            class="react-select__value-container css-dlobye-Component"
+            class="react-select__value-container css-16674sh-Component"
           >
             <div
-              class="react-select__placeholder css-14el2xx-placeholder"
+              class="react-select__placeholder css-1jqq78o-placeholder"
               id="react-select-3-placeholder"
             >
               Select...
             </div>
             <div
-              class="react-select__input-container css-1u4kn00-Component"
+              class="react-select__input-container css-d9r47t-Component"
               data-value=""
             >
               <input
                 aria-autocomplete="list"
-                aria-controls="react-select-3-listbox"
                 aria-describedby="react-select-3-placeholder"
                 aria-expanded="false"
                 aria-haspopup="true"
-                aria-owns="react-select-3-listbox"
                 autocapitalize="none"
                 autocomplete="off"
                 autocorrect="off"
@@ -171,11 +167,11 @@ exports[`SingleStringSelectGroup has matching snapshot 1`] = `
             class="react-select__indicators css-ny0e4k-Component"
           >
             <span
-              class="react-select__indicator-separator css-1okebmr-indicatorSeparator"
+              class="react-select__indicator-separator css-1u9des2-indicatorSeparator"
             />
             <div
               aria-hidden="true"
-              class="react-select__indicator react-select__dropdown-indicator css-tlfecz-indicatorContainer"
+              class="react-select__indicator react-select__dropdown-indicator css-1xc3v61-indicatorContainer"
             >
               <svg
                 aria-hidden="true"

package/src/StandardFormActions.tsx

@@ -5,10 +5,15 @@ import SubmitFormButton from './SubmitFormButton';
 import { FormDefaults } from './FormDefaults';
 
 export interface StandardFormActionsProps {
+  /** Allow the form to be submitted without any changes. By default this is not allowed. */
   allowPristineSubmit?: boolean;
+  /** The cancel button's `onClick`.
+   * @defaultValue `window.history.back()`
+   */
   handleCancel?: MouseEventHandler<HTMLButtonElement>;
 }
 
+/** Standard submit and cancel buttons. */
 export default function StandardFormActions({
   allowPristineSubmit,
   handleCancel,

package/src/SubmitFormButton.tsx

@@ -5,9 +5,12 @@ import { FormDefaults } from './FormDefaults';
 
 export interface SubmitFormButtonProps
   extends Omit<React.HTMLProps<HTMLButtonElement>, 'type'> {
+  /** Allow the form to be submitted without any changes. By default this is not allowed. */
   allowPristineSubmit?: boolean;
+  /** Text to display on the button. Default text is 'Submit'. */
   children?: React.ReactNode;
 }
+
 function SubmitFormButton(
   {
     allowPristineSubmit,
@@ -45,6 +48,7 @@ function SubmitFormButton(
   );
 }
 
+/** Generic submit button for forms. */
 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'
@@ -14,7 +14,6 @@ export interface TextAreaGroupProps
   icon?: React.ReactNode;
 }
 
-/** generic controlled <textarea/> wrapped by a Group */
 function TextAreaGroup(
   {
     input,
@@ -22,6 +21,7 @@ function TextAreaGroup(
     label,
     helpText,
     className,
+    required,
     disabled,
     icon,
     ...rest
@@ -32,6 +32,7 @@ function TextAreaGroup(
     <Group
       input={input}
       meta={meta}
+      required={required}
       disabled={disabled}
       label={label}
       helpText={helpText}
@@ -43,7 +44,7 @@ function TextAreaGroup(
       <textarea
         {...input}
         {...rest}
-        value={input.value}
+        value={input.value ?? ''}
         onChange={(val) => input.onChange(val.target.value)}
         ref={ref}
         className={classNames(
@@ -55,6 +56,7 @@ function TextAreaGroup(
   );
 }
 
+/** Generic controlled `<textarea/>` wrapped by a `<Group/>` */
 const TextAreaGroupWithRef = React.forwardRef(
   TextAreaGroup
 ) as React.ComponentType<TextAreaGroupProps>;

package/src/Validation/validators.ts

@@ -9,13 +9,14 @@ export const required = (value: any) =>
     ? undefined
     : '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}`;
-};
+/** 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 | 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,41 +26,42 @@ 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) => {
+/** Validate for a ZIP Code. Accepts formats: ##### and #####-#### */
+export const zipCode = (value: string | undefined | null) => {
   return value && !/^[0-9]{5}(?:-[0-9]{4})?$/.test(value)
     ? 'Invalid ZIP Code'
     : undefined;
 };
 
-//one of the validators provided must be true
+/** One of the validators provided must be true. */
 export const any =
   <TValue>(validatorList: ValidationFunction<TValue>[]) =>
   (value: TValue) => {
@@ -73,7 +75,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,28 +1,29 @@
-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;
   initialValues?: TForm;
+  handleSubmit?: (data: TForm | FormData) => Promise<ValidatedApiResult>;
 }
 
 export default function FormTestBase<TForm extends PersonDto>({
   children,
   initialValues,
+  handleSubmit,
 }: FormTestBaseProps<TForm>) {
   return (
     <HashRouter>
-      <Form onSubmit={onSubmit} initialValues={initialValues}>
+      <Form
+        onSubmit={handleSubmit ? handleSubmit : onSubmit}
+        initialValues={initialValues}>
         {children}
       </Form>
     </HashRouter>
   );
 
-  async function onSubmit(
-    data: PersonDto | FormData
-  ): Promise<ValidatedApiResult> {
+  async function onSubmit(data: TForm | FormData): Promise<ValidatedApiResult> {
     const isFormData = data instanceof FormData;
     const result = await fetch('/api/submit', {
       body: isFormData ? data : JSON.stringify(data),
@@ -43,7 +44,7 @@ export default function FormTestBase<TForm extends PersonDto>({
   }
 }
 
-interface PersonDto {
+export interface PersonDto {
   name?: string | undefined;
   nameWithIcon?: string | undefined;
   numberOfArms?: number;

package/src/__Tests__/RealisticForm.test.tsx

@@ -0,0 +1,82 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import user from '@testing-library/user-event';
+import FormTestBase from './FormTestBase';
+import { Form, StringInputGroup, ValidatedApiResult } from '../';
+import { PersonDto } from '../__Tests__/FormTestBase';
+import StandardFormActions from '../StandardFormActions';
+import { validators } from '../';
+
+const handleSubmitMock = jest.fn((value: PersonDto | FormData) => {
+  //return value;
+  return new Promise<ValidatedApiResult>((res, rej) => {
+    setTimeout(() => {
+      res({});
+    }, 15);
+  });
+});
+
+describe('Realistic Form', () => {
+  it('Validates, resolves validation, submits values', async () => {
+    global.scrollTo = jest.fn();
+    const fullForm = (
+      <FormTestBase handleSubmit={handleSubmitMock}>
+        {({ Field }) => (
+          <>
+            <Field name="name" label="name" Component={StringInputGroup} />
+            <Field
+              name="nameWithIcon"
+              label="Name with Icon"
+              Component={StringInputGroup}
+              validate={validators.required}
+            />
+            <StandardFormActions />
+            <Form.DisplayFormState />
+          </>
+        )}
+      </FormTestBase>
+    );
+
+    render(fullForm);
+    const nameInput = screen.getByLabelText('name');
+    const formSubmitButton = screen.getByRole('button', {
+      name: 'Submit',
+    });
+    //The form should start off with the submit button disabled
+    expect(formSubmitButton).toBeDisabled();
+
+    //Enter a name into the name input
+    user.click(nameInput);
+    user.type(nameInput, 'Travis Overmier');
+    expect(nameInput).toHaveValue('Travis Overmier');
+
+    //Submit should be enabled, click submit
+    expect(formSubmitButton).toBeEnabled();
+    user.click(formSubmitButton);
+
+    //Submit should disable while 'submitting' then re-enable
+    expect(formSubmitButton).toBeDisabled();
+    await waitFor(() => {
+      expect(formSubmitButton).toBeEnabled();
+    });
+
+    //Validation message should appear
+    const nameWithIconInput = screen.getByLabelText('Name with Icon');
+    expect(nameWithIconInput).toHaveErrorMessage('Required');
+
+    //Fill in field, error message goes away
+    user.type(nameWithIconInput, 'Kyle Joiner');
+    user.tab();
+    await waitFor(() => {
+      expect(nameWithIconInput).not.toHaveErrorMessage();
+    });
+
+    //Click the submit button
+    user.click(formSubmitButton);
+    await waitFor(() => {
+      expect(handleSubmitMock).toHaveBeenCalled();
+      expect(JSON.stringify(handleSubmitMock.mock.calls[0][0])).toBe(
+        `{"name":"Travis Overmier","nameWithIcon":"Kyle Joiner"}`
+      );
+    });
+  });
+});

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';

package/src/setupTests.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom/extend-expect';

package/src/utils/objectToFormData.test.tsx

@@ -10,7 +10,7 @@ const options = {
 const formDataAppend = global.FormData.prototype.append;
 
 beforeEach(() => {
-  global.FormData.prototype.append = jest.fn(formDataAppend);
+  global.FormData.prototype.append = jest.fn(formDataAppend) as any;
 });
 
 describe('Object To Form Data', () => {

package/es/__Tests__/FormTestBase.d.ts

@@ -1,27 +0,0 @@
-/// <reference types="react" />
-import '@testing-library/jest-dom/extend-expect';
-import { FormBuilderProp } from '../../src';
-interface FormTestBaseProps<TForm extends object> {
-    children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
-    initialValues?: TForm;
-}
-export default function FormTestBase<TForm extends PersonDto>({ children, initialValues, }: FormTestBaseProps<TForm>): JSX.Element;
-interface PersonDto {
-    name?: string | undefined;
-    nameWithIcon?: string | undefined;
-    numberOfArms?: number;
-    phoneNumber?: string;
-    yearlySalaryUSD?: number;
-    isCool?: boolean;
-    gradDate?: string;
-    favoriteDate?: string;
-    favoriteNumber?: number;
-    favoriteColor?: string;
-    favoriteColors?: string[];
-    favoriteNames?: string[];
-    allowLogin?: boolean;
-    userRoles?: number[];
-    profileImage?: any;
-    favoritePictures?: any[];
-}
-export {};