@digigov/form 0.9.0 → 0.10.0

package/MultiplicityField/add-objects.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ErrorOption, FieldArrayWithId, UseFieldArrayReturn } from 'react-hook-form';
 import { MultiplicityProps, StashedObject } from '@digigov/form/MultiplicityField';
-export interface AddObjectsProps extends Omit<MultiplicityProps, 'key' | 'formState' | 'component'> {
+export interface AddObjectsProps extends Omit<MultiplicityProps, 'key' | 'component'> {
     fields: FieldArrayWithId[];
     error?: ErrorOption;
     append: UseFieldArrayReturn['append'];

package/MultiplicityField/add-objects.js

@@ -38,6 +38,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 var AddObjects = function AddObjects(_ref) {
   var name = _ref.name,
       fields = _ref.fields,
+      formState = _ref.formState,
       extra = _ref.extra,
       append = _ref.append,
       remove = _ref.remove,
@@ -78,6 +79,7 @@ var AddObjects = function AddObjects(_ref) {
             name: currentName,
             error: error && error[currentIndex],
             register: register,
+            formState: formState,
             control: control
           }, extra === null || extra === void 0 ? void 0 : extra.of, {
             label: (extra === null || extra === void 0 ? void 0 : extra.label.question.objectLabel) || (extra === null || extra === void 0 ? void 0 : extra.of.label)

package/MultiplicityField/index.js

@@ -96,6 +96,7 @@ var Multiplicity = function Multiplicity(_ref) {
     register: register,
     control: control,
     fields: fields,
+    formState: formState,
     error: error,
     stashedObjects: stashedObjects,
     extra: extra,

package/__stories__/AutoCompleteField.js

@@ -15,7 +15,7 @@ var _Field = require("@digigov/form/Field");
 
 var _Button = _interopRequireDefault(require("@digigov/ui/core/Button"));
 
-var _utils = require("@digigov/ui/admin/AutoComplete/__stories__/utils");
+var _utils = require("@digigov/ui/admin/AutoComplete/utils");
 
 var fields = [{
   key: 'autocomplete',

package/es/Field/index.js

@@ -40,28 +40,28 @@ export var Field = function Field(_ref) {
     });
   }
 
-  if (calculatedField.type === 'array' && calculatedField.multiplicity) {
+  if (calculatedField.type === 'array' && calculatedField.multiplicity === false) {
     calculatedField.name = name;
-    return /*#__PURE__*/React.createElement(Multiplicity, _extends({
+    return /*#__PURE__*/React.createElement(FieldArray, _extends({
       control: control,
       register: register,
-      trigger: trigger,
-      clearErrors: clearErrors,
       error: error,
-      formState: formState,
-      setValue: setValue,
-      getValues: getValues,
-      unregister: unregister
+      formState: formState
     }, calculatedField));
   }
 
   if (calculatedField.type === 'array') {
     calculatedField.name = name;
-    return /*#__PURE__*/React.createElement(FieldArray, _extends({
+    return /*#__PURE__*/React.createElement(Multiplicity, _extends({
       control: control,
       register: register,
+      trigger: trigger,
+      clearErrors: clearErrors,
       error: error,
-      formState: formState
+      formState: formState,
+      setValue: setValue,
+      getValues: getValues,
+      unregister: unregister
     }, calculatedField));
   }
 

package/es/FieldArray/index.js

@@ -4,11 +4,13 @@ var _excluded = ["name", "register", "control", "formState", "error", "layout",
 import React from 'react';
 import { useFieldArray } from 'react-hook-form';
 import FieldObject from '@digigov/form/FieldObject';
-import { Button, Card } from '@digigov/ui/core';
+import { Button, Card, Hint } from '@digigov/ui';
 import { FieldsetLabel } from '@digigov/form/Fieldset';
 import Fieldset from '@digigov/react-core/Fieldset';
 import FieldContainer from '@digigov/form/Field/FieldContainer';
 export var FieldArray = function FieldArray(_ref) {
+  var _customField$extra, _customField$extra4;
+
   var name = _ref.name,
       register = _ref.register,
       control = _ref.control,
@@ -32,19 +34,19 @@ export var FieldArray = function FieldArray(_ref) {
     error: formState.isSubmitted && !formState.isSubmitting && error !== null && error !== void 0 && error.message && error ? error : undefined,
     wrapper: "fieldset",
     name: name
-  }, fields.map(function (field, index) {
-    var _customField$extra;
+  }, fields.length === 0 && /*#__PURE__*/React.createElement(Hint, null, (_customField$extra = customField.extra) === null || _customField$extra === void 0 ? void 0 : _customField$extra.label.object.nothing_added), fields.map(function (field, index) {
+    var _customField$extra2, _customField$extra3;
 
     return /*#__PURE__*/React.createElement(Card, {
       variant: "border",
       key: field.id
-    }, /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement(FieldsetLabel, null, "\u03A3\u03C5\u03BD\u03C5\u03C0\u03BF\u03B3\u03C1\u03AC\u03C6\u03BF\u03BD\u03C4\u03B1\u03C2 ", index + 1), /*#__PURE__*/React.createElement(FieldObject, _extends({
+    }, /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement(FieldsetLabel, null, (_customField$extra2 = customField.extra) === null || _customField$extra2 === void 0 ? void 0 : _customField$extra2.label.object.title, " ", index + 1), /*#__PURE__*/React.createElement(FieldObject, _extends({
       name: "".concat(name, ".").concat(index),
       error: Array.isArray(error) && error[index],
       formState: formState,
       register: register,
       control: control
-    }, (_customField$extra = customField.extra) === null || _customField$extra === void 0 ? void 0 : _customField$extra.of)), /*#__PURE__*/React.createElement(Button, {
+    }, (_customField$extra3 = customField.extra) === null || _customField$extra3 === void 0 ? void 0 : _customField$extra3.of)), /*#__PURE__*/React.createElement(Button, {
       type: "button",
       color: "warning",
       onClick: function onClick() {
@@ -58,6 +60,6 @@ export var FieldArray = function FieldArray(_ref) {
       ev.preventDefault();
       append({});
     }
-  }, "\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03C3\u03C5\u03BD\u03C5\u03C0\u03BF\u03B3\u03C1\u03AC\u03C6\u03BF\u03BD\u03C4\u03B1"));
+  }, (_customField$extra4 = customField.extra) === null || _customField$extra4 === void 0 ? void 0 : _customField$extra4.label.object.add));
 };
 export default FieldArray;

package/es/Fieldset/index.js

@@ -1,3 +1,7 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["children"],
+    _excluded2 = ["children"];
 import React from 'react';
 import Grid from '@digigov/ui/layouts/Grid';
 import CoreFieldset from '@digigov/react-core/Fieldset';
@@ -5,15 +9,19 @@ import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
 import Hint from '@digigov/react-core/Hint';
 import NormalText from '@digigov/ui/typography/NormalText';
 export var FieldsetLabel = function FieldsetLabel(_ref) {
-  var children = _ref.children;
-  return /*#__PURE__*/React.createElement(FieldsetLegend, {
+  var children = _ref.children,
+      props = _objectWithoutProperties(_ref, _excluded);
+
+  return /*#__PURE__*/React.createElement(FieldsetLegend, _extends({
     heading: true,
     size: "xl"
-  }, children);
+  }, props), children);
 };
 export var FieldsetCaption = function FieldsetCaption(_ref2) {
-  var children = _ref2.children;
-  return /*#__PURE__*/React.createElement(Hint, null, children);
+  var children = _ref2.children,
+      props = _objectWithoutProperties(_ref2, _excluded2);
+
+  return /*#__PURE__*/React.createElement(Hint, props, children);
 };
 export var FieldsetBody = function FieldsetBody(_ref3) {
   var children = _ref3.children;