envoc-form 4.0.1-0 → 4.0.1-1

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.
Files changed (54) hide show
  1. package/es/DatePicker/DateOnlyDatePickerGroup.d.ts +10 -0
  2. package/es/DatePicker/DateOnlyDatePickerGroup.js +23 -0
  3. package/es/DatePicker/DatePickerGroup.d.ts +8 -0
  4. package/es/{DatePickerInput/DatePickerInput.js → DatePicker/DatePickerGroup.js} +13 -16
  5. package/es/DatePicker/DatePickerHelper.d.ts +3 -0
  6. package/es/DatePicker/DatePickerHelper.js +1 -0
  7. package/es/DatePicker/StringDatePickerGroup.d.ts +5 -0
  8. package/es/DatePicker/StringDatePickerGroup.js +19 -0
  9. package/es/Field/Field.d.ts +2 -2
  10. package/es/Field/StandAloneInput.d.ts +9 -0
  11. package/es/Field/StandAloneInput.js +49 -0
  12. package/es/Group.d.ts +1 -1
  13. package/es/Input/StringInputGroup.d.ts +1 -1
  14. package/es/TextArea/TextAreaGroup.d.ts +8 -0
  15. package/es/TextArea/TextAreaGroup.js +33 -0
  16. package/es/Validation/validators.d.ts +1 -1
  17. package/es/Validation/validators.js +1 -1
  18. package/es/index.d.ts +19 -5
  19. package/es/index.js +7 -1
  20. package/lib/DatePicker/DateOnlyDatePickerGroup.d.ts +10 -0
  21. package/lib/DatePicker/DateOnlyDatePickerGroup.js +29 -0
  22. package/lib/DatePicker/DatePickerGroup.d.ts +8 -0
  23. package/lib/{DatePickerInput/DatePickerInput.js → DatePicker/DatePickerGroup.js} +14 -17
  24. package/lib/DatePicker/DatePickerHelper.d.ts +3 -0
  25. package/lib/DatePicker/DatePickerHelper.js +2 -0
  26. package/lib/DatePicker/StringDatePickerGroup.d.ts +5 -0
  27. package/lib/DatePicker/StringDatePickerGroup.js +25 -0
  28. package/lib/Field/Field.d.ts +2 -2
  29. package/lib/Field/StandAloneInput.d.ts +9 -0
  30. package/lib/Field/StandAloneInput.js +75 -0
  31. package/lib/Group.d.ts +1 -1
  32. package/lib/Input/StringInputGroup.d.ts +1 -1
  33. package/lib/TextArea/TextAreaGroup.d.ts +8 -0
  34. package/lib/TextArea/TextAreaGroup.js +38 -0
  35. package/lib/Validation/validators.d.ts +1 -1
  36. package/lib/Validation/validators.js +1 -1
  37. package/lib/index.d.ts +19 -5
  38. package/lib/index.js +14 -3
  39. package/package.json +2 -2
  40. package/src/DatePicker/DateOnlyDatePickerGroup.tsx +24 -0
  41. package/src/{DatePickerInput/DatePickerInput.test.tsx → DatePicker/DatePicker.test.tsx} +3 -3
  42. package/src/{DatePickerInput/DatePickerInput.tsx → DatePicker/DatePickerGroup.tsx} +38 -48
  43. package/src/DatePicker/DatePickerHelper.ts +4 -0
  44. package/src/DatePicker/StringDatePickerGroup.tsx +14 -0
  45. package/src/{DatePickerInput/__snapshots__/DatePickerInput.test.tsx.snap → DatePicker/__snapshots__/DatePicker.test.tsx.snap} +0 -0
  46. package/src/Field/Field.tsx +7 -4
  47. package/src/Field/StandAloneInput.tsx +51 -0
  48. package/src/Group.tsx +1 -1
  49. package/src/Input/StringInputGroup.tsx +9 -1
  50. package/src/TextArea/TextAreaGroup.tsx +55 -0
  51. package/src/Validation/validators.ts +2 -2
  52. package/src/index.ts +40 -5
  53. package/es/DatePickerInput/DatePickerInput.d.ts +0 -14
  54. package/lib/DatePickerInput/DatePickerInput.d.ts +0 -14
@@ -0,0 +1,75 @@
1
+ "use strict";
2
+ var __assign = (this && this.__assign) || function () {
3
+ __assign = Object.assign || function(t) {
4
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
5
+ s = arguments[i];
6
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
7
+ t[p] = s[p];
8
+ }
9
+ return t;
10
+ };
11
+ return __assign.apply(this, arguments);
12
+ };
13
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
14
+ if (k2 === undefined) k2 = k;
15
+ var desc = Object.getOwnPropertyDescriptor(m, k);
16
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
17
+ desc = { enumerable: true, get: function() { return m[k]; } };
18
+ }
19
+ Object.defineProperty(o, k2, desc);
20
+ }) : (function(o, m, k, k2) {
21
+ if (k2 === undefined) k2 = k;
22
+ o[k2] = m[k];
23
+ }));
24
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
25
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
26
+ }) : function(o, v) {
27
+ o["default"] = v;
28
+ });
29
+ var __importStar = (this && this.__importStar) || function (mod) {
30
+ if (mod && mod.__esModule) return mod;
31
+ var result = {};
32
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
33
+ __setModuleDefault(result, mod);
34
+ return result;
35
+ };
36
+ var __rest = (this && this.__rest) || function (s, e) {
37
+ var t = {};
38
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
39
+ t[p] = s[p];
40
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
41
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
42
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
43
+ t[p[i]] = s[p[i]];
44
+ }
45
+ return t;
46
+ };
47
+ Object.defineProperty(exports, "__esModule", { value: true });
48
+ var jsx_runtime_1 = require("react/jsx-runtime");
49
+ var react_1 = require("react");
50
+ var uuid = __importStar(require("uuid"));
51
+ function StandAloneInput(props) {
52
+ var Component = props.Component, value = props.value, onChange = props.onChange, disabled = props.disabled, rest = __rest(props, ["Component", "value", "onChange", "disabled"]);
53
+ var handleChange = function (arg) {
54
+ if (!disabled) {
55
+ onChange(arg);
56
+ }
57
+ };
58
+ var Wrapped = Component;
59
+ var idRef = (0, react_1.useRef)(uuid.v4());
60
+ var input = {
61
+ id: idRef.current,
62
+ name: idRef.current,
63
+ value: value,
64
+ onChange: handleChange,
65
+ onBlur: function () { },
66
+ };
67
+ var meta = {
68
+ warning: undefined,
69
+ value: value,
70
+ touched: false,
71
+ initialTouched: false,
72
+ };
73
+ return (0, jsx_runtime_1.jsx)(Wrapped, __assign({}, rest, { disabled: disabled, input: input, meta: meta }));
74
+ }
75
+ exports.default = StandAloneInput;
package/lib/Group.d.ts CHANGED
@@ -6,7 +6,7 @@ export interface GroupProps extends InjectedFieldProps<any> {
6
6
  /** simple text label before the input */
7
7
  label?: string;
8
8
  /** simple helper text after the input*/
9
- helpText?: string;
9
+ helpText?: string | React.ReactNode;
10
10
  disabled?: boolean;
11
11
  }
12
12
  /** contains standard field bits like a label, helper text, error scroll target, validation message container, etc */
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  import { InputGroupProps } from './InputGroup';
3
3
  export interface StringInputGroupProps extends Omit<InputGroupProps<string | undefined>, 'onChange' | 'type' | 'value'> {
4
- type?: 'color' | 'email' | 'search' | 'tel' | 'text' | 'url';
4
+ type?: 'color' | 'email' | 'search' | 'tel' | 'text' | 'url' | 'password' | 'textarea';
5
5
  }
6
6
  declare const StringInputGroupWithRef: React.ComponentType<StringInputGroupProps>;
7
7
  export default StringInputGroupWithRef;
@@ -0,0 +1,8 @@
1
+ import React from 'react';
2
+ import { InjectedFieldProps } from '../Field/InjectedFieldProps';
3
+ import { GroupProps } from '../Group';
4
+ export interface TextAreaGroupProps extends InjectedFieldProps<string | undefined>, Omit<React.HTMLProps<HTMLTextAreaElement>, keyof InjectedFieldProps<any> | 'children' | 'className' | 'label'>, Omit<GroupProps, keyof InjectedFieldProps<any> | 'children'> {
5
+ icon?: React.ReactNode;
6
+ }
7
+ declare const TextAreaGroupWithRef: React.ComponentType<TextAreaGroupProps>;
8
+ export default TextAreaGroupWithRef;
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ var __assign = (this && this.__assign) || function () {
3
+ __assign = Object.assign || function(t) {
4
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
5
+ s = arguments[i];
6
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
7
+ t[p] = s[p];
8
+ }
9
+ return t;
10
+ };
11
+ return __assign.apply(this, arguments);
12
+ };
13
+ var __rest = (this && this.__rest) || function (s, e) {
14
+ var t = {};
15
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
16
+ t[p] = s[p];
17
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
18
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
19
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
20
+ t[p[i]] = s[p[i]];
21
+ }
22
+ return t;
23
+ };
24
+ var __importDefault = (this && this.__importDefault) || function (mod) {
25
+ return (mod && mod.__esModule) ? mod : { "default": mod };
26
+ };
27
+ Object.defineProperty(exports, "__esModule", { value: true });
28
+ var jsx_runtime_1 = require("react/jsx-runtime");
29
+ var react_1 = __importDefault(require("react"));
30
+ var classnames_1 = __importDefault(require("classnames"));
31
+ var Group_1 = __importDefault(require("../Group"));
32
+ /** generic controlled <textarea/> wrapped by a Group */
33
+ 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') }))] })));
36
+ }
37
+ var TextAreaGroupWithRef = react_1.default.forwardRef(TextAreaGroup);
38
+ exports.default = TextAreaGroupWithRef;
@@ -1,7 +1,7 @@
1
1
  import { ValidationFunction } from './ValidationFunction';
2
2
  export declare const required: (value: any) => "Required" | undefined;
3
3
  export declare const length: (len: number) => (value: string | number | undefined) => string | undefined;
4
- export declare const integer: (val: string | undefined) => "Must be a whole number" | undefined;
4
+ export declare const integer: (val: string | number | undefined) => "Must be a whole number" | undefined;
5
5
  export declare const maxLength: (len: number) => (value: string | number | undefined) => string | undefined;
6
6
  export declare const maxCount: (count: number) => (value: {
7
7
  isDeleted?: boolean;
@@ -21,7 +21,7 @@ var integer = function (val) {
21
21
  if (!val) {
22
22
  return undefined;
23
23
  }
24
- if (!Number.isInteger(parseFloat(val))) {
24
+ if (!Number.isInteger(typeof val === 'number' ? val : parseFloat(val))) {
25
25
  return 'Must be a whole number';
26
26
  }
27
27
  };
package/lib/index.d.ts CHANGED
@@ -6,13 +6,22 @@ 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 DatePickerInput } from './DatePickerInput/DatePickerInput';
10
- export type { DatePickerInputProps, DateOnly } from './DatePickerInput/DatePickerInput';
9
+ export { default as DatePickerGroup } from './DatePicker/DatePickerGroup';
10
+ export type { DatePickerGroupProps as DatePickerGroupProps } from './DatePicker/DatePickerGroup';
11
+ export type { DatePickerHelper } from './DatePicker/DatePickerHelper';
12
+ export { default as DateOnlyDatePickerGroup } from './DatePicker/DateOnlyDatePickerGroup';
13
+ export type { DateOnly, DateOnlyDatePickerGroupProps, } from './DatePicker/DateOnlyDatePickerGroup';
14
+ export { default as StringDatePickerGroup } from './DatePicker/StringDatePickerGroup';
15
+ export type { StringDatePickerGroupProps } from './DatePicker/StringDatePickerGroup';
11
16
  export { default as Field } from './Field/Field';
12
17
  export type { FieldProps } from './Field/Field';
18
+ export type { RenderComponent } from './Field/Field';
19
+ export type { RenderComponentProps } from './Field/Field';
13
20
  export { default as FieldErrorScrollTarget } from './Field/FieldErrorScrollTarget';
14
21
  export { FieldNameContext } from './Field/FieldNameContext';
15
22
  export type { InjectedFieldProps } from './Field/InjectedFieldProps';
23
+ export { default as StandAloneInput } from './Field/StandAloneInput';
24
+ export type { StandAloneInputProps } from './Field/StandAloneInput';
16
25
  export { default as useStandardField } from './Field/useStandardField';
17
26
  export type { useStandardFieldProps } from './Field/useStandardField';
18
27
  export { default as FieldArray } from './FieldArray/FieldArray';
@@ -25,6 +34,8 @@ export { ServerErrorContext } from './Form/ServerErrorContext';
25
34
  export type { ServerErrorContextProps, ServerErrors, } from './Form/ServerErrorContext';
26
35
  export { default as FormActions } from './FormActions';
27
36
  export type { FormActionsProps as FormActionsProps } from './FormActions';
37
+ export { default as StandardFormActions } from './StandardFormActions';
38
+ export type { StandardFormActionsProps as StandardFormActionsProps } from './StandardFormActions';
28
39
  export { default as Group } from './Group';
29
40
  export type { GroupProps as GroupProps } from './Group';
30
41
  export { default as IconInputGroup } from './Input/IconInputGroup';
@@ -40,13 +51,16 @@ export type { StringInputGroupProps } from './Input/StringInputGroup';
40
51
  export type { NormalizationFunction } from './Normalization/NormalizationFunction';
41
52
  export * as normalizers from './Normalization/normalizers';
42
53
  export { default as SelectGroup } from './Select/SelectGroup';
43
- export type { SelectGroupProps } from './Select/SelectGroup';
54
+ export type { SelectGroupProps, SelectOption } from './Select/SelectGroup';
44
55
  export { BooleanSelectGroup } from './Select/BooleanSelectGroup';
45
56
  export type { BooleanSelectGroupProps } from './Select/BooleanSelectGroup';
46
57
  export { MultiNumberSelectGroup, SingleNumberSelectGroup, } from './Select/NumberSelectGroup';
47
- export type { MultiNumberSelectGroupProps, SingleNumberSelectGroupProps } from './Select/NumberSelectGroup';
58
+ export type { MultiNumberSelectGroupProps, SingleNumberSelectGroupProps, } from './Select/NumberSelectGroup';
59
+ export type { SelectGroupPropsHelper } from './Select/SelectGroupPropsHelper';
48
60
  export { MultiStringSelectGroup, SingleStringSelectGroup, } from './Select/StringSelectGroup';
49
- export type { MultiStringSelectGroupProps, SingleStringSelectGroupProps } from './Select/StringSelectGroup';
61
+ export type { MultiStringSelectGroupProps, SingleStringSelectGroupProps, } from './Select/StringSelectGroup';
62
+ export { default as TextAreaGroup } from './TextArea/TextAreaGroup';
63
+ export type { TextAreaGroupProps } from './TextArea/TextAreaGroup';
50
64
  export { default as objectContainsNonSerializableProperty } from './utils/objectContainsNonSerializableProperty';
51
65
  export { default as serialize } from './utils/objectToFormData';
52
66
  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.DatePickerInput = 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.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.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,12 @@ 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 DatePickerInput_1 = require("./DatePickerInput/DatePickerInput");
47
- Object.defineProperty(exports, "DatePickerInput", { enumerable: true, get: function () { return __importDefault(DatePickerInput_1).default; } });
46
+ var DatePickerGroup_1 = require("./DatePicker/DatePickerGroup");
47
+ Object.defineProperty(exports, "DatePickerGroup", { enumerable: true, get: function () { return __importDefault(DatePickerGroup_1).default; } });
48
+ var DateOnlyDatePickerGroup_1 = require("./DatePicker/DateOnlyDatePickerGroup");
49
+ Object.defineProperty(exports, "DateOnlyDatePickerGroup", { enumerable: true, get: function () { return __importDefault(DateOnlyDatePickerGroup_1).default; } });
50
+ var StringDatePickerGroup_1 = require("./DatePicker/StringDatePickerGroup");
51
+ Object.defineProperty(exports, "StringDatePickerGroup", { enumerable: true, get: function () { return __importDefault(StringDatePickerGroup_1).default; } });
48
52
  // Field
49
53
  var Field_1 = require("./Field/Field");
50
54
  Object.defineProperty(exports, "Field", { enumerable: true, get: function () { return __importDefault(Field_1).default; } });
@@ -52,6 +56,8 @@ var FieldErrorScrollTarget_1 = require("./Field/FieldErrorScrollTarget");
52
56
  Object.defineProperty(exports, "FieldErrorScrollTarget", { enumerable: true, get: function () { return __importDefault(FieldErrorScrollTarget_1).default; } });
53
57
  var FieldNameContext_1 = require("./Field/FieldNameContext");
54
58
  Object.defineProperty(exports, "FieldNameContext", { enumerable: true, get: function () { return FieldNameContext_1.FieldNameContext; } });
59
+ var StandAloneInput_1 = require("./Field/StandAloneInput");
60
+ Object.defineProperty(exports, "StandAloneInput", { enumerable: true, get: function () { return __importDefault(StandAloneInput_1).default; } });
55
61
  var useStandardField_1 = require("./Field/useStandardField");
56
62
  Object.defineProperty(exports, "useStandardField", { enumerable: true, get: function () { return __importDefault(useStandardField_1).default; } });
57
63
  // Field Array
@@ -67,6 +73,8 @@ var ServerErrorContext_1 = require("./Form/ServerErrorContext");
67
73
  Object.defineProperty(exports, "ServerErrorContext", { enumerable: true, get: function () { return ServerErrorContext_1.ServerErrorContext; } });
68
74
  var FormActions_1 = require("./FormActions");
69
75
  Object.defineProperty(exports, "FormActions", { enumerable: true, get: function () { return __importDefault(FormActions_1).default; } });
76
+ var StandardFormActions_1 = require("./StandardFormActions");
77
+ Object.defineProperty(exports, "StandardFormActions", { enumerable: true, get: function () { return __importDefault(StandardFormActions_1).default; } });
70
78
  // Input
71
79
  var Group_1 = require("./Group");
72
80
  Object.defineProperty(exports, "Group", { enumerable: true, get: function () { return __importDefault(Group_1).default; } });
@@ -92,6 +100,9 @@ Object.defineProperty(exports, "SingleNumberSelectGroup", { enumerable: true, ge
92
100
  var StringSelectGroup_1 = require("./Select/StringSelectGroup");
93
101
  Object.defineProperty(exports, "MultiStringSelectGroup", { enumerable: true, get: function () { return StringSelectGroup_1.MultiStringSelectGroup; } });
94
102
  Object.defineProperty(exports, "SingleStringSelectGroup", { enumerable: true, get: function () { return StringSelectGroup_1.SingleStringSelectGroup; } });
103
+ // Text Area
104
+ var TextAreaGroup_1 = require("./TextArea/TextAreaGroup");
105
+ Object.defineProperty(exports, "TextAreaGroup", { enumerable: true, get: function () { return __importDefault(TextAreaGroup_1).default; } });
95
106
  // Utils
96
107
  var objectContainsNonSerializableProperty_1 = require("./utils/objectContainsNonSerializableProperty");
97
108
  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-0",
3
+ "version": "4.0.1-1",
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-0",
40
+ "envoc-request": "^4.0.1-1",
41
41
  "lru-cache": "^6.0.0",
42
42
  "prop-types": "^15.7.2",
43
43
  "react-date-picker": "^8.2.0",
@@ -0,0 +1,24 @@
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
+ }
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import { render } from '@testing-library/react';
3
- import DatePickerInput from './DatePickerInput';
3
+ import DateOnlyDatePickerGroup from './DateOnlyDatePickerGroup';
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={DatePickerInput}
16
+ Component={DateOnlyDatePickerGroup}
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={DatePickerInput}
35
+ Component={DateOnlyDatePickerGroup}
36
36
  label="Favorite Date"
37
37
  monthPlaceholder="mm"
38
38
  dayPlaceholder="dd"
@@ -1,5 +1,5 @@
1
1
  import { useState } from 'react';
2
- import DatePicker, { DatePickerProps } from 'react-date-picker';
2
+ import DatePicker, { DatePickerProps } from 'react-date-picker/dist/entry.nostyle';
3
3
  import classnames from 'classnames';
4
4
  import parseISO from 'date-fns/parseISO';
5
5
  import { InjectedFieldProps } from '../Field/InjectedFieldProps';
@@ -7,34 +7,48 @@ import Group, { GroupProps } from '../Group';
7
7
 
8
8
  // Docs for react-date-picker https://www.npmjs.com/package/react-date-picker
9
9
 
10
- // TODO: pick better home for this
11
- export interface DateOnly {
12
- year?: number;
13
- month?: number;
14
- day?: number;
10
+ export interface DatePickerGroupProps<T>
11
+ extends InjectedFieldProps<T | undefined>,
12
+ Omit<
13
+ DatePickerProps,
14
+ keyof InjectedFieldProps<T> | 'name' | 'value' | 'className'
15
+ >,
16
+ Omit<GroupProps, keyof InjectedFieldProps<T> | 'children'> {
17
+ convert: (arg: Date) => T;
15
18
  }
16
19
 
17
- type InjectedDate = InjectedFieldProps<DateOnly | undefined>;
18
-
19
- export interface DatePickerInputProps
20
- extends InjectedDate,
21
- Omit<DatePickerProps, keyof InjectedDate | 'name' | 'value' | 'className'>,
22
- Omit<GroupProps, keyof InjectedDate | 'children'> {}
23
-
24
- export default function DatePickerInput({
20
+ export default function DatePickerGroup<T>({
25
21
  input,
26
22
  meta,
27
23
  label,
28
24
  helpText,
29
25
  className,
30
26
  disabled,
27
+ convert,
31
28
  ...rest
32
- }: DatePickerInputProps) {
29
+ }: DatePickerGroupProps<T>) {
33
30
  const [displayDate, setDisplayDate] = useState<Date | null>(null);
34
31
 
35
- function handleChange(e: DatePickerProps['value'] | undefined) {
32
+ return (
33
+ <Group
34
+ input={input}
35
+ meta={meta}
36
+ label={label}
37
+ helpText={helpText}
38
+ className={classnames(className, 'date-picker')}
39
+ disabled={disabled}>
40
+ <DatePicker
41
+ {...rest}
42
+ className={classnames('date-picker', className)}
43
+ value={displayDate}
44
+ onChange={handleChange}
45
+ />
46
+ </Group>
47
+ );
48
+
49
+ function handleChange(e: Date | Date[] | string | undefined) {
36
50
  const { onChange } = input;
37
- if (onChange == null) {
51
+ if (onChange === null) {
38
52
  return;
39
53
  }
40
54
 
@@ -42,44 +56,20 @@ export default function DatePickerInput({
42
56
  onChange(undefined);
43
57
  setDisplayDate(null);
44
58
  return;
45
- }
46
-
47
- if (e instanceof Date) {
59
+ } else if (typeof e === 'string') {
60
+ const parsedValue = parseISO(e.toString().split('T')[0]);
61
+ setDisplayDate(parsedValue);
62
+ onChange(convert(parsedValue));
63
+ } else if (e instanceof Date) {
48
64
  const parsedValue = parseISO(e.toISOString().split('T')[0]);
49
-
50
65
  setDisplayDate(parsedValue);
51
- onChange({
52
- year: e.getFullYear(),
53
- month: e.getMonth() + 1,
54
- day: e.getDate(),
55
- });
66
+ onChange(convert(parsedValue));
56
67
  } else {
57
68
  // e is instanceof Date[]
58
69
  const parsedValue = parseISO(e[0].toISOString().split('T')[0]);
59
70
 
60
71
  setDisplayDate(parsedValue);
61
- onChange({
62
- year: e[0].getFullYear(),
63
- month: e[0].getMonth() + 1,
64
- day: e[0].getDate(),
65
- });
72
+ onChange(convert(parsedValue));
66
73
  }
67
74
  }
68
-
69
- return (
70
- <Group
71
- input={input}
72
- meta={meta}
73
- label={label}
74
- helpText={helpText}
75
- className={classnames(className, 'date-picker')}
76
- disabled={disabled}>
77
- <DatePicker
78
- {...rest}
79
- className={classnames('date-picker', className)}
80
- value={displayDate}
81
- onChange={handleChange}
82
- />
83
- </Group>
84
- );
85
75
  }
@@ -0,0 +1,4 @@
1
+ import { DatePickerGroupProps } from './DatePickerGroup';
2
+
3
+ export interface DatePickerHelper<T>
4
+ extends Omit<DatePickerGroupProps<T>, 'convert'> {}
@@ -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
+ }
@@ -9,13 +9,16 @@ import { ValidationFunction } from '../Validation/ValidationFunction';
9
9
  // so, we assume the actual TRenderComponent has no generic arguments
10
10
  // instead, any concrete TRenderComponent can utilize a TRenderComponent<TValue> as needed
11
11
 
12
- type RenderComponent<TValue, TRenderComponent extends ElementType> = Partial<
13
- ComponentProps<TRenderComponent>
14
- > extends Partial<InjectedFieldProps<TValue>>
12
+ export type RenderComponent<
13
+ TValue,
14
+ TRenderComponent extends ElementType
15
+ > = Partial<ComponentProps<TRenderComponent>> extends Partial<
16
+ InjectedFieldProps<TValue>
17
+ >
15
18
  ? TRenderComponent
16
19
  : never;
17
20
 
18
- type RenderComponentProps<
21
+ export type RenderComponentProps<
19
22
  TValue,
20
23
  TRenderComponent extends ElementType
21
24
  > = Partial<ComponentProps<TRenderComponent>> extends Partial<
@@ -0,0 +1,51 @@
1
+ import { ElementType, useRef } from 'react';
2
+ import * as uuid from 'uuid';
3
+ import { CustomFieldInputProps } from './CustomFieldInputProps';
4
+ import { CustomFieldMetaProps } from './CustomFieldMetaProps';
5
+ import { RenderComponent, RenderComponentProps } from './Field';
6
+ import { InjectedFieldProps } from './InjectedFieldProps';
7
+
8
+ export type StandAloneInputProps<
9
+ TValue,
10
+ TRenderComponent extends ElementType
11
+ > = {
12
+ Component: RenderComponent<TValue, TRenderComponent>;
13
+ value: TValue;
14
+ onChange: (arg: TValue) => void;
15
+ } & Omit<
16
+ RenderComponentProps<TValue, TRenderComponent>,
17
+ | keyof InjectedFieldProps<TValue>
18
+ | 'value'
19
+ | 'onChange'
20
+ | 'normalize'
21
+ | 'validate'
22
+ >;
23
+
24
+ export default function StandAloneInput<TValue, TComponent extends ElementType>(
25
+ props: StandAloneInputProps<TValue, TComponent>
26
+ ) {
27
+ const { Component, value, onChange, disabled, ...rest } = props;
28
+ const handleChange = (arg: TValue) => {
29
+ if (!disabled) {
30
+ onChange(arg);
31
+ }
32
+ };
33
+ const Wrapped = Component as React.ComponentType<InjectedFieldProps<TValue>>;
34
+ const idRef = useRef(uuid.v4());
35
+ const input: CustomFieldInputProps<TValue> = {
36
+ id: idRef.current,
37
+ name: idRef.current,
38
+ value: value,
39
+ onChange: handleChange,
40
+ onBlur: () => {},
41
+ };
42
+
43
+ const meta: CustomFieldMetaProps<TValue> = {
44
+ warning: undefined,
45
+ value: value,
46
+ touched: false,
47
+ initialTouched: false,
48
+ };
49
+
50
+ return <Wrapped {...rest} disabled={disabled} input={input} meta={meta} />;
51
+ }
package/src/Group.tsx CHANGED
@@ -11,7 +11,7 @@ export interface GroupProps extends InjectedFieldProps<any> {
11
11
  label?: string;
12
12
 
13
13
  /** simple helper text after the input*/
14
- helpText?: string;
14
+ helpText?: string | React.ReactNode;
15
15
 
16
16
  disabled?: boolean;
17
17
  }
@@ -7,7 +7,15 @@ export interface StringInputGroupProps
7
7
  InputGroupProps<string | undefined>,
8
8
  'onChange' | 'type' | 'value'
9
9
  > {
10
- type?: 'color' | 'email' | 'search' | 'tel' | 'text' | 'url';
10
+ type?:
11
+ | 'color'
12
+ | 'email'
13
+ | 'search'
14
+ | 'tel'
15
+ | 'text'
16
+ | 'url'
17
+ | 'password'
18
+ | 'textarea';
11
19
  }
12
20
 
13
21
  function StringInputGroup(
@@ -0,0 +1,55 @@
1
+ import React, { LegacyRef } from 'react';
2
+ import classNames from 'classnames';
3
+ import { InjectedFieldProps } from '../Field/InjectedFieldProps';
4
+ import Group, { GroupProps } from '../Group';
5
+
6
+ export interface TextAreaGroupProps
7
+ extends InjectedFieldProps<string | undefined>,
8
+ Omit<
9
+ React.HTMLProps<HTMLTextAreaElement>,
10
+ keyof InjectedFieldProps<any> | 'children' | 'className' | 'label'
11
+ >,
12
+ Omit<GroupProps, keyof InjectedFieldProps<any> | 'children'> {
13
+ icon?: React.ReactNode;
14
+ }
15
+
16
+ /** generic controlled <textarea/> wrapped by a Group */
17
+ function TextAreaGroup(
18
+ {
19
+ input,
20
+ meta,
21
+ label,
22
+ helpText,
23
+ className,
24
+ disabled,
25
+ icon,
26
+ ...rest
27
+ }: TextAreaGroupProps,
28
+ ref: LegacyRef<HTMLTextAreaElement>
29
+ ) {
30
+ return (
31
+ <Group
32
+ input={input}
33
+ meta={meta}
34
+ disabled={disabled}
35
+ label={label}
36
+ helpText={helpText}
37
+ className={classNames(className, 'text-area-group')}>
38
+ {icon}
39
+ <textarea
40
+ {...input}
41
+ {...rest}
42
+ value={input.value}
43
+ onChange={(val) => input.onChange(val.target.value)}
44
+ ref={ref}
45
+ className={classNames(className, 'text-area-group')}
46
+ />
47
+ </Group>
48
+ );
49
+ }
50
+
51
+ const TextAreaGroupWithRef = React.forwardRef(
52
+ TextAreaGroup
53
+ ) as React.ComponentType<TextAreaGroupProps>;
54
+
55
+ export default TextAreaGroupWithRef;