@ukhomeoffice/cop-react-form-renderer 5.74.2 → 5.74.4

package/dist/components/CollectionSummary/SummaryCard.js

@@ -61,17 +61,6 @@ var SummaryCard = function SummaryCard(_ref) {
     formData = _ref.formData,
     masterPage = _ref.masterPage,
     hideDetails = _ref.hideDetails;
-  var summaryCardRef = (0, _react.useRef)(null);
-  var handleDuplicateAndScroll = function handleDuplicateAndScroll() {
-    onDuplicate(entryData);
-    var currentSummaryCard = summaryCardRef.current;
-    if (currentSummaryCard && currentSummaryCard.nextSibling) {
-      currentSummaryCard.nextSibling.scrollIntoView({
-        behavior: 'smooth',
-        block: 'start'
-      });
-    }
-  };
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     quickEdit = _useState2[0],
@@ -170,7 +159,6 @@ var SummaryCard = function SummaryCard(_ref) {
     });
   }
   return /*#__PURE__*/_react.default.createElement("div", {
-    ref: summaryCardRef,
     className: classes(),
     id: id
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -198,7 +186,8 @@ var SummaryCard = function SummaryCard(_ref) {
     },
     classModifiers: "primary",
     disabled: quickEdit,
-    name: "QuickEdit"
+    name: "QuickEdit",
+    autoFocus: entryData.isDuplicate
   }, DEFAULT_EDIT_LABEL), config.changeAction && typeof onFullEdit === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".changeButton"),
     onClick: function onClick() {
@@ -207,7 +196,8 @@ var SummaryCard = function SummaryCard(_ref) {
     },
     classModifiers: ((_config$changeAction2 = config.changeAction) === null || _config$changeAction2 === void 0 ? void 0 : _config$changeAction2.classModifiers) || DEFAULT_CHANGE_BUTTON_CLASS,
     "aria-label": _utils.default.FormPage.getConditionalText((_config$changeAction3 = config.changeAction) === null || _config$changeAction3 === void 0 ? void 0 : _config$changeAction3.aria_label, entryData),
-    name: "Change"
+    name: "Change",
+    autoFocus: entryData.isDuplicate
   }, ((_config$changeAction4 = config.changeAction) === null || _config$changeAction4 === void 0 ? void 0 : _config$changeAction4.label) || DEFAULT_CHANGE_BUTTON_LABEL), config.deleteAction && typeof onDelete === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".deleteButton"),
     onClick: function onClick() {
@@ -215,15 +205,17 @@ var SummaryCard = function SummaryCard(_ref) {
     },
     classModifiers: "secondary",
     "aria-label": _utils.default.FormPage.getConditionalText((_config$deleteAction = config.deleteAction) === null || _config$deleteAction === void 0 ? void 0 : _config$deleteAction.aria_label, entryData),
-    name: "Delete"
+    name: "Delete",
+    autoFocus: entryData.isDuplicate
   }, ((_config$deleteAction2 = config.deleteAction) === null || _config$deleteAction2 === void 0 ? void 0 : _config$deleteAction2.label) || DEFAULT_DELETE_BUTTON_LABEL), config.duplicateAction && typeof onDuplicate === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".duplicateButton"),
     onClick: function onClick() {
-      handleDuplicateAndScroll();
+      onDuplicate(entryData);
     },
     classModifiers: "secondary",
     "aria-label": _utils.default.FormPage.getConditionalText((_config$duplicateActi = config.duplicateAction) === null || _config$duplicateActi === void 0 ? void 0 : _config$duplicateActi.aria_label, entryData),
-    name: "Duplicate"
+    name: "Duplicate",
+    autoFocus: entryData.isDuplicate
   }, ((_config$duplicateActi2 = config.duplicateAction) === null || _config$duplicateActi2 === void 0 ? void 0 : _config$duplicateActi2.label) || DEFAULT_DUPLICATE_BUTTON_LABEL))), quickEdit && quickEditPage && /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: quickEditPage,
     onAction: function onAction(action, patch) {
@@ -246,7 +238,8 @@ SummaryCard.propTypes = {
   id: _propTypes.default.string.isRequired,
   entryData: _propTypes.default.shape({
     id: _propTypes.default.string.isRequired,
-    index: _propTypes.default.number.isRequired
+    index: _propTypes.default.number.isRequired,
+    isDuplicate: _propTypes.default.bool
   }).isRequired,
   config: _propTypes.default.shape({
     className: _propTypes.default.string,

package/dist/utils/CollectionPage/getQuickEditPage.js

@@ -55,6 +55,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * @returns Page suitble for rendering in a QuickEdit
  */
 var getQuickEditPage = function getQuickEditPage(masterPage, formData, entryData) {
+  var _masterPage$collectio;
   if (!masterPage) {
     return null;
   }
@@ -113,7 +114,7 @@ var getQuickEditPage = function getQuickEditPage(masterPage, formData, entryData
   // Remove ID to stop overwriting top-level form ID.
   var id = entryData.id,
     entryWithNoId = _objectWithoutProperties(entryData, _excluded);
-  pageToReturn.formData = _objectSpread(_objectSpread({}, pageToReturn.formData), entryWithNoId);
+  pageToReturn.formData = _objectSpread(_objectSpread(_objectSpread({}, pageToReturn.formData), entryWithNoId), {}, _defineProperty({}, "".concat((_masterPage$collectio = masterPage.collection) === null || _masterPage$collectio === void 0 || (_masterPage$collectio = _masterPage$collectio.name) === null || _masterPage$collectio === void 0 ? void 0 : _masterPage$collectio.split('.').pop(), "ActiveId"), entryData.id));
   delete pageToReturn.title;
   delete pageToReturn.collection;
   return pageToReturn;

package/dist/utils/CollectionPage/getQuickEditPage.test.js

@@ -19,6 +19,9 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
     }]
   };
   var MASTER_PAGE = {
+    collection: {
+      name: 'entries'
+    },
     childPages: [{
       id: 'firstPage',
       name: 'firstPage',
@@ -132,4 +135,9 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
     var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, CUSTOM_ENTRY_DATA);
     expect(createdPage).toMatchObject(CUSTOM_OUTPUT);
   });
+  it('should return a quick edit page with the activeId for the current collection correctly set', function () {
+    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, ENTRY_DATA);
+    expect(createdPage.formData.entriesActiveId).toEqual('123');
+    expect(createdPage).toMatchObject(EXPECTED_OUTPUT);
+  });
 });

package/package.json

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