@digigov/form 0.5.1 → 0.6.0

package/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change Log - @digigov/form
 
-This log was last generated on Thu, 24 Feb 2022 14:51:06 GMT and should not be manually modified.
+This log was last generated on Wed, 30 Mar 2022 12:28:30 GMT and should not be manually modified.
+
+## 0.6.0
+Wed, 30 Mar 2022 12:28:30 GMT
+
+### Minor changes
+
+- Add support for `characterWidth` and `cellWidth` props in `@digigov/form/Field`, these props will be used by the `@digigov/react-core/TextInput`
+
+## 0.5.3
+Mon, 28 Feb 2022 15:04:49 GMT
+
+### Patches
+
+- pass custom component registry to formbuilder
 
 ## 0.5.1
 Thu, 24 Feb 2022 14:51:06 GMT

package/Field/index.js

@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.FieldBase = exports.Field = void 0;
 
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _ConditionalField = require("@digigov/form/Field/ConditionalField");
@@ -49,7 +49,8 @@ var _Label2 = _interopRequireDefault(require("@digigov/form/inputs/Label"));
 
 var _i18n = require("@digigov/ui/app/i18n");
 
-var _excluded = ["name", "children"];
+var _excluded = ["name", "component", "wrapper", "control", "type", "controlled", "enabled", "editable", "defaultValue", "label", "extra", "layout", "error", "register"],
+    _excluded2 = ["name", "children"];
 
 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); }
 
@@ -129,7 +130,8 @@ var FieldBase = function FieldBase(props) {
       extra = _props$extra === void 0 ? {} : _props$extra,
       layout = props.layout,
       error = props.error,
-      register = props.register;
+      register = props.register,
+      componentProps = (0, _objectWithoutProperties2["default"])(props, _excluded);
 
   if (!enabled) {
     return null;
@@ -148,7 +150,7 @@ var FieldBase = function FieldBase(props) {
         var onChange = _ref2.onChange,
             onBlur = _ref2.onBlur,
             value = _ref2.value;
-        return /*#__PURE__*/_react["default"].createElement(Component, {
+        return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
           name: name,
           onChange: onChange,
           onBlur: onBlur,
@@ -158,7 +160,7 @@ var FieldBase = function FieldBase(props) {
           error: !!error,
           type: type,
           disabled: editable === false
-        });
+        }, componentProps));
       }
     }));
   }
@@ -168,7 +170,7 @@ var FieldBase = function FieldBase(props) {
     layout: layout,
     error: error,
     wrapper: wrapper
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/_react["default"].createElement(Component, {
+  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
     name: name,
     ref: register,
     control: control,
@@ -176,7 +178,7 @@ var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }) : /*#__PURE__*/_react["default"].createElement(Component, {
+  }, componentProps)) : /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
     name: name,
     register: register,
     control: control,
@@ -184,7 +186,7 @@ var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }));
+  }, componentProps)));
 };
 
 exports.FieldBase = FieldBase;
@@ -195,7 +197,8 @@ var useField = function useField(name, customField) {
       control = _useContext.control,
       register = _useContext.register,
       errors = _useContext.errors,
-      registerField = _useContext.registerField;
+      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, {
@@ -206,58 +209,60 @@ var useField = function useField(name, customField) {
     field: customField || fieldsMap[name],
     control: control,
     register: register,
+    componentRegistry: componentRegistry,
     error: errors[name]
   };
 };
 
-function calculateField(children, field) {
+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 _FIELD_COMPONENTS$str;
+    var _FieldComponentRegist;
 
-    calculatedField.component = FIELD_COMPONENTS.string.component;
-    calculatedField.controlled = ((_FIELD_COMPONENTS$str = FIELD_COMPONENTS.string) === null || _FIELD_COMPONENTS$str === void 0 ? void 0 : _FIELD_COMPONENTS$str.controlled) || false;
+    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 && FIELD_COMPONENTS[field.type]) {
-    var _FIELD_COMPONENTS$fie;
+  } else if (!field.component && field.type && FieldComponentRegistry[field.type]) {
+    var _FieldComponentRegist2;
 
-    calculatedField.component = FIELD_COMPONENTS[field.type].component;
-    calculatedField.wrapper = FIELD_COMPONENTS[field.type].wrapper;
-    calculatedField.controlled = ((_FIELD_COMPONENTS$fie = FIELD_COMPONENTS[field.type]) === null || _FIELD_COMPONENTS$fie === void 0 ? void 0 : _FIELD_COMPONENTS$fie.controlled) || false;
+    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 _FIELD_COMPONENTS$str2;
+    var _FieldComponentRegist3;
 
-    calculatedField.component = FIELD_COMPONENTS.string.component;
-    calculatedField.controlled = ((_FIELD_COMPONENTS$str2 = FIELD_COMPONENTS.string) === null || _FIELD_COMPONENTS$str2 === void 0 ? void 0 : _FIELD_COMPONENTS$str2.controlled) || false;
+    calculatedField.component = FieldComponentRegistry.string.component;
+    calculatedField.controlled = ((_FieldComponentRegist3 = FieldComponentRegistry.string) === null || _FieldComponentRegist3 === void 0 ? void 0 : _FieldComponentRegist3.controlled) || false;
   }
 
-  calculatedField.wrapper = calculatedField.wrapper || 'label';
   return calculatedField;
 }
 
 var Field = function Field(_ref3) {
   var name = _ref3.name,
       children = _ref3.children,
-      customField = (0, _objectWithoutProperties2["default"])(_ref3, _excluded);
+      customField = (0, _objectWithoutProperties2["default"])(_ref3, _excluded2);
 
   var _useField = useField(name, customField !== null && customField !== void 0 && customField.type ? customField : null),
       field = _useField.field,
       control = _useField.control,
       register = _useField.register,
-      error = _useField.error;
+      error = _useField.error,
+      componentRegistry = _useField.componentRegistry;
 
   var calculatedField = (0, _react.useMemo)(function () {
-    return calculateField(children, field);
+    return calculateField(children, field, componentRegistry);
   }, [field]);
 
   if (calculatedField.condition) {

package/es/Field/index.js

@@ -1,6 +1,7 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["name", "children"];
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["name", "component", "wrapper", "control", "type", "controlled", "enabled", "editable", "defaultValue", "label", "extra", "layout", "error", "register"],
+    _excluded2 = ["name", "children"];
 import React, { useContext, useMemo } from 'react';
 import { ConditionalField } from '@digigov/form/Field/ConditionalField';
 import { Controller } from 'react-hook-form';
@@ -93,7 +94,8 @@ export var FieldBase = function FieldBase(props) {
       extra = _props$extra === void 0 ? {} : _props$extra,
       layout = props.layout,
       error = props.error,
-      register = props.register;
+      register = props.register,
+      componentProps = _objectWithoutProperties(props, _excluded);
 
   if (!enabled) {
     return null;
@@ -112,7 +114,7 @@ export var FieldBase = function FieldBase(props) {
         var onChange = _ref2.onChange,
             onBlur = _ref2.onBlur,
             value = _ref2.value;
-        return /*#__PURE__*/React.createElement(Component, {
+        return /*#__PURE__*/React.createElement(Component, _extends({
           name: name,
           onChange: onChange,
           onBlur: onBlur,
@@ -122,7 +124,7 @@ export var FieldBase = function FieldBase(props) {
           error: !!error,
           type: type,
           disabled: editable === false
-        });
+        }, componentProps));
       }
     }));
   }
@@ -132,7 +134,7 @@ export var FieldBase = function FieldBase(props) {
     layout: layout,
     error: error,
     wrapper: wrapper
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, {
+  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({
     name: name,
     ref: register,
     control: control,
@@ -140,7 +142,7 @@ export var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }) : /*#__PURE__*/React.createElement(Component, {
+  }, componentProps)) : /*#__PURE__*/React.createElement(Component, _extends({
     name: name,
     register: register,
     control: control,
@@ -148,7 +150,7 @@ export var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }));
+  }, componentProps)));
 };
 
 var useField = function useField(name, customField) {
@@ -157,7 +159,8 @@ var useField = function useField(name, customField) {
       control = _useContext.control,
       register = _useContext.register,
       errors = _useContext.errors,
-      registerField = _useContext.registerField;
+      registerField = _useContext.registerField,
+      componentRegistry = _useContext.componentRegistry;
 
   useMemo(function () {
     return (customField === null || customField === void 0 ? void 0 : customField.type) && registerField(_extends({}, customField, {
@@ -168,58 +171,61 @@ var useField = function useField(name, customField) {
     field: customField || fieldsMap[name],
     control: control,
     register: register,
+    componentRegistry: componentRegistry,
     error: errors[name]
   };
 };
 
-function calculateField(children, field) {
+function calculateField(children, field, componentRegistry) {
   var _field$extra;
 
   var calculatedField = _extends({}, field);
 
+  var FieldComponentRegistry = _extends({}, FIELD_COMPONENTS, componentRegistry);
+
   if (children) {
     calculatedField.component = children;
   } else if (typeof field.component === 'function') {// leave as is
   } else if (!field.component && !field.type) {
-    var _FIELD_COMPONENTS$str;
+    var _FieldComponentRegist;
 
-    calculatedField.component = FIELD_COMPONENTS.string.component;
-    calculatedField.controlled = ((_FIELD_COMPONENTS$str = FIELD_COMPONENTS.string) === null || _FIELD_COMPONENTS$str === void 0 ? void 0 : _FIELD_COMPONENTS$str.controlled) || false;
+    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 && FIELD_COMPONENTS[field.type]) {
-    var _FIELD_COMPONENTS$fie;
+  } else if (!field.component && field.type && FieldComponentRegistry[field.type]) {
+    var _FieldComponentRegist2;
 
-    calculatedField.component = FIELD_COMPONENTS[field.type].component;
-    calculatedField.wrapper = FIELD_COMPONENTS[field.type].wrapper;
-    calculatedField.controlled = ((_FIELD_COMPONENTS$fie = FIELD_COMPONENTS[field.type]) === null || _FIELD_COMPONENTS$fie === void 0 ? void 0 : _FIELD_COMPONENTS$fie.controlled) || false;
+    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 _FIELD_COMPONENTS$str2;
+    var _FieldComponentRegist3;
 
-    calculatedField.component = FIELD_COMPONENTS.string.component;
-    calculatedField.controlled = ((_FIELD_COMPONENTS$str2 = FIELD_COMPONENTS.string) === null || _FIELD_COMPONENTS$str2 === void 0 ? void 0 : _FIELD_COMPONENTS$str2.controlled) || false;
+    calculatedField.component = FieldComponentRegistry.string.component;
+    calculatedField.controlled = ((_FieldComponentRegist3 = FieldComponentRegistry.string) === null || _FieldComponentRegist3 === void 0 ? void 0 : _FieldComponentRegist3.controlled) || false;
   }
 
-  calculatedField.wrapper = calculatedField.wrapper || 'label';
   return calculatedField;
 }
 
 export var Field = function Field(_ref3) {
   var name = _ref3.name,
       children = _ref3.children,
-      customField = _objectWithoutProperties(_ref3, _excluded);
+      customField = _objectWithoutProperties(_ref3, _excluded2);
 
   var _useField = useField(name, customField !== null && customField !== void 0 && customField.type ? customField : null),
       field = _useField.field,
       control = _useField.control,
       register = _useField.register,
-      error = _useField.error;
+      error = _useField.error,
+      componentRegistry = _useField.componentRegistry;
 
   var calculatedField = useMemo(function () {
-    return calculateField(children, field);
+    return calculateField(children, field, componentRegistry);
   }, [field]);
 
   if (calculatedField.condition) {

package/es/index.js

@@ -27,7 +27,8 @@ export var FormBase = function FormBase(_ref) {
       initial = _ref.initial,
       reValidateMode = _ref.reValidateMode,
       shouldFocusError = _ref.shouldFocusError,
-      criteriaMode = _ref.criteriaMode;
+      criteriaMode = _ref.criteriaMode,
+      componentRegistry = _ref.componentRegistry;
   var form = useForm({
     resolver: resolver,
     mode: mode,
@@ -52,7 +53,8 @@ export var FormBase = function FormBase(_ref) {
     register: form.register,
     registerField: registerField,
     errors: form.errors,
-    reset: form.reset
+    reset: form.reset,
+    componentRegistry: componentRegistry
   };
   return /*#__PURE__*/React.createElement(FormContext.Provider, {
     value: ctx
@@ -83,7 +85,8 @@ export function FormBuilder(_ref2) {
       criteriaMode = _ref2$criteriaMode === void 0 ? 'firstError' : _ref2$criteriaMode,
       _ref2$auto = _ref2.auto,
       auto = _ref2$auto === void 0 ? false : _ref2$auto,
-      validatorRegistry = _ref2.validatorRegistry;
+      validatorRegistry = _ref2.validatorRegistry,
+      componentRegistry = _ref2.componentRegistry;
   var fieldsState = useRef(fields);
   var setFieldsState = useCallback(function (newFields) {
     fieldsState.current = newFields;
@@ -135,7 +138,8 @@ export function FormBuilder(_ref2) {
     mode: mode,
     shouldFocusError: shouldFocusError,
     criteriaMode: criteriaMode,
-    onSubmit: onSubmit
+    onSubmit: onSubmit,
+    componentRegistry: componentRegistry
   }, fieldChildren, children);
 }
 export default FormBuilder;

package/esm/Field/index.js

@@ -1,6 +1,7 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["name", "children"];
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["name", "component", "wrapper", "control", "type", "controlled", "enabled", "editable", "defaultValue", "label", "extra", "layout", "error", "register"],
+    _excluded2 = ["name", "children"];
 import React, { useContext, useMemo } from 'react';
 import { ConditionalField } from '@digigov/form/Field/ConditionalField';
 import { Controller } from 'react-hook-form';
@@ -93,7 +94,8 @@ export var FieldBase = function FieldBase(props) {
       extra = _props$extra === void 0 ? {} : _props$extra,
       layout = props.layout,
       error = props.error,
-      register = props.register;
+      register = props.register,
+      componentProps = _objectWithoutProperties(props, _excluded);
 
   if (!enabled) {
     return null;
@@ -112,7 +114,7 @@ export var FieldBase = function FieldBase(props) {
         var onChange = _ref2.onChange,
             onBlur = _ref2.onBlur,
             value = _ref2.value;
-        return /*#__PURE__*/React.createElement(Component, {
+        return /*#__PURE__*/React.createElement(Component, _extends({
           name: name,
           onChange: onChange,
           onBlur: onBlur,
@@ -122,7 +124,7 @@ export var FieldBase = function FieldBase(props) {
           error: !!error,
           type: type,
           disabled: editable === false
-        });
+        }, componentProps));
       }
     }));
   }
@@ -132,7 +134,7 @@ export var FieldBase = function FieldBase(props) {
     layout: layout,
     error: error,
     wrapper: wrapper
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, {
+  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({
     name: name,
     ref: register,
     control: control,
@@ -140,7 +142,7 @@ export var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }) : /*#__PURE__*/React.createElement(Component, {
+  }, componentProps)) : /*#__PURE__*/React.createElement(Component, _extends({
     name: name,
     register: register,
     control: control,
@@ -148,7 +150,7 @@ export var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }));
+  }, componentProps)));
 };
 
 var useField = function useField(name, customField) {
@@ -157,7 +159,8 @@ var useField = function useField(name, customField) {
       control = _useContext.control,
       register = _useContext.register,
       errors = _useContext.errors,
-      registerField = _useContext.registerField;
+      registerField = _useContext.registerField,
+      componentRegistry = _useContext.componentRegistry;
 
   useMemo(function () {
     return (customField === null || customField === void 0 ? void 0 : customField.type) && registerField(_extends({}, customField, {
@@ -168,58 +171,61 @@ var useField = function useField(name, customField) {
     field: customField || fieldsMap[name],
     control: control,
     register: register,
+    componentRegistry: componentRegistry,
     error: errors[name]
   };
 };
 
-function calculateField(children, field) {
+function calculateField(children, field, componentRegistry) {
   var _field$extra;
 
   var calculatedField = _extends({}, field);
 
+  var FieldComponentRegistry = _extends({}, FIELD_COMPONENTS, componentRegistry);
+
   if (children) {
     calculatedField.component = children;
   } else if (typeof field.component === 'function') {// leave as is
   } else if (!field.component && !field.type) {
-    var _FIELD_COMPONENTS$str;
+    var _FieldComponentRegist;
 
-    calculatedField.component = FIELD_COMPONENTS.string.component;
-    calculatedField.controlled = ((_FIELD_COMPONENTS$str = FIELD_COMPONENTS.string) === null || _FIELD_COMPONENTS$str === void 0 ? void 0 : _FIELD_COMPONENTS$str.controlled) || false;
+    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 && FIELD_COMPONENTS[field.type]) {
-    var _FIELD_COMPONENTS$fie;
+  } else if (!field.component && field.type && FieldComponentRegistry[field.type]) {
+    var _FieldComponentRegist2;
 
-    calculatedField.component = FIELD_COMPONENTS[field.type].component;
-    calculatedField.wrapper = FIELD_COMPONENTS[field.type].wrapper;
-    calculatedField.controlled = ((_FIELD_COMPONENTS$fie = FIELD_COMPONENTS[field.type]) === null || _FIELD_COMPONENTS$fie === void 0 ? void 0 : _FIELD_COMPONENTS$fie.controlled) || false;
+    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 _FIELD_COMPONENTS$str2;
+    var _FieldComponentRegist3;
 
-    calculatedField.component = FIELD_COMPONENTS.string.component;
-    calculatedField.controlled = ((_FIELD_COMPONENTS$str2 = FIELD_COMPONENTS.string) === null || _FIELD_COMPONENTS$str2 === void 0 ? void 0 : _FIELD_COMPONENTS$str2.controlled) || false;
+    calculatedField.component = FieldComponentRegistry.string.component;
+    calculatedField.controlled = ((_FieldComponentRegist3 = FieldComponentRegistry.string) === null || _FieldComponentRegist3 === void 0 ? void 0 : _FieldComponentRegist3.controlled) || false;
   }
 
-  calculatedField.wrapper = calculatedField.wrapper || 'label';
   return calculatedField;
 }
 
 export var Field = function Field(_ref3) {
   var name = _ref3.name,
       children = _ref3.children,
-      customField = _objectWithoutProperties(_ref3, _excluded);
+      customField = _objectWithoutProperties(_ref3, _excluded2);
 
   var _useField = useField(name, customField !== null && customField !== void 0 && customField.type ? customField : null),
       field = _useField.field,
       control = _useField.control,
       register = _useField.register,
-      error = _useField.error;
+      error = _useField.error,
+      componentRegistry = _useField.componentRegistry;
 
   var calculatedField = useMemo(function () {
-    return calculateField(children, field);
+    return calculateField(children, field, componentRegistry);
   }, [field]);
 
   if (calculatedField.condition) {

package/esm/index.js

@@ -1,4 +1,4 @@
-/** @license Digigov v0.5.1
+/** @license Digigov v0.6.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -32,7 +32,8 @@ export var FormBase = function FormBase(_ref) {
       initial = _ref.initial,
       reValidateMode = _ref.reValidateMode,
       shouldFocusError = _ref.shouldFocusError,
-      criteriaMode = _ref.criteriaMode;
+      criteriaMode = _ref.criteriaMode,
+      componentRegistry = _ref.componentRegistry;
   var form = useForm({
     resolver: resolver,
     mode: mode,
@@ -57,7 +58,8 @@ export var FormBase = function FormBase(_ref) {
     register: form.register,
     registerField: registerField,
     errors: form.errors,
-    reset: form.reset
+    reset: form.reset,
+    componentRegistry: componentRegistry
   };
   return /*#__PURE__*/React.createElement(FormContext.Provider, {
     value: ctx
@@ -88,7 +90,8 @@ export function FormBuilder(_ref2) {
       criteriaMode = _ref2$criteriaMode === void 0 ? 'firstError' : _ref2$criteriaMode,
       _ref2$auto = _ref2.auto,
       auto = _ref2$auto === void 0 ? false : _ref2$auto,
-      validatorRegistry = _ref2.validatorRegistry;
+      validatorRegistry = _ref2.validatorRegistry,
+      componentRegistry = _ref2.componentRegistry;
   var fieldsState = useRef(fields);
   var setFieldsState = useCallback(function (newFields) {
     fieldsState.current = newFields;
@@ -140,7 +143,8 @@ export function FormBuilder(_ref2) {
     mode: mode,
     shouldFocusError: shouldFocusError,
     criteriaMode: criteriaMode,
-    onSubmit: onSubmit
+    onSubmit: onSubmit,
+    componentRegistry: componentRegistry
   }, fieldChildren, children);
 }
 export default FormBuilder;

package/index.js

@@ -82,7 +82,8 @@ var FormBase = function FormBase(_ref) {
       initial = _ref.initial,
       reValidateMode = _ref.reValidateMode,
       shouldFocusError = _ref.shouldFocusError,
-      criteriaMode = _ref.criteriaMode;
+      criteriaMode = _ref.criteriaMode,
+      componentRegistry = _ref.componentRegistry;
   var form = (0, _reactHookForm.useForm)({
     resolver: resolver,
     mode: mode,
@@ -107,7 +108,8 @@ var FormBase = function FormBase(_ref) {
     register: form.register,
     registerField: registerField,
     errors: form.errors,
-    reset: form.reset
+    reset: form.reset,
+    componentRegistry: componentRegistry
   };
   return /*#__PURE__*/_react["default"].createElement(FormContext.Provider, {
     value: ctx
@@ -141,7 +143,8 @@ function FormBuilder(_ref2) {
       criteriaMode = _ref2$criteriaMode === void 0 ? 'firstError' : _ref2$criteriaMode,
       _ref2$auto = _ref2.auto,
       auto = _ref2$auto === void 0 ? false : _ref2$auto,
-      validatorRegistry = _ref2.validatorRegistry;
+      validatorRegistry = _ref2.validatorRegistry,
+      componentRegistry = _ref2.componentRegistry;
   var fieldsState = (0, _react.useRef)(fields);
   var setFieldsState = (0, _react.useCallback)(function (newFields) {
     fieldsState.current = newFields;
@@ -193,7 +196,8 @@ function FormBuilder(_ref2) {
     mode: mode,
     shouldFocusError: shouldFocusError,
     criteriaMode: criteriaMode,
-    onSubmit: onSubmit
+    onSubmit: onSubmit,
+    componentRegistry: componentRegistry
   }, fieldChildren, children);
 }
 

package/libs/form/src/Field/index.d.ts

@@ -53,6 +53,7 @@ export interface UseFieldProps {
     control: FieldBaseProps['control'];
     register: FieldBaseProps['register'];
     error: FieldError;
+    componentRegistry?: FieldComponentRegistry;
 }
 export interface FieldProps extends FieldSpec {
     name: string;

package/libs/form/src/index.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { UseFormMethods, UseFormOptions } from 'react-hook-form';
 import { GridProps } from '@material-ui/core/Grid';
 import { ValidatorSchema } from '@digigov/form/validators';
+import { FieldComponentRegistry } from '@digigov/form/Field';
 export * from '@digigov/form/Fieldset';
 export * from '@digigov/form/Field';
 export declare type FieldError = {
@@ -45,6 +46,7 @@ export interface FormContextProps {
     register: UseFormMethods['register'];
     registerField: (field: FieldSpec) => void;
     errors: UseFormMethods['errors'];
+    componentRegistry?: FieldComponentRegistry;
 }
 export declare const FormContext: React.Context<FormContextProps>;
 export interface FormBuilderProps {
@@ -59,6 +61,7 @@ export interface FormBuilderProps {
     shouldFocusError?: boolean;
     auto?: boolean;
     validatorRegistry?: Record<string, ValidatorSchema>;
+    componentRegistry?: FieldComponentRegistry;
 }
 interface FormBaseProps extends Omit<FormBuilderProps, 'fields' | 'fieldsets' | 'auto'> {
     fieldsetsMap?: Record<string, FieldsetSpec>;
@@ -67,5 +70,5 @@ interface FormBaseProps extends Omit<FormBuilderProps, 'fields' | 'fieldsets' |
     resolver: any;
 }
 export declare const FormBase: React.FC<FormBaseProps>;
-export declare function FormBuilder({ fields, fieldsets, initial, onSubmit, children, reValidateMode, mode, shouldFocusError, criteriaMode, auto, validatorRegistry, }: FormBuilderProps): React.ReactElement;
+export declare function FormBuilder({ fields, fieldsets, initial, onSubmit, children, reValidateMode, mode, shouldFocusError, criteriaMode, auto, validatorRegistry, componentRegistry, }: FormBuilderProps): React.ReactElement;
 export default FormBuilder;