envoc-form 4.0.1-1 → 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 +2 -1
- package/es/DatePicker/DatePickerGroup.js +22 -5
- package/es/DatePicker/StringDateOnlyPickerGroup.d.ts +5 -0
- package/es/DatePicker/{DateOnlyDatePickerGroup.js → StringDateOnlyPickerGroup.js} +7 -6
- package/es/Field/Field.d.ts +3 -3
- package/es/Field/Field.js +9 -4
- 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 +2 -1
- 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.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.js +3 -2
- package/es/__Tests__/FormTestBase.d.ts +3 -3
- package/es/index.d.ts +4 -2
- package/es/index.js +4 -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 +2 -1
- package/lib/DatePicker/DatePickerGroup.js +23 -4
- package/lib/DatePicker/StringDateOnlyPickerGroup.d.ts +5 -0
- package/lib/DatePicker/{DateOnlyDatePickerGroup.js → StringDateOnlyPickerGroup.js} +8 -7
- package/lib/Field/Field.d.ts +3 -3
- package/lib/Field/Field.js +9 -4
- 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 +2 -1
- 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.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.js +3 -2
- package/lib/__Tests__/FormTestBase.d.ts +3 -3
- package/lib/index.d.ts +4 -2
- package/lib/index.js +8 -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/DatePicker/DatePicker.test.tsx +3 -3
- package/src/DatePicker/DatePickerGroup.tsx +40 -7
- package/src/DatePicker/StringDateOnlyPickerGroup.tsx +23 -0
- package/src/DatePicker/__snapshots__/DatePicker.test.tsx.snap +3 -2
- package/src/Field/Field.tsx +22 -7
- 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 +21 -6
- 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 +5 -1
- 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 +11 -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 +7 -6
- package/es/DatePicker/DateOnlyDatePickerGroup.d.ts +0 -10
- package/lib/DatePicker/DateOnlyDatePickerGroup.d.ts +0 -10
- package/src/DatePicker/DateOnlyDatePickerGroup.tsx +0 -24
@@ -29,11 +29,12 @@ var jsx_runtime_1 = require("react/jsx-runtime");
|
|
29
29
|
var react_1 = __importDefault(require("react"));
|
30
30
|
var classnames_1 = __importDefault(require("classnames"));
|
31
31
|
var InputGroup_1 = __importDefault(require("./InputGroup"));
|
32
|
+
var FormDefaults_1 = require("../FormDefaults");
|
32
33
|
function MoneyInputGroup(_a, ref) {
|
33
34
|
var parseFunc = _a.parseFunc, className = _a.className, rest = __rest(_a, ["parseFunc", "className"]);
|
34
35
|
var effectiveParse = parseFunc !== null && parseFunc !== void 0 ? parseFunc : parseFloat;
|
35
36
|
var input = rest.input;
|
36
|
-
return ((0, jsx_runtime_1.jsx)(InputGroup_1.default, __assign({ ref: ref, step: 0.01, min: 0 }, rest, { type: "number", className: (0, classnames_1.default)(className, 'money-group'), value: input.value || '', onChange: function (e) {
|
37
|
+
return ((0, jsx_runtime_1.jsx)(InputGroup_1.default, __assign({ ref: ref, step: 0.01, min: 0 }, rest, { type: "number", className: (0, classnames_1.default)(className, FormDefaults_1.FormDefaults.cssClassPrefix + 'money-group'), value: input.value || '', onChange: function (e) {
|
37
38
|
if (!e.target.value) {
|
38
39
|
input.onChange(undefined);
|
39
40
|
}
|
@@ -29,11 +29,12 @@ var jsx_runtime_1 = require("react/jsx-runtime");
|
|
29
29
|
var react_1 = __importDefault(require("react"));
|
30
30
|
var classnames_1 = __importDefault(require("classnames"));
|
31
31
|
var InputGroup_1 = __importDefault(require("./InputGroup"));
|
32
|
+
var FormDefaults_1 = require("../FormDefaults");
|
32
33
|
function NumberInputGroup(_a, ref) {
|
33
34
|
var parseFunc = _a.parseFunc, className = _a.className, rest = __rest(_a, ["parseFunc", "className"]);
|
34
35
|
var effectiveParse = parseFunc !== null && parseFunc !== void 0 ? parseFunc : parseFloat;
|
35
36
|
var input = rest.input;
|
36
|
-
return ((0, jsx_runtime_1.jsx)(InputGroup_1.default, __assign({ ref: ref }, rest, { type: "number", className: (0, classnames_1.default)(className, 'number-group'), value: input.value || '', onChange: function (e) {
|
37
|
+
return ((0, jsx_runtime_1.jsx)(InputGroup_1.default, __assign({ ref: ref }, rest, { type: "number", className: (0, classnames_1.default)(className, FormDefaults_1.FormDefaults.cssClassPrefix + 'number-group'), value: input.value || '', onChange: function (e) {
|
37
38
|
if (!e.target.value) {
|
38
39
|
input.onChange(undefined);
|
39
40
|
}
|
@@ -29,10 +29,11 @@ var jsx_runtime_1 = require("react/jsx-runtime");
|
|
29
29
|
var react_1 = __importDefault(require("react"));
|
30
30
|
var classnames_1 = __importDefault(require("classnames"));
|
31
31
|
var InputGroup_1 = __importDefault(require("./InputGroup"));
|
32
|
+
var FormDefaults_1 = require("../FormDefaults");
|
32
33
|
function StringInputGroup(_a, ref) {
|
33
34
|
var className = _a.className, rest = __rest(_a, ["className"]);
|
34
35
|
var input = rest.input;
|
35
|
-
return ((0, jsx_runtime_1.jsx)(InputGroup_1.default, __assign({ ref: ref }, rest, { className: (0, classnames_1.default)(className, 'string-group'), value: input.value || '', onChange: function (e) {
|
36
|
+
return ((0, jsx_runtime_1.jsx)(InputGroup_1.default, __assign({ ref: ref }, rest, { className: (0, classnames_1.default)(className, FormDefaults_1.FormDefaults.cssClassPrefix + 'string-group'), value: input.value || '', onChange: function (e) {
|
36
37
|
if (!e.target.value) {
|
37
38
|
input.onChange(undefined);
|
38
39
|
}
|
@@ -18,5 +18,5 @@ export interface SelectGroupProps<TValue> extends InjectedFieldProps<TValue | un
|
|
18
18
|
multiple: TValue extends Array<any> ? true : false;
|
19
19
|
placeholder?: string;
|
20
20
|
}
|
21
|
-
export default function SelectGroup<TValue>({ input, meta, className, options, multiple, placeholder, ...rest }: SelectGroupProps<TValue>): JSX.Element;
|
21
|
+
export default function SelectGroup<TValue>({ input, meta, className, required, disabled, options, multiple, placeholder, ...rest }: SelectGroupProps<TValue>): JSX.Element;
|
22
22
|
export {};
|
@@ -29,9 +29,11 @@ var jsx_runtime_1 = require("react/jsx-runtime");
|
|
29
29
|
var react_select_1 = __importDefault(require("react-select"));
|
30
30
|
var classnames_1 = __importDefault(require("classnames"));
|
31
31
|
var Group_1 = __importDefault(require("../Group"));
|
32
|
+
var FormDefaults_1 = require("../FormDefaults");
|
32
33
|
// TODO: we could also name this "ReactSelectGroup" or similar but the types are strongly defined now so kept the names consistent
|
33
34
|
function SelectGroup(_a) {
|
34
|
-
var
|
35
|
+
var _b;
|
36
|
+
var input = _a.input, meta = _a.meta, className = _a.className, required = _a.required, disabled = _a.disabled, options = _a.options, multiple = _a.multiple, placeholder = _a.placeholder, rest = __rest(_a, ["input", "meta", "className", "required", "disabled", "options", "multiple", "placeholder"]);
|
35
37
|
var effectiveOptions = !options
|
36
38
|
? []
|
37
39
|
: Array.isArray(options)
|
@@ -45,14 +47,17 @@ function SelectGroup(_a) {
|
|
45
47
|
? options.resp
|
46
48
|
: [];
|
47
49
|
var isLoading = (options && 'loading' in options && options.loading) || false;
|
48
|
-
return ((0, jsx_runtime_1.jsx)(Group_1.default, __assign({}, rest, { input: input, meta: meta,
|
50
|
+
return ((0, jsx_runtime_1.jsx)(Group_1.default, __assign({}, rest, { input: input, meta: meta, required: required, disabled: disabled, className: (0, classnames_1.default)(className, (_b = {},
|
51
|
+
_b[FormDefaults_1.FormDefaults.cssClassPrefix + 'multiple'] = multiple,
|
52
|
+
_b[FormDefaults_1.FormDefaults.cssClassPrefix + 'loading'] = isLoading,
|
53
|
+
_b), FormDefaults_1.FormDefaults.cssClassPrefix + 'select-group') }, { children: (0, jsx_runtime_1.jsx)(react_select_1.default, { inputId: input.id, isMulti: multiple, isDisabled: disabled, options: effectiveOptions, onBlur: input.onBlur, value: getValue(), onChange: function (e) {
|
49
54
|
if (multiple === true) {
|
50
55
|
input.onChange(e === null || e === void 0 ? void 0 : e.map(function (x) { return x.value; }));
|
51
56
|
}
|
52
57
|
else {
|
53
58
|
input.onChange(e === null || e === void 0 ? void 0 : e.value);
|
54
59
|
}
|
55
|
-
}, getOptionLabel: function (option) { var _a; return (_a = option === null || option === void 0 ? void 0 : option.label) !== null && _a !== void 0 ? _a : ''; }, className: (0, classnames_1.default)(className, 'select-group'), classNamePrefix: "react-select", menuPortalTarget: document.body, menuPlacement: "auto", placeholder: placeholder }) })));
|
60
|
+
}, getOptionLabel: function (option) { var _a; return (_a = option === null || option === void 0 ? void 0 : option.label) !== null && _a !== void 0 ? _a : ''; }, className: (0, classnames_1.default)(className, FormDefaults_1.FormDefaults.cssClassPrefix + 'select-group'), classNamePrefix: "react-select", menuPortalTarget: document.body, menuPlacement: "auto", placeholder: placeholder }) })));
|
56
61
|
function getValue() {
|
57
62
|
if (multiple) {
|
58
63
|
return effectiveOptions.filter(function (o) {
|
@@ -18,10 +18,11 @@ var jsx_runtime_1 = require("react/jsx-runtime");
|
|
18
18
|
var classnames_1 = __importDefault(require("classnames"));
|
19
19
|
var formik_1 = require("formik");
|
20
20
|
var SubmitFormButton_1 = __importDefault(require("./SubmitFormButton"));
|
21
|
+
var FormDefaults_1 = require("./FormDefaults");
|
21
22
|
function StandardFormActions(_a) {
|
22
23
|
var allowPristineSubmit = _a.allowPristineSubmit, handleCancel = _a.handleCancel;
|
23
24
|
var isSubmitting = (0, formik_1.useFormikContext)().isSubmitting;
|
24
|
-
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(SubmitFormButton_1.default, { allowPristineSubmit: allowPristineSubmit }), "\u00A0", (0, jsx_runtime_1.jsx)("button", __assign({ className: (0, classnames_1.default)('standard-form-actions-cancel-button'), type: "button", disabled: isSubmitting, onClick: handleCancel || goBack }, { children: "Cancel" }))] }));
|
25
|
+
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(SubmitFormButton_1.default, { allowPristineSubmit: allowPristineSubmit }), "\u00A0", (0, jsx_runtime_1.jsx)("button", __assign({ className: (0, classnames_1.default)(FormDefaults_1.FormDefaults.cssClassPrefix + 'standard-form-actions-cancel-button'), type: "button", disabled: isSubmitting, onClick: handleCancel || goBack }, { children: "Cancel" }))] }));
|
25
26
|
function goBack() {
|
26
27
|
window.history.back();
|
27
28
|
}
|
package/lib/SubmitFormButton.js
CHANGED
@@ -29,14 +29,16 @@ var jsx_runtime_1 = require("react/jsx-runtime");
|
|
29
29
|
var react_1 = __importDefault(require("react"));
|
30
30
|
var classnames_1 = __importDefault(require("classnames"));
|
31
31
|
var formik_1 = require("formik");
|
32
|
+
var FormDefaults_1 = require("./FormDefaults");
|
32
33
|
function SubmitFormButton(_a, ref) {
|
33
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"]);
|
34
35
|
var _b = (0, formik_1.useFormikContext)(), isSubmitting = _b.isSubmitting, dirty = _b.dirty;
|
35
36
|
var preventSubmit = (!dirty && !allowPristineSubmit) || isSubmitting;
|
36
|
-
|
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
|
37
39
|
? 'Loading, please wait...'
|
38
40
|
: preventSubmit
|
39
41
|
? "You haven't made any changes"
|
40
|
-
: '', className: (0, classnames_1.default)('submit-form-button', className) }, { children: children || 'Submit' })));
|
42
|
+
: '', className: (0, classnames_1.default)(FormDefaults_1.FormDefaults.cssClassPrefix + 'submit-form-button', className) }, { children: children || 'Submit' })));
|
41
43
|
}
|
42
44
|
exports.default = react_1.default.forwardRef(SubmitFormButton);
|
@@ -29,10 +29,11 @@ var jsx_runtime_1 = require("react/jsx-runtime");
|
|
29
29
|
var react_1 = __importDefault(require("react"));
|
30
30
|
var classnames_1 = __importDefault(require("classnames"));
|
31
31
|
var Group_1 = __importDefault(require("../Group"));
|
32
|
+
var FormDefaults_1 = require("../FormDefaults");
|
32
33
|
/** generic controlled <textarea/> wrapped by a Group */
|
33
34
|
function TextAreaGroup(_a, ref) {
|
34
|
-
var input = _a.input, meta = _a.meta, label = _a.label, helpText = _a.helpText, className = _a.className, disabled = _a.disabled, icon = _a.icon, rest = __rest(_a, ["input", "meta", "label", "helpText", "className", "disabled", "icon"]);
|
35
|
-
return ((0, jsx_runtime_1.jsxs)(Group_1.default, __assign({ input: input, meta: meta, disabled: disabled, label: label, helpText: helpText, className: (0, classnames_1.default)(className, 'text-area-group') }, { children: [icon, (0, jsx_runtime_1.jsx)("textarea", __assign({}, input, rest, { value: input.value, onChange: function (val) { return input.onChange(val.target.value); }, ref: ref, className: (0, classnames_1.default)(className, 'text-area-group') }))] })));
|
35
|
+
var input = _a.input, meta = _a.meta, label = _a.label, helpText = _a.helpText, className = _a.className, required = _a.required, disabled = _a.disabled, icon = _a.icon, rest = __rest(_a, ["input", "meta", "label", "helpText", "className", "required", "disabled", "icon"]);
|
36
|
+
return ((0, jsx_runtime_1.jsxs)(Group_1.default, __assign({ input: input, meta: meta, required: required, disabled: disabled, label: label, helpText: helpText, className: (0, classnames_1.default)(className, FormDefaults_1.FormDefaults.cssClassPrefix + 'text-area-group') }, { children: [icon, (0, jsx_runtime_1.jsx)("textarea", __assign({}, input, rest, { value: input.value, onChange: function (val) { return input.onChange(val.target.value); }, ref: ref, className: (0, classnames_1.default)(className, FormDefaults_1.FormDefaults.cssClassPrefix + 'text-area-group') }))] })));
|
36
37
|
}
|
37
38
|
var TextAreaGroupWithRef = react_1.default.forwardRef(TextAreaGroup);
|
38
39
|
exports.default = TextAreaGroupWithRef;
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/// <reference types="react" />
|
2
2
|
import '@testing-library/jest-dom/extend-expect';
|
3
|
-
import {
|
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?:
|
17
|
-
favoriteDate?:
|
16
|
+
gradDate?: string;
|
17
|
+
favoriteDate?: string;
|
18
18
|
favoriteNumber?: number;
|
19
19
|
favoriteColor?: string;
|
20
20
|
favoriteColors?: string[];
|
package/lib/index.d.ts
CHANGED
@@ -8,11 +8,12 @@ export { default as ConfirmDeleteForm } from './ConfirmDeleteForm/ConfirmDeleteF
|
|
8
8
|
export type { ConfirmDeleteFormProps } from './ConfirmDeleteForm/ConfirmDeleteForm';
|
9
9
|
export { default as DatePickerGroup } from './DatePicker/DatePickerGroup';
|
10
10
|
export type { DatePickerGroupProps as DatePickerGroupProps } from './DatePicker/DatePickerGroup';
|
11
|
+
export { convertToTimeZoneInsensitiveISOString } from './DatePicker/DatePickerGroup';
|
11
12
|
export type { DatePickerHelper } from './DatePicker/DatePickerHelper';
|
12
|
-
export { default as DateOnlyDatePickerGroup } from './DatePicker/DateOnlyDatePickerGroup';
|
13
|
-
export type { DateOnly, DateOnlyDatePickerGroupProps, } from './DatePicker/DateOnlyDatePickerGroup';
|
14
13
|
export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
|
15
14
|
export type { StringDatePickerGroupProps } from './DatePicker/StringDatePickerGroup';
|
15
|
+
export { default as StringDateOnlyPickerGroup } from './DatePicker/StringDateOnlyPickerGroup';
|
16
|
+
export type { StringDateOnlyPickerGroupProps } from './DatePicker/StringDateOnlyPickerGroup';
|
16
17
|
export { default as Field } from './Field/Field';
|
17
18
|
export type { FieldProps } from './Field/Field';
|
18
19
|
export type { RenderComponent } from './Field/Field';
|
@@ -36,6 +37,7 @@ export { default as FormActions } from './FormActions';
|
|
36
37
|
export type { FormActionsProps as FormActionsProps } from './FormActions';
|
37
38
|
export { default as StandardFormActions } from './StandardFormActions';
|
38
39
|
export type { StandardFormActionsProps as StandardFormActionsProps } from './StandardFormActions';
|
40
|
+
export { FormDefaults } from './FormDefaults';
|
39
41
|
export { default as Group } from './Group';
|
40
42
|
export type { GroupProps as GroupProps } from './Group';
|
41
43
|
export { default as IconInputGroup } from './Input/IconInputGroup';
|
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.StandardFormActions = exports.FormActions = exports.ServerErrorContext = exports.Form = exports.FileGroup = exports.FieldArray = exports.useStandardField = exports.StandAloneInput = exports.FieldNameContext = exports.FieldErrorScrollTarget = exports.Field = exports.StringDatePickerGroup = 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; } });
|
@@ -45,10 +45,12 @@ Object.defineProperty(exports, "ConfirmDeleteForm", { enumerable: true, get: fun
|
|
45
45
|
// Date
|
46
46
|
var DatePickerGroup_1 = require("./DatePicker/DatePickerGroup");
|
47
47
|
Object.defineProperty(exports, "DatePickerGroup", { enumerable: true, get: function () { return __importDefault(DatePickerGroup_1).default; } });
|
48
|
-
var
|
49
|
-
Object.defineProperty(exports, "
|
48
|
+
var DatePickerGroup_2 = require("./DatePicker/DatePickerGroup");
|
49
|
+
Object.defineProperty(exports, "convertToTimeZoneInsensitiveISOString", { enumerable: true, get: function () { return DatePickerGroup_2.convertToTimeZoneInsensitiveISOString; } });
|
50
50
|
var StringDatePickerGroup_1 = require("./DatePicker/StringDatePickerGroup");
|
51
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; } });
|
52
54
|
// Field
|
53
55
|
var Field_1 = require("./Field/Field");
|
54
56
|
Object.defineProperty(exports, "Field", { enumerable: true, get: function () { return __importDefault(Field_1).default; } });
|
@@ -75,6 +77,9 @@ var FormActions_1 = require("./FormActions");
|
|
75
77
|
Object.defineProperty(exports, "FormActions", { enumerable: true, get: function () { return __importDefault(FormActions_1).default; } });
|
76
78
|
var StandardFormActions_1 = require("./StandardFormActions");
|
77
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; } });
|
78
83
|
// Input
|
79
84
|
var Group_1 = require("./Group");
|
80
85
|
Object.defineProperty(exports, "Group", { enumerable: true, get: function () { return __importDefault(Group_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"
|
@@ -1,8 +1,11 @@
|
|
1
|
-
import { useState } from 'react';
|
2
|
-
import DatePicker, {
|
1
|
+
import { useEffect, useState } from 'react';
|
2
|
+
import DatePicker, {
|
3
|
+
DatePickerProps,
|
4
|
+
} from 'react-date-picker/dist/entry.nostyle';
|
3
5
|
import classnames from 'classnames';
|
4
6
|
import parseISO from 'date-fns/parseISO';
|
5
7
|
import { InjectedFieldProps } from '../Field/InjectedFieldProps';
|
8
|
+
import { FormDefaults } from '../FormDefaults';
|
6
9
|
import Group, { GroupProps } from '../Group';
|
7
10
|
|
8
11
|
// Docs for react-date-picker https://www.npmjs.com/package/react-date-picker
|
@@ -23,23 +26,39 @@ export default function DatePickerGroup<T>({
|
|
23
26
|
label,
|
24
27
|
helpText,
|
25
28
|
className,
|
29
|
+
required,
|
26
30
|
disabled,
|
27
31
|
convert,
|
28
32
|
...rest
|
29
33
|
}: DatePickerGroupProps<T>) {
|
30
34
|
const [displayDate, setDisplayDate] = useState<Date | null>(null);
|
31
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
|
+
|
32
44
|
return (
|
33
45
|
<Group
|
34
46
|
input={input}
|
35
47
|
meta={meta}
|
36
48
|
label={label}
|
37
49
|
helpText={helpText}
|
38
|
-
className={classnames(
|
50
|
+
className={classnames(
|
51
|
+
className,
|
52
|
+
FormDefaults.cssClassPrefix + 'date-picker'
|
53
|
+
)}
|
54
|
+
required={required}
|
39
55
|
disabled={disabled}>
|
40
56
|
<DatePicker
|
41
57
|
{...rest}
|
42
|
-
className={classnames(
|
58
|
+
className={classnames(
|
59
|
+
FormDefaults.cssClassPrefix + 'date-picker',
|
60
|
+
className
|
61
|
+
)}
|
43
62
|
value={displayDate}
|
44
63
|
onChange={handleChange}
|
45
64
|
/>
|
@@ -61,15 +80,29 @@ export default function DatePickerGroup<T>({
|
|
61
80
|
setDisplayDate(parsedValue);
|
62
81
|
onChange(convert(parsedValue));
|
63
82
|
} else if (e instanceof Date) {
|
64
|
-
const parsedValue = parseISO(
|
83
|
+
const parsedValue = parseISO(
|
84
|
+
convertToTimeZoneInsensitiveISOString(e).split('T')[0]
|
85
|
+
);
|
65
86
|
setDisplayDate(parsedValue);
|
66
87
|
onChange(convert(parsedValue));
|
67
88
|
} else {
|
68
89
|
// e is instanceof Date[]
|
69
|
-
const parsedValue = parseISO(
|
70
|
-
|
90
|
+
const parsedValue = parseISO(
|
91
|
+
convertToTimeZoneInsensitiveISOString(e[0]).split('T')[0]
|
92
|
+
);
|
71
93
|
setDisplayDate(parsedValue);
|
72
94
|
onChange(convert(parsedValue));
|
73
95
|
}
|
74
96
|
}
|
75
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
|
+
}
|
@@ -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"
|