@ukhomeoffice/cop-react-form-renderer 5.0.0-alpha → 5.0.0

package/dist/components/FormComponent/FormComponent.stories.mdx

@@ -0,0 +1,184 @@
+<!-- Global imports -->
+import { ArgsTable, Canvas, Meta, Story } from '@storybook/addon-docs';
+import { Details, Heading, Link } from '@ukhomeoffice/cop-react-components';
+import withMock from 'storybook-addon-mock';
+
+<!-- Local imports -->
+import { HooksContextProvider, ValidationContextProvider } from '../../context';
+import FormComponent from './FormComponent';
+
+<!-- JSON documents -->
+import CIVIL_SERVANT from '../../json/areYouACivilServant.json';
+import GRADE from '../../json/grade.json';
+import TEAMS from '../../json/team.json';
+import USER_PROFILE_DATA from '../../json/userProfile.data.json';
+import USER_PROFILE from '../../json/userProfile.json';
+
+<Meta title="Components/Form component" id="D-FormComponent" component={ FormComponent } decorators={[withMock]} />
+
+<Heading size="xl" caption="Components">Form component</Heading>
+
+Renders a single component on a form with <Link href="https://ukhomeoffice.github.io/cop-react-components/?path=/docs/d-alert--default-story">COP React components</Link>,
+on the basis of a <Link href="/?path=/docs/f-json-component">JSON</Link> configuration.
+
+<Canvas withToolbar>
+  <Story name="Default" parameters={{
+    mockData: [
+      {
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
+        method: 'GET',
+        status: 200,
+        response: CIVIL_SERVANT
+      },
+      {
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
+        method: 'GET',
+        status: 200,
+        response: GRADE
+      },
+      {
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
+        method: 'GET',
+        status: 200,
+        response: TEAMS
+      }
+    ]
+  }}>
+    {() => {
+      const COMPONENT = {
+        ...USER_PROFILE.components.find(c => c.id === 'areYouACivilServant'),
+        data: {
+          url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`
+        }
+      };
+      const ON_CHANGE = ({ target }) => {
+        // Do something with the target here.
+      };
+      return (
+        <HooksContextProvider>
+          <ValidationContextProvider>
+            <FormComponent component={COMPONENT} value={''} onChange={ON_CHANGE} />
+          </ValidationContextProvider>
+        </HooksContextProvider>
+      );
+    }}
+  </Story>
+</Canvas>
+
+<Details summary="Properties" className="no-indent">
+  <ArgsTable of={ FormComponent } />
+</Details>
+
+
+## Variants
+### `autocomplete`
+<Canvas>
+  <Story name="Autocomplete" parameters={{
+    mockData: [
+      {
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
+        method: 'GET',
+        status: 200,
+        response: CIVIL_SERVANT
+      },
+      {
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
+        method: 'GET',
+        status: 200,
+        response: GRADE
+      },
+      {
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
+        method: 'GET',
+        status: 200,
+        response: TEAMS
+      }
+    ]
+  }}>
+    {() => {
+      const COMPONENT = {
+        ...USER_PROFILE.components.find(c => c.id === 'team'),
+        data: {
+          url: `${USER_PROFILE_DATA.urls.refData}/team`
+        }
+      };
+      const ON_CHANGE = ({ target }) => {
+        // Do something with the target here.
+      };
+      return (
+        <HooksContextProvider>
+          <ValidationContextProvider>
+            <FormComponent component={COMPONENT} value={''} onChange={ON_CHANGE} />
+          </ValidationContextProvider>
+        </HooksContextProvider>
+      );
+    }}
+  </Story>
+</Canvas>
+
+### `html`
+
+<Canvas>
+  <Story name="HTML">
+    {() => {
+      const COMPONENT = { type: 'html', tagName: 'p', content: 'A paragraph of text to render' };
+      const ON_CHANGE = ({ target }) => {
+        // Do something with the target here.
+      };
+      return (
+        <HooksContextProvider>
+          <ValidationContextProvider>
+            <FormComponent component={COMPONENT} value={''} onChange={ON_CHANGE} />
+          </ValidationContextProvider>
+        </HooksContextProvider>
+      );
+    }}
+  </Story>
+</Canvas>
+
+### Unwrapped `autocomplete`
+<Canvas>
+  <Story name="Unwrapped autocomplete" parameters={{
+    mockData: [
+      {
+        url: `${USER_PROFILE_DATA.urls.refData}/areYouACivilServant`,
+        method: 'GET',
+        status: 200,
+        response: CIVIL_SERVANT
+      },
+      {
+        url: `${USER_PROFILE_DATA.urls.refData}/grade`,
+        method: 'GET',
+        status: 200,
+        response: GRADE
+      },
+      {
+        url: `${USER_PROFILE_DATA.urls.refData}/team`,
+        method: 'GET',
+        status: 200,
+        response: TEAMS
+      }
+    ]
+  }}>
+    {() => {
+      const COMPONENT = {
+        ...USER_PROFILE.components.find(c => c.id === 'team'),
+        id: 'team2',
+        fieldId: 'team2',
+        data: {
+          url: `${USER_PROFILE_DATA.urls.refData}/team`
+        }
+      };
+      const ON_CHANGE = ({ target }) => {
+        // Do something with the target here.
+      };
+      return (
+        <HooksContextProvider>
+          <ValidationContextProvider>
+            <FormComponent component={COMPONENT} value={''} wrap={false} onChange={ON_CHANGE} />
+          </ValidationContextProvider>
+        </HooksContextProvider>
+      );
+    }}
+  </Story>
+</Canvas>

package/dist/components/FormComponent/FormComponent.test.js

@@ -0,0 +1,226 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _react = _interopRequireDefault(require("react"));
+var _setupTests = require("../../setupTests");
+var _FormComponent = _interopRequireDefault(require("./FormComponent"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+describe('components', function () {
+  describe('FormComponent', function () {
+    it('should render a text component appropriately', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var ID, VALUE, COMPONENT, ON_CHANGE, _renderWithValidation, container, formGroup, label, hint, input;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            ID = 'component';
+            VALUE = 'Text value';
+            COMPONENT = {
+              id: ID,
+              fieldId: ID,
+              type: 'text',
+              label: 'Text component',
+              hint: 'Text hint'
+            };
+            ON_CHANGE = function ON_CHANGE() {};
+            _renderWithValidation = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+              "data-testid": ID,
+              component: COMPONENT,
+              value: VALUE,
+              onChange: ON_CHANGE
+            })), container = _renderWithValidation.container; // text components are wrapper in a FormGroup by default.
+            formGroup = container.childNodes[0];
+            expect(formGroup.tagName).toEqual('DIV');
+            expect(formGroup.classList).toContain('govuk-form-group');
+            label = formGroup.childNodes[0];
+            expect(label.tagName).toEqual('LABEL');
+            expect(label.classList).toContain('govuk-label');
+            expect(label.textContent).toEqual("".concat(COMPONENT.label, " (optional)"));
+            expect(label.getAttribute('for')).toEqual(ID);
+            hint = formGroup.childNodes[1];
+            expect(hint.tagName).toEqual('DIV');
+            expect(hint.classList).toContain('govuk-hint');
+            expect(hint.textContent).toEqual(COMPONENT.hint);
+            input = formGroup.childNodes[2];
+            expect(input.tagName).toEqual('INPUT');
+            expect(input.classList).toContain('govuk-input');
+            expect(input.id).toEqual(ID);
+            expect(input.value).toEqual(VALUE);
+          case 22:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })));
+    it('should render a text component appropriately with wrap turned off', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var ID, VALUE, COMPONENT, ON_CHANGE, _renderWithValidation2, container, input;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            ID = 'component';
+            VALUE = 'Text value';
+            COMPONENT = {
+              id: ID,
+              fieldId: ID,
+              type: 'text',
+              label: 'Text component',
+              hint: 'Text hint'
+            };
+            ON_CHANGE = function ON_CHANGE() {};
+            _renderWithValidation2 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+              "data-testid": ID,
+              component: COMPONENT,
+              wrap: false,
+              value: VALUE,
+              onChange: ON_CHANGE
+            })), container = _renderWithValidation2.container; // With wrap = false, there should be no form group.
+            input = container.childNodes[0];
+            expect(input.tagName).toEqual('INPUT');
+            expect(input.classList).toContain('govuk-input');
+            expect(input.id).toEqual(ID);
+            expect(input.value).toEqual(VALUE);
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    })));
+    it('should render an html component appropriately', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var ID, COMPONENT, _renderWithValidation3, container, p;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            ID = 'component';
+            COMPONENT = {
+              type: 'html',
+              tagName: 'p',
+              content: 'HTML content'
+            };
+            _renderWithValidation3 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+              "data-testid": ID,
+              component: COMPONENT
+            })), container = _renderWithValidation3.container;
+            p = container.childNodes[0];
+            expect(p.tagName).toEqual('P');
+            expect(p.textContent).toEqual(COMPONENT.content);
+          case 6:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    })));
+    it('should render an overridden html component appropriately', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var hooks, ID, COMPONENT, _renderWithValidation4, container, div;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            hooks = {
+              onGetComponent: function onGetComponent(config, wrap) {
+                return /*#__PURE__*/_react.default.createElement("div", null, "".concat(config.type, " | ").concat(config.tagName, " | ").concat(config.content, " | ").concat(wrap));
+              }
+            };
+            ID = 'component';
+            COMPONENT = {
+              type: 'html',
+              tagName: 'p',
+              content: 'HTML content'
+            };
+            _renderWithValidation4 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+              "data-testid": ID,
+              component: COMPONENT
+            }), {
+              hooks: hooks
+            }), container = _renderWithValidation4.container;
+            div = container.childNodes[0];
+            expect(div.tagName).toEqual('DIV');
+            expect(div.textContent).toEqual("".concat(COMPONENT.type, " | ").concat(COMPONENT.tagName, " | ").concat(COMPONENT.content, " | true"));
+          case 7:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    })));
+    it('should render the correct html component when the override returns null', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var hooks, ID, COMPONENT, _renderWithValidation5, container, p;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            hooks = {
+              onGetComponent: function onGetComponent() {
+                return null;
+              }
+            };
+            ID = 'component';
+            COMPONENT = {
+              type: 'html',
+              tagName: 'p',
+              content: 'HTML content'
+            };
+            _renderWithValidation5 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+              "data-testid": ID,
+              component: COMPONENT
+            }), {
+              hooks: hooks
+            }), container = _renderWithValidation5.container;
+            p = container.childNodes[0];
+            expect(p.tagName).toEqual('P');
+            expect(p.textContent).toEqual(COMPONENT.content);
+          case 7:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    })));
+    it('should render a text component appropriately with interpolated label', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var ID, VALUE, COMPONENT, DATA, ON_CHANGE, _renderWithValidation6, container, formGroup, label, hint, input;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            ID = 'component';
+            VALUE = 'Text value'; // eslint-disable-next-line no-template-curly-in-string
+            COMPONENT = {
+              id: ID,
+              fieldId: ID,
+              type: 'text',
+              label: '${text} Text component',
+              cya_label: '${text} Text component',
+              hint: 'Text hint'
+            };
+            DATA = {
+              text: 'Interpolated'
+            };
+            ON_CHANGE = function ON_CHANGE() {};
+            _renderWithValidation6 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+              "data-testid": ID,
+              component: COMPONENT,
+              value: VALUE,
+              onChange: ON_CHANGE,
+              formData: DATA
+            })), container = _renderWithValidation6.container; // text components are wrapper in a FormGroup by default.
+            formGroup = container.childNodes[0];
+            expect(formGroup.tagName).toEqual('DIV');
+            expect(formGroup.classList).toContain('govuk-form-group');
+            label = formGroup.childNodes[0];
+            expect(label.tagName).toEqual('LABEL');
+            expect(label.classList).toContain('govuk-label');
+            expect(label.textContent).toEqual('Interpolated Text component (optional)');
+            expect(label.getAttribute('for')).toEqual(ID);
+            hint = formGroup.childNodes[1];
+            expect(hint.tagName).toEqual('DIV');
+            expect(hint.classList).toContain('govuk-hint');
+            expect(hint.textContent).toEqual(COMPONENT.hint);
+            input = formGroup.childNodes[2];
+            expect(input.tagName).toEqual('INPUT');
+            expect(input.classList).toContain('govuk-input');
+            expect(input.id).toEqual(ID);
+            expect(input.value).toEqual(VALUE);
+          case 23:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    })));
+  });
+});

package/dist/components/FormComponent/helpers/addLabel.js

@@ -10,16 +10,17 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
  * @param {object} target The target to be updated.
  * @returns The updated target.
  */
-var addLabel = function addLabel(target, component, data) {
+var addLabel = function addLabel(paramTarget, component, data) {
+  var target = paramTarget;
   // target.value can be an object in which case use value in object attribute
   var value = _typeof(target.value) === 'object' ? target.value.value : target.value;
   // find the reference data item using the value
   var item = data.find(function (e) {
-    return e.id === value;
+    return String(e.id) === value;
   });
   // if item is null it means that the target.value can be used as a label otherwise use item.label
-  target['label'] = item === undefined ? target.value : item.label;
-  target['component'] = component.cya_label;
+  target.label = item === undefined ? target.value : item.label;
+  target.component = component.cya_label;
   return target;
 };
 var _default = addLabel;

package/dist/components/FormComponent/helpers/getComponentFieldSet.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _models = require("../../../models");
+var SHOULD_HAVE_FIELDSET = [_models.ComponentTypes.RADIOS, _models.ComponentTypes.CHECKBOXES, _models.ComponentTypes.DATE];
+var _default = function _default(component) {
+  // Check to see if this is explicitly set first, as this is efficient.
+  if (component.fieldset === true) {
+    return true;
+  }
+  return SHOULD_HAVE_FIELDSET.includes(component.type);
+};
+exports.default = _default;

package/dist/components/FormComponent/helpers/getComponentFieldSet.test.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _getComponentFieldSet = _interopRequireDefault(require("./getComponentFieldSet"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+describe('components.FormComponent.helpers.getComponentFieldSet', function () {
+  it('should return true for component type radios', function () {
+    expect((0, _getComponentFieldSet.default)({
+      type: 'radios'
+    })).toEqual(true);
+  });
+  it('should return true for component type checkboxes', function () {
+    expect((0, _getComponentFieldSet.default)({
+      type: 'checkboxes'
+    })).toEqual(true);
+  });
+  it('should return true for component type date', function () {
+    expect((0, _getComponentFieldSet.default)({
+      type: 'date'
+    })).toEqual(true);
+  });
+  it('should return false for component type text', function () {
+    expect((0, _getComponentFieldSet.default)({
+      type: 'text'
+    })).toEqual(false);
+  });
+  it('should return false when component type missing', function () {
+    expect((0, _getComponentFieldSet.default)({})).toEqual(false);
+  });
+});

package/dist/components/FormComponent/helpers/index.js

@@ -21,7 +21,14 @@ Object.defineProperty(exports, "getComponentError", {
     return _getComponentError.default;
   }
 });
+Object.defineProperty(exports, "getComponentFieldSet", {
+  enumerable: true,
+  get: function get() {
+    return _getComponentFieldSet.default;
+  }
+});
+var _addLabel = _interopRequireDefault(require("./addLabel"));
 var _getComponentDisabled = _interopRequireDefault(require("./getComponentDisabled"));
 var _getComponentError = _interopRequireDefault(require("./getComponentError"));
-var _addLabel = _interopRequireDefault(require("./addLabel"));
+var _getComponentFieldSet = _interopRequireDefault(require("./getComponentFieldSet"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }