@ukhomeoffice/cop-react-form-renderer 4.19.0 → 4.19.1

package/dist/utils/FormPage/useComponent.js

@@ -19,38 +19,55 @@ var getComponentToUse = function getComponentToUse(toUse, formComponents) {
     return fc.id === firstId;
   }));
 
+  var component = wrapper;
   var parent = wrapper;
 
   var _loop = function _loop() {
     var id = path.shift();
 
-    if (Array.isArray(parent.components)) {
+    if (Array.isArray(component.components)) {
       // Filter the parent components down to just the one referenced
       // by the current id.
+      parent = component;
       parent.components = parent.components.filter(function (c) {
         return c.id === id;
       });
 
       if (parent.components.length > 0) {
         // Make the found child the parent so we can iterate.
-        parent = parent.components[0];
+        component = parent.components[0];
       } else {
         // If no child was found, there can be no parent.
-        parent = undefined;
+        component = undefined;
       }
     } else {
       // We cannot find the child with this id if there are no child
       // components on this parent.
-      parent = undefined;
+      component = undefined;
     }
   };
 
-  while (parent && path.length > 0) {
+  while (component && path.length > 0) {
     _loop();
+  }
+
+  if (component) {
+    component = _objectSpread(_objectSpread(_objectSpread({}, component), toUse), {}, {
+      cya_label: component.label || component.cya_label,
+      fieldId: toUse.fieldId || component.fieldId
+    });
+
+    if (parent && parent.id !== component.id) {
+      parent.components[0] = component;
+    } else {
+      wrapper = component;
+    }
+
+    return wrapper;
   } // If we missed a nested reference along the way, don't return the wrapper.
 
 
-  return parent ? wrapper : undefined;
+  return undefined;
 };
 /**
  * Use an existing component from the formComponents, overriding any properties
@@ -66,11 +83,7 @@ var useComponent = function useComponent(toUse, formComponents) {
     var component = getComponentToUse(toUse, formComponents);
 
     if (component) {
-      var fieldId = toUse.fieldId || component.fieldId;
-      return _objectSpread(_objectSpread(_objectSpread({}, component), toUse), {}, {
-        cya_label: component.label || component.cya_label,
-        fieldId: fieldId
-      });
+      return component;
     }
   }
 

package/dist/utils/FormPage/useComponent.test.js

@@ -142,11 +142,12 @@ describe('utils', function () {
         var TO_USE = {
           use: ID
         };
-        expect((0, _useComponent.default)(TO_USE, FORM_COMPONENTS)).toEqual(_objectSpread(_objectSpread({
-          use: ID
-        }, CONTAINER), {}, {
-          cya_label: CONTAINER.label,
-          components: [ZULU // Foxtrot is not included
+        expect((0, _useComponent.default)(TO_USE, FORM_COMPONENTS)).toEqual(_objectSpread(_objectSpread({}, CONTAINER), {}, {
+          components: [_objectSpread(_objectSpread({
+            use: ID
+          }, ZULU), {}, {
+            cya_label: ZULU.label
+          }) // Foxtrot is not included
           ]
         }));
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.19.0",
+  "version": "4.19.1",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",