@digigov/form 0.6.9 → 0.6.10

package/Questions/Step/index.js

@@ -8,265 +8,146 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  StepContext: true,
-  Step: true,
-  getAddMoreFields: true,
-  StepArrayReview: true
+  StepDescription: true,
+  StepForm: true,
+  StepQuote: true,
+  StepTitle: true
 };
-exports.getAddMoreFields = exports["default"] = exports.StepContext = exports.StepArrayReview = exports.Step = void 0;
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _Questions = require("@digigov/form/Questions/");
-
-var _PageTitle = _interopRequireWildcard(require("@digigov/ui/app/PageTitle"));
-
-var _Button = _interopRequireDefault(require("@digigov/ui/core/Button"));
-
-var _form = _interopRequireWildcard(require("@digigov/form"));
-
-var _Label = _interopRequireDefault(require("@digigov/form/inputs/Label"));
-
-var _SummaryList = require("@digigov/ui/core/SummaryList");
-
-var _i18n = require("@digigov/ui/app/i18n");
+Object.defineProperty(exports, "StepDescription", {
+  enumerable: true,
+  get: function get() {
+    return _StepDescription["default"];
+  }
+});
+Object.defineProperty(exports, "StepForm", {
+  enumerable: true,
+  get: function get() {
+    return _StepForm["default"];
+  }
+});
+Object.defineProperty(exports, "StepQuote", {
+  enumerable: true,
+  get: function get() {
+    return _StepQuote["default"];
+  }
+});
+Object.defineProperty(exports, "StepTitle", {
+  enumerable: true,
+  get: function get() {
+    return _StepTitle["default"];
+  }
+});
+exports["default"] = void 0;
 
-var _StepDescription = require("@digigov/form/Questions/Step/StepDescription");
+var _ReviewStep = require("@digigov/form/Questions/Step/ReviewStep");
 
-Object.keys(_StepDescription).forEach(function (key) {
+Object.keys(_ReviewStep).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _StepDescription[key]) return;
+  if (key in exports && exports[key] === _ReviewStep[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _StepDescription[key];
+      return _ReviewStep[key];
     }
   });
 });
 
-var _StepForm = require("@digigov/form/Questions/Step/StepForm");
+var _Step = _interopRequireWildcard(require("@digigov/form/Questions/Step/Step"));
 
-Object.keys(_StepForm).forEach(function (key) {
+Object.keys(_Step).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _StepForm[key]) return;
+  if (key in exports && exports[key] === _Step[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _StepForm[key];
+      return _Step[key];
     }
   });
 });
 
-var _StepQuote = require("@digigov/form/Questions/Step/StepQuote");
+var _StepArrayReview = require("@digigov/form/Questions/Step/StepArrayReview");
 
-Object.keys(_StepQuote).forEach(function (key) {
+Object.keys(_StepArrayReview).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _StepQuote[key]) return;
+  if (key in exports && exports[key] === _StepArrayReview[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _StepQuote[key];
+      return _StepArrayReview[key];
     }
   });
 });
 
-var _StepTitle = require("@digigov/form/Questions/Step/StepTitle");
+var _StepContext = require("@digigov/form/Questions/Step/StepContext");
 
-Object.keys(_StepTitle).forEach(function (key) {
+Object.keys(_StepContext).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _StepTitle[key]) return;
+  if (key in exports && exports[key] === _StepContext[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _StepTitle[key];
+      return _StepContext[key];
     }
   });
 });
 
-var _ReviewStep = require("@digigov/form/Questions/Step/ReviewStep");
+var _StepDescription = _interopRequireDefault(require("@digigov/form/Questions/Step/StepDescription"));
 
-Object.keys(_ReviewStep).forEach(function (key) {
+var _StepForm = _interopRequireDefault(require("@digigov/form/Questions/Step/StepForm"));
+
+var _StepQuote = _interopRequireDefault(require("@digigov/form/Questions/Step/StepQuote"));
+
+var _StepTitle = _interopRequireDefault(require("@digigov/form/Questions/Step/StepTitle"));
+
+var _getAddMoreFields = require("@digigov/form/Questions/Step/getAddMoreFields");
+
+Object.keys(_getAddMoreFields).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _ReviewStep[key]) return;
+  if (key in exports && exports[key] === _getAddMoreFields[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _ReviewStep[key];
+      return _getAddMoreFields[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 _Step2 = require("@digigov/form/Questions/Step/");
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-var StepContext = /*#__PURE__*/(0, _react.createContext)({
-  name: '',
-  fields: [],
-  initial: [],
-  errorLabels: [],
-  submitStep: '',
-  review: {
-    title: '',
-    primaryFieldKey: '',
-    addMore: {
-      title: {
-        primary: ''
-      },
-      answers: {
-        positive: {
-          primary: 'Yes'
-        },
-        negative: {
-          primary: 'No'
-        }
-      }
+Object.keys(_Step2).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _Step2[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _Step2[key];
     }
-  },
-  type: 'object'
+  });
 });
-/**
- * The Step component accepts Step data as props
- * uses composable components to provide a wholesome UX
- *
- */
-
-exports.StepContext = StepContext;
-
-var Step = function Step(props) {
-  // or return all Questions and currentStepName
-  // or return a specific Step object
-  var _useContext = (0, _react.useContext)(_Questions.QuestionsContext),
-      currentStep = _useContext.currentStep,
-      submitStep = _useContext.submitStep,
-      data = _useContext.data;
-
-  var _useState = (0, _react.useState)([]),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      stepData = _useState2[0],
-      setStepData = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(false),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      reviewActive = _useState4[0],
-      setReviewActive = _useState4[1];
-
-  var handleArraySubmit = function handleArraySubmit(_name, data) {
-    setStepData([].concat((0, _toConsumableArray2["default"])(stepData), [data]));
-    setReviewActive(true);
-  };
-
-  var handleArrayDeleteItem = function handleArrayDeleteItem(deleteIndex) {
-    var nextStepData = stepData.filter(function (_item, stepIndex) {
-      return stepIndex !== deleteIndex;
-    });
-    setStepData(nextStepData);
-
-    if (nextStepData.length === 0) {
-      setReviewActive(false);
-    }
-  };
-
-  var handleArrayReviewStep = function handleArrayReviewStep(data) {
-    if (data.addMore === 'yes') {
-      setReviewActive(false);
-    } else if (data.addMore === 'no') {
-      submitStep(currentStep.name, stepData);
-    }
-  };
-
-  if (!currentStep || props.name !== currentStep.name) return null; // then provide the currentStep object
-
-  return /*#__PURE__*/_react["default"].createElement(StepContext.Provider, {
-    value: (0, _extends2["default"])({}, currentStep, {
-      submitStep: currentStep.type === 'array' ? handleArraySubmit : submitStep,
-      initial: data[props.name]
-    })
-  }, reviewActive ? /*#__PURE__*/_react["default"].createElement(StepArrayReview, {
-    array: stepData,
-    handleSubmit: handleArrayReviewStep,
-    handleDelete: handleArrayDeleteItem
-  }) : props.children);
-};
 
-exports.Step = Step;
+var _types = require("@digigov/form/Questions/Step/types");
 
-var getAddMoreFields = function getAddMoreFields(currentStep) {
-  var _currentStep$review, _currentStep$review2;
-
-  return [{
-    key: 'addMore',
-    type: 'choice:single',
-    required: true,
-    extra: {
-      options: [{
-        label: ((_currentStep$review = currentStep.review) === null || _currentStep$review === void 0 ? void 0 : _currentStep$review.addMore.answers.positive) || {
-          primary: 'Yes'
-        },
-        value: 'yes'
-      }, {
-        label: ((_currentStep$review2 = currentStep.review) === null || _currentStep$review2 === void 0 ? void 0 : _currentStep$review2.addMore.answers.negative) || {
-          primary: 'No'
-        },
-        value: 'no'
-      }]
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _types[key];
     }
-  }];
-};
-
-exports.getAddMoreFields = getAddMoreFields;
-
-var StepArrayReview = function StepArrayReview(props) {
-  var _currentStep$review4, _currentStep$review5, _currentStep$review6;
-
-  var _useTranslation = (0, _i18n.useTranslation)(),
-      t = _useTranslation.t;
-
-  var _useContext2 = (0, _react.useContext)(_Questions.QuestionsContext),
-      currentStep = _useContext2.currentStep;
+  });
+});
 
-  var fields = getAddMoreFields(currentStep);
-  var primaryField = currentStep.fields.find(function (field) {
-    var _currentStep$review3;
+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); }
 
-    return field.key === ((_currentStep$review3 = currentStep.review) === null || _currentStep$review3 === void 0 ? void 0 : _currentStep$review3.primaryFieldKey);
-  }) || {};
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_PageTitle["default"], null, /*#__PURE__*/_react["default"].createElement(_PageTitle.PageTitleHeading, null, ((_currentStep$review4 = currentStep.review) === null || _currentStep$review4 === void 0 ? void 0 : _currentStep$review4.title) && t((_currentStep$review5 = currentStep.review) === null || _currentStep$review5 === void 0 ? void 0 : _currentStep$review5.title))), /*#__PURE__*/_react["default"].createElement(_SummaryList.SummaryList, null, props.array.map(function (item, idx) {
-    return /*#__PURE__*/_react["default"].createElement(_SummaryList.SummaryListItem, {
-      key: idx
-    }, /*#__PURE__*/_react["default"].createElement(_SummaryList.SummaryListItemKey, null, t(primaryField.label.primary)), /*#__PURE__*/_react["default"].createElement(_SummaryList.SummaryListItemValue, null, item[primaryField.key]), /*#__PURE__*/_react["default"].createElement(_SummaryList.SummaryListItemAction, {
-      onClick: function onClick() {
-        return props.handleDelete(idx);
-      }
-    }, t('button.delete')));
-  })), /*#__PURE__*/_react["default"].createElement(_form["default"], {
-    key: "addmore",
-    fields: fields,
-    onSubmit: props.handleSubmit
-  }, /*#__PURE__*/_react["default"].createElement(_form.Fieldset, null, /*#__PURE__*/_react["default"].createElement(_Label["default"], {
-    label: (_currentStep$review6 = currentStep.review) === null || _currentStep$review6 === void 0 ? void 0 : _currentStep$review6.addMore.title
-  }), fields.map(function (field) {
-    return /*#__PURE__*/_react["default"].createElement(_form.Field, {
-      key: field.key,
-      name: field.key
-    });
-  })), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    type: "submit"
-  }, t('button.submit'))));
-};
+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; }
 
-exports.StepArrayReview = StepArrayReview;
-var _default = Step;
+var _default = _Step["default"];
 exports["default"] = _default;

package/Questions/Step/types.js

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

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
+});