@digigov/form 0.4.6 → 0.4.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/CHANGELOG.md +28 -1
- package/Field/index.js +35 -45
- package/Fieldset/index.js +10 -14
- package/Questions/Step/index.js +1 -0
- package/es/Field/index.js +29 -41
- package/es/Fieldset/index.js +9 -14
- package/es/Questions/Step/index.js +2 -0
- package/es/index.js +2 -0
- package/es/index.mdx +0 -3
- package/es/inputs/Checkboxes/index.js +19 -51
- package/es/inputs/FileInput/index.js +8 -42
- package/es/inputs/Input/index.js +24 -18
- package/es/inputs/Label/index.js +6 -34
- package/es/inputs/Radio/index.js +24 -87
- package/es/inputs/Select/index.js +10 -31
- package/es/utils.js +1 -0
- package/es/validators.js +4 -4
- package/esm/Field/index.js +29 -41
- package/esm/Fieldset/index.js +9 -14
- package/esm/Questions/Step/index.js +2 -0
- package/esm/index.js +3 -1
- package/esm/index.mdx +0 -3
- package/esm/inputs/Checkboxes/index.js +19 -51
- package/esm/inputs/FileInput/index.js +8 -42
- package/esm/inputs/Input/index.js +24 -18
- package/esm/inputs/Label/index.js +6 -34
- package/esm/inputs/Radio/index.js +24 -87
- package/esm/inputs/Select/index.js +10 -31
- package/esm/utils.js +1 -0
- package/esm/validators.js +4 -4
- package/index.js +1 -0
- package/index.mdx +0 -3
- package/inputs/Checkboxes/index.js +19 -53
- package/inputs/FileInput/index.js +8 -45
- package/inputs/Input/index.js +25 -18
- package/inputs/Label/index.js +6 -37
- package/inputs/Radio/index.js +26 -95
- package/inputs/Select/index.js +10 -34
- package/libs/form/src/Field/index.d.ts +10 -7
- package/libs/form/src/Fieldset/index.d.ts +9 -3
- package/libs/form/src/index.d.ts +1 -0
- package/libs/form/src/inputs/Checkboxes/index.d.ts +2 -1
- package/libs/form/src/inputs/Input/index.d.ts +1 -1
- package/libs/form/src/inputs/Radio/index.d.ts +1 -11
- package/libs/form/src/validators.d.ts +4 -2
- package/libs/ui/src/core/Accordion/index.d.ts +3 -3
- package/libs/ui/src/core/Blockquote/index.d.ts +1 -1
- package/libs/ui/src/core/Button/BackButton.d.ts +1 -1
- package/libs/ui/src/core/Button/ButtonLink.d.ts +1 -1
- package/libs/ui/src/core/Button/index.d.ts +1 -1
- package/libs/ui/src/core/NavList/NavList.d.ts +1 -1
- package/libs/ui/src/core/NavList/NavListItemBase.d.ts +1 -1
- package/libs/ui/src/typography/Caption.d.ts +1 -1
- package/libs-ui/react-core/src/Accordion/index.d.ts +1 -1
- package/libs-ui/react-core/src/AccordionControls/index.d.ts +1 -1
- package/libs-ui/react-core/src/AccordionSection/index.d.ts +1 -1
- package/libs-ui/react-core/src/AccordionSectionContent/index.d.ts +1 -1
- package/libs-ui/react-core/src/AccordionSectionHeader/index.d.ts +1 -1
- package/libs-ui/react-core/src/BackLink/index.d.ts +1 -1
- package/libs-ui/react-core/src/Blockquote/index.d.ts +1 -1
- package/libs-ui/react-core/src/Button/index.d.ts +1 -1
- package/libs-ui/react-core/src/ButtonLink/index.d.ts +1 -1
- package/libs-ui/react-core/src/CallToAction/index.d.ts +1 -1
- package/libs-ui/react-core/src/Checkbox/index.d.ts +11 -0
- package/libs-ui/react-core/src/CheckboxItem/index.d.ts +19 -0
- package/libs-ui/react-core/src/Details/index.d.ts +1 -1
- package/libs-ui/react-core/src/DetailsContent/index.d.ts +1 -1
- package/libs-ui/react-core/src/DetailsSummary/index.d.ts +1 -1
- package/libs-ui/react-core/src/ErrorMessage/index.d.ts +11 -0
- package/libs-ui/react-core/src/ErrorSummary/index.d.ts +1 -1
- package/libs-ui/react-core/src/Field/index.d.ts +13 -0
- package/libs-ui/react-core/src/Fieldset/index.d.ts +10 -0
- package/libs-ui/react-core/src/FieldsetLegend/index.d.ts +19 -0
- package/libs-ui/react-core/src/FileUpload/index.d.ts +14 -0
- package/libs-ui/react-core/src/Heading/index.d.ts +1 -1
- package/libs-ui/react-core/src/HeadingCaption/index.d.ts +1 -1
- package/libs-ui/react-core/src/Hint/index.d.ts +9 -0
- package/libs-ui/react-core/src/Label/index.d.ts +9 -0
- package/libs-ui/react-core/src/LabelTitle/index.d.ts +19 -0
- package/libs-ui/react-core/src/List/index.d.ts +1 -1
- package/libs-ui/react-core/src/ListItem/index.d.ts +1 -1
- package/libs-ui/react-core/src/NormalText/index.d.ts +1 -1
- package/libs-ui/react-core/src/NotificationBanner/index.d.ts +1 -1
- package/libs-ui/react-core/src/NotificationBannerContent/index.d.ts +1 -1
- package/libs-ui/react-core/src/NotificationBannerHeader/index.d.ts +1 -1
- package/libs-ui/react-core/src/NotificationBannerHeading/index.d.ts +1 -1
- package/libs-ui/react-core/src/Paragraph/index.d.ts +1 -1
- package/libs-ui/react-core/src/PhaseBanner/index.d.ts +1 -1
- package/libs-ui/react-core/src/PhaseBannerTag/index.d.ts +1 -1
- package/libs-ui/react-core/src/Radio/index.d.ts +10 -0
- package/libs-ui/react-core/src/RadioItem/index.d.ts +18 -0
- package/libs-ui/react-core/src/SectionBreak/index.d.ts +1 -1
- package/libs-ui/react-core/src/Select/index.d.ts +14 -0
- package/libs-ui/react-core/src/SelectOption/index.d.ts +18 -0
- package/libs-ui/react-core/src/SummaryList/index.d.ts +1 -1
- package/libs-ui/react-core/src/SummaryListItem/index.d.ts +1 -1
- package/libs-ui/react-core/src/SummaryListItemAction/index.d.ts +1 -1
- package/libs-ui/react-core/src/SummaryListItemKey/index.d.ts +1 -1
- package/libs-ui/react-core/src/SummaryListItemValue/index.d.ts +1 -1
- package/libs-ui/react-core/src/Tabs/index.d.ts +1 -1
- package/libs-ui/react-core/src/TabsHeading/index.d.ts +1 -1
- package/libs-ui/react-core/src/TabsList/index.d.ts +1 -1
- package/libs-ui/react-core/src/TabsListItem/index.d.ts +1 -1
- package/libs-ui/react-core/src/TabsPanel/index.d.ts +1 -1
- package/libs-ui/react-core/src/TextArea/index.d.ts +23 -0
- package/libs-ui/react-core/src/TextInput/index.d.ts +28 -0
- package/libs-ui/react-core/src/WarningText/index.d.ts +1 -1
- package/package.json +2 -2
- package/utils.js +1 -0
- package/validators.js +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,33 @@
|
|
|
1
1
|
# Change Log - @digigov/form
|
|
2
2
|
|
|
3
|
-
This log was last generated on Thu,
|
|
3
|
+
This log was last generated on Thu, 10 Feb 2022 13:45:56 GMT and should not be manually modified.
|
|
4
|
+
|
|
5
|
+
## 0.4.10
|
|
6
|
+
Thu, 10 Feb 2022 13:45:56 GMT
|
|
7
|
+
|
|
8
|
+
### Patches
|
|
9
|
+
|
|
10
|
+
- pin down dependency versions
|
|
11
|
+
|
|
12
|
+
## 0.4.9
|
|
13
|
+
Tue, 08 Feb 2022 15:21:11 GMT
|
|
14
|
+
|
|
15
|
+
### Patches
|
|
16
|
+
|
|
17
|
+
- fix linting errors in @digigov/form
|
|
18
|
+
|
|
19
|
+
## 0.4.8
|
|
20
|
+
Thu, 03 Feb 2022 15:47:05 GMT
|
|
21
|
+
|
|
22
|
+
_Version update only_
|
|
23
|
+
|
|
24
|
+
## 0.4.7
|
|
25
|
+
Wed, 02 Feb 2022 15:44:29 GMT
|
|
26
|
+
|
|
27
|
+
### Patches
|
|
28
|
+
|
|
29
|
+
- Integrate @digigov/react-core components to @digigov/form
|
|
30
|
+
- fix package.json inconsistencies by running cli-lab verify-and-update-local-package-versions
|
|
4
31
|
|
|
5
32
|
## 0.4.6
|
|
6
33
|
Thu, 20 Jan 2022 10:45:21 GMT
|
package/Field/index.js
CHANGED
|
@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
|
|
|
7
7
|
Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
value: true
|
|
9
9
|
});
|
|
10
|
-
exports
|
|
10
|
+
exports["default"] = exports.FieldBase = exports.Field = void 0;
|
|
11
11
|
|
|
12
12
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
13
13
|
|
|
@@ -21,9 +21,17 @@ var _reactHookForm = require("react-hook-form");
|
|
|
21
21
|
|
|
22
22
|
var _form = require("@digigov/form");
|
|
23
23
|
|
|
24
|
-
var
|
|
24
|
+
var _Field = _interopRequireDefault(require("@digigov/react-core/Field"));
|
|
25
25
|
|
|
26
|
-
var
|
|
26
|
+
var _Label = _interopRequireDefault(require("@digigov/react-core/Label"));
|
|
27
|
+
|
|
28
|
+
var _Fieldset = _interopRequireDefault(require("@digigov/react-core/Fieldset"));
|
|
29
|
+
|
|
30
|
+
var _Hint = _interopRequireDefault(require("@digigov/react-core/Hint"));
|
|
31
|
+
|
|
32
|
+
var _FieldsetLegend = _interopRequireDefault(require("@digigov/react-core/FieldsetLegend"));
|
|
33
|
+
|
|
34
|
+
var _ErrorMessage = _interopRequireDefault(require("@digigov/react-core/ErrorMessage"));
|
|
27
35
|
|
|
28
36
|
var _Input = _interopRequireDefault(require("@digigov/form/inputs/Input"));
|
|
29
37
|
|
|
@@ -35,9 +43,7 @@ var _Select = _interopRequireDefault(require("@digigov/form/inputs/Select"));
|
|
|
35
43
|
|
|
36
44
|
var _FileInput = _interopRequireDefault(require("@digigov/form/inputs/FileInput"));
|
|
37
45
|
|
|
38
|
-
var
|
|
39
|
-
|
|
40
|
-
var _NormalText = _interopRequireDefault(require("@digigov/ui/typography/NormalText"));
|
|
46
|
+
var _Label2 = _interopRequireDefault(require("@digigov/form/inputs/Label"));
|
|
41
47
|
|
|
42
48
|
var _i18n = require("@digigov/ui/app/i18n");
|
|
43
49
|
|
|
@@ -58,10 +64,12 @@ var FIELD_COMPONENTS = {
|
|
|
58
64
|
component: _FileInput["default"]
|
|
59
65
|
},
|
|
60
66
|
'choice:multiple': {
|
|
67
|
+
wrapper: 'fieldset',
|
|
61
68
|
controlled: true,
|
|
62
69
|
component: _Checkboxes["default"]
|
|
63
70
|
},
|
|
64
71
|
'choice:single': {
|
|
72
|
+
wrapper: 'fieldset',
|
|
65
73
|
controlled: false,
|
|
66
74
|
component: _Radio["default"]
|
|
67
75
|
}
|
|
@@ -72,57 +80,35 @@ var ALTERNATIVE_COMPONENTS = {
|
|
|
72
80
|
controlled: false
|
|
73
81
|
}
|
|
74
82
|
};
|
|
75
|
-
var useFieldContainerStyles = (0, _styles.makeStyles)(function (theme) {
|
|
76
|
-
return {
|
|
77
|
-
fieldContainer: {
|
|
78
|
-
marginBottom: theme.spacing(2)
|
|
79
|
-
},
|
|
80
|
-
fieldLabel: {
|
|
81
|
-
fontWeight: 500
|
|
82
|
-
},
|
|
83
|
-
hint: {
|
|
84
|
-
color: theme.palette.grey['700']
|
|
85
|
-
},
|
|
86
|
-
errorContainer: {
|
|
87
|
-
borderLeft: "".concat(theme.spacing(0.5), "px solid ").concat(theme.palette.error.main, " "),
|
|
88
|
-
paddingLeft: theme.spacing(2)
|
|
89
|
-
},
|
|
90
|
-
error: {
|
|
91
|
-
color: theme.palette.error.main,
|
|
92
|
-
fontWeight: 'bolder',
|
|
93
|
-
margin: theme.spacing(2, 0)
|
|
94
|
-
}
|
|
95
|
-
};
|
|
96
|
-
});
|
|
97
|
-
exports.useFieldContainerStyles = useFieldContainerStyles;
|
|
98
83
|
|
|
99
84
|
var FieldContainer = function FieldContainer(_ref) {
|
|
100
|
-
var
|
|
85
|
+
var wrapper = _ref.wrapper,
|
|
101
86
|
label = _ref.label,
|
|
102
87
|
children = _ref.children,
|
|
103
88
|
error = _ref.error;
|
|
104
|
-
var classes = useFieldContainerStyles();
|
|
105
89
|
|
|
106
90
|
var _useTranslation = (0, _i18n.useTranslation)(),
|
|
107
91
|
t = _useTranslation.t;
|
|
108
92
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
93
|
+
if (wrapper === 'fieldset') {
|
|
94
|
+
return /*#__PURE__*/_react["default"].createElement(_Field["default"], {
|
|
95
|
+
error: !!error
|
|
96
|
+
}, /*#__PURE__*/_react["default"].createElement(_Fieldset["default"], null, /*#__PURE__*/_react["default"].createElement(_FieldsetLegend["default"], {
|
|
97
|
+
size: "s"
|
|
98
|
+
}, label && label.primary, label && label.secondary && /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, t(label.secondary)), error && /*#__PURE__*/_react["default"].createElement(_ErrorMessage["default"], null, t((error === null || error === void 0 ? void 0 : error.message) || '')))), children);
|
|
99
|
+
} else {
|
|
100
|
+
return /*#__PURE__*/_react["default"].createElement(_Field["default"], {
|
|
101
|
+
error: !!error
|
|
102
|
+
}, /*#__PURE__*/_react["default"].createElement(_Label["default"], null, label && /*#__PURE__*/_react["default"].createElement(_Label2["default"], {
|
|
103
|
+
label: label
|
|
104
|
+
}), error && /*#__PURE__*/_react["default"].createElement(_ErrorMessage["default"], null, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
|
|
105
|
+
}
|
|
121
106
|
};
|
|
122
107
|
|
|
123
108
|
var FieldBase = function FieldBase(props) {
|
|
124
109
|
var name = props.name,
|
|
125
110
|
Component = props.component,
|
|
111
|
+
wrapper = props.wrapper,
|
|
126
112
|
control = props.control,
|
|
127
113
|
type = props.type,
|
|
128
114
|
_props$controlled = props.controlled,
|
|
@@ -146,7 +132,8 @@ var FieldBase = function FieldBase(props) {
|
|
|
146
132
|
return /*#__PURE__*/_react["default"].createElement(FieldContainer, {
|
|
147
133
|
label: label,
|
|
148
134
|
layout: layout,
|
|
149
|
-
error: error
|
|
135
|
+
error: error,
|
|
136
|
+
wrapper: wrapper
|
|
150
137
|
}, /*#__PURE__*/_react["default"].createElement(_reactHookForm.Controller, {
|
|
151
138
|
control: control,
|
|
152
139
|
name: name,
|
|
@@ -172,7 +159,8 @@ var FieldBase = function FieldBase(props) {
|
|
|
172
159
|
return /*#__PURE__*/_react["default"].createElement(FieldContainer, {
|
|
173
160
|
label: label,
|
|
174
161
|
layout: layout,
|
|
175
|
-
error: error
|
|
162
|
+
error: error,
|
|
163
|
+
wrapper: wrapper
|
|
176
164
|
}, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/_react["default"].createElement(Component, {
|
|
177
165
|
name: name,
|
|
178
166
|
ref: register,
|
|
@@ -237,6 +225,7 @@ function calculateField(children, field) {
|
|
|
237
225
|
var _FIELD_COMPONENTS$fie;
|
|
238
226
|
|
|
239
227
|
calculatedField.component = FIELD_COMPONENTS[field.type].component;
|
|
228
|
+
calculatedField.wrapper = FIELD_COMPONENTS[field.type].wrapper;
|
|
240
229
|
calculatedField.controlled = ((_FIELD_COMPONENTS$fie = FIELD_COMPONENTS[field.type]) === null || _FIELD_COMPONENTS$fie === void 0 ? void 0 : _FIELD_COMPONENTS$fie.controlled) || false;
|
|
241
230
|
} else {
|
|
242
231
|
var _FIELD_COMPONENTS$str2;
|
|
@@ -245,6 +234,7 @@ function calculateField(children, field) {
|
|
|
245
234
|
calculatedField.controlled = ((_FIELD_COMPONENTS$str2 = FIELD_COMPONENTS.string) === null || _FIELD_COMPONENTS$str2 === void 0 ? void 0 : _FIELD_COMPONENTS$str2.controlled) || false;
|
|
246
235
|
}
|
|
247
236
|
|
|
237
|
+
calculatedField.wrapper = calculatedField.wrapper || 'label';
|
|
248
238
|
return calculatedField;
|
|
249
239
|
}
|
|
250
240
|
|
package/Fieldset/index.js
CHANGED
|
@@ -13,9 +13,11 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
13
13
|
|
|
14
14
|
var _Grid = _interopRequireDefault(require("@material-ui/core/Grid"));
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _Fieldset = _interopRequireDefault(require("@digigov/react-core/Fieldset"));
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _FieldsetLegend = _interopRequireDefault(require("@digigov/react-core/FieldsetLegend"));
|
|
19
|
+
|
|
20
|
+
var _Hint = _interopRequireDefault(require("@digigov/react-core/Hint"));
|
|
19
21
|
|
|
20
22
|
var _form = require("@digigov/form");
|
|
21
23
|
|
|
@@ -31,20 +33,17 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
31
33
|
|
|
32
34
|
var FieldsetLabel = function FieldsetLabel(_ref) {
|
|
33
35
|
var children = _ref.children;
|
|
34
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
},
|
|
36
|
+
return /*#__PURE__*/_react["default"].createElement(_FieldsetLegend["default"], {
|
|
37
|
+
heading: true,
|
|
38
|
+
size: "xl"
|
|
39
|
+
}, children);
|
|
38
40
|
};
|
|
39
41
|
|
|
40
42
|
exports.FieldsetLabel = FieldsetLabel;
|
|
41
43
|
|
|
42
44
|
var FieldsetCaption = function FieldsetCaption(_ref2) {
|
|
43
45
|
var children = _ref2.children;
|
|
44
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
45
|
-
item: true,
|
|
46
|
-
xs: 12
|
|
47
|
-
}, /*#__PURE__*/_react["default"].createElement(_Caption["default"], null, children));
|
|
46
|
+
return /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, children);
|
|
48
47
|
};
|
|
49
48
|
|
|
50
49
|
exports.FieldsetCaption = FieldsetCaption;
|
|
@@ -108,10 +107,7 @@ var Fieldset = function Fieldset(_ref6) {
|
|
|
108
107
|
});
|
|
109
108
|
}
|
|
110
109
|
|
|
111
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
112
|
-
container: true,
|
|
113
|
-
spacing: 1
|
|
114
|
-
}, children);
|
|
110
|
+
return /*#__PURE__*/_react["default"].createElement(_Fieldset["default"], null, children);
|
|
115
111
|
};
|
|
116
112
|
|
|
117
113
|
exports.Fieldset = Fieldset;
|
package/Questions/Step/index.js
CHANGED
|
@@ -111,6 +111,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
111
111
|
|
|
112
112
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
113
113
|
|
|
114
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
114
115
|
var StepContext = /*#__PURE__*/(0, _react.createContext)({
|
|
115
116
|
name: '',
|
|
116
117
|
fields: [],
|
package/es/Field/index.js
CHANGED
|
@@ -5,15 +5,18 @@ import React, { useContext, useMemo } from 'react';
|
|
|
5
5
|
import { ConditionalField } from '@digigov/form/Field/ConditionalField';
|
|
6
6
|
import { Controller } from 'react-hook-form';
|
|
7
7
|
import { FormContext } from '@digigov/form';
|
|
8
|
-
import
|
|
9
|
-
import
|
|
8
|
+
import CoreField from '@digigov/react-core/Field';
|
|
9
|
+
import CoreLabel from '@digigov/react-core/Label';
|
|
10
|
+
import CoreFieldset from '@digigov/react-core/Fieldset';
|
|
11
|
+
import Hint from '@digigov/react-core/Hint';
|
|
12
|
+
import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
|
|
13
|
+
import ErrorMessage from '@digigov/react-core/ErrorMessage';
|
|
10
14
|
import Input from '@digigov/form/inputs/Input';
|
|
11
15
|
import Checkboxes from '@digigov/form/inputs/Checkboxes';
|
|
12
16
|
import Radio from '@digigov/form/inputs/Radio';
|
|
13
17
|
import Select from '@digigov/form/inputs/Select';
|
|
14
18
|
import FileInput from '@digigov/form/inputs/FileInput';
|
|
15
19
|
import Label from '@digigov/form/inputs/Label';
|
|
16
|
-
import NormalText from '@digigov/ui/typography/NormalText';
|
|
17
20
|
import { useTranslation } from '@digigov/ui/app/i18n';
|
|
18
21
|
var FIELD_COMPONENTS = {
|
|
19
22
|
text: {
|
|
@@ -26,10 +29,12 @@ var FIELD_COMPONENTS = {
|
|
|
26
29
|
component: FileInput
|
|
27
30
|
},
|
|
28
31
|
'choice:multiple': {
|
|
32
|
+
wrapper: 'fieldset',
|
|
29
33
|
controlled: true,
|
|
30
34
|
component: Checkboxes
|
|
31
35
|
},
|
|
32
36
|
'choice:single': {
|
|
37
|
+
wrapper: 'fieldset',
|
|
33
38
|
controlled: false,
|
|
34
39
|
component: Radio
|
|
35
40
|
}
|
|
@@ -40,56 +45,35 @@ var ALTERNATIVE_COMPONENTS = {
|
|
|
40
45
|
controlled: false
|
|
41
46
|
}
|
|
42
47
|
};
|
|
43
|
-
export var useFieldContainerStyles = makeStyles(function (theme) {
|
|
44
|
-
return {
|
|
45
|
-
fieldContainer: {
|
|
46
|
-
marginBottom: theme.spacing(2)
|
|
47
|
-
},
|
|
48
|
-
fieldLabel: {
|
|
49
|
-
fontWeight: 500
|
|
50
|
-
},
|
|
51
|
-
hint: {
|
|
52
|
-
color: theme.palette.grey['700']
|
|
53
|
-
},
|
|
54
|
-
errorContainer: {
|
|
55
|
-
borderLeft: "".concat(theme.spacing(0.5), "px solid ").concat(theme.palette.error.main, " "),
|
|
56
|
-
paddingLeft: theme.spacing(2)
|
|
57
|
-
},
|
|
58
|
-
error: {
|
|
59
|
-
color: theme.palette.error.main,
|
|
60
|
-
fontWeight: 'bolder',
|
|
61
|
-
margin: theme.spacing(2, 0)
|
|
62
|
-
}
|
|
63
|
-
};
|
|
64
|
-
});
|
|
65
48
|
|
|
66
49
|
var FieldContainer = function FieldContainer(_ref) {
|
|
67
|
-
var
|
|
50
|
+
var wrapper = _ref.wrapper,
|
|
68
51
|
label = _ref.label,
|
|
69
52
|
children = _ref.children,
|
|
70
53
|
error = _ref.error;
|
|
71
|
-
var classes = useFieldContainerStyles();
|
|
72
54
|
|
|
73
55
|
var _useTranslation = useTranslation(),
|
|
74
56
|
t = _useTranslation.t;
|
|
75
57
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
58
|
+
if (wrapper === 'fieldset') {
|
|
59
|
+
return /*#__PURE__*/React.createElement(CoreField, {
|
|
60
|
+
error: !!error
|
|
61
|
+
}, /*#__PURE__*/React.createElement(CoreFieldset, null, /*#__PURE__*/React.createElement(FieldsetLegend, {
|
|
62
|
+
size: "s"
|
|
63
|
+
}, label && label.primary, label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)), error && /*#__PURE__*/React.createElement(ErrorMessage, null, t((error === null || error === void 0 ? void 0 : error.message) || '')))), children);
|
|
64
|
+
} else {
|
|
65
|
+
return /*#__PURE__*/React.createElement(CoreField, {
|
|
66
|
+
error: !!error
|
|
67
|
+
}, /*#__PURE__*/React.createElement(CoreLabel, null, label && /*#__PURE__*/React.createElement(Label, {
|
|
68
|
+
label: label
|
|
69
|
+
}), error && /*#__PURE__*/React.createElement(ErrorMessage, null, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
|
|
70
|
+
}
|
|
88
71
|
};
|
|
89
72
|
|
|
90
73
|
export var FieldBase = function FieldBase(props) {
|
|
91
74
|
var name = props.name,
|
|
92
75
|
Component = props.component,
|
|
76
|
+
wrapper = props.wrapper,
|
|
93
77
|
control = props.control,
|
|
94
78
|
type = props.type,
|
|
95
79
|
_props$controlled = props.controlled,
|
|
@@ -113,7 +97,8 @@ export var FieldBase = function FieldBase(props) {
|
|
|
113
97
|
return /*#__PURE__*/React.createElement(FieldContainer, {
|
|
114
98
|
label: label,
|
|
115
99
|
layout: layout,
|
|
116
|
-
error: error
|
|
100
|
+
error: error,
|
|
101
|
+
wrapper: wrapper
|
|
117
102
|
}, /*#__PURE__*/React.createElement(Controller, {
|
|
118
103
|
control: control,
|
|
119
104
|
name: name,
|
|
@@ -139,7 +124,8 @@ export var FieldBase = function FieldBase(props) {
|
|
|
139
124
|
return /*#__PURE__*/React.createElement(FieldContainer, {
|
|
140
125
|
label: label,
|
|
141
126
|
layout: layout,
|
|
142
|
-
error: error
|
|
127
|
+
error: error,
|
|
128
|
+
wrapper: wrapper
|
|
143
129
|
}, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, {
|
|
144
130
|
name: name,
|
|
145
131
|
ref: register,
|
|
@@ -202,6 +188,7 @@ function calculateField(children, field) {
|
|
|
202
188
|
var _FIELD_COMPONENTS$fie;
|
|
203
189
|
|
|
204
190
|
calculatedField.component = FIELD_COMPONENTS[field.type].component;
|
|
191
|
+
calculatedField.wrapper = FIELD_COMPONENTS[field.type].wrapper;
|
|
205
192
|
calculatedField.controlled = ((_FIELD_COMPONENTS$fie = FIELD_COMPONENTS[field.type]) === null || _FIELD_COMPONENTS$fie === void 0 ? void 0 : _FIELD_COMPONENTS$fie.controlled) || false;
|
|
206
193
|
} else {
|
|
207
194
|
var _FIELD_COMPONENTS$str2;
|
|
@@ -210,6 +197,7 @@ function calculateField(children, field) {
|
|
|
210
197
|
calculatedField.controlled = ((_FIELD_COMPONENTS$str2 = FIELD_COMPONENTS.string) === null || _FIELD_COMPONENTS$str2 === void 0 ? void 0 : _FIELD_COMPONENTS$str2.controlled) || false;
|
|
211
198
|
}
|
|
212
199
|
|
|
200
|
+
calculatedField.wrapper = calculatedField.wrapper || 'label';
|
|
213
201
|
return calculatedField;
|
|
214
202
|
}
|
|
215
203
|
|
package/es/Fieldset/index.js
CHANGED
|
@@ -1,24 +1,22 @@
|
|
|
1
1
|
import React, { useContext, useMemo } from 'react';
|
|
2
2
|
import Grid from '@material-ui/core/Grid';
|
|
3
|
-
import
|
|
4
|
-
import
|
|
3
|
+
import CoreFieldset from '@digigov/react-core/Fieldset';
|
|
4
|
+
import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
|
|
5
|
+
import Hint from '@digigov/react-core/Hint';
|
|
5
6
|
import { FormContext } from '@digigov/form';
|
|
6
7
|
import Field from '@digigov/form/Field';
|
|
7
8
|
import NormalText from '@digigov/ui/typography/NormalText';
|
|
8
9
|
import { useTranslation } from '@digigov/ui/app/i18n';
|
|
9
10
|
export var FieldsetLabel = function FieldsetLabel(_ref) {
|
|
10
11
|
var children = _ref.children;
|
|
11
|
-
return /*#__PURE__*/React.createElement(
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
},
|
|
12
|
+
return /*#__PURE__*/React.createElement(FieldsetLegend, {
|
|
13
|
+
heading: true,
|
|
14
|
+
size: "xl"
|
|
15
|
+
}, children);
|
|
15
16
|
};
|
|
16
17
|
export var FieldsetCaption = function FieldsetCaption(_ref2) {
|
|
17
18
|
var children = _ref2.children;
|
|
18
|
-
return /*#__PURE__*/React.createElement(
|
|
19
|
-
item: true,
|
|
20
|
-
xs: 12
|
|
21
|
-
}, /*#__PURE__*/React.createElement(Caption, null, children));
|
|
19
|
+
return /*#__PURE__*/React.createElement(Hint, null, children);
|
|
22
20
|
};
|
|
23
21
|
export var FieldsetBody = function FieldsetBody(_ref3) {
|
|
24
22
|
var children = _ref3.children;
|
|
@@ -74,9 +72,6 @@ export var Fieldset = function Fieldset(_ref6) {
|
|
|
74
72
|
});
|
|
75
73
|
}
|
|
76
74
|
|
|
77
|
-
return /*#__PURE__*/React.createElement(
|
|
78
|
-
container: true,
|
|
79
|
-
spacing: 1
|
|
80
|
-
}, children);
|
|
75
|
+
return /*#__PURE__*/React.createElement(CoreFieldset, null, children);
|
|
81
76
|
};
|
|
82
77
|
export default Fieldset;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
2
|
import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
|
|
3
3
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
4
|
+
|
|
5
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
4
6
|
import React, { createContext, useContext, useState } from 'react';
|
|
5
7
|
import { QuestionsContext } from '@digigov/form/Questions/';
|
|
6
8
|
import PageTitle, { PageTitleHeading } from '@digigov/ui/app/PageTitle';
|
package/es/index.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
import _extends from "@babel/runtime/helpers/extends";
|
|
3
3
|
import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
|
|
4
|
+
|
|
5
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
4
6
|
import React, { createContext, useCallback, useRef } from 'react';
|
|
5
7
|
import { useForm } from 'react-hook-form';
|
|
6
8
|
import { yupResolver } from '@digigov/form/utils';
|
package/es/index.mdx
CHANGED
|
@@ -3,10 +3,7 @@ title: Form
|
|
|
3
3
|
parent: docs/ui/components
|
|
4
4
|
---
|
|
5
5
|
|
|
6
|
-
import { useState, useEffect } from 'react';
|
|
7
6
|
import FormBuilder from '@digigov/form/';
|
|
8
|
-
import PropsDoc from '@docs-components/propsDoc';
|
|
9
|
-
import StylesDoc from '@docs-components/stylesDoc';
|
|
10
7
|
|
|
11
8
|
export const fields = [
|
|
12
9
|
{
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import
|
|
6
|
-
import
|
|
7
|
-
import FormControlLabel from '@material-ui/core/FormControlLabel';
|
|
8
|
-
import Label from '@digigov/form/inputs/Label';
|
|
3
|
+
import { useTranslation } from '@digigov/ui/app/i18n';
|
|
4
|
+
import CoreCheckboxes from '@digigov/react-core/Checkbox';
|
|
5
|
+
import CheckboxItem from '@digigov/react-core/CheckboxItem';
|
|
6
|
+
import Hint from '@digigov/react-core/Hint';
|
|
9
7
|
|
|
10
8
|
var Checkboxes = function Checkboxes(_ref) {
|
|
11
9
|
var name = _ref.name,
|
|
@@ -22,8 +20,12 @@ var Checkboxes = function Checkboxes(_ref) {
|
|
|
22
20
|
var newValue;
|
|
23
21
|
|
|
24
22
|
if (evt.currentTarget.checked) {
|
|
23
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
24
|
+
// @ts-ignore
|
|
25
25
|
newValue = value.concat([optionValue]);
|
|
26
26
|
} else {
|
|
27
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
28
|
+
// @ts-ignore
|
|
27
29
|
newValue = value.filter(function (val) {
|
|
28
30
|
return val !== optionValue;
|
|
29
31
|
});
|
|
@@ -33,56 +35,22 @@ var Checkboxes = function Checkboxes(_ref) {
|
|
|
33
35
|
};
|
|
34
36
|
};
|
|
35
37
|
|
|
36
|
-
|
|
37
|
-
|
|
38
|
+
var _useTranslation = useTranslation(),
|
|
39
|
+
t = _useTranslation.t;
|
|
40
|
+
|
|
41
|
+
return /*#__PURE__*/React.createElement(CoreCheckboxes, {
|
|
38
42
|
className: className
|
|
39
43
|
}, options.map(function (option, key) {
|
|
40
|
-
return /*#__PURE__*/React.createElement(
|
|
44
|
+
return /*#__PURE__*/React.createElement(CheckboxItem, _extends({
|
|
45
|
+
name: name,
|
|
41
46
|
disabled: disabled,
|
|
42
|
-
key: key
|
|
47
|
+
key: key // eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
48
|
+
// @ts-ignore
|
|
49
|
+
,
|
|
43
50
|
checked: value.includes(option.value),
|
|
44
|
-
onChange: handleChange
|
|
45
|
-
}, option));
|
|
51
|
+
onChange: handleChange(option.value)
|
|
52
|
+
}, option), option.label && option.label.primary && t(option.label.primary) || value, option.label && option.label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(option.label.secondary)));
|
|
46
53
|
}));
|
|
47
54
|
};
|
|
48
55
|
|
|
49
|
-
var useCheckboxStyles = makeStyles(function (theme) {
|
|
50
|
-
return {
|
|
51
|
-
formControlLabelActive: {
|
|
52
|
-
backgroundColor: theme.palette.grey['200'],
|
|
53
|
-
border: "2px solid ".concat(theme.palette.primary.main)
|
|
54
|
-
},
|
|
55
|
-
formControlLabel: {
|
|
56
|
-
fontWeight: 'bolder',
|
|
57
|
-
padding: theme.spacing(0.5),
|
|
58
|
-
margin: theme.spacing(0.5, 0)
|
|
59
|
-
}
|
|
60
|
-
};
|
|
61
|
-
});
|
|
62
|
-
|
|
63
|
-
var Checkbox = function Checkbox(_ref2) {
|
|
64
|
-
var className = _ref2.className,
|
|
65
|
-
checked = _ref2.checked,
|
|
66
|
-
value = _ref2.value,
|
|
67
|
-
label = _ref2.label,
|
|
68
|
-
onChange = _ref2.onChange,
|
|
69
|
-
disabled = _ref2.disabled;
|
|
70
|
-
var classes = useCheckboxStyles();
|
|
71
|
-
return /*#__PURE__*/React.createElement(FormControlLabel, {
|
|
72
|
-
key: value,
|
|
73
|
-
className: clsx(classes.formControlLabel, checked && classes.formControlLabelActive, className),
|
|
74
|
-
control: /*#__PURE__*/React.createElement(MuiCheckbox, {
|
|
75
|
-
checked: checked,
|
|
76
|
-
disabled: disabled,
|
|
77
|
-
color: "primary",
|
|
78
|
-
onChange: onChange(value),
|
|
79
|
-
name: value
|
|
80
|
-
}),
|
|
81
|
-
label: /*#__PURE__*/React.createElement(Label, {
|
|
82
|
-
label: label,
|
|
83
|
-
value: value
|
|
84
|
-
})
|
|
85
|
-
});
|
|
86
|
-
};
|
|
87
|
-
|
|
88
56
|
export default Checkboxes;
|
|
@@ -1,35 +1,13 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
2
|
import React, { useState } from 'react';
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
import Button from '@digigov/ui/core/Button';
|
|
7
|
-
var useStyles = makeStyles(function (theme) {
|
|
8
|
-
return {
|
|
9
|
-
root: {
|
|
10
|
-
'& > *': {
|
|
11
|
-
margin: theme.spacing(1)
|
|
12
|
-
}
|
|
13
|
-
},
|
|
14
|
-
input: {
|
|
15
|
-
display: 'none'
|
|
16
|
-
},
|
|
17
|
-
button: {
|
|
18
|
-
margin: 0
|
|
19
|
-
},
|
|
20
|
-
text: {
|
|
21
|
-
marginLeft: theme.spacing(2),
|
|
22
|
-
position: 'relative',
|
|
23
|
-
top: theme.spacing(0.5)
|
|
24
|
-
}
|
|
25
|
-
};
|
|
26
|
-
});
|
|
3
|
+
import NormalText from '@digigov/react-core/NormalText';
|
|
4
|
+
import FileUpload from '@digigov/react-core/FileUpload';
|
|
5
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
27
6
|
var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
|
|
28
7
|
var name = _ref.name,
|
|
29
8
|
_ref$extra = _ref.extra,
|
|
30
9
|
extra = _ref$extra === void 0 ? {} : _ref$extra,
|
|
31
10
|
disabled = _ref.disabled;
|
|
32
|
-
var classes = useStyles();
|
|
33
11
|
|
|
34
12
|
var _useState = useState([]),
|
|
35
13
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -38,16 +16,13 @@ var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
|
|
|
38
16
|
|
|
39
17
|
var filesLabel = extra.multiple ? 'αρχεία' : 'αρχείο';
|
|
40
18
|
return /*#__PURE__*/React.createElement("div", {
|
|
41
|
-
className:
|
|
42
|
-
}, /*#__PURE__*/React.createElement(
|
|
19
|
+
className: extra.className
|
|
20
|
+
}, /*#__PURE__*/React.createElement(FileUpload, {
|
|
21
|
+
ref: ref,
|
|
43
22
|
name: name,
|
|
44
23
|
id: name,
|
|
45
24
|
disabled: disabled,
|
|
46
25
|
type: 'file',
|
|
47
|
-
inputProps: {
|
|
48
|
-
multiple: extra.multiple,
|
|
49
|
-
accept: extra.accept
|
|
50
|
-
},
|
|
51
26
|
onChange: function onChange(e) {
|
|
52
27
|
var target = e.target;
|
|
53
28
|
var selectedFiles = Array.from(target.files).map(function (_ref2) {
|
|
@@ -55,16 +30,7 @@ var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
|
|
|
55
30
|
return name;
|
|
56
31
|
});
|
|
57
32
|
setFiles(selectedFiles);
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
inputRef: ref
|
|
61
|
-
}), /*#__PURE__*/React.createElement("label", {
|
|
62
|
-
htmlFor: name
|
|
63
|
-
}, /*#__PURE__*/React.createElement(Button, {
|
|
64
|
-
color: "secondary",
|
|
65
|
-
className: classes.button
|
|
66
|
-
}, "\u0395\u03C0\u03B9\u03BB\u03AD\u03BE\u03C4\u03B5 ", filesLabel)), /*#__PURE__*/React.createElement(NormalText, {
|
|
67
|
-
className: classes.text
|
|
68
|
-
}, files.length ? files.join(', ') : "\u0394\u03B5\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03B9 ".concat(filesLabel)));
|
|
33
|
+
}
|
|
34
|
+
}), /*#__PURE__*/React.createElement(NormalText, null, files.length ? files.join(', ') : "\u0394\u03B5\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03B9 ".concat(filesLabel)));
|
|
69
35
|
});
|
|
70
36
|
export default FileInput;
|