@ukhomeoffice/cop-react-form-renderer 2.1.0 → 2.2.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.
@@ -11,6 +11,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
11
11
 
12
12
  var _react = require("react");
13
13
 
14
+ var _useHooks2 = _interopRequireDefault(require("../../hooks/useHooks"));
15
+
14
16
  var _useRefData2 = _interopRequireWildcard(require("../../hooks/useRefData"));
15
17
 
16
18
  var _utils = _interopRequireDefault(require("../../utils"));
@@ -52,6 +54,9 @@ var FormComponent = function FormComponent(_ref) {
52
54
  onChange = _ref.onChange,
53
55
  attrs = _objectWithoutProperties(_ref, _excluded);
54
56
 
57
+ var _useHooks = (0, _useHooks2.default)(),
58
+ hooks = _useHooks.hooks;
59
+
55
60
  var _useRefData = (0, _useRefData2.default)(component),
56
61
  data = _useRefData.data,
57
62
  status = _useRefData.status;
@@ -72,7 +77,7 @@ var FormComponent = function FormComponent(_ref) {
72
77
  options: options,
73
78
  value: value || '',
74
79
  onChange: onChange
75
- }), wrap);
80
+ }), wrap, hooks.onGetComponent);
76
81
  };
77
82
 
78
83
  FormComponent.propTypes = {
@@ -4,6 +4,8 @@ var _react = require("@testing-library/react");
4
4
 
5
5
  var _react2 = _interopRequireDefault(require("react"));
6
6
 
7
+ var _useHooks = require("../../hooks/useHooks");
8
+
7
9
  var _FormComponent = _interopRequireDefault(require("./FormComponent"));
8
10
 
9
11
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -14,6 +16,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
14
16
 
15
17
  describe('components', function () {
16
18
  describe('FormComponent', function () {
19
+ beforeEach(function () {
20
+ (0, _useHooks.resetHooks)();
21
+ });
17
22
  it('should render a text component appropriately', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
18
23
  var ID, VALUE, COMPONENT, ON_CHANGE, _render, container, formGroup, label, hint, input;
19
24
 
@@ -133,5 +138,67 @@ describe('components', function () {
133
138
  }
134
139
  }, _callee3);
135
140
  })));
141
+ it('should render an overridden html component appropriately', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
142
+ var ID, COMPONENT, _render4, container, div;
143
+
144
+ return regeneratorRuntime.wrap(function _callee4$(_context4) {
145
+ while (1) {
146
+ switch (_context4.prev = _context4.next) {
147
+ case 0:
148
+ (0, _useHooks.addHook)('onGetComponent', function (config, wrap) {
149
+ return /*#__PURE__*/_react2.default.createElement("div", null, "".concat(config.type, " | ").concat(config.tagName, " | ").concat(config.content, " | ").concat(wrap));
150
+ });
151
+ ID = 'component';
152
+ COMPONENT = {
153
+ type: 'html',
154
+ tagName: 'p',
155
+ content: 'HTML content'
156
+ };
157
+ _render4 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_FormComponent.default, {
158
+ "data-testid": ID,
159
+ component: COMPONENT
160
+ })), container = _render4.container;
161
+ div = container.childNodes[0];
162
+ expect(div.tagName).toEqual('DIV');
163
+ expect(div.textContent).toEqual("".concat(COMPONENT.type, " | ").concat(COMPONENT.tagName, " | ").concat(COMPONENT.content, " | true"));
164
+
165
+ case 7:
166
+ case "end":
167
+ return _context4.stop();
168
+ }
169
+ }
170
+ }, _callee4);
171
+ })));
172
+ it('should render the correct html component when the override returns null', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
173
+ var ID, COMPONENT, _render5, container, p;
174
+
175
+ return regeneratorRuntime.wrap(function _callee5$(_context5) {
176
+ while (1) {
177
+ switch (_context5.prev = _context5.next) {
178
+ case 0:
179
+ (0, _useHooks.addHook)('onGetComponent', function () {
180
+ return null;
181
+ });
182
+ ID = 'component';
183
+ COMPONENT = {
184
+ type: 'html',
185
+ tagName: 'p',
186
+ content: 'HTML content'
187
+ };
188
+ _render5 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_FormComponent.default, {
189
+ "data-testid": ID,
190
+ component: COMPONENT
191
+ })), container = _render5.container;
192
+ p = container.childNodes[0];
193
+ expect(p.tagName).toEqual('P');
194
+ expect(p.textContent).toEqual(COMPONENT.content);
195
+
196
+ case 7:
197
+ case "end":
198
+ return _context5.stop();
199
+ }
200
+ }
201
+ }, _callee5);
202
+ })));
136
203
  });
137
204
  });
@@ -4,11 +4,14 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.resetHooks = exports.removeHook = exports.default = exports.addHook = exports.ALLOWED_HOOKS = void 0;
7
- var ALLOWED_HOOKS = ['onRequest', 'onFormComplete', 'onFormLoad', 'onPageChange', 'onSubmit'];
7
+ var ALLOWED_HOOKS = ['onFormComplete', 'onFormLoad', 'onGetComponent', 'onPageChange', 'onRequest', 'onSubmit'];
8
8
  exports.ALLOWED_HOOKS = ALLOWED_HOOKS;
9
9
  var DEFAULT_HOOKS = {
10
10
  onFormComplete: function onFormComplete() {},
11
11
  onFormLoad: function onFormLoad() {},
12
+ onGetComponent: function onGetComponent(config, wrap) {
13
+ return null;
14
+ },
12
15
  onPageChange: function onPageChange(pageId) {
13
16
  return pageId;
14
17
  },
@@ -22,6 +25,7 @@ var DEFAULT_HOOKS = {
22
25
  var hooks = {
23
26
  onFormComplete: DEFAULT_HOOKS.onFormComplete,
24
27
  onFormLoad: DEFAULT_HOOKS.onFormLoad,
28
+ onGetComponent: DEFAULT_HOOKS.onGetComponent,
25
29
  onPageChange: DEFAULT_HOOKS.onPageChange,
26
30
  onRequest: DEFAULT_HOOKS.onRequest,
27
31
  onSubmit: DEFAULT_HOOKS.onSubmit
@@ -132,9 +132,27 @@ var getComponentByType = function getComponentByType(config) {
132
132
  }
133
133
  }
134
134
  };
135
+ /**
136
+ * Get a renderable component, based on a configuration object.
137
+ * @param {object} config The configuration object for the component.
138
+ * @param {boolean} wrap Indicates whether or not the component should be wrapped.
139
+ * @param {Function} fnOverride An optional override function for component rendering.
140
+ * @returns A renderable component.
141
+ */
142
+
135
143
 
136
144
  var getComponent = function getComponent(config) {
137
145
  var wrap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
146
+ var fnOverride = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
147
+
148
+ if (typeof fnOverride === 'function') {
149
+ var overrideComponent = fnOverride(config, wrap);
150
+
151
+ if (overrideComponent) {
152
+ return overrideComponent;
153
+ }
154
+ }
155
+
138
156
  var component = getComponentByType(config);
139
157
 
140
158
  if (component && wrap && (0, _isEditable.default)(config)) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ukhomeoffice/cop-react-form-renderer",
3
- "version": "2.1.0",
3
+ "version": "2.2.0",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "clean": "rimraf dist",