envoc-form 4.0.1-6 → 4.0.1-8

package/README.md

@@ -10,8 +10,8 @@ Base form package for envoc projects.
 Important naming conventions for our sanity while creating envoc-form types:
 
 - TForm = The type of the some form. e.g. LoginDto
-- TProp = The key / symbol of a indvidual property of some form. e.g. TProp would be literally "Username" for the prop of the same name for a LoginDto
-- TValue = The value of an indvidual property of some form. e.g. a "Username" property would probably have a TValue of string
+- TProp = The key / symbol of a individual property of some form. e.g. TProp would be literally "Username" for the prop of the same name for a LoginDto
+- TValue = The value of an individual property of some form. e.g. a "Username" property would probably have a TValue of string
 - Field = the abstract thing that deals with some specific TProp. Might represent several composed elements (e.g. label, input, helperText, etc) or may just be a direct component
 - TRenderComponent = The type of any 'Component' passed to a Field, e.g. 'StandardTextInputGroup' passed to Component means TRenderComponent is typeof(StandardTextInputGroup)
 - TComponentProps = For any 'Component' passed to a Field as a prop, this represents that Component's props

package/es/DatePicker/DatePickerGroup.js

@@ -21,15 +21,23 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import DatePicker from 'react-date-picker/dist/entry.nostyle';
 import classnames from 'classnames';
 import parseISO from 'date-fns/parseISO';
-import Group from '../Group';
 import { FormDefaults } from '../FormDefaults';
+import Group from '../Group';
 export default function DatePickerGroup(_a) {
     var input = _a.input, meta = _a.meta, label = _a.label, helpText = _a.helpText, className = _a.className, disabled = _a.disabled, convert = _a.convert, rest = __rest(_a, ["input", "meta", "label", "helpText", "className", "disabled", "convert"]);
     var _b = useState(null), displayDate = _b[0], setDisplayDate = _b[1];
+    useEffect(function () {
+        if (input.value != null) {
+            setDisplayDate(new Date("".concat(input.value, "T00:00:00.000")));
+        }
+        else {
+            setDisplayDate(null);
+        }
+    }, [setDisplayDate, input.value]);
     return (_jsx(Group, __assign({ input: input, meta: meta, label: label, helpText: helpText, className: classnames(className, FormDefaults.cssClassPrefix + 'date-picker'), disabled: disabled }, { children: _jsx(DatePicker, __assign({}, rest, { className: classnames(FormDefaults.cssClassPrefix + 'date-picker', className), value: displayDate, onChange: handleChange })) })));
     function handleChange(e) {
         var onChange = input.onChange;

package/es/DatePicker/StringDateOnlyPickerGroup.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { DatePickerHelper } from './DatePickerHelper';
+export interface StringDateOnlyPickerGroupProps extends DatePickerHelper<string | undefined> {
+}
+export default function StringDatePickerGroup(props: StringDateOnlyPickerGroupProps): JSX.Element;

package/es/DatePicker/{DateOnlyDatePickerGroup.js → StringDateOnlyPickerGroup.js}

@@ -11,13 +11,14 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import DatePickerGroup from './DatePickerGroup';
-export default function DateOnlyDatePickerGroup(props) {
+export default function StringDatePickerGroup(props) {
     return _jsx(DatePickerGroup, __assign({}, props, { convert: convertToDateOnly }));
 }
 function convertToDateOnly(arg) {
-    return {
-        year: arg.getFullYear(),
-        month: arg.getMonth() + 1,
-        day: arg.getDate(),
-    };
+    var year = new Intl.DateTimeFormat('en', { year: 'numeric' })
+        .format(arg)
+        .padStart(4, '0');
+    var month = new Intl.DateTimeFormat('en', { month: '2-digit' }).format(arg);
+    var day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(arg);
+    return "".concat(year, "-").concat(month, "-").concat(day);
 }

package/es/Form/Form.d.ts

@@ -7,15 +7,20 @@ export declare type FormBuilderProp<TForm extends object> = {
     Field: <TProp extends keyof TForm, TRenderComponent extends ElementType>(props: FieldProps<TForm, TProp, TRenderComponent>) => JSX.Element;
     FieldArray: <TProp extends keyof TForm>(props: FieldArrayProps<TForm, TProp>) => JSX.Element;
 };
-export interface FormProps<TForm extends object> {
+export interface FullFormProps<TForm extends object> {
     children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
-    onSubmit: (formValues: FormData | TForm, formikBag: FormikHelpers<TForm>) => Promise<ValidatedApiResult>;
+    onSubmit: (formValues: TForm, formikBag: FormikHelpers<TForm>) => Promise<ValidatedApiResult>;
+    onFormDataSubmit: (formValues: FormData, formikBag: FormikHelpers<TForm>) => Promise<ValidatedApiResult>;
     className?: string;
     style?: CSSProperties;
     ignoreLostChanges?: boolean;
     initialValues?: TForm;
 }
-declare function Form<TForm extends object>({ children, className, style, ignoreLostChanges, onSubmit, initialValues, ...props }: FormProps<TForm>): JSX.Element;
+declare type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> & {
+    [K in Keys]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<Keys, K>>>;
+}[Keys];
+export declare type FormProps<TForm extends object> = RequireAtLeastOne<FullFormProps<TForm>, 'onSubmit' | 'onFormDataSubmit'>;
+declare function Form<TForm extends object>({ children, className, style, ignoreLostChanges, onSubmit, onFormDataSubmit, initialValues, ...props }: FormProps<TForm>): JSX.Element;
 declare namespace Form {
     var DisplayFormState: () => JSX.Element;
 }

package/es/Form/Form.js

@@ -29,11 +29,11 @@ import FormBasedPreventNavigation from './FormBasedPreventNavigation';
 import { ServerErrorContext, } from './ServerErrorContext';
 import Field from '../Field/Field';
 import FieldArray from '../FieldArray/FieldArray';
+import { FormDefaults } from '../FormDefaults';
 import objectContainsNonSerializableProperty from '../utils/objectContainsNonSerializableProperty';
 import objectToFormData from '../utils/objectToFormData';
-import { FormDefaults } from '../FormDefaults';
 export default function Form(_a) {
-    var children = _a.children, className = _a.className, style = _a.style, ignoreLostChanges = _a.ignoreLostChanges, onSubmit = _a.onSubmit, initialValues = _a.initialValues, props = __rest(_a, ["children", "className", "style", "ignoreLostChanges", "onSubmit", "initialValues"]);
+    var children = _a.children, className = _a.className, style = _a.style, ignoreLostChanges = _a.ignoreLostChanges, onSubmit = _a.onSubmit, onFormDataSubmit = _a.onFormDataSubmit, initialValues = _a.initialValues, props = __rest(_a, ["children", "className", "style", "ignoreLostChanges", "onSubmit", "onFormDataSubmit", "initialValues"]);
     // formik resets all error on each blur (with our settings)
     // this means that ALL errors from the server disappear when any one field is blurred
     // So, we have to store server errors ourselves
@@ -60,6 +60,7 @@ export default function Form(_a) {
                     })] })) })) })));
     function handleSubmit(values, formikBag) {
         var formData = undefined;
+        var submitFunc;
         if (objectContainsNonSerializableProperty(values)) {
             formData = objectToFormData(values, {
                 indices: true,
@@ -67,8 +68,34 @@ export default function Form(_a) {
                 allowEmptyArrays: true,
                 noFileListBrackets: true,
             });
+            if (onFormDataSubmit === undefined) {
+                throw new Error('No onFormDataSubmit supplied for non-serializable properties.');
+            }
+            submitFunc = function () {
+                return onFormDataSubmit(formData !== null && formData !== void 0 ? formData : new FormData(), formikBag);
+            };
+        }
+        else {
+            if (onSubmit === undefined) {
+                formData = objectToFormData(values, {
+                    indices: true,
+                    dotNotation: true,
+                    allowEmptyArrays: true,
+                    noFileListBrackets: true,
+                });
+                if (onFormDataSubmit === undefined) {
+                    // This error should never occur, as this case is covered by RequireAtLeastOne type safety
+                    throw new Error('No onFormDataSubmit supplied for non-serializable properties.');
+                }
+                submitFunc = function () {
+                    return onFormDataSubmit(formData !== null && formData !== void 0 ? formData : new FormData(), formikBag);
+                };
+            }
+            else {
+                submitFunc = function () { return onSubmit(values, formikBag); };
+            }
         }
-        return onSubmit(formData !== null && formData !== void 0 ? formData : values, formikBag)
+        return submitFunc()
             .then(function (response) {
             return response;
         })

package/es/SubmitFormButton.js

@@ -29,7 +29,8 @@ function SubmitFormButton(_a, ref) {
     var allowPristineSubmit = _a.allowPristineSubmit, children = _a.children, disabled = _a.disabled, title = _a.title, className = _a.className, props = __rest(_a, ["allowPristineSubmit", "children", "disabled", "title", "className"]);
     var _b = useFormikContext(), isSubmitting = _b.isSubmitting, dirty = _b.dirty;
     var preventSubmit = (!dirty && !allowPristineSubmit) || isSubmitting;
-    return (_jsx("button", __assign({}, props, { ref: ref, type: "submit", disabled: preventSubmit || disabled, title: title || isSubmitting
+    var buttonName = typeof children === 'string' ? children : 'Submit';
+    return (_jsx("button", __assign({}, props, { ref: ref, type: "submit", disabled: preventSubmit || disabled, "aria-label": buttonName, title: title || isSubmitting
             ? 'Loading, please wait...'
             : preventSubmit
                 ? "You haven't made any changes"

package/es/__Tests__/FormTestBase.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import '@testing-library/jest-dom/extend-expect';
-import { DateOnly, FormBuilderProp } from '../../src';
+import { FormBuilderProp } from '../../src';
 interface FormTestBaseProps<TForm extends object> {
     children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
     initialValues?: TForm;
@@ -13,8 +13,8 @@ interface PersonDto {
     phoneNumber?: string;
     yearlySalaryUSD?: number;
     isCool?: boolean;
-    gradDate?: DateOnly;
-    favoriteDate?: DateOnly;
+    gradDate?: string;
+    favoriteDate?: string;
     favoriteNumber?: number;
     favoriteColor?: string;
     favoriteColors?: string[];

package/es/index.d.ts

@@ -10,10 +10,10 @@ export { default as DatePickerGroup } from './DatePicker/DatePickerGroup';
 export type { DatePickerGroupProps as DatePickerGroupProps } from './DatePicker/DatePickerGroup';
 export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGroup';
 export type { DatePickerHelper } from './DatePicker/DatePickerHelper';
-export { default as DateOnlyDatePickerGroup } from './DatePicker/DateOnlyDatePickerGroup';
-export type { DateOnly, DateOnlyDatePickerGroupProps, } from './DatePicker/DateOnlyDatePickerGroup';
 export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
 export type { StringDatePickerGroupProps } from './DatePicker/StringDatePickerGroup';
+export { default as StringDateOnlyPickerGroup } from './DatePicker/StringDateOnlyPickerGroup';
+export type { StringDateOnlyPickerGroupProps } from './DatePicker/StringDateOnlyPickerGroup';
 export { default as Field } from './Field/Field';
 export type { FieldProps } from './Field/Field';
 export type { RenderComponent } from './Field/Field';

package/es/index.js

@@ -9,8 +9,8 @@ export { default as ConfirmDeleteForm } from './ConfirmDeleteForm/ConfirmDeleteF
 // Date
 export { default as DatePickerGroup } from './DatePicker/DatePickerGroup';
 export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGroup';
-export { default as DateOnlyDatePickerGroup } from './DatePicker/DateOnlyDatePickerGroup';
 export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
+export { default as StringDateOnlyPickerGroup } from './DatePicker/StringDateOnlyPickerGroup';
 // Field
 export { default as Field } from './Field/Field';
 export { default as FieldErrorScrollTarget } from './Field/FieldErrorScrollTarget';

package/lib/DatePicker/DatePickerGroup.js

@@ -31,11 +31,19 @@ var react_1 = require("react");
 var entry_nostyle_1 = __importDefault(require("react-date-picker/dist/entry.nostyle"));
 var classnames_1 = __importDefault(require("classnames"));
 var parseISO_1 = __importDefault(require("date-fns/parseISO"));
-var Group_1 = __importDefault(require("../Group"));
 var FormDefaults_1 = require("../FormDefaults");
+var Group_1 = __importDefault(require("../Group"));
 function DatePickerGroup(_a) {
     var input = _a.input, meta = _a.meta, label = _a.label, helpText = _a.helpText, className = _a.className, disabled = _a.disabled, convert = _a.convert, rest = __rest(_a, ["input", "meta", "label", "helpText", "className", "disabled", "convert"]);
     var _b = (0, react_1.useState)(null), displayDate = _b[0], setDisplayDate = _b[1];
+    (0, react_1.useEffect)(function () {
+        if (input.value != null) {
+            setDisplayDate(new Date("".concat(input.value, "T00:00:00.000")));
+        }
+        else {
+            setDisplayDate(null);
+        }
+    }, [setDisplayDate, input.value]);
     return ((0, jsx_runtime_1.jsx)(Group_1.default, __assign({ input: input, meta: meta, label: label, helpText: helpText, className: (0, classnames_1.default)(className, FormDefaults_1.FormDefaults.cssClassPrefix + 'date-picker'), disabled: disabled }, { children: (0, jsx_runtime_1.jsx)(entry_nostyle_1.default, __assign({}, rest, { className: (0, classnames_1.default)(FormDefaults_1.FormDefaults.cssClassPrefix + 'date-picker', className), value: displayDate, onChange: handleChange })) })));
     function handleChange(e) {
         var onChange = input.onChange;

package/lib/DatePicker/StringDateOnlyPickerGroup.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { DatePickerHelper } from './DatePickerHelper';
+export interface StringDateOnlyPickerGroupProps extends DatePickerHelper<string | undefined> {
+}
+export default function StringDatePickerGroup(props: StringDateOnlyPickerGroupProps): JSX.Element;

package/lib/DatePicker/{DateOnlyDatePickerGroup.js → StringDateOnlyPickerGroup.js}

@@ -16,14 +16,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var DatePickerGroup_1 = __importDefault(require("./DatePickerGroup"));
-function DateOnlyDatePickerGroup(props) {
+function StringDatePickerGroup(props) {
     return (0, jsx_runtime_1.jsx)(DatePickerGroup_1.default, __assign({}, props, { convert: convertToDateOnly }));
 }
-exports.default = DateOnlyDatePickerGroup;
+exports.default = StringDatePickerGroup;
 function convertToDateOnly(arg) {
-    return {
-        year: arg.getFullYear(),
-        month: arg.getMonth() + 1,
-        day: arg.getDate(),
-    };
+    var year = new Intl.DateTimeFormat('en', { year: 'numeric' })
+        .format(arg)
+        .padStart(4, '0');
+    var month = new Intl.DateTimeFormat('en', { month: '2-digit' }).format(arg);
+    var day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(arg);
+    return "".concat(year, "-").concat(month, "-").concat(day);
 }

package/lib/Form/Form.d.ts

@@ -7,15 +7,20 @@ export declare type FormBuilderProp<TForm extends object> = {
     Field: <TProp extends keyof TForm, TRenderComponent extends ElementType>(props: FieldProps<TForm, TProp, TRenderComponent>) => JSX.Element;
     FieldArray: <TProp extends keyof TForm>(props: FieldArrayProps<TForm, TProp>) => JSX.Element;
 };
-export interface FormProps<TForm extends object> {
+export interface FullFormProps<TForm extends object> {
     children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
-    onSubmit: (formValues: FormData | TForm, formikBag: FormikHelpers<TForm>) => Promise<ValidatedApiResult>;
+    onSubmit: (formValues: TForm, formikBag: FormikHelpers<TForm>) => Promise<ValidatedApiResult>;
+    onFormDataSubmit: (formValues: FormData, formikBag: FormikHelpers<TForm>) => Promise<ValidatedApiResult>;
     className?: string;
     style?: CSSProperties;
     ignoreLostChanges?: boolean;
     initialValues?: TForm;
 }
-declare function Form<TForm extends object>({ children, className, style, ignoreLostChanges, onSubmit, initialValues, ...props }: FormProps<TForm>): JSX.Element;
+declare type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> & {
+    [K in Keys]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<Keys, K>>>;
+}[Keys];
+export declare type FormProps<TForm extends object> = RequireAtLeastOne<FullFormProps<TForm>, 'onSubmit' | 'onFormDataSubmit'>;
+declare function Form<TForm extends object>({ children, className, style, ignoreLostChanges, onSubmit, onFormDataSubmit, initialValues, ...props }: FormProps<TForm>): JSX.Element;
 declare namespace Form {
     var DisplayFormState: () => JSX.Element;
 }

package/lib/Form/Form.js

@@ -34,11 +34,11 @@ var FormBasedPreventNavigation_1 = __importDefault(require("./FormBasedPreventNa
 var ServerErrorContext_1 = require("./ServerErrorContext");
 var Field_1 = __importDefault(require("../Field/Field"));
 var FieldArray_1 = __importDefault(require("../FieldArray/FieldArray"));
+var FormDefaults_1 = require("../FormDefaults");
 var objectContainsNonSerializableProperty_1 = __importDefault(require("../utils/objectContainsNonSerializableProperty"));
 var objectToFormData_1 = __importDefault(require("../utils/objectToFormData"));
-var FormDefaults_1 = require("../FormDefaults");
 function Form(_a) {
-    var children = _a.children, className = _a.className, style = _a.style, ignoreLostChanges = _a.ignoreLostChanges, onSubmit = _a.onSubmit, initialValues = _a.initialValues, props = __rest(_a, ["children", "className", "style", "ignoreLostChanges", "onSubmit", "initialValues"]);
+    var children = _a.children, className = _a.className, style = _a.style, ignoreLostChanges = _a.ignoreLostChanges, onSubmit = _a.onSubmit, onFormDataSubmit = _a.onFormDataSubmit, initialValues = _a.initialValues, props = __rest(_a, ["children", "className", "style", "ignoreLostChanges", "onSubmit", "onFormDataSubmit", "initialValues"]);
     // formik resets all error on each blur (with our settings)
     // this means that ALL errors from the server disappear when any one field is blurred
     // So, we have to store server errors ourselves
@@ -65,6 +65,7 @@ function Form(_a) {
                     })] })) })) })));
     function handleSubmit(values, formikBag) {
         var formData = undefined;
+        var submitFunc;
         if ((0, objectContainsNonSerializableProperty_1.default)(values)) {
             formData = (0, objectToFormData_1.default)(values, {
                 indices: true,
@@ -72,8 +73,34 @@ function Form(_a) {
                 allowEmptyArrays: true,
                 noFileListBrackets: true,
             });
+            if (onFormDataSubmit === undefined) {
+                throw new Error('No onFormDataSubmit supplied for non-serializable properties.');
+            }
+            submitFunc = function () {
+                return onFormDataSubmit(formData !== null && formData !== void 0 ? formData : new FormData(), formikBag);
+            };
+        }
+        else {
+            if (onSubmit === undefined) {
+                formData = (0, objectToFormData_1.default)(values, {
+                    indices: true,
+                    dotNotation: true,
+                    allowEmptyArrays: true,
+                    noFileListBrackets: true,
+                });
+                if (onFormDataSubmit === undefined) {
+                    // This error should never occur, as this case is covered by RequireAtLeastOne type safety
+                    throw new Error('No onFormDataSubmit supplied for non-serializable properties.');
+                }
+                submitFunc = function () {
+                    return onFormDataSubmit(formData !== null && formData !== void 0 ? formData : new FormData(), formikBag);
+                };
+            }
+            else {
+                submitFunc = function () { return onSubmit(values, formikBag); };
+            }
         }
-        return onSubmit(formData !== null && formData !== void 0 ? formData : values, formikBag)
+        return submitFunc()
             .then(function (response) {
             return response;
         })

package/lib/SubmitFormButton.js

@@ -34,7 +34,8 @@ function SubmitFormButton(_a, ref) {
     var allowPristineSubmit = _a.allowPristineSubmit, children = _a.children, disabled = _a.disabled, title = _a.title, className = _a.className, props = __rest(_a, ["allowPristineSubmit", "children", "disabled", "title", "className"]);
     var _b = (0, formik_1.useFormikContext)(), isSubmitting = _b.isSubmitting, dirty = _b.dirty;
     var preventSubmit = (!dirty && !allowPristineSubmit) || isSubmitting;
-    return ((0, jsx_runtime_1.jsx)("button", __assign({}, props, { ref: ref, type: "submit", disabled: preventSubmit || disabled, title: title || isSubmitting
+    var buttonName = typeof children === 'string' ? children : 'Submit';
+    return ((0, jsx_runtime_1.jsx)("button", __assign({}, props, { ref: ref, type: "submit", disabled: preventSubmit || disabled, "aria-label": buttonName, title: title || isSubmitting
             ? 'Loading, please wait...'
             : preventSubmit
                 ? "You haven't made any changes"

package/lib/__Tests__/FormTestBase.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import '@testing-library/jest-dom/extend-expect';
-import { DateOnly, FormBuilderProp } from '../../src';
+import { FormBuilderProp } from '../../src';
 interface FormTestBaseProps<TForm extends object> {
     children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
     initialValues?: TForm;
@@ -13,8 +13,8 @@ interface PersonDto {
     phoneNumber?: string;
     yearlySalaryUSD?: number;
     isCool?: boolean;
-    gradDate?: DateOnly;
-    favoriteDate?: DateOnly;
+    gradDate?: string;
+    favoriteDate?: string;
     favoriteNumber?: number;
     favoriteColor?: string;
     favoriteColors?: string[];

package/lib/index.d.ts

@@ -10,10 +10,10 @@ export { default as DatePickerGroup } from './DatePicker/DatePickerGroup';
 export type { DatePickerGroupProps as DatePickerGroupProps } from './DatePicker/DatePickerGroup';
 export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGroup';
 export type { DatePickerHelper } from './DatePicker/DatePickerHelper';
-export { default as DateOnlyDatePickerGroup } from './DatePicker/DateOnlyDatePickerGroup';
-export type { DateOnly, DateOnlyDatePickerGroupProps, } from './DatePicker/DateOnlyDatePickerGroup';
 export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
 export type { StringDatePickerGroupProps } from './DatePicker/StringDatePickerGroup';
+export { default as StringDateOnlyPickerGroup } from './DatePicker/StringDateOnlyPickerGroup';
+export type { StringDateOnlyPickerGroupProps } from './DatePicker/StringDateOnlyPickerGroup';
 export { default as Field } from './Field/Field';
 export type { FieldProps } from './Field/Field';
 export type { RenderComponent } from './Field/Field';

package/lib/index.js

@@ -29,7 +29,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validators = exports.serialize = exports.objectContainsNonSerializableProperty = exports.TextAreaGroup = exports.SingleStringSelectGroup = exports.MultiStringSelectGroup = exports.SingleNumberSelectGroup = exports.MultiNumberSelectGroup = exports.BooleanSelectGroup = exports.SelectGroup = exports.normalizers = exports.StringInputGroup = exports.NumberInputGroup = exports.MoneyInputGroup = exports.InputGroup = exports.IconInputGroup = exports.Group = exports.FormDefaults = exports.StandardFormActions = exports.FormActions = exports.ServerErrorContext = exports.Form = exports.FileGroup = exports.FieldArray = exports.useStandardField = exports.StandAloneInput = exports.FieldNameContext = exports.FieldErrorScrollTarget = exports.Field = exports.StringDatePickerGroup = exports.DateOnlyDatePickerGroup = exports.convertToTimeZoneInsensitiveISOString = exports.DatePickerGroup = exports.ConfirmDeleteForm = exports.ConfirmBaseForm = exports.SubmitFormButton = exports.AddressInput = void 0;
+exports.validators = exports.serialize = exports.objectContainsNonSerializableProperty = exports.TextAreaGroup = exports.SingleStringSelectGroup = exports.MultiStringSelectGroup = exports.SingleNumberSelectGroup = exports.MultiNumberSelectGroup = exports.BooleanSelectGroup = exports.SelectGroup = exports.normalizers = exports.StringInputGroup = exports.NumberInputGroup = exports.MoneyInputGroup = exports.InputGroup = exports.IconInputGroup = exports.Group = exports.FormDefaults = exports.StandardFormActions = exports.FormActions = exports.ServerErrorContext = exports.Form = exports.FileGroup = exports.FieldArray = exports.useStandardField = exports.StandAloneInput = exports.FieldNameContext = exports.FieldErrorScrollTarget = exports.Field = exports.StringDateOnlyPickerGroup = exports.StringDatePickerGroup = exports.convertToTimeZoneInsensitiveISOString = exports.DatePickerGroup = exports.ConfirmDeleteForm = exports.ConfirmBaseForm = exports.SubmitFormButton = exports.AddressInput = void 0;
 // Address
 var AddressInput_1 = require("./AddressInput/AddressInput");
 Object.defineProperty(exports, "AddressInput", { enumerable: true, get: function () { return __importDefault(AddressInput_1).default; } });
@@ -47,10 +47,10 @@ var DatePickerGroup_1 = require("./DatePicker/DatePickerGroup");
 Object.defineProperty(exports, "DatePickerGroup", { enumerable: true, get: function () { return __importDefault(DatePickerGroup_1).default; } });
 var DatePickerGroup_2 = require("./DatePicker/DatePickerGroup");
 Object.defineProperty(exports, "convertToTimeZoneInsensitiveISOString", { enumerable: true, get: function () { return DatePickerGroup_2.convertToTimeZoneInsensitiveISOString; } });
-var DateOnlyDatePickerGroup_1 = require("./DatePicker/DateOnlyDatePickerGroup");
-Object.defineProperty(exports, "DateOnlyDatePickerGroup", { enumerable: true, get: function () { return __importDefault(DateOnlyDatePickerGroup_1).default; } });
 var StringDatePickerGroup_1 = require("./DatePicker/StringDatePickerGroup");
 Object.defineProperty(exports, "StringDatePickerGroup", { enumerable: true, get: function () { return __importDefault(StringDatePickerGroup_1).default; } });
+var StringDateOnlyPickerGroup_1 = require("./DatePicker/StringDateOnlyPickerGroup");
+Object.defineProperty(exports, "StringDateOnlyPickerGroup", { enumerable: true, get: function () { return __importDefault(StringDateOnlyPickerGroup_1).default; } });
 // Field
 var Field_1 = require("./Field/Field");
 Object.defineProperty(exports, "Field", { enumerable: true, get: function () { return __importDefault(Field_1).default; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envoc-form",
-  "version": "4.0.1-6",
+  "version": "4.0.1-8",
   "description": "Envoc form components",
   "keywords": [
     "react-component",
@@ -37,7 +37,7 @@
     "axios": "^0.21.1",
     "classnames": "^2.3.1",
     "date-fns": "^2.22.1",
-    "envoc-request": "^4.0.1-6",
+    "envoc-request": "^4.0.1-8",
     "lru-cache": "^6.0.0",
     "prop-types": "^15.7.2",
     "react-date-picker": "^8.2.0",
@@ -72,6 +72,8 @@
     "clean-webpack-plugin": "^3.0.0",
     "cross-env": "7.0.3",
     "css-loader": "^5.0.2",
+    "eslint": "^8.32.0",
+    "eslint-config-react-app": "^7.0.1",
     "html-webpack-plugin": "^5.3.2",
     "identity-obj-proxy": "^3.0.0",
     "jest-junit": "~12.2.0",

package/src/DatePicker/DatePicker.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import DateOnlyDatePickerGroup from './DateOnlyDatePickerGroup';
+import StringDatePickerGroup from './StringDatePickerGroup';
 import FormTestBase from '../__Tests__/FormTestBase';
 
 //hack so the datepicker internals don't complain about this not existing in the context of jest
@@ -13,7 +13,7 @@ describe('IconInputGroup', () => {
         {({ Field }) => (
           <Field
             name="favoriteDate"
-            Component={DateOnlyDatePickerGroup}
+            Component={StringDatePickerGroup}
             label="Favorite Date"
             monthPlaceholder="mm"
             dayPlaceholder="dd"
@@ -32,7 +32,7 @@ describe('IconInputGroup', () => {
         {({ Field }) => (
           <Field
             name="favoriteDate"
-            Component={DateOnlyDatePickerGroup}
+            Component={StringDatePickerGroup}
             label="Favorite Date"
             monthPlaceholder="mm"
             dayPlaceholder="dd"

package/src/DatePicker/DatePickerGroup.tsx

@@ -1,12 +1,10 @@
-import { useState } from 'react';
-import DatePicker, {
-  DatePickerProps,
-} from 'react-date-picker/dist/entry.nostyle';
+import { useEffect, useState } from 'react';
+import DatePicker, { DatePickerProps } from 'react-date-picker/dist/entry.nostyle';
 import classnames from 'classnames';
 import parseISO from 'date-fns/parseISO';
 import { InjectedFieldProps } from '../Field/InjectedFieldProps';
-import Group, { GroupProps } from '../Group';
 import { FormDefaults } from '../FormDefaults';
+import Group, { GroupProps } from '../Group';
 
 // Docs for react-date-picker https://www.npmjs.com/package/react-date-picker
 
@@ -32,6 +30,14 @@ export default function DatePickerGroup<T>({
 }: DatePickerGroupProps<T>) {
   const [displayDate, setDisplayDate] = useState<Date | null>(null);
 
+  useEffect(() => {
+    if (input.value != null) {
+      setDisplayDate(new Date(`${input.value}T00:00:00.000`));
+    } else {
+      setDisplayDate(null);
+    }
+  }, [setDisplayDate, input.value]);
+
   return (
     <Group
       input={input}

package/src/DatePicker/StringDateOnlyPickerGroup.tsx

@@ -0,0 +1,23 @@
+import { DatePickerHelper } from './DatePickerHelper';
+import DatePickerGroup from './DatePickerGroup';
+
+export interface StringDateOnlyPickerGroupProps
+  extends DatePickerHelper<string | undefined> {}
+
+export default function StringDatePickerGroup(
+  props: StringDateOnlyPickerGroupProps
+) {
+  return <DatePickerGroup {...props} convert={convertToDateOnly} />;
+}
+
+function convertToDateOnly(arg: Date) {
+  const year = new Intl.DateTimeFormat('en', { year: 'numeric' })
+    .format(arg)
+    .padStart(4, '0');
+
+  const month = new Intl.DateTimeFormat('en', { month: '2-digit' }).format(arg);
+
+  const day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(arg);
+
+  return `${year}-${month}-${day}`;
+}

package/src/Form/Form.tsx

@@ -21,11 +21,11 @@ import {
 } from './ServerErrorContext';
 import Field, { FieldProps } from '../Field/Field';
 import FieldArray, { FieldArrayProps } from '../FieldArray/FieldArray';
+import { FormDefaults } from '../FormDefaults';
 import objectContainsNonSerializableProperty from '../utils/objectContainsNonSerializableProperty';
 import objectToFormData from '../utils/objectToFormData';
 import { ValidatedApiResult } from '../Validation/ValidatedApiResult';
 import { ValidationError } from '../Validation/ValidationError';
-import { FormDefaults } from '../FormDefaults';
 
 // This exposes the builder that ensures only "name" values on the given TForm can be used
 // Further, each Field can then infer the proper type given the name
@@ -40,10 +40,14 @@ export type FormBuilderProp<TForm extends object> = {
   ) => JSX.Element;
 };
 
-export interface FormProps<TForm extends object> {
+export interface FullFormProps<TForm extends object> {
   children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
   onSubmit: (
-    formValues: FormData | TForm,
+    formValues: TForm,
+    formikBag: FormikHelpers<TForm>
+  ) => Promise<ValidatedApiResult>;
+  onFormDataSubmit: (
+    formValues: FormData,
     formikBag: FormikHelpers<TForm>
   ) => Promise<ValidatedApiResult>;
   className?: string;
@@ -52,12 +56,26 @@ export interface FormProps<TForm extends object> {
   initialValues?: TForm;
 }
 
+type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = Pick<
+  T,
+  Exclude<keyof T, Keys>
+> &
+  {
+    [K in Keys]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<Keys, K>>>;
+  }[Keys];
+
+export type FormProps<TForm extends object> = RequireAtLeastOne<
+  FullFormProps<TForm>,
+  'onSubmit' | 'onFormDataSubmit'
+>;
+
 export default function Form<TForm extends object>({
   children,
   className,
   style,
   ignoreLostChanges,
   onSubmit,
+  onFormDataSubmit,
   initialValues,
   ...props
 }: FormProps<TForm>) {
@@ -114,6 +132,7 @@ export default function Form<TForm extends object>({
 
   function handleSubmit(values: TForm, formikBag: FormikHelpers<TForm>) {
     let formData: FormData | undefined = undefined;
+    let submitFunc: () => Promise<ValidatedApiResult>;
     if (objectContainsNonSerializableProperty(values)) {
       formData = objectToFormData(values, {
         indices: true,
@@ -121,9 +140,35 @@ export default function Form<TForm extends object>({
         allowEmptyArrays: true,
         noFileListBrackets: true,
       });
+      if (onFormDataSubmit === undefined) {
+        throw new Error(
+          'No onFormDataSubmit supplied for non-serializable properties.'
+        );
+      }
+      submitFunc = () =>
+        onFormDataSubmit(formData ?? new FormData(), formikBag);
+    } else {
+      if (onSubmit === undefined) {
+        formData = objectToFormData(values, {
+          indices: true,
+          dotNotation: true,
+          allowEmptyArrays: true,
+          noFileListBrackets: true,
+        });
+        if (onFormDataSubmit === undefined) {
+          // This error should never occur, as this case is covered by RequireAtLeastOne type safety
+          throw new Error(
+            'No onFormDataSubmit supplied for non-serializable properties.'
+          );
+        }
+        submitFunc = () =>
+          onFormDataSubmit(formData ?? new FormData(), formikBag);
+      } else {
+        submitFunc = () => onSubmit(values, formikBag);
+      }
     }
 
-    return onSubmit(formData ?? values, formikBag)
+    return submitFunc()
       .then((response) => {
         return response;
       })

package/src/SubmitFormButton.tsx

@@ -21,12 +21,14 @@ function SubmitFormButton(
 ) {
   const { isSubmitting, dirty } = useFormikContext();
   const preventSubmit = (!dirty && !allowPristineSubmit) || isSubmitting;
+  const buttonName = typeof children === 'string' ? children : 'Submit';
   return (
     <button
       {...props}
       ref={ref}
       type="submit"
       disabled={preventSubmit || disabled}
+      aria-label={buttonName}
       title={
         title || isSubmitting
           ? 'Loading, please wait...'

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 { DateOnly, Form, FormBuilderProp } from '../../src';
+import { Form, FormBuilderProp } from '../../src';
 
 interface FormTestBaseProps<TForm extends object> {
   children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
@@ -50,8 +50,8 @@ interface PersonDto {
   phoneNumber?: string;
   yearlySalaryUSD?: number;
   isCool?: boolean;
-  gradDate?: DateOnly;
-  favoriteDate?: DateOnly;
+  gradDate?: string;
+  favoriteDate?: string;
   favoriteNumber?: number;
   favoriteColor?: string;
   favoriteColors?: string[];

package/src/__Tests__/__snapshots__/StandardFormActions.test.tsx.snap

@@ -7,6 +7,7 @@ exports[`StandardFormActions has matching snapshot 1`] = `
     class="envoc-form-form"
   >
     <button
+      aria-label="Submit"
       class="envoc-form-submit-form-button"
       disabled=""
       title="You haven't made any changes"

package/src/__Tests__/__snapshots__/SubmitFormButton.test.tsx.snap

@@ -7,6 +7,7 @@ exports[`SubmitFormButton has matching snapshot 1`] = `
     class="envoc-form-form"
   >
     <button
+      aria-label="Submit"
       class="envoc-form-submit-form-button"
       disabled=""
       title="You haven't made any changes"

package/src/index.ts

@@ -21,15 +21,12 @@ export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGr
 
 export type { DatePickerHelper } from './DatePicker/DatePickerHelper';
 
-export { default as DateOnlyDatePickerGroup } from './DatePicker/DateOnlyDatePickerGroup';
-export type {
-  DateOnly,
-  DateOnlyDatePickerGroupProps,
-} from './DatePicker/DateOnlyDatePickerGroup';
-
 export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
 export type { StringDatePickerGroupProps } from './DatePicker/StringDatePickerGroup';
 
+export { default as StringDateOnlyPickerGroup } from './DatePicker/StringDateOnlyPickerGroup';
+export type { StringDateOnlyPickerGroupProps } from './DatePicker/StringDateOnlyPickerGroup';
+
 // Field
 export { default as Field } from './Field/Field';
 export type { FieldProps } from './Field/Field';

package/es/DatePicker/DateOnlyDatePickerGroup.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="react" />
-import { DatePickerHelper } from './DatePickerHelper';
-export interface DateOnly {
-    year?: number;
-    month?: number;
-    day?: number;
-}
-export interface DateOnlyDatePickerGroupProps extends DatePickerHelper<DateOnly | undefined> {
-}
-export default function DateOnlyDatePickerGroup(props: DateOnlyDatePickerGroupProps): JSX.Element;

package/lib/DatePicker/DateOnlyDatePickerGroup.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="react" />
-import { DatePickerHelper } from './DatePickerHelper';
-export interface DateOnly {
-    year?: number;
-    month?: number;
-    day?: number;
-}
-export interface DateOnlyDatePickerGroupProps extends DatePickerHelper<DateOnly | undefined> {
-}
-export default function DateOnlyDatePickerGroup(props: DateOnlyDatePickerGroupProps): JSX.Element;

package/src/DatePicker/DateOnlyDatePickerGroup.tsx

@@ -1,24 +0,0 @@
-import DatePickerGroup from './DatePickerGroup';
-import { DatePickerHelper } from './DatePickerHelper';
-
-export interface DateOnly {
-  year?: number;
-  month?: number;
-  day?: number;
-}
-
-export interface DateOnlyDatePickerGroupProps
-  extends DatePickerHelper<DateOnly | undefined> {}
-export default function DateOnlyDatePickerGroup(
-  props: DateOnlyDatePickerGroupProps
-) {
-  return <DatePickerGroup {...props} convert={convertToDateOnly} />;
-}
-
-function convertToDateOnly(arg: Date) {
-  return {
-    year: arg.getFullYear(),
-    month: arg.getMonth() + 1,
-    day: arg.getDate(),
-  };
-}