@ukhomeoffice/cop-react-form-renderer 5.88.2 → 5.88.6

package/dist/components/FormComponent/FormComponent.js

@@ -89,7 +89,7 @@ var FormComponent = function FormComponent(_ref) {
   };
   (0, _react.useEffect)(function () {
     var defaultValue = _utils.default.Component.defaultValue(component, formData);
-    if (!value && defaultValue) {
+    if (!value && !(formData !== null && formData !== void 0 && formData[component.fieldId]) && defaultValue) {
       if (typeof onComponentChange === 'function') {
         onComponentChange({
           target: {

package/dist/utils/Validate/additional/index.js

@@ -22,7 +22,8 @@ var _mustHaveLessThanDecimalPlaces = _interopRequireDefault(require("./mustHaveL
 var _mustNotContainSql = _interopRequireDefault(require("./mustNotContainSql"));
 var _mustSelectOnlyOne = _interopRequireDefault(require("./mustSelectOnlyOne"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); } // Local imports
+// Local imports
+
 var functions = {
   conditionallyRequired: _conditionallyRequired.default,
   mustBeAfter: _mustBeAfter.default,
@@ -44,7 +45,7 @@ var functions = {
 };
 var additionalValidation = function additionalValidation(value, config, component, formData) {
   var fn = functions[config.function];
-  var valueToValidate = _typeof(value) === 'object' ? value[config.objectValueToUse] : value;
+  var valueToValidate = config.objectValueToUse ? value[config.objectValueToUse] : value;
   if (typeof fn === 'function') {
     return fn(valueToValidate, config, component, formData) ? undefined : config.message;
   }

package/dist/utils/Validate/additional/index.test.js

@@ -58,6 +58,56 @@ describe('utils', function () {
         var VALUE = (0, _dayjs.default)().add(150, 'day').format(_utils.DATE_FORMAT);
         expect((0, _index.default)(COMPONENT, VALUE)).toEqual(undefined);
       });
+      it('should apply optional validators that fail when the value is an object', function () {
+        var COMPONENT = {
+          fieldId: 'container',
+          components: [{
+            id: 'eventDate',
+            fieldId: 'eventDate'
+          }, {
+            id: 'eventTime',
+            fieldId: 'eventTime'
+          }],
+          additionalValidation: [{
+            function: 'mustBeEarlierDateTime',
+            date: 'eventDate',
+            time: 'eventTime',
+            message: 'The date and time cannot be in the future'
+          }]
+        };
+        var VALUE = {
+          container: {
+            eventDate: '01-07-4024',
+            eventTime: '1:1'
+          }
+        };
+        expect((0, _index.default)(COMPONENT, VALUE)).toEqual('The date and time cannot be in the future');
+      });
+      it('should apply optional validators that pass when the value is an object', function () {
+        var COMPONENT = {
+          fieldId: 'container',
+          components: [{
+            id: 'eventDate',
+            fieldId: 'eventDate'
+          }, {
+            id: 'eventTime',
+            fieldId: 'eventTime'
+          }],
+          additionalValidation: [{
+            function: 'mustBeEarlierDateTime',
+            date: 'eventDate',
+            time: 'eventTime',
+            message: 'The date and time cannot be in the future'
+          }]
+        };
+        var VALUE = {
+          container: {
+            eventDate: '01-07-1024',
+            eventTime: '1:1'
+          }
+        };
+        expect((0, _index.default)(COMPONENT, VALUE)).toEqual(undefined);
+      });
       it('should apply optional validators when the value is within an object', function () {
         var COMPONENT = {
           additionalValidation: [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "5.88.2",
+  "version": "5.88.6",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "3.24.0",
+    "@ukhomeoffice/cop-react-components": "3.24.1",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",
@@ -101,4 +101,4 @@
       "last 1 safari version"
     ]
   }
-}
+}