@digigov/form 0.6.9 → 0.7.1

package/Questions/getNextStep.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getNextStep = getNextStep;
+
+function getNextStep(currentStep, steps, data) {
+  if (currentStep.nextStep) {
+    var nextStepName = currentStep.nextStep(data);
+
+    if (nextStepName) {
+      return steps.find(function (step) {
+        return step.name === nextStepName;
+      });
+    }
+  }
+
+  var currentStepIndex = steps.findIndex(function (step) {
+    return step.name === currentStep.name;
+  });
+  var nextStep = steps.slice(currentStepIndex + 1).find(function (step) {
+    if (step.show) {
+      return step.show(data);
+    }
+
+    return true;
+  });
+  return nextStep;
+}

package/Questions/index.js

@@ -1,21 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  QuestionsContext: true,
-  Questions: true
-};
-exports["default"] = exports.QuestionsContext = exports.Questions = void 0;
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _exportNames = {};
+exports["default"] = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _Questions = require("@digigov/form/Questions/Questions");
 
 var _Step = require("@digigov/form/Questions/Step");
 
@@ -30,142 +21,5 @@ Object.keys(_Step).forEach(function (key) {
     }
   });
 });
-
-var _form = require("@digigov/form");
-
-Object.keys(_form).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _form[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _form[key];
-    }
-  });
-});
-
-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); }
-
-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; }
-
-var isBrowser = typeof window !== 'undefined';
-var defaultStep = {
-  name: ''
-};
-var QuestionsContext = /*#__PURE__*/(0, _react.createContext)({
-  currentStep: defaultStep,
-  steps: [],
-  submitStep: function submitStep() {
-    return null;
-  }
-});
-exports.QuestionsContext = QuestionsContext;
-
-function getNextStep(currentStep, steps, data) {
-  if (currentStep.nextStep) {
-    var nextStepName = currentStep.nextStep(data);
-
-    if (nextStepName) {
-      return steps.find(function (step) {
-        return step.name === nextStepName;
-      });
-    }
-  }
-
-  var currentStepIndex = steps.findIndex(function (step) {
-    return step.name === currentStep.name;
-  });
-  var nextStep = steps.slice(currentStepIndex + 1).find(function (step) {
-    if (step.show) {
-      return step.show(data);
-    }
-
-    return true;
-  });
-  return nextStep;
-}
-/**
- * The Question component accepts question data as props
- * uses composable components to provide a wholesome UX
- *
- */
-
-
-var Questions = function Questions(_ref) {
-  var name = _ref.name,
-      steps = _ref.steps,
-      _ref$initialData = _ref.initialData,
-      initialData = _ref$initialData === void 0 ? {} : _ref$initialData,
-      onChange = _ref.onChange,
-      onSubmit = _ref.onSubmit,
-      onActiveStep = _ref.onActiveStep,
-      forceStepName = _ref.forceStepName,
-      _ref$localDraft = _ref.localDraft,
-      localDraft = _ref$localDraft === void 0 ? false : _ref$localDraft,
-      children = _ref.children;
-
-  var _useState = (0, _react.useState)({
-    name: ''
-  }),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      currentStep = _useState2[0],
-      setCurrentStep = _useState2[1];
-
-  (0, _react.useEffect)(function () {
-    if (!forceStepName) {
-      setCurrentStep(steps[0]);
-    }
-  }, [forceStepName, steps]);
-  (0, _react.useEffect)(function () {
-    if (forceStepName !== currentStep.name) {
-      var forceStep = steps.find(function (_ref2) {
-        var name = _ref2.name;
-        return name === forceStepName;
-      });
-      forceStep && setCurrentStep(forceStep);
-    }
-  }, [forceStepName]);
-  var localData = isBrowser && localDraft && window.localStorage.getItem("questions-".concat(name));
-
-  var _useState3 = (0, _react.useState)(localData && JSON.parse(localData) || initialData),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      data = _useState4[0],
-      setData = _useState4[1];
-
-  var submitStep = function submitStep(stepName, stepData) {
-    data[stepName] = stepData;
-
-    if (localDraft) {
-      isBrowser && window.localStorage.setItem("questions-".concat(name), JSON.stringify(data));
-    }
-
-    if (onChange) {
-      onChange && onChange(data);
-    }
-
-    setData(data);
-    var nextStep = getNextStep(currentStep, steps, data);
-
-    if (nextStep) {
-      onActiveStep && onActiveStep(nextStep);
-      setCurrentStep(nextStep);
-    } else {
-      onSubmit(data);
-    }
-  };
-
-  return /*#__PURE__*/_react["default"].createElement(QuestionsContext.Provider, {
-    value: {
-      steps: steps,
-      currentStep: currentStep,
-      submitStep: submitStep,
-      data: data,
-      onActiveStep: onActiveStep
-    }
-  }, children);
-};
-
-exports.Questions = Questions;
-var _default = Questions;
+var _default = _Questions.Questions;
 exports["default"] = _default;

package/Questions/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/es/Field/FieldBase.js

@@ -0,0 +1,93 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["required", "name", "component", "wrapper", "control", "type", "controlled", "enabled", "editable", "defaultValue", "label", "extra", "layout", "error", "register"];
+import React from 'react';
+import FieldContainer from '@digigov/form/Field/FieldContainer';
+import { Controller } from 'react-hook-form';
+export var FieldBase = function FieldBase(props) {
+  var required = props.required,
+      name = props.name,
+      Component = props.component,
+      wrapper = props.wrapper,
+      control = props.control,
+      type = props.type,
+      _props$controlled = props.controlled,
+      controlled = _props$controlled === void 0 ? false : _props$controlled,
+      _props$enabled = props.enabled,
+      enabled = _props$enabled === void 0 ? true : _props$enabled,
+      editable = props.editable,
+      defaultValue = props.defaultValue,
+      label = props.label,
+      _props$extra = props.extra,
+      extra = _props$extra === void 0 ? {} : _props$extra,
+      layout = props.layout,
+      error = props.error,
+      register = props.register,
+      componentProps = _objectWithoutProperties(props, _excluded);
+
+  if (!enabled) {
+    return null;
+  }
+
+  if (controlled) {
+    return /*#__PURE__*/React.createElement(FieldContainer, {
+      label: label,
+      layout: layout,
+      error: error,
+      wrapper: wrapper,
+      name: name
+    }, /*#__PURE__*/React.createElement(Controller, {
+      control: control,
+      name: name,
+      render: function render(_ref) {
+        var onChange = _ref.onChange,
+            onBlur = _ref.onBlur,
+            value = _ref.value;
+        return /*#__PURE__*/React.createElement(Component, _extends({
+          name: name,
+          onChange: onChange,
+          onBlur: onBlur,
+          value: value,
+          defaultValue: defaultValue,
+          extra: extra,
+          error: !!error,
+          type: type,
+          "aria-required": !!required,
+          "aria-describedby": error && "".concat(name, "-error"),
+          required: required,
+          disabled: editable === false
+        }, componentProps));
+      }
+    }));
+  }
+
+  return /*#__PURE__*/React.createElement(FieldContainer, {
+    label: label,
+    layout: layout,
+    error: error,
+    wrapper: wrapper,
+    name: name
+  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({
+    name: name,
+    ref: register,
+    control: control,
+    error: !!error,
+    extra: extra,
+    type: type,
+    "aria-required": !!required,
+    "aria-describedby": error && "".concat(name, "-error"),
+    required: required,
+    disabled: editable === false
+  }, componentProps)) : /*#__PURE__*/React.createElement(Component, _extends({
+    name: name,
+    register: register,
+    control: control,
+    error: !!error,
+    extra: extra,
+    type: type,
+    "aria-required": !!required,
+    "aria-describedby": error && "".concat(name, "-error"),
+    required: required,
+    disabled: editable === false
+  }, componentProps)));
+};

package/es/Field/{ConditionalField.js → FieldConditional.js}

@@ -1,32 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { useWatch } from 'react-hook-form';
-import { FieldBase } from '@digigov/form/Field/';
-
-function evaluateFieldWithConditions(field, variables) {
-  var newField = _extends({}, 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;
-}
-
+import { evaluateFieldWithConditions } from '@digigov/form/Field/utils';
+import { FieldBase } from '@digigov/form/Field/FieldBase';
 var ChildFieldMemo = /*#__PURE__*/React.memo(function ChildField(_ref) {
   var dependencies = _ref.dependencies,
       field = _ref.field,
@@ -57,7 +33,7 @@ var ChildFieldMemo = /*#__PURE__*/React.memo(function ChildField(_ref) {
 
   return true;
 });
-export var ConditionalField = function ConditionalField(_ref2) {
+export var FieldConditional = function FieldConditional(_ref2) {
   var control = _ref2.control,
       field = _ref2.field,
       register = _ref2.register,
@@ -74,4 +50,5 @@ export var ConditionalField = function ConditionalField(_ref2) {
     register: register,
     error: error
   });
-};
+};
+export default FieldConditional;

package/es/Field/FieldContainer.js

@@ -0,0 +1,40 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import CoreField from '@digigov/react-core/Field';
+import CoreLabel from '@digigov/react-core/Label';
+import CoreFieldset from '@digigov/react-core/Fieldset';
+import Hint from '@digigov/react-core/Hint';
+import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
+import ErrorMessage from '@digigov/react-core/ErrorMessage';
+import { useTranslation } from '@digigov/ui/app/i18n';
+import Label from '@digigov/form/inputs/Label';
+export var FieldContainer = function FieldContainer(_ref) {
+  var name = _ref.name,
+      wrapper = _ref.wrapper,
+      label = _ref.label,
+      children = _ref.children,
+      error = _ref.error,
+      layout = _ref.layout;
+
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
+  if (wrapper === 'fieldset') {
+    return /*#__PURE__*/React.createElement(CoreField, _extends({
+      error: !!error
+    }, layout), /*#__PURE__*/React.createElement(CoreFieldset, null, /*#__PURE__*/React.createElement(FieldsetLegend, {
+      size: "s"
+    }, label && label.primary, label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)), error && /*#__PURE__*/React.createElement(ErrorMessage, {
+      id: "".concat(name, "-error")
+    }, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
+  } else {
+    return /*#__PURE__*/React.createElement(CoreField, _extends({
+      error: !!error
+    }, layout), /*#__PURE__*/React.createElement(CoreLabel, null, label && /*#__PURE__*/React.createElement(Label, {
+      label: label
+    }), error && /*#__PURE__*/React.createElement(ErrorMessage, {
+      id: "".concat(name, "-error")
+    }, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
+  }
+};
+export default FieldContainer;

package/es/Field/index.js

@@ -1,239 +1,14 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["required", "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';
-import { FormContext } from '@digigov/form';
-import CoreField from '@digigov/react-core/Field';
-import CoreLabel from '@digigov/react-core/Label';
-import CoreFieldset from '@digigov/react-core/Fieldset';
-import Hint from '@digigov/react-core/Hint';
-import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
-import ErrorMessage from '@digigov/react-core/ErrorMessage';
-import Input from '@digigov/form/inputs/Input';
-import Checkboxes from '@digigov/form/inputs/Checkboxes';
-import Radio from '@digigov/form/inputs/Radio';
-import Select from '@digigov/form/inputs/Select';
-import FileInput from '@digigov/form/inputs/FileInput';
-import DateInput from '@digigov/form/inputs/DateInput';
-import Label from '@digigov/form/inputs/Label';
-import { useTranslation } from '@digigov/ui/app/i18n';
-var FIELD_COMPONENTS = {
-  text: {
-    component: Input
-  },
-  string: {
-    component: Input
-  },
-  file: {
-    wrapper: 'fieldset',
-    component: FileInput
-  },
-  date: {
-    wrapper: 'fieldset',
-    controlled: true,
-    component: DateInput
-  },
-  'choice:multiple': {
-    wrapper: 'fieldset',
-    controlled: true,
-    component: Checkboxes
-  },
-  'choice:single': {
-    wrapper: 'fieldset',
-    controlled: false,
-    component: Radio
-  }
-};
-var ALTERNATIVE_COMPONENTS = {
-  Select: {
-    component: Select,
-    controlled: false
-  }
-};
-
-var FieldContainer = function FieldContainer(_ref) {
+var _excluded = ["name", "children"];
+import React, { useMemo } from 'react';
+import { FieldBase } from '@digigov/form/Field/FieldBase';
+import FieldConditional from '@digigov/form/Field/FieldConditional';
+import { useField, calculateField } from '@digigov/form/Field/utils';
+export var Field = function Field(_ref) {
   var name = _ref.name,
-      wrapper = _ref.wrapper,
-      label = _ref.label,
       children = _ref.children,
-      error = _ref.error;
-
-  var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
-  if (wrapper === 'fieldset') {
-    return /*#__PURE__*/React.createElement(CoreField, {
-      error: !!error
-    }, /*#__PURE__*/React.createElement(CoreFieldset, null, /*#__PURE__*/React.createElement(FieldsetLegend, {
-      size: "s"
-    }, label && label.primary, label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)), error && /*#__PURE__*/React.createElement(ErrorMessage, {
-      id: "".concat(name, "-error")
-    }, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
-  } else {
-    return /*#__PURE__*/React.createElement(CoreField, {
-      error: !!error
-    }, /*#__PURE__*/React.createElement(CoreLabel, null, label && /*#__PURE__*/React.createElement(Label, {
-      label: label
-    }), error && /*#__PURE__*/React.createElement(ErrorMessage, {
-      id: "".concat(name, "-error")
-    }, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
-  }
-};
-
-export var FieldBase = function FieldBase(props) {
-  var required = props.required,
-      name = props.name,
-      Component = props.component,
-      wrapper = props.wrapper,
-      control = props.control,
-      type = props.type,
-      _props$controlled = props.controlled,
-      controlled = _props$controlled === void 0 ? false : _props$controlled,
-      _props$enabled = props.enabled,
-      enabled = _props$enabled === void 0 ? true : _props$enabled,
-      editable = props.editable,
-      defaultValue = props.defaultValue,
-      label = props.label,
-      _props$extra = props.extra,
-      extra = _props$extra === void 0 ? {} : _props$extra,
-      layout = props.layout,
-      error = props.error,
-      register = props.register,
-      componentProps = _objectWithoutProperties(props, _excluded);
-
-  if (!enabled) {
-    return null;
-  }
-
-  if (controlled) {
-    return /*#__PURE__*/React.createElement(FieldContainer, {
-      label: label,
-      layout: layout,
-      error: error,
-      wrapper: wrapper,
-      name: name
-    }, /*#__PURE__*/React.createElement(Controller, {
-      control: control,
-      name: name,
-      render: function render(_ref2) {
-        var onChange = _ref2.onChange,
-            onBlur = _ref2.onBlur,
-            value = _ref2.value;
-        return /*#__PURE__*/React.createElement(Component, _extends({
-          name: name,
-          onChange: onChange,
-          onBlur: onBlur,
-          value: value,
-          defaultValue: defaultValue,
-          extra: extra,
-          error: !!error,
-          type: type,
-          "aria-required": !!required,
-          "aria-describedby": error && "".concat(name, "-error"),
-          required: required,
-          disabled: editable === false
-        }, componentProps));
-      }
-    }));
-  }
-
-  return /*#__PURE__*/React.createElement(FieldContainer, {
-    label: label,
-    layout: layout,
-    error: error,
-    wrapper: wrapper,
-    name: name
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({
-    name: name,
-    ref: register,
-    control: control,
-    error: !!error,
-    extra: extra,
-    type: type,
-    "aria-required": !!required,
-    "aria-describedby": error && "".concat(name, "-error"),
-    required: required,
-    disabled: editable === false
-  }, componentProps)) : /*#__PURE__*/React.createElement(Component, _extends({
-    name: name,
-    register: register,
-    control: control,
-    error: !!error,
-    extra: extra,
-    type: type,
-    "aria-required": !!required,
-    "aria-describedby": error && "".concat(name, "-error"),
-    required: required,
-    disabled: editable === false
-  }, componentProps)));
-};
-
-var useField = function useField(name, customField) {
-  var _useContext = useContext(FormContext),
-      fieldsMap = _useContext.fieldsMap,
-      control = _useContext.control,
-      register = _useContext.register,
-      errors = _useContext.errors,
-      registerField = _useContext.registerField,
-      componentRegistry = _useContext.componentRegistry;
-
-  useMemo(function () {
-    return (customField === null || customField === void 0 ? void 0 : customField.type) && registerField(_extends({}, customField, {
-      key: name
-    }));
-  }, [customField, name, registerField]);
-  return {
-    field: customField || fieldsMap[name],
-    control: control,
-    register: register,
-    componentRegistry: componentRegistry,
-    error: errors[name]
-  };
-};
-
-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 _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;
-}
-
-export var Field = function Field(_ref3) {
-  var name = _ref3.name,
-      children = _ref3.children,
-      customField = _objectWithoutProperties(_ref3, _excluded2);
+      customField = _objectWithoutProperties(_ref, _excluded);
 
   var _useField = useField(name, customField !== null && customField !== void 0 && customField.type ? customField : null),
       field = _useField.field,
@@ -247,7 +22,7 @@ export var Field = function Field(_ref3) {
   }, [field]);
 
   if (calculatedField.condition) {
-    return /*#__PURE__*/React.createElement(ConditionalField, {
+    return /*#__PURE__*/React.createElement(FieldConditional, {
       control: control,
       register: register,
       field: calculatedField,

package/es/Field/types.js

@@ -0,0 +1 @@
+export {};