envoc-form 4.0.1-0 → 4.0.1-10
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 +2 -2
- package/es/ConfirmBaseForm/ConfirmBaseForm.d.ts +3 -1
- package/es/ConfirmBaseForm/ConfirmBaseForm.js +3 -2
- package/es/ConfirmDeleteForm/ConfirmDeleteForm.js +2 -1
- package/es/DatePicker/DatePickerGroup.d.ts +9 -0
- package/es/DatePicker/DatePickerGroup.js +77 -0
- package/es/DatePicker/DatePickerHelper.d.ts +3 -0
- package/es/DatePicker/DatePickerHelper.js +1 -0
- package/es/DatePicker/StringDateOnlyPickerGroup.d.ts +5 -0
- package/es/DatePicker/StringDateOnlyPickerGroup.js +24 -0
- package/es/DatePicker/StringDatePickerGroup.d.ts +5 -0
- package/es/DatePicker/StringDatePickerGroup.js +19 -0
- package/es/Field/Field.d.ts +3 -3
- package/es/Field/Field.js +9 -4
- package/es/Field/StandAloneInput.d.ts +9 -0
- package/es/Field/StandAloneInput.js +49 -0
- package/es/FieldArray/FieldArray.js +10 -7
- package/es/File/FileGroup.js +5 -3
- package/es/File/FileList.js +2 -1
- package/es/Form/Form.d.ts +8 -3
- package/es/Form/Form.js +32 -3
- package/es/FormActions.js +5 -1
- package/es/FormDefaults.d.ts +3 -0
- package/es/FormDefaults.js +1 -0
- package/es/Group.d.ts +3 -2
- package/es/Group.js +8 -5
- package/es/Input/IconInputGroup.js +2 -1
- package/es/Input/InputGroup.d.ts +1 -1
- package/es/Input/InputGroup.js +3 -2
- package/es/Input/MoneyInputGroup.js +2 -1
- package/es/Input/NumberInputGroup.js +2 -1
- package/es/Input/StringInputGroup.d.ts +1 -1
- package/es/Input/StringInputGroup.js +2 -1
- package/es/Select/SelectGroup.d.ts +1 -1
- package/es/Select/SelectGroup.js +8 -3
- package/es/StandardFormActions.js +2 -1
- package/es/SubmitFormButton.js +4 -2
- package/es/TextArea/TextAreaGroup.d.ts +8 -0
- package/es/TextArea/TextAreaGroup.js +34 -0
- package/es/Validation/validators.d.ts +1 -1
- package/es/Validation/validators.js +1 -1
- package/es/__Tests__/FormTestBase.d.ts +3 -3
- package/es/index.d.ts +21 -5
- package/es/index.js +10 -1
- package/lib/ConfirmBaseForm/ConfirmBaseForm.d.ts +3 -1
- package/lib/ConfirmBaseForm/ConfirmBaseForm.js +3 -2
- package/lib/ConfirmDeleteForm/ConfirmDeleteForm.js +2 -1
- package/lib/DatePicker/DatePickerGroup.d.ts +9 -0
- package/lib/DatePicker/DatePickerGroup.js +85 -0
- package/lib/DatePicker/DatePickerHelper.d.ts +3 -0
- package/lib/DatePicker/DatePickerHelper.js +2 -0
- package/lib/DatePicker/StringDateOnlyPickerGroup.d.ts +5 -0
- package/lib/DatePicker/StringDateOnlyPickerGroup.js +30 -0
- package/lib/DatePicker/StringDatePickerGroup.d.ts +5 -0
- package/lib/DatePicker/StringDatePickerGroup.js +25 -0
- package/lib/Field/Field.d.ts +3 -3
- package/lib/Field/Field.js +9 -4
- package/lib/Field/StandAloneInput.d.ts +9 -0
- package/lib/Field/StandAloneInput.js +75 -0
- package/lib/FieldArray/FieldArray.js +10 -7
- package/lib/File/FileGroup.js +5 -3
- package/lib/File/FileList.js +2 -1
- package/lib/Form/Form.d.ts +8 -3
- package/lib/Form/Form.js +32 -3
- package/lib/FormActions.js +5 -1
- package/lib/FormDefaults.d.ts +3 -0
- package/lib/FormDefaults.js +4 -0
- package/lib/Group.d.ts +3 -2
- package/lib/Group.js +8 -5
- package/lib/Input/IconInputGroup.js +2 -1
- package/lib/Input/InputGroup.d.ts +1 -1
- package/lib/Input/InputGroup.js +3 -2
- package/lib/Input/MoneyInputGroup.js +2 -1
- package/lib/Input/NumberInputGroup.js +2 -1
- package/lib/Input/StringInputGroup.d.ts +1 -1
- package/lib/Input/StringInputGroup.js +2 -1
- package/lib/Select/SelectGroup.d.ts +1 -1
- package/lib/Select/SelectGroup.js +8 -3
- package/lib/StandardFormActions.js +2 -1
- package/lib/SubmitFormButton.js +4 -2
- package/lib/TextArea/TextAreaGroup.d.ts +8 -0
- package/lib/TextArea/TextAreaGroup.js +39 -0
- package/lib/Validation/validators.d.ts +1 -1
- package/lib/Validation/validators.js +1 -1
- package/lib/__Tests__/FormTestBase.d.ts +3 -3
- package/lib/index.d.ts +21 -5
- package/lib/index.js +19 -3
- package/package.json +4 -2
- package/src/AddressInput/__snapshots__/AddressInput.test.tsx.snap +15 -10
- package/src/ConfirmBaseForm/ConfirmBaseForm.tsx +13 -3
- package/src/ConfirmBaseForm/__snapshots__/ConfirmBaseForm.test.tsx.snap +3 -3
- package/src/ConfirmDeleteForm/ConfirmDeleteForm.tsx +8 -1
- package/src/ConfirmDeleteForm/__snapshots__/ConfirmDeleteForm.test.tsx.snap +2 -2
- package/src/{DatePickerInput/DatePickerInput.test.tsx → DatePicker/DatePicker.test.tsx} +3 -3
- package/src/DatePicker/DatePickerGroup.tsx +108 -0
- package/src/DatePicker/DatePickerHelper.ts +4 -0
- package/src/DatePicker/StringDateOnlyPickerGroup.tsx +23 -0
- package/src/DatePicker/StringDatePickerGroup.tsx +14 -0
- package/src/{DatePickerInput/__snapshots__/DatePickerInput.test.tsx.snap → DatePicker/__snapshots__/DatePicker.test.tsx.snap} +3 -2
- package/src/Field/Field.tsx +28 -10
- package/src/Field/StandAloneInput.tsx +51 -0
- package/src/FieldArray/FieldArray.tsx +21 -9
- package/src/File/FileGroup.tsx +14 -2
- package/src/File/FileList.tsx +3 -1
- package/src/File/__snapshots__/FileGroup.test.tsx.snap +5 -3
- package/src/Form/Form.tsx +56 -4
- package/src/Form/__snapshots__/Form.test.tsx.snap +1 -0
- package/src/FormActions.tsx +8 -2
- package/src/FormDefaults.ts +1 -0
- package/src/Group.tsx +22 -7
- package/src/Input/IconInputGroup.tsx +5 -2
- package/src/Input/InputGroup.tsx +11 -2
- package/src/Input/MoneyInputGroup.tsx +5 -1
- package/src/Input/NumberInputGroup.tsx +5 -1
- package/src/Input/StringInputGroup.tsx +14 -2
- package/src/Input/__Tests__/__snapshots__/IconInputGroup.test.tsx.snap +4 -2
- package/src/Input/__Tests__/__snapshots__/MoneyInputGroup.test.tsx.snap +4 -2
- package/src/Input/__Tests__/__snapshots__/NumberInputGroup.test.tsx.snap +4 -2
- package/src/Input/__Tests__/__snapshots__/StringInputGroup.test.tsx.snap +4 -2
- package/src/Select/SelectGroup.tsx +15 -3
- package/src/Select/__tests__/__snapshots__/BooleanSelectGroup.test.tsx.snap +3 -2
- package/src/Select/__tests__/__snapshots__/NumberSelectGroup.test.tsx.snap +6 -4
- package/src/Select/__tests__/__snapshots__/StringSelectGroup.test.tsx.snap +6 -4
- package/src/StandardFormActions.tsx +4 -1
- package/src/SubmitFormButton.tsx +7 -1
- package/src/TextArea/TextAreaGroup.tsx +64 -0
- package/src/Validation/validators.ts +2 -2
- package/src/__Tests__/FormTestBase.tsx +3 -3
- package/src/__Tests__/__snapshots__/StandardFormActions.test.tsx.snap +4 -2
- package/src/__Tests__/__snapshots__/SubmitFormButton.test.tsx.snap +3 -1
- package/src/index.ts +41 -5
- package/es/DatePickerInput/DatePickerInput.d.ts +0 -14
- package/es/DatePickerInput/DatePickerInput.js +0 -63
- package/lib/DatePickerInput/DatePickerInput.d.ts +0 -14
- package/lib/DatePickerInput/DatePickerInput.js +0 -69
- package/src/DatePickerInput/DatePickerInput.tsx +0 -85
package/lib/index.d.ts
CHANGED
@@ -6,13 +6,23 @@ export { default as ConfirmBaseForm } from './ConfirmBaseForm/ConfirmBaseForm';
|
|
6
6
|
export type { ConfirmBaseFormProps } from './ConfirmBaseForm/ConfirmBaseForm';
|
7
7
|
export { default as ConfirmDeleteForm } from './ConfirmDeleteForm/ConfirmDeleteForm';
|
8
8
|
export type { ConfirmDeleteFormProps } from './ConfirmDeleteForm/ConfirmDeleteForm';
|
9
|
-
export { default as
|
10
|
-
export type {
|
9
|
+
export { default as DatePickerGroup } from './DatePicker/DatePickerGroup';
|
10
|
+
export type { DatePickerGroupProps as DatePickerGroupProps } from './DatePicker/DatePickerGroup';
|
11
|
+
export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGroup';
|
12
|
+
export type { DatePickerHelper } from './DatePicker/DatePickerHelper';
|
13
|
+
export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
|
14
|
+
export type { StringDatePickerGroupProps } from './DatePicker/StringDatePickerGroup';
|
15
|
+
export { default as StringDateOnlyPickerGroup } from './DatePicker/StringDateOnlyPickerGroup';
|
16
|
+
export type { StringDateOnlyPickerGroupProps } from './DatePicker/StringDateOnlyPickerGroup';
|
11
17
|
export { default as Field } from './Field/Field';
|
12
18
|
export type { FieldProps } from './Field/Field';
|
19
|
+
export type { RenderComponent } from './Field/Field';
|
20
|
+
export type { RenderComponentProps } from './Field/Field';
|
13
21
|
export { default as FieldErrorScrollTarget } from './Field/FieldErrorScrollTarget';
|
14
22
|
export { FieldNameContext } from './Field/FieldNameContext';
|
15
23
|
export type { InjectedFieldProps } from './Field/InjectedFieldProps';
|
24
|
+
export { default as StandAloneInput } from './Field/StandAloneInput';
|
25
|
+
export type { StandAloneInputProps } from './Field/StandAloneInput';
|
16
26
|
export { default as useStandardField } from './Field/useStandardField';
|
17
27
|
export type { useStandardFieldProps } from './Field/useStandardField';
|
18
28
|
export { default as FieldArray } from './FieldArray/FieldArray';
|
@@ -25,6 +35,9 @@ export { ServerErrorContext } from './Form/ServerErrorContext';
|
|
25
35
|
export type { ServerErrorContextProps, ServerErrors, } from './Form/ServerErrorContext';
|
26
36
|
export { default as FormActions } from './FormActions';
|
27
37
|
export type { FormActionsProps as FormActionsProps } from './FormActions';
|
38
|
+
export { default as StandardFormActions } from './StandardFormActions';
|
39
|
+
export type { StandardFormActionsProps as StandardFormActionsProps } from './StandardFormActions';
|
40
|
+
export { FormDefaults } from './FormDefaults';
|
28
41
|
export { default as Group } from './Group';
|
29
42
|
export type { GroupProps as GroupProps } from './Group';
|
30
43
|
export { default as IconInputGroup } from './Input/IconInputGroup';
|
@@ -40,13 +53,16 @@ export type { StringInputGroupProps } from './Input/StringInputGroup';
|
|
40
53
|
export type { NormalizationFunction } from './Normalization/NormalizationFunction';
|
41
54
|
export * as normalizers from './Normalization/normalizers';
|
42
55
|
export { default as SelectGroup } from './Select/SelectGroup';
|
43
|
-
export type { SelectGroupProps } from './Select/SelectGroup';
|
56
|
+
export type { SelectGroupProps, SelectOption } from './Select/SelectGroup';
|
44
57
|
export { BooleanSelectGroup } from './Select/BooleanSelectGroup';
|
45
58
|
export type { BooleanSelectGroupProps } from './Select/BooleanSelectGroup';
|
46
59
|
export { MultiNumberSelectGroup, SingleNumberSelectGroup, } from './Select/NumberSelectGroup';
|
47
|
-
export type { MultiNumberSelectGroupProps, SingleNumberSelectGroupProps } from './Select/NumberSelectGroup';
|
60
|
+
export type { MultiNumberSelectGroupProps, SingleNumberSelectGroupProps, } from './Select/NumberSelectGroup';
|
61
|
+
export type { SelectGroupPropsHelper } from './Select/SelectGroupPropsHelper';
|
48
62
|
export { MultiStringSelectGroup, SingleStringSelectGroup, } from './Select/StringSelectGroup';
|
49
|
-
export type { MultiStringSelectGroupProps, SingleStringSelectGroupProps } from './Select/StringSelectGroup';
|
63
|
+
export type { MultiStringSelectGroupProps, SingleStringSelectGroupProps, } from './Select/StringSelectGroup';
|
64
|
+
export { default as TextAreaGroup } from './TextArea/TextAreaGroup';
|
65
|
+
export type { TextAreaGroupProps } from './TextArea/TextAreaGroup';
|
50
66
|
export { default as objectContainsNonSerializableProperty } from './utils/objectContainsNonSerializableProperty';
|
51
67
|
export { default as serialize } from './utils/objectToFormData';
|
52
68
|
export type { ObjectToFormDataCfgProps } from './utils/objectToFormData';
|
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.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.FormActions = exports.ServerErrorContext = exports.Form = exports.FileGroup = exports.FieldArray = exports.useStandardField = exports.FieldNameContext = exports.FieldErrorScrollTarget = exports.Field = exports.
|
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; } });
|
@@ -43,8 +43,14 @@ Object.defineProperty(exports, "ConfirmBaseForm", { enumerable: true, get: funct
|
|
43
43
|
var ConfirmDeleteForm_1 = require("./ConfirmDeleteForm/ConfirmDeleteForm");
|
44
44
|
Object.defineProperty(exports, "ConfirmDeleteForm", { enumerable: true, get: function () { return __importDefault(ConfirmDeleteForm_1).default; } });
|
45
45
|
// Date
|
46
|
-
var
|
47
|
-
Object.defineProperty(exports, "
|
46
|
+
var DatePickerGroup_1 = require("./DatePicker/DatePickerGroup");
|
47
|
+
Object.defineProperty(exports, "DatePickerGroup", { enumerable: true, get: function () { return __importDefault(DatePickerGroup_1).default; } });
|
48
|
+
var DatePickerGroup_2 = require("./DatePicker/DatePickerGroup");
|
49
|
+
Object.defineProperty(exports, "convertToTimeZoneInsensitiveISOString", { enumerable: true, get: function () { return DatePickerGroup_2.convertToTimeZoneInsensitiveISOString; } });
|
50
|
+
var StringDatePickerGroup_1 = require("./DatePicker/StringDatePickerGroup");
|
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; } });
|
48
54
|
// Field
|
49
55
|
var Field_1 = require("./Field/Field");
|
50
56
|
Object.defineProperty(exports, "Field", { enumerable: true, get: function () { return __importDefault(Field_1).default; } });
|
@@ -52,6 +58,8 @@ var FieldErrorScrollTarget_1 = require("./Field/FieldErrorScrollTarget");
|
|
52
58
|
Object.defineProperty(exports, "FieldErrorScrollTarget", { enumerable: true, get: function () { return __importDefault(FieldErrorScrollTarget_1).default; } });
|
53
59
|
var FieldNameContext_1 = require("./Field/FieldNameContext");
|
54
60
|
Object.defineProperty(exports, "FieldNameContext", { enumerable: true, get: function () { return FieldNameContext_1.FieldNameContext; } });
|
61
|
+
var StandAloneInput_1 = require("./Field/StandAloneInput");
|
62
|
+
Object.defineProperty(exports, "StandAloneInput", { enumerable: true, get: function () { return __importDefault(StandAloneInput_1).default; } });
|
55
63
|
var useStandardField_1 = require("./Field/useStandardField");
|
56
64
|
Object.defineProperty(exports, "useStandardField", { enumerable: true, get: function () { return __importDefault(useStandardField_1).default; } });
|
57
65
|
// Field Array
|
@@ -67,6 +75,11 @@ var ServerErrorContext_1 = require("./Form/ServerErrorContext");
|
|
67
75
|
Object.defineProperty(exports, "ServerErrorContext", { enumerable: true, get: function () { return ServerErrorContext_1.ServerErrorContext; } });
|
68
76
|
var FormActions_1 = require("./FormActions");
|
69
77
|
Object.defineProperty(exports, "FormActions", { enumerable: true, get: function () { return __importDefault(FormActions_1).default; } });
|
78
|
+
var StandardFormActions_1 = require("./StandardFormActions");
|
79
|
+
Object.defineProperty(exports, "StandardFormActions", { enumerable: true, get: function () { return __importDefault(StandardFormActions_1).default; } });
|
80
|
+
// FormDefaults
|
81
|
+
var FormDefaults_1 = require("./FormDefaults");
|
82
|
+
Object.defineProperty(exports, "FormDefaults", { enumerable: true, get: function () { return FormDefaults_1.FormDefaults; } });
|
70
83
|
// Input
|
71
84
|
var Group_1 = require("./Group");
|
72
85
|
Object.defineProperty(exports, "Group", { enumerable: true, get: function () { return __importDefault(Group_1).default; } });
|
@@ -92,6 +105,9 @@ Object.defineProperty(exports, "SingleNumberSelectGroup", { enumerable: true, ge
|
|
92
105
|
var StringSelectGroup_1 = require("./Select/StringSelectGroup");
|
93
106
|
Object.defineProperty(exports, "MultiStringSelectGroup", { enumerable: true, get: function () { return StringSelectGroup_1.MultiStringSelectGroup; } });
|
94
107
|
Object.defineProperty(exports, "SingleStringSelectGroup", { enumerable: true, get: function () { return StringSelectGroup_1.SingleStringSelectGroup; } });
|
108
|
+
// Text Area
|
109
|
+
var TextAreaGroup_1 = require("./TextArea/TextAreaGroup");
|
110
|
+
Object.defineProperty(exports, "TextAreaGroup", { enumerable: true, get: function () { return __importDefault(TextAreaGroup_1).default; } });
|
95
111
|
// Utils
|
96
112
|
var objectContainsNonSerializableProperty_1 = require("./utils/objectContainsNonSerializableProperty");
|
97
113
|
Object.defineProperty(exports, "objectContainsNonSerializableProperty", { enumerable: true, get: function () { return __importDefault(objectContainsNonSerializableProperty_1).default; } });
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "envoc-form",
|
3
|
-
"version": "4.0.1-
|
3
|
+
"version": "4.0.1-10",
|
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-
|
40
|
+
"envoc-request": "^4.0.1-10",
|
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",
|
@@ -4,9 +4,10 @@ exports[`AddressInput has matching snapshot 1`] = `
|
|
4
4
|
<DocumentFragment>
|
5
5
|
<form
|
6
6
|
action="#"
|
7
|
+
class="envoc-form-form"
|
7
8
|
>
|
8
9
|
<div
|
9
|
-
class="string-group input-group group"
|
10
|
+
class="envoc-form-string-group envoc-form-input-group envoc-form-group envoc-form-required"
|
10
11
|
>
|
11
12
|
<div
|
12
13
|
id="normaladdressinput.address1-error-scroll-target"
|
@@ -18,14 +19,15 @@ exports[`AddressInput has matching snapshot 1`] = `
|
|
18
19
|
Address 1
|
19
20
|
</label>
|
20
21
|
<input
|
21
|
-
class="string-group input-group"
|
22
|
+
class="envoc-form-string-group envoc-form-input-group"
|
23
|
+
id="normalAddressInput.address1"
|
22
24
|
name="normalAddressInput.address1"
|
23
25
|
placeholder="Address, Line 1"
|
24
26
|
value=""
|
25
27
|
/>
|
26
28
|
</div>
|
27
29
|
<div
|
28
|
-
class="string-group input-group group"
|
30
|
+
class="envoc-form-string-group envoc-form-input-group envoc-form-group"
|
29
31
|
>
|
30
32
|
<div
|
31
33
|
id="normaladdressinput.address2-error-scroll-target"
|
@@ -37,14 +39,15 @@ exports[`AddressInput has matching snapshot 1`] = `
|
|
37
39
|
Address 2
|
38
40
|
</label>
|
39
41
|
<input
|
40
|
-
class="string-group input-group"
|
42
|
+
class="envoc-form-string-group envoc-form-input-group"
|
43
|
+
id="normalAddressInput.address2"
|
41
44
|
name="normalAddressInput.address2"
|
42
45
|
placeholder="Address, Line 2"
|
43
46
|
value=""
|
44
47
|
/>
|
45
48
|
</div>
|
46
49
|
<div
|
47
|
-
class="string-group input-group group"
|
50
|
+
class="envoc-form-string-group envoc-form-input-group envoc-form-group envoc-form-required"
|
48
51
|
>
|
49
52
|
<div
|
50
53
|
id="normaladdressinput.city-error-scroll-target"
|
@@ -56,14 +59,15 @@ exports[`AddressInput has matching snapshot 1`] = `
|
|
56
59
|
City
|
57
60
|
</label>
|
58
61
|
<input
|
59
|
-
class="string-group input-group"
|
62
|
+
class="envoc-form-string-group envoc-form-input-group"
|
63
|
+
id="normalAddressInput.city"
|
60
64
|
name="normalAddressInput.city"
|
61
65
|
placeholder="City"
|
62
66
|
value=""
|
63
67
|
/>
|
64
68
|
</div>
|
65
69
|
<div
|
66
|
-
class="select-group group"
|
70
|
+
class="envoc-form-select-group envoc-form-group envoc-form-required"
|
67
71
|
>
|
68
72
|
<div
|
69
73
|
id="normaladdressinput.state-error-scroll-target"
|
@@ -75,7 +79,7 @@ exports[`AddressInput has matching snapshot 1`] = `
|
|
75
79
|
State
|
76
80
|
</label>
|
77
81
|
<div
|
78
|
-
class="select-group css-b62m3t-container"
|
82
|
+
class="envoc-form-select-group css-b62m3t-container"
|
79
83
|
>
|
80
84
|
<span
|
81
85
|
class="css-1f43avz-a11yText-A11yText"
|
@@ -152,7 +156,7 @@ exports[`AddressInput has matching snapshot 1`] = `
|
|
152
156
|
</div>
|
153
157
|
</div>
|
154
158
|
<div
|
155
|
-
class="string-group input-group group"
|
159
|
+
class="envoc-form-string-group envoc-form-input-group envoc-form-group envoc-form-required"
|
156
160
|
>
|
157
161
|
<div
|
158
162
|
id="normaladdressinput.zipcode-error-scroll-target"
|
@@ -164,7 +168,8 @@ exports[`AddressInput has matching snapshot 1`] = `
|
|
164
168
|
Zip
|
165
169
|
</label>
|
166
170
|
<input
|
167
|
-
class="string-group input-group"
|
171
|
+
class="envoc-form-string-group envoc-form-input-group"
|
172
|
+
id="normalAddressInput.zipCode"
|
168
173
|
name="normalAddressInput.zipCode"
|
169
174
|
placeholder="Zip"
|
170
175
|
value=""
|
@@ -1,6 +1,7 @@
|
|
1
1
|
import React, { MouseEventHandler } from 'react';
|
2
2
|
import classNames from 'classnames';
|
3
3
|
import { useAxiosRequest, useAxiosRequestProps } from 'envoc-request';
|
4
|
+
import { FormDefaults } from '../FormDefaults';
|
4
5
|
|
5
6
|
// TODO: change the style prop type to Tailwind type (does this exist before Tailwind 3.1 ???), or
|
6
7
|
// should this just be type 'string'
|
@@ -9,6 +10,8 @@ export interface ConfirmBaseFormProps {
|
|
9
10
|
request: useAxiosRequestProps;
|
10
11
|
style?: React.CSSProperties;
|
11
12
|
title?: string;
|
13
|
+
confirmButtonText?: string;
|
14
|
+
confirmButtonClass?: string;
|
12
15
|
children?: React.ReactNode;
|
13
16
|
}
|
14
17
|
|
@@ -18,6 +21,8 @@ export default function ConfirmBaseForm({
|
|
18
21
|
request,
|
19
22
|
style,
|
20
23
|
title,
|
24
|
+
confirmButtonText,
|
25
|
+
confirmButtonClass,
|
21
26
|
children,
|
22
27
|
...props
|
23
28
|
}: ConfirmBaseFormProps) {
|
@@ -31,13 +36,18 @@ export default function ConfirmBaseForm({
|
|
31
36
|
<h3>{title}</h3>
|
32
37
|
{children}
|
33
38
|
<button
|
34
|
-
className={classNames(
|
39
|
+
className={classNames(
|
40
|
+
confirmButtonClass ??
|
41
|
+
FormDefaults.cssClassPrefix + 'confirm-base-form-confirm-button'
|
42
|
+
)}
|
35
43
|
type="button"
|
36
44
|
onClick={webRequest.submitRequest}>
|
37
|
-
|
45
|
+
{confirmButtonText ?? 'Confirm'}
|
38
46
|
</button>
|
39
47
|
<button
|
40
|
-
className={classNames(
|
48
|
+
className={classNames(
|
49
|
+
FormDefaults.cssClassPrefix + 'confirm-base-form-cancel-button'
|
50
|
+
)}
|
41
51
|
type="button"
|
42
52
|
onClick={onCancel}>
|
43
53
|
Cancel
|
@@ -7,13 +7,13 @@ exports[`ConfirmBaseForm has matching snapshot 1`] = `
|
|
7
7
|
>
|
8
8
|
<h3 />
|
9
9
|
<button
|
10
|
-
class="confirm-base-form-
|
10
|
+
class="envoc-form-confirm-base-form-confirm-button"
|
11
11
|
type="button"
|
12
12
|
>
|
13
|
-
|
13
|
+
Confirm
|
14
14
|
</button>
|
15
15
|
<button
|
16
|
-
class="confirm-base-form-cancel-button"
|
16
|
+
class="envoc-form-confirm-base-form-cancel-button"
|
17
17
|
type="button"
|
18
18
|
>
|
19
19
|
Cancel
|
@@ -2,7 +2,10 @@ import React from 'react';
|
|
2
2
|
import { useNavigate, useParams } from 'react-router-dom';
|
3
3
|
import { toast } from 'react-toastify';
|
4
4
|
import { useAxiosRequestProps } from 'envoc-request';
|
5
|
-
import ConfirmBaseForm, {
|
5
|
+
import ConfirmBaseForm, {
|
6
|
+
ConfirmBaseFormProps,
|
7
|
+
} from '../ConfirmBaseForm/ConfirmBaseForm';
|
8
|
+
import { FormDefaults } from '../FormDefaults';
|
6
9
|
|
7
10
|
export interface ConfirmDeleteFormProps
|
8
11
|
extends Pick<ConfirmBaseFormProps, 'style'> {
|
@@ -52,6 +55,10 @@ export default function ConfirmDeleteForm({
|
|
52
55
|
request={request}
|
53
56
|
handleCancel={goBack}
|
54
57
|
title={title ?? 'Are you sure you want to delete this?'}
|
58
|
+
confirmButtonText="Yes"
|
59
|
+
confirmButtonClass={
|
60
|
+
FormDefaults.cssClassPrefix + 'confirm-delete-form-yes-button'
|
61
|
+
}
|
55
62
|
{...props}>
|
56
63
|
{children}
|
57
64
|
</ConfirmBaseForm>
|
@@ -9,13 +9,13 @@ exports[`ConfirmDeleteForm has matching snapshot 1`] = `
|
|
9
9
|
Are you sure you want to delete this?
|
10
10
|
</h3>
|
11
11
|
<button
|
12
|
-
class="confirm-
|
12
|
+
class="envoc-form-confirm-delete-form-yes-button"
|
13
13
|
type="button"
|
14
14
|
>
|
15
15
|
Yes
|
16
16
|
</button>
|
17
17
|
<button
|
18
|
-
class="confirm-base-form-cancel-button"
|
18
|
+
class="envoc-form-confirm-base-form-cancel-button"
|
19
19
|
type="button"
|
20
20
|
>
|
21
21
|
Cancel
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { render } from '@testing-library/react';
|
3
|
-
import
|
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={
|
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={
|
35
|
+
Component={StringDatePickerGroup}
|
36
36
|
label="Favorite Date"
|
37
37
|
monthPlaceholder="mm"
|
38
38
|
dayPlaceholder="dd"
|
@@ -0,0 +1,108 @@
|
|
1
|
+
import { useEffect, useState } from 'react';
|
2
|
+
import DatePicker, {
|
3
|
+
DatePickerProps,
|
4
|
+
} from 'react-date-picker/dist/entry.nostyle';
|
5
|
+
import classnames from 'classnames';
|
6
|
+
import parseISO from 'date-fns/parseISO';
|
7
|
+
import { InjectedFieldProps } from '../Field/InjectedFieldProps';
|
8
|
+
import { FormDefaults } from '../FormDefaults';
|
9
|
+
import Group, { GroupProps } from '../Group';
|
10
|
+
|
11
|
+
// Docs for react-date-picker https://www.npmjs.com/package/react-date-picker
|
12
|
+
|
13
|
+
export interface DatePickerGroupProps<T>
|
14
|
+
extends InjectedFieldProps<T | undefined>,
|
15
|
+
Omit<
|
16
|
+
DatePickerProps,
|
17
|
+
keyof InjectedFieldProps<T> | 'name' | 'value' | 'className'
|
18
|
+
>,
|
19
|
+
Omit<GroupProps, keyof InjectedFieldProps<T> | 'children'> {
|
20
|
+
convert: (arg: Date) => T;
|
21
|
+
}
|
22
|
+
|
23
|
+
export default function DatePickerGroup<T>({
|
24
|
+
input,
|
25
|
+
meta,
|
26
|
+
label,
|
27
|
+
helpText,
|
28
|
+
className,
|
29
|
+
required,
|
30
|
+
disabled,
|
31
|
+
convert,
|
32
|
+
...rest
|
33
|
+
}: DatePickerGroupProps<T>) {
|
34
|
+
const [displayDate, setDisplayDate] = useState<Date | null>(null);
|
35
|
+
|
36
|
+
useEffect(() => {
|
37
|
+
if (input.value != null) {
|
38
|
+
setDisplayDate(new Date(`${input.value}T00:00:00.000`));
|
39
|
+
} else {
|
40
|
+
setDisplayDate(null);
|
41
|
+
}
|
42
|
+
}, [setDisplayDate, input.value]);
|
43
|
+
|
44
|
+
return (
|
45
|
+
<Group
|
46
|
+
input={input}
|
47
|
+
meta={meta}
|
48
|
+
label={label}
|
49
|
+
helpText={helpText}
|
50
|
+
className={classnames(
|
51
|
+
className,
|
52
|
+
FormDefaults.cssClassPrefix + 'date-picker'
|
53
|
+
)}
|
54
|
+
required={required}
|
55
|
+
disabled={disabled}>
|
56
|
+
<DatePicker
|
57
|
+
{...rest}
|
58
|
+
className={classnames(
|
59
|
+
FormDefaults.cssClassPrefix + 'date-picker',
|
60
|
+
className
|
61
|
+
)}
|
62
|
+
value={displayDate}
|
63
|
+
onChange={handleChange}
|
64
|
+
/>
|
65
|
+
</Group>
|
66
|
+
);
|
67
|
+
|
68
|
+
function handleChange(e: Date | Date[] | string | undefined) {
|
69
|
+
const { onChange } = input;
|
70
|
+
if (onChange === null) {
|
71
|
+
return;
|
72
|
+
}
|
73
|
+
|
74
|
+
if (!e) {
|
75
|
+
onChange(undefined);
|
76
|
+
setDisplayDate(null);
|
77
|
+
return;
|
78
|
+
} else if (typeof e === 'string') {
|
79
|
+
const parsedValue = parseISO(e.toString().split('T')[0]);
|
80
|
+
setDisplayDate(parsedValue);
|
81
|
+
onChange(convert(parsedValue));
|
82
|
+
} else if (e instanceof Date) {
|
83
|
+
const parsedValue = parseISO(
|
84
|
+
convertToTimeZoneInsensitiveISOString(e).split('T')[0]
|
85
|
+
);
|
86
|
+
setDisplayDate(parsedValue);
|
87
|
+
onChange(convert(parsedValue));
|
88
|
+
} else {
|
89
|
+
// e is instanceof Date[]
|
90
|
+
const parsedValue = parseISO(
|
91
|
+
convertToTimeZoneInsensitiveISOString(e[0]).split('T')[0]
|
92
|
+
);
|
93
|
+
setDisplayDate(parsedValue);
|
94
|
+
onChange(convert(parsedValue));
|
95
|
+
}
|
96
|
+
}
|
97
|
+
}
|
98
|
+
|
99
|
+
export function convertToTimeZoneInsensitiveISOString(date: Date): string {
|
100
|
+
const year = new Intl.DateTimeFormat('en', { year: 'numeric' })
|
101
|
+
.format(date)
|
102
|
+
.padStart(4, '0');
|
103
|
+
const month = new Intl.DateTimeFormat('en', { month: '2-digit' }).format(
|
104
|
+
date
|
105
|
+
);
|
106
|
+
const day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(date);
|
107
|
+
return `${year}-${month}-${day}T00:00:00.000Z`;
|
108
|
+
}
|
@@ -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
|
+
}
|
@@ -0,0 +1,14 @@
|
|
1
|
+
import DatePickerGroup from './DatePickerGroup';
|
2
|
+
import { DatePickerHelper } from './DatePickerHelper';
|
3
|
+
|
4
|
+
export interface StringDatePickerGroupProps
|
5
|
+
extends DatePickerHelper<string | undefined> {}
|
6
|
+
export default function StringDatePickerGroup(
|
7
|
+
props: StringDatePickerGroupProps
|
8
|
+
) {
|
9
|
+
return <DatePickerGroup {...props} convert={convertToDateOnly} />;
|
10
|
+
}
|
11
|
+
|
12
|
+
function convertToDateOnly(arg: Date) {
|
13
|
+
return arg.toISOString();
|
14
|
+
}
|
@@ -4,9 +4,10 @@ exports[`IconInputGroup has matching snapshot 1`] = `
|
|
4
4
|
<DocumentFragment>
|
5
5
|
<form
|
6
6
|
action="#"
|
7
|
+
class="envoc-form-form"
|
7
8
|
>
|
8
9
|
<div
|
9
|
-
class="date-picker group"
|
10
|
+
class="envoc-form-date-picker envoc-form-group"
|
10
11
|
>
|
11
12
|
<div
|
12
13
|
id="favoritedate-error-scroll-target"
|
@@ -18,7 +19,7 @@ exports[`IconInputGroup has matching snapshot 1`] = `
|
|
18
19
|
Favorite Date
|
19
20
|
</label>
|
20
21
|
<div
|
21
|
-
class="react-date-picker react-date-picker--closed react-date-picker--enabled date-picker"
|
22
|
+
class="react-date-picker react-date-picker--closed react-date-picker--enabled envoc-form-date-picker"
|
22
23
|
>
|
23
24
|
<div
|
24
25
|
class="react-date-picker__wrapper"
|
package/src/Field/Field.tsx
CHANGED
@@ -4,22 +4,26 @@ import { InjectedFieldProps } from './InjectedFieldProps';
|
|
4
4
|
import useStandardFormInput from './useStandardField';
|
5
5
|
import { NormalizationFunction } from '../Normalization/NormalizationFunction';
|
6
6
|
import { ValidationFunction } from '../Validation/ValidationFunction';
|
7
|
+
import { required as requiredValidator } from '../Validation/validators';
|
7
8
|
|
8
9
|
// we attempted to support generic components but failed
|
9
10
|
// so, we assume the actual TRenderComponent has no generic arguments
|
10
11
|
// instead, any concrete TRenderComponent can utilize a TRenderComponent<TValue> as needed
|
11
12
|
|
12
|
-
type RenderComponent<
|
13
|
-
|
14
|
-
|
13
|
+
export type RenderComponent<
|
14
|
+
TValue,
|
15
|
+
TRenderComponent extends ElementType
|
16
|
+
> = Partial<ComponentProps<TRenderComponent>> extends Partial<
|
17
|
+
InjectedFieldProps<TValue | undefined>
|
18
|
+
>
|
15
19
|
? TRenderComponent
|
16
20
|
: never;
|
17
21
|
|
18
|
-
type RenderComponentProps<
|
22
|
+
export type RenderComponentProps<
|
19
23
|
TValue,
|
20
24
|
TRenderComponent extends ElementType
|
21
25
|
> = Partial<ComponentProps<TRenderComponent>> extends Partial<
|
22
|
-
InjectedFieldProps<TValue>
|
26
|
+
InjectedFieldProps<TValue | undefined>
|
23
27
|
>
|
24
28
|
? ComponentProps<TRenderComponent>
|
25
29
|
: never;
|
@@ -57,9 +61,9 @@ function Field<
|
|
57
61
|
name,
|
58
62
|
Component,
|
59
63
|
id,
|
60
|
-
normalize,
|
61
|
-
validate,
|
62
64
|
disabled,
|
65
|
+
validate,
|
66
|
+
normalize,
|
63
67
|
...rest
|
64
68
|
}: FieldProps<TForm, TProp, TRenderComponent>,
|
65
69
|
ref: LegacyRef<any>
|
@@ -67,11 +71,17 @@ function Field<
|
|
67
71
|
const [input, meta] = useStandardFormInput<TForm[TProp]>({
|
68
72
|
name: String(name),
|
69
73
|
id: id,
|
70
|
-
normalize: normalize,
|
71
|
-
validate: validate,
|
72
74
|
disabled: disabled,
|
75
|
+
validate: validate,
|
76
|
+
normalize: normalize,
|
73
77
|
});
|
74
78
|
|
79
|
+
const isRequired =
|
80
|
+
rest?.required !== undefined
|
81
|
+
? rest.required
|
82
|
+
: validate === requiredValidator ||
|
83
|
+
(Array.isArray(validate) && validate.includes(requiredValidator));
|
84
|
+
|
75
85
|
// a bit of a hack so JSX is happy with us
|
76
86
|
const Wrapped = Component as React.ComponentType<
|
77
87
|
InjectedFieldProps<TForm[TProp]>
|
@@ -79,7 +89,15 @@ function Field<
|
|
79
89
|
|
80
90
|
return (
|
81
91
|
<FieldNameContext.Provider value={input.name}>
|
82
|
-
<Wrapped
|
92
|
+
<Wrapped
|
93
|
+
{...rest}
|
94
|
+
ref={ref}
|
95
|
+
id={input.id}
|
96
|
+
input={input}
|
97
|
+
meta={meta}
|
98
|
+
required={isRequired}
|
99
|
+
disabled={disabled}
|
100
|
+
/>
|
83
101
|
</FieldNameContext.Provider>
|
84
102
|
);
|
85
103
|
}
|