@digigov/form 0.6.10 → 0.7.0

package/Field/utils.js

@@ -0,0 +1,146 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.calculateField = calculateField;
+exports.evaluateFieldWithConditions = evaluateFieldWithConditions;
+exports.useField = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = require("react");
+
+var _Input = _interopRequireDefault(require("@digigov/form/inputs/Input"));
+
+var _Checkboxes = _interopRequireDefault(require("@digigov/form/inputs/Checkboxes"));
+
+var _Radio = _interopRequireDefault(require("@digigov/form/inputs/Radio"));
+
+var _Select = _interopRequireDefault(require("@digigov/form/inputs/Select"));
+
+var _FileInput = _interopRequireDefault(require("@digigov/form/inputs/FileInput"));
+
+var _DateInput = _interopRequireDefault(require("@digigov/form/inputs/DateInput"));
+
+var _FormContext = require("@digigov/form/FormContext");
+
+var FIELD_COMPONENTS = {
+  text: {
+    component: _Input["default"]
+  },
+  string: {
+    component: _Input["default"]
+  },
+  file: {
+    wrapper: 'fieldset',
+    component: _FileInput["default"]
+  },
+  date: {
+    wrapper: 'fieldset',
+    controlled: true,
+    component: _DateInput["default"]
+  },
+  'choice:multiple': {
+    wrapper: 'fieldset',
+    controlled: true,
+    component: _Checkboxes["default"]
+  },
+  'choice:single': {
+    wrapper: 'fieldset',
+    controlled: false,
+    component: _Radio["default"]
+  }
+};
+var ALTERNATIVE_COMPONENTS = {
+  Select: {
+    component: _Select["default"],
+    controlled: false
+  }
+};
+
+function calculateField(children, field, componentRegistry) {
+  var _field$extra;
+
+  var calculatedField = (0, _extends2["default"])({}, field);
+  var fieldComponentRegistry = (0, _extends2["default"])({}, FIELD_COMPONENTS, componentRegistry);
+
+  if (children) {
+    calculatedField.component = children;
+  } else if (typeof field.component === 'function') {// leave as is
+  } else if (!field.component && !field.type) {
+    var _fieldComponentRegist;
+
+    calculatedField.component = fieldComponentRegistry.string.component;
+    calculatedField.controlled = ((_fieldComponentRegist = fieldComponentRegistry.string) === null || _fieldComponentRegist === void 0 ? void 0 : _fieldComponentRegist.controlled) || false;
+  } else if (typeof (field === null || field === void 0 ? void 0 : (_field$extra = field.extra) === null || _field$extra === void 0 ? void 0 : _field$extra.component) === 'string' && ALTERNATIVE_COMPONENTS[field.extra.component]) {
+    var _ALTERNATIVE_COMPONEN;
+
+    calculatedField.controlled = ((_ALTERNATIVE_COMPONEN = ALTERNATIVE_COMPONENTS[field.extra.component]) === null || _ALTERNATIVE_COMPONEN === void 0 ? void 0 : _ALTERNATIVE_COMPONEN.controlled) || false;
+    calculatedField.component = ALTERNATIVE_COMPONENTS[field.extra.component].component;
+  } else if (!field.component && field.type && fieldComponentRegistry[field.type]) {
+    var _fieldComponentRegist2;
+
+    calculatedField.component = fieldComponentRegistry[field.type].component;
+    calculatedField.wrapper = fieldComponentRegistry[field.type].wrapper;
+    calculatedField.controlled = ((_fieldComponentRegist2 = fieldComponentRegistry[field.type]) === null || _fieldComponentRegist2 === void 0 ? void 0 : _fieldComponentRegist2.controlled) || false;
+  } else {
+    var _fieldComponentRegist3;
+
+    calculatedField.component = fieldComponentRegistry.string.component;
+    calculatedField.controlled = ((_fieldComponentRegist3 = fieldComponentRegistry.string) === null || _fieldComponentRegist3 === void 0 ? void 0 : _fieldComponentRegist3.controlled) || false;
+  }
+
+  return calculatedField;
+}
+
+var useField = function useField(name, customField) {
+  var _useContext = (0, _react.useContext)(_FormContext.FormContext),
+      fieldsMap = _useContext.fieldsMap,
+      control = _useContext.control,
+      register = _useContext.register,
+      errors = _useContext.errors,
+      registerField = _useContext.registerField,
+      componentRegistry = _useContext.componentRegistry;
+
+  (0, _react.useMemo)(function () {
+    return (customField === null || customField === void 0 ? void 0 : customField.type) && registerField((0, _extends2["default"])({}, customField, {
+      key: name
+    }));
+  }, [customField, name, registerField]);
+  return {
+    field: customField || fieldsMap[name],
+    control: control,
+    register: register,
+    componentRegistry: componentRegistry,
+    error: errors[name]
+  };
+};
+
+exports.useField = useField;
+
+function evaluateFieldWithConditions(field, variables) {
+  var newField = (0, _extends2["default"])({}, field);
+
+  if (variables) {
+    for (var key in variables) {
+      if (field.condition[key] && field.condition[key].is === variables[key]) {
+        var then = field.condition[key].then || {};
+
+        for (var attr in then) {
+          newField[attr] = then[attr];
+        }
+      } else if (field.condition[key]) {
+        var otherwise = field.condition[key]["else"] || {};
+
+        for (var _attr in otherwise) {
+          newField[_attr] = otherwise[_attr];
+        }
+      }
+    }
+  }
+
+  return newField;
+}

package/FormBuilder.js

@@ -23,8 +23,6 @@ var _reactHookForm = require("react-hook-form");
 
 var _utils = require("@digigov/form/utils");
 
-var _Grid = _interopRequireDefault(require("@digigov/ui/layouts/Grid"));
-
 var _validators = require("@digigov/form/validators");
 
 var _Fieldset = _interopRequireDefault(require("@digigov/form/Fieldset"));
@@ -33,8 +31,10 @@ var _Field = _interopRequireDefault(require("@digigov/form/Field"));
 
 var _FormContext = require("@digigov/form/FormContext");
 
-var _excluded = ["onSubmit", "children", "registerField", "fieldsMap", "fieldsetsMap", "resolver", "mode", "initial", "reValidateMode", "shouldFocusError", "criteriaMode", "componentRegistry"],
-    _excluded2 = ["fields", "fieldsets", "initial", "onSubmit", "children", "reValidateMode", "mode", "shouldFocusError", "criteriaMode", "auto", "validatorRegistry", "componentRegistry"];
+var _Form = require("@digigov/react-core/Form");
+
+var _excluded = ["onSubmit", "children", "registerField", "fieldsMap", "fieldsetsMap", "resolver", "mode", "initial", "reValidateMode", "shouldFocusError", "criteriaMode", "componentRegistry", "grid"],
+    _excluded2 = ["fields", "fieldsets", "initial", "onSubmit", "children", "reValidateMode", "mode", "shouldFocusError", "criteriaMode", "auto", "validatorRegistry", "componentRegistry", "grid"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -53,6 +53,7 @@ var FormBase = /*#__PURE__*/_react["default"].forwardRef(function FormBase(_ref,
       shouldFocusError = _ref.shouldFocusError,
       criteriaMode = _ref.criteriaMode,
       componentRegistry = _ref.componentRegistry,
+      grid = _ref.grid,
       props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
   var form = (0, _reactHookForm.useForm)({
     resolver: resolver,
@@ -83,15 +84,11 @@ var FormBase = /*#__PURE__*/_react["default"].forwardRef(function FormBase(_ref,
   };
   return /*#__PURE__*/_react["default"].createElement(_FormContext.FormContext.Provider, {
     value: ctx
-  }, /*#__PURE__*/_react["default"].createElement("form", (0, _extends4["default"])({
+  }, /*#__PURE__*/_react["default"].createElement(_Form.Form, (0, _extends4["default"])({
+    grid: grid,
     onSubmit: form.handleSubmit(handleSubmit),
     ref: ref
-  }, props), /*#__PURE__*/_react["default"].createElement(_Grid["default"], {
-    container: true
-  }, /*#__PURE__*/_react["default"].createElement(_Grid["default"], {
-    item: true,
-    xs: 12
-  }, children))));
+  }, props), children));
 });
 
 exports.FormBase = FormBase;
@@ -116,6 +113,8 @@ var FormBuilder = /*#__PURE__*/_react["default"].forwardRef(function FormBuilder
       auto = _ref2$auto === void 0 ? false : _ref2$auto,
       validatorRegistry = _ref2.validatorRegistry,
       componentRegistry = _ref2.componentRegistry,
+      _ref2$grid = _ref2.grid,
+      grid = _ref2$grid === void 0 ? false : _ref2$grid,
       props = (0, _objectWithoutProperties2["default"])(_ref2, _excluded2);
   var fieldsState = (0, _react.useRef)(fields);
   var setFieldsState = (0, _react.useCallback)(function (newFields) {
@@ -169,7 +168,8 @@ var FormBuilder = /*#__PURE__*/_react["default"].forwardRef(function FormBuilder
     criteriaMode: criteriaMode,
     onSubmit: onSubmit,
     componentRegistry: componentRegistry,
-    ref: ref
+    ref: ref,
+    grid: grid
   }, props), fieldChildren, children);
 });