envoc-form 4.0.1-7 → 4.0.1-9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -10,8 +10,8 @@ Base form package for envoc projects.
10
10
  Important naming conventions for our sanity while creating envoc-form types:
11
11
 
12
12
  - TForm = The type of the some form. e.g. LoginDto
13
- - 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
14
- - TValue = The value of an indvidual property of some form. e.g. a "Username" property would probably have a TValue of string
13
+ - 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
14
+ - TValue = The value of an individual property of some form. e.g. a "Username" property would probably have a TValue of string
15
15
  - 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
16
16
  - TRenderComponent = The type of any 'Component' passed to a Field, e.g. 'StandardTextInputGroup' passed to Component means TRenderComponent is typeof(StandardTextInputGroup)
17
17
  - TComponentProps = For any 'Component' passed to a Field as a prop, this represents that Component's props
@@ -21,15 +21,23 @@ var __rest = (this && this.__rest) || function (s, e) {
21
21
  return t;
22
22
  };
23
23
  import { jsx as _jsx } from "react/jsx-runtime";
24
- import { useState } from 'react';
24
+ import { useEffect, useState } from 'react';
25
25
  import DatePicker from 'react-date-picker/dist/entry.nostyle';
26
26
  import classnames from 'classnames';
27
27
  import parseISO from 'date-fns/parseISO';
28
- import Group from '../Group';
29
28
  import { FormDefaults } from '../FormDefaults';
29
+ import Group from '../Group';
30
30
  export default function DatePickerGroup(_a) {
31
31
  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"]);
32
32
  var _b = useState(null), displayDate = _b[0], setDisplayDate = _b[1];
33
+ useEffect(function () {
34
+ if (input.value != null) {
35
+ setDisplayDate(new Date("".concat(input.value, "T00:00:00.000")));
36
+ }
37
+ else {
38
+ setDisplayDate(null);
39
+ }
40
+ }, [setDisplayDate, input.value]);
33
41
  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 })) })));
34
42
  function handleChange(e) {
35
43
  var onChange = input.onChange;
@@ -0,0 +1,5 @@
1
+ /// <reference types="react" />
2
+ import { DatePickerHelper } from './DatePickerHelper';
3
+ export interface StringDateOnlyPickerGroupProps extends DatePickerHelper<string | undefined> {
4
+ }
5
+ export default function StringDatePickerGroup(props: StringDateOnlyPickerGroupProps): JSX.Element;
@@ -11,13 +11,14 @@ var __assign = (this && this.__assign) || function () {
11
11
  };
12
12
  import { jsx as _jsx } from "react/jsx-runtime";
13
13
  import DatePickerGroup from './DatePickerGroup';
14
- export default function DateOnlyDatePickerGroup(props) {
14
+ export default function StringDatePickerGroup(props) {
15
15
  return _jsx(DatePickerGroup, __assign({}, props, { convert: convertToDateOnly }));
16
16
  }
17
17
  function convertToDateOnly(arg) {
18
- return {
19
- year: arg.getFullYear(),
20
- month: arg.getMonth() + 1,
21
- day: arg.getDate(),
22
- };
18
+ var year = new Intl.DateTimeFormat('en', { year: 'numeric' })
19
+ .format(arg)
20
+ .padStart(4, '0');
21
+ var month = new Intl.DateTimeFormat('en', { month: '2-digit' }).format(arg);
22
+ var day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(arg);
23
+ return "".concat(year, "-").concat(month, "-").concat(day);
23
24
  }
@@ -2,8 +2,8 @@ import { ComponentProps, ElementType, LegacyRef } from 'react';
2
2
  import { InjectedFieldProps } from './InjectedFieldProps';
3
3
  import { NormalizationFunction } from '../Normalization/NormalizationFunction';
4
4
  import { ValidationFunction } from '../Validation/ValidationFunction';
5
- export declare type RenderComponent<TValue, TRenderComponent extends ElementType> = Partial<ComponentProps<TRenderComponent>> extends Partial<InjectedFieldProps<TValue>> ? TRenderComponent : never;
6
- export declare type RenderComponentProps<TValue, TRenderComponent extends ElementType> = Partial<ComponentProps<TRenderComponent>> extends Partial<InjectedFieldProps<TValue>> ? ComponentProps<TRenderComponent> : never;
5
+ export declare type RenderComponent<TValue, TRenderComponent extends ElementType> = Partial<ComponentProps<TRenderComponent>> extends Partial<InjectedFieldProps<TValue | undefined>> ? TRenderComponent : never;
6
+ export declare type RenderComponentProps<TValue, TRenderComponent extends ElementType> = Partial<ComponentProps<TRenderComponent>> extends Partial<InjectedFieldProps<TValue | undefined>> ? ComponentProps<TRenderComponent> : never;
7
7
  /** A specific Field instance to be rendered by the given TRenderComponent or by whatever default is reasonable */
8
8
  export declare type FieldProps<TForm extends object, TProp extends keyof TForm, TRenderComponent extends ElementType> = {
9
9
  name: TProp;
@@ -29,7 +29,8 @@ function SubmitFormButton(_a, ref) {
29
29
  var allowPristineSubmit = _a.allowPristineSubmit, children = _a.children, disabled = _a.disabled, title = _a.title, className = _a.className, props = __rest(_a, ["allowPristineSubmit", "children", "disabled", "title", "className"]);
30
30
  var _b = useFormikContext(), isSubmitting = _b.isSubmitting, dirty = _b.dirty;
31
31
  var preventSubmit = (!dirty && !allowPristineSubmit) || isSubmitting;
32
- return (_jsx("button", __assign({}, props, { ref: ref, type: "submit", disabled: preventSubmit || disabled, title: title || isSubmitting
32
+ var buttonName = typeof children === 'string' ? children : 'Submit';
33
+ return (_jsx("button", __assign({}, props, { ref: ref, type: "submit", disabled: preventSubmit || disabled, "aria-label": buttonName, title: title || isSubmitting
33
34
  ? 'Loading, please wait...'
34
35
  : preventSubmit
35
36
  ? "You haven't made any changes"
@@ -1,6 +1,6 @@
1
1
  /// <reference types="react" />
2
2
  import '@testing-library/jest-dom/extend-expect';
3
- import { DateOnly, FormBuilderProp } from '../../src';
3
+ import { FormBuilderProp } from '../../src';
4
4
  interface FormTestBaseProps<TForm extends object> {
5
5
  children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
6
6
  initialValues?: TForm;
@@ -13,8 +13,8 @@ interface PersonDto {
13
13
  phoneNumber?: string;
14
14
  yearlySalaryUSD?: number;
15
15
  isCool?: boolean;
16
- gradDate?: DateOnly;
17
- favoriteDate?: DateOnly;
16
+ gradDate?: string;
17
+ favoriteDate?: string;
18
18
  favoriteNumber?: number;
19
19
  favoriteColor?: string;
20
20
  favoriteColors?: string[];
package/es/index.d.ts CHANGED
@@ -10,10 +10,10 @@ export { default as DatePickerGroup } from './DatePicker/DatePickerGroup';
10
10
  export type { DatePickerGroupProps as DatePickerGroupProps } from './DatePicker/DatePickerGroup';
11
11
  export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGroup';
12
12
  export type { DatePickerHelper } from './DatePicker/DatePickerHelper';
13
- export { default as DateOnlyDatePickerGroup } from './DatePicker/DateOnlyDatePickerGroup';
14
- export type { DateOnly, DateOnlyDatePickerGroupProps, } from './DatePicker/DateOnlyDatePickerGroup';
15
13
  export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
16
14
  export type { StringDatePickerGroupProps } from './DatePicker/StringDatePickerGroup';
15
+ export { default as StringDateOnlyPickerGroup } from './DatePicker/StringDateOnlyPickerGroup';
16
+ export type { StringDateOnlyPickerGroupProps } from './DatePicker/StringDateOnlyPickerGroup';
17
17
  export { default as Field } from './Field/Field';
18
18
  export type { FieldProps } from './Field/Field';
19
19
  export type { RenderComponent } from './Field/Field';
package/es/index.js CHANGED
@@ -9,8 +9,8 @@ export { default as ConfirmDeleteForm } from './ConfirmDeleteForm/ConfirmDeleteF
9
9
  // Date
10
10
  export { default as DatePickerGroup } from './DatePicker/DatePickerGroup';
11
11
  export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGroup';
12
- export { default as DateOnlyDatePickerGroup } from './DatePicker/DateOnlyDatePickerGroup';
13
12
  export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
13
+ export { default as StringDateOnlyPickerGroup } from './DatePicker/StringDateOnlyPickerGroup';
14
14
  // Field
15
15
  export { default as Field } from './Field/Field';
16
16
  export { default as FieldErrorScrollTarget } from './Field/FieldErrorScrollTarget';
@@ -31,11 +31,19 @@ var react_1 = require("react");
31
31
  var entry_nostyle_1 = __importDefault(require("react-date-picker/dist/entry.nostyle"));
32
32
  var classnames_1 = __importDefault(require("classnames"));
33
33
  var parseISO_1 = __importDefault(require("date-fns/parseISO"));
34
- var Group_1 = __importDefault(require("../Group"));
35
34
  var FormDefaults_1 = require("../FormDefaults");
35
+ var Group_1 = __importDefault(require("../Group"));
36
36
  function DatePickerGroup(_a) {
37
37
  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"]);
38
38
  var _b = (0, react_1.useState)(null), displayDate = _b[0], setDisplayDate = _b[1];
39
+ (0, react_1.useEffect)(function () {
40
+ if (input.value != null) {
41
+ setDisplayDate(new Date("".concat(input.value, "T00:00:00.000")));
42
+ }
43
+ else {
44
+ setDisplayDate(null);
45
+ }
46
+ }, [setDisplayDate, input.value]);
39
47
  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 })) })));
40
48
  function handleChange(e) {
41
49
  var onChange = input.onChange;
@@ -0,0 +1,5 @@
1
+ /// <reference types="react" />
2
+ import { DatePickerHelper } from './DatePickerHelper';
3
+ export interface StringDateOnlyPickerGroupProps extends DatePickerHelper<string | undefined> {
4
+ }
5
+ export default function StringDatePickerGroup(props: StringDateOnlyPickerGroupProps): JSX.Element;
@@ -16,14 +16,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  var jsx_runtime_1 = require("react/jsx-runtime");
18
18
  var DatePickerGroup_1 = __importDefault(require("./DatePickerGroup"));
19
- function DateOnlyDatePickerGroup(props) {
19
+ function StringDatePickerGroup(props) {
20
20
  return (0, jsx_runtime_1.jsx)(DatePickerGroup_1.default, __assign({}, props, { convert: convertToDateOnly }));
21
21
  }
22
- exports.default = DateOnlyDatePickerGroup;
22
+ exports.default = StringDatePickerGroup;
23
23
  function convertToDateOnly(arg) {
24
- return {
25
- year: arg.getFullYear(),
26
- month: arg.getMonth() + 1,
27
- day: arg.getDate(),
28
- };
24
+ var year = new Intl.DateTimeFormat('en', { year: 'numeric' })
25
+ .format(arg)
26
+ .padStart(4, '0');
27
+ var month = new Intl.DateTimeFormat('en', { month: '2-digit' }).format(arg);
28
+ var day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(arg);
29
+ return "".concat(year, "-").concat(month, "-").concat(day);
29
30
  }
@@ -2,8 +2,8 @@ import { ComponentProps, ElementType, LegacyRef } from 'react';
2
2
  import { InjectedFieldProps } from './InjectedFieldProps';
3
3
  import { NormalizationFunction } from '../Normalization/NormalizationFunction';
4
4
  import { ValidationFunction } from '../Validation/ValidationFunction';
5
- export declare type RenderComponent<TValue, TRenderComponent extends ElementType> = Partial<ComponentProps<TRenderComponent>> extends Partial<InjectedFieldProps<TValue>> ? TRenderComponent : never;
6
- export declare type RenderComponentProps<TValue, TRenderComponent extends ElementType> = Partial<ComponentProps<TRenderComponent>> extends Partial<InjectedFieldProps<TValue>> ? ComponentProps<TRenderComponent> : never;
5
+ export declare type RenderComponent<TValue, TRenderComponent extends ElementType> = Partial<ComponentProps<TRenderComponent>> extends Partial<InjectedFieldProps<TValue | undefined>> ? TRenderComponent : never;
6
+ export declare type RenderComponentProps<TValue, TRenderComponent extends ElementType> = Partial<ComponentProps<TRenderComponent>> extends Partial<InjectedFieldProps<TValue | undefined>> ? ComponentProps<TRenderComponent> : never;
7
7
  /** A specific Field instance to be rendered by the given TRenderComponent or by whatever default is reasonable */
8
8
  export declare type FieldProps<TForm extends object, TProp extends keyof TForm, TRenderComponent extends ElementType> = {
9
9
  name: TProp;
@@ -34,7 +34,8 @@ function SubmitFormButton(_a, ref) {
34
34
  var allowPristineSubmit = _a.allowPristineSubmit, children = _a.children, disabled = _a.disabled, title = _a.title, className = _a.className, props = __rest(_a, ["allowPristineSubmit", "children", "disabled", "title", "className"]);
35
35
  var _b = (0, formik_1.useFormikContext)(), isSubmitting = _b.isSubmitting, dirty = _b.dirty;
36
36
  var preventSubmit = (!dirty && !allowPristineSubmit) || isSubmitting;
37
- return ((0, jsx_runtime_1.jsx)("button", __assign({}, props, { ref: ref, type: "submit", disabled: preventSubmit || disabled, title: title || isSubmitting
37
+ var buttonName = typeof children === 'string' ? children : 'Submit';
38
+ return ((0, jsx_runtime_1.jsx)("button", __assign({}, props, { ref: ref, type: "submit", disabled: preventSubmit || disabled, "aria-label": buttonName, title: title || isSubmitting
38
39
  ? 'Loading, please wait...'
39
40
  : preventSubmit
40
41
  ? "You haven't made any changes"
@@ -1,6 +1,6 @@
1
1
  /// <reference types="react" />
2
2
  import '@testing-library/jest-dom/extend-expect';
3
- import { DateOnly, FormBuilderProp } from '../../src';
3
+ import { FormBuilderProp } from '../../src';
4
4
  interface FormTestBaseProps<TForm extends object> {
5
5
  children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
6
6
  initialValues?: TForm;
@@ -13,8 +13,8 @@ interface PersonDto {
13
13
  phoneNumber?: string;
14
14
  yearlySalaryUSD?: number;
15
15
  isCool?: boolean;
16
- gradDate?: DateOnly;
17
- favoriteDate?: DateOnly;
16
+ gradDate?: string;
17
+ favoriteDate?: string;
18
18
  favoriteNumber?: number;
19
19
  favoriteColor?: string;
20
20
  favoriteColors?: string[];
package/lib/index.d.ts CHANGED
@@ -10,10 +10,10 @@ export { default as DatePickerGroup } from './DatePicker/DatePickerGroup';
10
10
  export type { DatePickerGroupProps as DatePickerGroupProps } from './DatePicker/DatePickerGroup';
11
11
  export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGroup';
12
12
  export type { DatePickerHelper } from './DatePicker/DatePickerHelper';
13
- export { default as DateOnlyDatePickerGroup } from './DatePicker/DateOnlyDatePickerGroup';
14
- export type { DateOnly, DateOnlyDatePickerGroupProps, } from './DatePicker/DateOnlyDatePickerGroup';
15
13
  export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
16
14
  export type { StringDatePickerGroupProps } from './DatePicker/StringDatePickerGroup';
15
+ export { default as StringDateOnlyPickerGroup } from './DatePicker/StringDateOnlyPickerGroup';
16
+ export type { StringDateOnlyPickerGroupProps } from './DatePicker/StringDateOnlyPickerGroup';
17
17
  export { default as Field } from './Field/Field';
18
18
  export type { FieldProps } from './Field/Field';
19
19
  export type { RenderComponent } from './Field/Field';
package/lib/index.js CHANGED
@@ -29,7 +29,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
29
29
  return (mod && mod.__esModule) ? mod : { "default": mod };
30
30
  };
31
31
  Object.defineProperty(exports, "__esModule", { value: true });
32
- 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;
32
+ 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;
33
33
  // Address
34
34
  var AddressInput_1 = require("./AddressInput/AddressInput");
35
35
  Object.defineProperty(exports, "AddressInput", { enumerable: true, get: function () { return __importDefault(AddressInput_1).default; } });
@@ -47,10 +47,10 @@ var DatePickerGroup_1 = require("./DatePicker/DatePickerGroup");
47
47
  Object.defineProperty(exports, "DatePickerGroup", { enumerable: true, get: function () { return __importDefault(DatePickerGroup_1).default; } });
48
48
  var DatePickerGroup_2 = require("./DatePicker/DatePickerGroup");
49
49
  Object.defineProperty(exports, "convertToTimeZoneInsensitiveISOString", { enumerable: true, get: function () { return DatePickerGroup_2.convertToTimeZoneInsensitiveISOString; } });
50
- var DateOnlyDatePickerGroup_1 = require("./DatePicker/DateOnlyDatePickerGroup");
51
- Object.defineProperty(exports, "DateOnlyDatePickerGroup", { enumerable: true, get: function () { return __importDefault(DateOnlyDatePickerGroup_1).default; } });
52
50
  var StringDatePickerGroup_1 = require("./DatePicker/StringDatePickerGroup");
53
51
  Object.defineProperty(exports, "StringDatePickerGroup", { enumerable: true, get: function () { return __importDefault(StringDatePickerGroup_1).default; } });
52
+ var StringDateOnlyPickerGroup_1 = require("./DatePicker/StringDateOnlyPickerGroup");
53
+ Object.defineProperty(exports, "StringDateOnlyPickerGroup", { enumerable: true, get: function () { return __importDefault(StringDateOnlyPickerGroup_1).default; } });
54
54
  // Field
55
55
  var Field_1 = require("./Field/Field");
56
56
  Object.defineProperty(exports, "Field", { enumerable: true, get: function () { return __importDefault(Field_1).default; } });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "envoc-form",
3
- "version": "4.0.1-7",
3
+ "version": "4.0.1-9",
4
4
  "description": "Envoc form components",
5
5
  "keywords": [
6
6
  "react-component",
@@ -37,7 +37,7 @@
37
37
  "axios": "^0.21.1",
38
38
  "classnames": "^2.3.1",
39
39
  "date-fns": "^2.22.1",
40
- "envoc-request": "^4.0.1-7",
40
+ "envoc-request": "^4.0.1-9",
41
41
  "lru-cache": "^6.0.0",
42
42
  "prop-types": "^15.7.2",
43
43
  "react-date-picker": "^8.2.0",
@@ -72,6 +72,8 @@
72
72
  "clean-webpack-plugin": "^3.0.0",
73
73
  "cross-env": "7.0.3",
74
74
  "css-loader": "^5.0.2",
75
+ "eslint": "^8.32.0",
76
+ "eslint-config-react-app": "^7.0.1",
75
77
  "html-webpack-plugin": "^5.3.2",
76
78
  "identity-obj-proxy": "^3.0.0",
77
79
  "jest-junit": "~12.2.0",
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import { render } from '@testing-library/react';
3
- import DateOnlyDatePickerGroup from './DateOnlyDatePickerGroup';
3
+ import StringDatePickerGroup from './StringDatePickerGroup';
4
4
  import FormTestBase from '../__Tests__/FormTestBase';
5
5
 
6
6
  //hack so the datepicker internals don't complain about this not existing in the context of jest
@@ -13,7 +13,7 @@ describe('IconInputGroup', () => {
13
13
  {({ Field }) => (
14
14
  <Field
15
15
  name="favoriteDate"
16
- Component={DateOnlyDatePickerGroup}
16
+ Component={StringDatePickerGroup}
17
17
  label="Favorite Date"
18
18
  monthPlaceholder="mm"
19
19
  dayPlaceholder="dd"
@@ -32,7 +32,7 @@ describe('IconInputGroup', () => {
32
32
  {({ Field }) => (
33
33
  <Field
34
34
  name="favoriteDate"
35
- Component={DateOnlyDatePickerGroup}
35
+ Component={StringDatePickerGroup}
36
36
  label="Favorite Date"
37
37
  monthPlaceholder="mm"
38
38
  dayPlaceholder="dd"
@@ -1,12 +1,10 @@
1
- import { useState } from 'react';
2
- import DatePicker, {
3
- DatePickerProps,
4
- } from 'react-date-picker/dist/entry.nostyle';
1
+ import { useEffect, useState } from 'react';
2
+ import DatePicker, { DatePickerProps } from 'react-date-picker/dist/entry.nostyle';
5
3
  import classnames from 'classnames';
6
4
  import parseISO from 'date-fns/parseISO';
7
5
  import { InjectedFieldProps } from '../Field/InjectedFieldProps';
8
- import Group, { GroupProps } from '../Group';
9
6
  import { FormDefaults } from '../FormDefaults';
7
+ import Group, { GroupProps } from '../Group';
10
8
 
11
9
  // Docs for react-date-picker https://www.npmjs.com/package/react-date-picker
12
10
 
@@ -32,6 +30,14 @@ export default function DatePickerGroup<T>({
32
30
  }: DatePickerGroupProps<T>) {
33
31
  const [displayDate, setDisplayDate] = useState<Date | null>(null);
34
32
 
33
+ useEffect(() => {
34
+ if (input.value != null) {
35
+ setDisplayDate(new Date(`${input.value}T00:00:00.000`));
36
+ } else {
37
+ setDisplayDate(null);
38
+ }
39
+ }, [setDisplayDate, input.value]);
40
+
35
41
  return (
36
42
  <Group
37
43
  input={input}
@@ -0,0 +1,23 @@
1
+ import { DatePickerHelper } from './DatePickerHelper';
2
+ import DatePickerGroup from './DatePickerGroup';
3
+
4
+ export interface StringDateOnlyPickerGroupProps
5
+ extends DatePickerHelper<string | undefined> {}
6
+
7
+ export default function StringDatePickerGroup(
8
+ props: StringDateOnlyPickerGroupProps
9
+ ) {
10
+ return <DatePickerGroup {...props} convert={convertToDateOnly} />;
11
+ }
12
+
13
+ function convertToDateOnly(arg: Date) {
14
+ const year = new Intl.DateTimeFormat('en', { year: 'numeric' })
15
+ .format(arg)
16
+ .padStart(4, '0');
17
+
18
+ const month = new Intl.DateTimeFormat('en', { month: '2-digit' }).format(arg);
19
+
20
+ const day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(arg);
21
+
22
+ return `${year}-${month}-${day}`;
23
+ }
@@ -13,7 +13,7 @@ export type RenderComponent<
13
13
  TValue,
14
14
  TRenderComponent extends ElementType
15
15
  > = Partial<ComponentProps<TRenderComponent>> extends Partial<
16
- InjectedFieldProps<TValue>
16
+ InjectedFieldProps<TValue | undefined>
17
17
  >
18
18
  ? TRenderComponent
19
19
  : never;
@@ -22,7 +22,7 @@ export type RenderComponentProps<
22
22
  TValue,
23
23
  TRenderComponent extends ElementType
24
24
  > = Partial<ComponentProps<TRenderComponent>> extends Partial<
25
- InjectedFieldProps<TValue>
25
+ InjectedFieldProps<TValue | undefined>
26
26
  >
27
27
  ? ComponentProps<TRenderComponent>
28
28
  : never;
@@ -21,12 +21,14 @@ function SubmitFormButton(
21
21
  ) {
22
22
  const { isSubmitting, dirty } = useFormikContext();
23
23
  const preventSubmit = (!dirty && !allowPristineSubmit) || isSubmitting;
24
+ const buttonName = typeof children === 'string' ? children : 'Submit';
24
25
  return (
25
26
  <button
26
27
  {...props}
27
28
  ref={ref}
28
29
  type="submit"
29
30
  disabled={preventSubmit || disabled}
31
+ aria-label={buttonName}
30
32
  title={
31
33
  title || isSubmitting
32
34
  ? 'Loading, please wait...'
@@ -1,7 +1,7 @@
1
1
  import '@testing-library/jest-dom/extend-expect';
2
2
  import { HashRouter } from 'react-router-dom';
3
3
  import { ValidatedApiResult } from 'Validation/ValidatedApiResult';
4
- import { DateOnly, Form, FormBuilderProp } from '../../src';
4
+ import { Form, FormBuilderProp } from '../../src';
5
5
 
6
6
  interface FormTestBaseProps<TForm extends object> {
7
7
  children: (formBuilder: FormBuilderProp<TForm>) => JSX.Element;
@@ -50,8 +50,8 @@ interface PersonDto {
50
50
  phoneNumber?: string;
51
51
  yearlySalaryUSD?: number;
52
52
  isCool?: boolean;
53
- gradDate?: DateOnly;
54
- favoriteDate?: DateOnly;
53
+ gradDate?: string;
54
+ favoriteDate?: string;
55
55
  favoriteNumber?: number;
56
56
  favoriteColor?: string;
57
57
  favoriteColors?: string[];
@@ -7,6 +7,7 @@ exports[`StandardFormActions has matching snapshot 1`] = `
7
7
  class="envoc-form-form"
8
8
  >
9
9
  <button
10
+ aria-label="Submit"
10
11
  class="envoc-form-submit-form-button"
11
12
  disabled=""
12
13
  title="You haven't made any changes"
@@ -7,6 +7,7 @@ exports[`SubmitFormButton has matching snapshot 1`] = `
7
7
  class="envoc-form-form"
8
8
  >
9
9
  <button
10
+ aria-label="Submit"
10
11
  class="envoc-form-submit-form-button"
11
12
  disabled=""
12
13
  title="You haven't made any changes"
package/src/index.ts CHANGED
@@ -21,15 +21,12 @@ export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGr
21
21
 
22
22
  export type { DatePickerHelper } from './DatePicker/DatePickerHelper';
23
23
 
24
- export { default as DateOnlyDatePickerGroup } from './DatePicker/DateOnlyDatePickerGroup';
25
- export type {
26
- DateOnly,
27
- DateOnlyDatePickerGroupProps,
28
- } from './DatePicker/DateOnlyDatePickerGroup';
29
-
30
24
  export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
31
25
  export type { StringDatePickerGroupProps } from './DatePicker/StringDatePickerGroup';
32
26
 
27
+ export { default as StringDateOnlyPickerGroup } from './DatePicker/StringDateOnlyPickerGroup';
28
+ export type { StringDateOnlyPickerGroupProps } from './DatePicker/StringDateOnlyPickerGroup';
29
+
33
30
  // Field
34
31
  export { default as Field } from './Field/Field';
35
32
  export type { FieldProps } from './Field/Field';
@@ -1,10 +0,0 @@
1
- /// <reference types="react" />
2
- import { DatePickerHelper } from './DatePickerHelper';
3
- export interface DateOnly {
4
- year?: number;
5
- month?: number;
6
- day?: number;
7
- }
8
- export interface DateOnlyDatePickerGroupProps extends DatePickerHelper<DateOnly | undefined> {
9
- }
10
- export default function DateOnlyDatePickerGroup(props: DateOnlyDatePickerGroupProps): JSX.Element;
@@ -1,10 +0,0 @@
1
- /// <reference types="react" />
2
- import { DatePickerHelper } from './DatePickerHelper';
3
- export interface DateOnly {
4
- year?: number;
5
- month?: number;
6
- day?: number;
7
- }
8
- export interface DateOnlyDatePickerGroupProps extends DatePickerHelper<DateOnly | undefined> {
9
- }
10
- export default function DateOnlyDatePickerGroup(props: DateOnlyDatePickerGroupProps): JSX.Element;
@@ -1,24 +0,0 @@
1
- import DatePickerGroup from './DatePickerGroup';
2
- import { DatePickerHelper } from './DatePickerHelper';
3
-
4
- export interface DateOnly {
5
- year?: number;
6
- month?: number;
7
- day?: number;
8
- }
9
-
10
- export interface DateOnlyDatePickerGroupProps
11
- extends DatePickerHelper<DateOnly | undefined> {}
12
- export default function DateOnlyDatePickerGroup(
13
- props: DateOnlyDatePickerGroupProps
14
- ) {
15
- return <DatePickerGroup {...props} convert={convertToDateOnly} />;
16
- }
17
-
18
- function convertToDateOnly(arg: Date) {
19
- return {
20
- year: arg.getFullYear(),
21
- month: arg.getMonth() + 1,
22
- day: arg.getDate(),
23
- };
24
- }