@ukhomeoffice/cop-react-form-renderer 4.78.1 → 4.79.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/context/HooksContext/HooksContext.js +9 -2
  2. package/dist/context/ValidationContext/ValidationContext.js +13 -4
  3. package/dist/context/ValidationContext/ValidationContext.test.js +4 -3
  4. package/package.json +1 -1
package/dist/context/HooksContext/HooksContext.js CHANGED
@@ -41,6 +41,10 @@ var DEFAULT_HOOKS = {
41
41
  onSubmit: function onSubmit(type, payload, onSuccess, onError) {
42
42
  if (typeof onSuccess === 'function') onSuccess();
43
43
  },
44
+ onValidate: function onValidate(page) {
45
+ return [];
46
+ },
47
+ // Consuming application must provide functionality, otherwise this reports no errors.
44
48
  onCancel: function onCancel() {} // Consuming application must provide function to action, else this does nothing.
45
49
  };
46
50
 
@@ -61,6 +65,7 @@ var HooksContextProvider = function HooksContextProvider(_ref) {
61
65
  onPageChange: (overrides === null || overrides === void 0 ? void 0 : overrides.onPageChange) || DEFAULT_HOOKS.onPageChange,
62
66
  onRequest: (overrides === null || overrides === void 0 ? void 0 : overrides.onRequest) || DEFAULT_HOOKS.onRequest,
63
67
  onSubmit: (overrides === null || overrides === void 0 ? void 0 : overrides.onSubmit) || DEFAULT_HOOKS.onSubmit,
68
+ onValidate: (overrides === null || overrides === void 0 ? void 0 : overrides.onValidate) || DEFAULT_HOOKS.onValidate,
64
69
  onCancel: (overrides === null || overrides === void 0 ? void 0 : overrides.onCancel) || DEFAULT_HOOKS.onCancel
65
70
  }),
66
71
  _useState2 = _slicedToArray(_useState, 2),
@@ -102,7 +107,8 @@ HooksContextProvider.propTypes = {
102
107
  onGoingBack: _propTypes.default.func,
103
108
  onPageChange: _propTypes.default.func,
104
109
  onRequest: _propTypes.default.func,
105
- onSubmit: _propTypes.default.func
110
+ onSubmit: _propTypes.default.func,
111
+ onValidate: _propTypes.default.func
106
112
  })
107
113
  };
108
114
  HooksContextProvider.defaultProps = {
@@ -117,6 +123,7 @@ HooksContextProvider.defaultProps = {
117
123
  onGoingBack: undefined,
118
124
  onPageChange: undefined,
119
125
  onRequest: undefined,
120
- onSubmit: undefined
126
+ onSubmit: undefined,
127
+ onValidate: undefined
121
128
  }
122
129
  };
package/dist/context/ValidationContext/ValidationContext.js CHANGED
@@ -8,6 +8,7 @@ exports.default = exports.ValidationContext = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _propTypes = _interopRequireDefault(require("prop-types"));
10
10
  var _utils = _interopRequireDefault(require("../../utils"));
11
+ var _hooks = require("../../hooks");
11
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
13
  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); }
13
14
  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; }
@@ -24,6 +25,8 @@ var ValidationContext = /*#__PURE__*/(0, _react.createContext)();
24
25
  exports.ValidationContext = ValidationContext;
25
26
  var ValidationContextProvider = function ValidationContextProvider(_ref) {
26
27
  var children = _ref.children;
28
+ var _useHooks = (0, _hooks.useHooks)(),
29
+ hooks = _useHooks.hooks;
27
30
  var _useState = (0, _react.useState)([]),
28
31
  _useState2 = _slicedToArray(_useState, 2),
29
32
  errors = _useState2[0],
@@ -67,15 +70,21 @@ var ValidationContextProvider = function ValidationContextProvider(_ref) {
67
70
  var validate = {
68
71
  page: function page(_page) {
69
72
  var pageErrors = _utils.default.Validate.page(_page);
70
- setErrors(pageErrors);
71
- return pageErrors;
73
+ var hookPageErrors = hooks.onValidate(_page);
74
+ var allErrors = Array.isArray(hookPageErrors) ? pageErrors.concat(hookPageErrors) : pageErrors;
75
+ setErrors(allErrors);
76
+ return allErrors;
72
77
  },
73
78
  pages: function pages(_pages) {
74
79
  var pagesErrors = _pages.flatMap(function (page) {
75
80
  return _utils.default.Validate.page(page);
76
81
  });
77
- setErrors(pagesErrors);
78
- return pagesErrors;
82
+ var hookPagesErrors = _pages.flatMap(function (page) {
83
+ return hooks.onValidate(page);
84
+ });
85
+ var allErrors = Array.isArray(hookPagesErrors) ? pagesErrors.concat(hookPagesErrors) : pagesErrors;
86
+ setErrors(allErrors);
87
+ return allErrors;
79
88
  }
80
89
  };
81
90
  return /*#__PURE__*/_react.default.createElement(ValidationContext.Provider, {
package/dist/context/ValidationContext/ValidationContext.test.js CHANGED
@@ -7,6 +7,7 @@ var _react2 = _interopRequireWildcard(require("react"));
7
7
  var _propTypes = _interopRequireDefault(require("prop-types"));
8
8
  var _hooks = require("../../hooks");
9
9
  var _ValidationContext = _interopRequireDefault(require("./ValidationContext"));
10
+ var _HooksContext = _interopRequireDefault(require("../HooksContext"));
10
11
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
12
  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); }
12
13
  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; }
@@ -35,7 +36,7 @@ describe('context.ValidationContext', function () {
35
36
  return _regeneratorRuntime().wrap(function _callee$(_context) {
36
37
  while (1) switch (_context.prev = _context.next) {
37
38
  case 0:
38
- _render = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_ValidationContext.default, null, /*#__PURE__*/_react2.default.createElement(TestComponent, null))), container = _render.container;
39
+ _render = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_HooksContext.default, null, /*#__PURE__*/_react2.default.createElement(_ValidationContext.default, null, /*#__PURE__*/_react2.default.createElement(TestComponent, null)))), container = _render.container;
39
40
  expect(container.childNodes.length).toEqual(4);
40
41
  expect(container.textContent).toContain('addErrors is a function');
41
42
  expect(container.textContent).toContain('clearErrors is a function');
@@ -56,9 +57,9 @@ describe('context.ValidationContext', function () {
56
57
  id: 'alpha',
57
58
  error: 'Alpha is required'
58
59
  }];
59
- _render2 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_ValidationContext.default, null, /*#__PURE__*/_react2.default.createElement(TestComponent, {
60
+ _render2 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_HooksContext.default, null, /*#__PURE__*/_react2.default.createElement(_ValidationContext.default, null, /*#__PURE__*/_react2.default.createElement(TestComponent, {
60
61
  customErrors: CUSTOM_ERRORS
61
- }))), container = _render2.container;
62
+ })))), container = _render2.container;
62
63
  expect(container.childNodes.length).toEqual(5);
63
64
  expect(container.textContent).toContain('addErrors is a function');
64
65
  expect(container.textContent).toContain('clearErrors is a function');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ukhomeoffice/cop-react-form-renderer",
3
- "version": "4.78.1",
3
+ "version": "4.79.0",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "clean": "rimraf dist",