@atlaskit/feedback-collector 15.2.1 → 15.4.0

package/dist/es2019/components/FeedbackForm.js

@@ -29,6 +29,7 @@ const FeedbackForm = ({
   showDefaultTextFields = true,
   customContent,
   onClose,
+  onCancel,
   onSubmit,
   feedbackTitle,
   feedbackTitleDetails,
@@ -59,6 +60,10 @@ const FeedbackForm = ({
     formatMessage
   } = useIntl();
   const isTypeSelected = () => type !== 'empty';
+  const handleCancel = () => {
+    onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+    onClose();
+  };
   const canShowTextField = isTypeSelected() || !showTypeField;
   const hasDescription = description || hasDescriptionDefaultValue;
   const isDisabled = isSubmitting || disableSubmitButton;
@@ -189,13 +194,7 @@ const FeedbackForm = ({
         }));
       }
     },
-    menuPortalTarget: document.body,
-    styles: {
-      menuPortal: base => ({
-        ...base,
-        zIndex: 9999
-      })
-    },
+    menuPosition: "fixed",
     options: selectOptions
     // @ts-ignore
     ,
@@ -222,10 +221,7 @@ const FeedbackForm = ({
       }
     },
     value: description
-  })), validationErrors.description && /*#__PURE__*/React.createElement(ErrorMessage, null, validationErrors.description))), !anonymousFeedback && /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement("legend", {
-    "aria-hidden": false,
-    hidden: true
-  }, /*#__PURE__*/React.createElement(FormattedMessage, messages.optInOptionsLegend)), /*#__PURE__*/React.createElement(Field, {
+  })), validationErrors.description && /*#__PURE__*/React.createElement(ErrorMessage, null, validationErrors.description))), !anonymousFeedback && /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement("legend", null, /*#__PURE__*/React.createElement(FormattedMessage, messages.optInOptionsLegend)), /*#__PURE__*/React.createElement(Field, {
     name: "can-be-contacted"
   }, ({
     fieldProps
@@ -260,7 +256,7 @@ const FeedbackForm = ({
     appearance: 'information'
   }, feedbackIsAnonymous))))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
     appearance: "subtle",
-    onClick: onClose
+    onClick: handleCancel
   }, cancelButtonLabel || /*#__PURE__*/React.createElement(FormattedMessage, messages.cancelButtonLabel)), /*#__PURE__*/React.createElement(Button, {
     appearance: "primary",
     type: "submit",
@@ -311,13 +307,7 @@ const FeedbackForm = ({
         }));
       }
     },
-    menuPortalTarget: document.body,
-    styles: {
-      menuPortal: base => ({
-        ...base,
-        zIndex: 9999
-      })
-    },
+    menuPosition: "fixed",
     options: selectOptions
     // @ts-ignore
     ,
@@ -344,10 +334,7 @@ const FeedbackForm = ({
       }
     },
     value: description
-  })), validationErrors.description && /*#__PURE__*/React.createElement(ErrorMessage, null, validationErrors.description))), !anonymousFeedback && /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement("legend", {
-    "aria-hidden": false,
-    hidden: true
-  }, /*#__PURE__*/React.createElement(FormattedMessage, messages.optInOptionsLegend)), /*#__PURE__*/React.createElement(Field, {
+  })), validationErrors.description && /*#__PURE__*/React.createElement(ErrorMessage, null, validationErrors.description))), !anonymousFeedback && /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement("legend", null, /*#__PURE__*/React.createElement(FormattedMessage, messages.optInOptionsLegend)), /*#__PURE__*/React.createElement(Field, {
     name: "can-be-contacted"
   }, ({
     fieldProps
@@ -382,7 +369,7 @@ const FeedbackForm = ({
     appearance: 'information'
   }, feedbackIsAnonymous))))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
     appearance: "subtle",
-    onClick: onClose
+    onClick: handleCancel
   }, cancelButtonLabel || /*#__PURE__*/React.createElement(FormattedMessage, messages.cancelButtonLabel)), /*#__PURE__*/React.createElement(Button, {
     appearance: "primary",
     type: "submit",

package/dist/esm/components/FeedbackCollector.js

@@ -38,18 +38,18 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
     _defineProperty(_this, "postFeedback", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(formValues) {
         var entrypointId, fetchUrl, formData, body, postData;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
+        return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               entrypointId = _this.props.entrypointId;
               fetchUrl = _this.getFeedbackUrl(); // Don't dispatch unless we have suitable props (allows tests to pass through empty strings and avoid redundant network calls)
               if (!entrypointId) {
-                _context.next = 10;
+                _context.next = 2;
                 break;
               }
-              _context.next = 5;
+              _context.next = 1;
               return _this.mapFormToJSD(formValues);
-            case 5:
+            case 1:
               formData = _context.sent;
               body = {
                 feedback: _objectSpread({
@@ -73,7 +73,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 }),
                 credentials: 'include'
               });
-            case 10:
+            case 2:
               _this.props.onClose();
 
               // slightly delay confirming submit since we don't wait for the REST call to succeed
@@ -85,7 +85,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
               setTimeout(function () {
                 return _this.props.onSubmit(formValues);
               }, _this.props.timeoutOnSubmit);
-            case 12:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -103,17 +103,17 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
     value: function () {
       var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var anonymousFeedback;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime.wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              _context2.next = 1;
               return this.shouldShowOptInCheckboxesNew();
-            case 2:
+            case 1:
               anonymousFeedback = !_context2.sent;
               this.setState({
                 anonymousFeedback: anonymousFeedback
               });
-            case 4:
+            case 2:
             case "end":
               return _context2.stop();
           }
@@ -155,20 +155,20 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "15.2.0" || 'Unknown, at least 11.0.0';
+      return "15.3.0" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",
     value: function () {
       var _getEntitlementInformation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
         var _entitlementDetails, _entitlementDetails2, _productName, _entitlement;
-        var url, productName, productEntitlement, entitlementDetails, productKey, _document$querySelect, hasPremium, entitlement, entitlementInformation, cloudSiteId, _entitlementDetails3;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        var url, productName, productEntitlement, entitlementDetails, productKey, _document$querySelect, hasPremium, entitlement, entitlementInformation, cloudSiteId, _entitlementDetails3, _t;
+        return _regeneratorRuntime.wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               url = this.getGatewayUrl(); // jira / confluence / bitbucket / trello
               if (!window.location.host.includes('bitbucket.org')) {
-                _context3.next = 9;
+                _context3.next = 1;
                 break;
               }
               productName = 'Bitbucket';
@@ -176,18 +176,18 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
               entitlementDetails = JSON.parse(JSON.stringify((_document$querySelect = document.querySelector('meta[id="bb-bootstrap"]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.getAttribute('data-current-user')));
               hasPremium = entitlementDetails['hasPremium'];
               productEntitlement = hasPremium ? 'PREMIUM' : 'STANDARD';
-              _context3.next = 24;
+              _context3.next = 6;
               break;
-            case 9:
+            case 1:
               if (!['trellis.coffee', 'trello.com'].includes(window.location.host)) {
-                _context3.next = 14;
+                _context3.next = 2;
                 break;
               }
               productName = 'Trello';
               productKey = 'trello';
-              _context3.next = 24;
+              _context3.next = 6;
               break;
-            case 14:
+            case 2:
               if (document.querySelector('meta[id="confluence-context-path"]')) {
                 productName = 'Confluence';
                 productKey = 'pricingplan.confluence.ondemand';
@@ -195,8 +195,8 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 productName = 'Jira';
                 productKey = 'jira-software.ondemand';
               }
-              _context3.prev = 15;
-              _context3.next = 18;
+              _context3.prev = 3;
+              _context3.next = 4;
               return fetch("".concat(url, "/customer-context/entitlements/").concat(window.location.host), _objectSpread({
                 method: 'GET',
                 headers: {
@@ -205,15 +205,15 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
               }, isApiGatewayUrl(url) ? {
                 credentials: 'include'
               } : {}));
-            case 18:
+            case 4:
               entitlementDetails = _context3.sent;
-              _context3.next = 24;
+              _context3.next = 6;
               break;
-            case 21:
-              _context3.prev = 21;
-              _context3.t0 = _context3["catch"](15);
+            case 5:
+              _context3.prev = 5;
+              _t = _context3["catch"](3);
               entitlementDetails = undefined;
-            case 24:
+            case 6:
               entitlementInformation = [];
               cloudSiteId = ((_entitlementDetails = entitlementDetails) === null || _entitlementDetails === void 0 ? void 0 : _entitlementDetails.cloudSiteId) || '';
               if ((_entitlementDetails2 = entitlementDetails) !== null && _entitlementDetails2 !== void 0 && _entitlementDetails2.children) {
@@ -235,11 +235,11 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 value: cloudSiteId
               });
               return _context3.abrupt("return", entitlementInformation);
-            case 29:
+            case 7:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[15, 21]]);
+        }, _callee3, this, [[3, 5]]);
       }));
       function getEntitlementInformation() {
         return _getEntitlementInformation.apply(this, arguments);
@@ -267,20 +267,20 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
     key: "getAtlassianID",
     value: function () {
       var _getAtlassianID = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-        var _this$props3, atlassianAccountId, shouldGetEntitlementDetails, url, result, json;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        var _this$props3, atlassianAccountId, shouldGetEntitlementDetails, url, result, json, _t2;
+        return _regeneratorRuntime.wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _this$props3 = this.props, atlassianAccountId = _this$props3.atlassianAccountId, shouldGetEntitlementDetails = _this$props3.shouldGetEntitlementDetails;
               _context4.prev = 1;
               if (!(atlassianAccountId || !shouldGetEntitlementDetails)) {
-                _context4.next = 4;
+                _context4.next = 2;
                 break;
               }
               return _context4.abrupt("return", atlassianAccountId);
-            case 4:
+            case 2:
               url = this.getGatewayUrl();
-              _context4.next = 7;
+              _context4.next = 3;
               return fetch("".concat(url, "/me"), _objectSpread({
                 method: 'GET',
                 headers: {
@@ -289,22 +289,22 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
               }, isApiGatewayUrl(url) ? {
                 credentials: 'include'
               } : {}));
-            case 7:
+            case 3:
               result = _context4.sent;
-              _context4.next = 10;
+              _context4.next = 4;
               return result.json();
-            case 10:
+            case 4:
               json = _context4.sent;
               return _context4.abrupt("return", json.account_id);
-            case 14:
-              _context4.prev = 14;
-              _context4.t0 = _context4["catch"](1);
+            case 5:
+              _context4.prev = 5;
+              _t2 = _context4["catch"](1);
               return _context4.abrupt("return", undefined);
-            case 17:
+            case 6:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[1, 14]]);
+        }, _callee4, this, [[1, 5]]);
       }));
       function getAtlassianID() {
         return _getAtlassianID.apply(this, arguments);
@@ -396,25 +396,25 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
       var _mapFormToJSD = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(formValues) {
         var _this$props4, _this$props5;
         var entitlementInformation, atlassianID;
-        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        return _regeneratorRuntime.wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               entitlementInformation = null;
               if (!((_this$props4 = this.props) !== null && _this$props4 !== void 0 && _this$props4.shouldGetEntitlementDetails)) {
-                _context5.next = 5;
+                _context5.next = 2;
                 break;
               }
-              _context5.next = 4;
+              _context5.next = 1;
               return this.getEntitlementInformation();
-            case 4:
+            case 1:
               entitlementInformation = _context5.sent;
-            case 5:
+            case 2:
               if ((_this$props5 = this.props) !== null && _this$props5 !== void 0 && _this$props5.email) {
                 this.addEmailToContext();
               }
-              _context5.next = 8;
+              _context5.next = 3;
               return this.getAtlassianID();
-            case 8:
+            case 3:
               atlassianID = _context5.sent;
               this.addAccountIdToContext(atlassianID);
               return _context5.abrupt("return", {
@@ -447,7 +447,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                   value: this.props.enrollInResearchDeclineValue
                 }], _toConsumableArray(this.props.additionalFields)).filter(Boolean)
               });
-            case 11:
+            case 4:
             case "end":
               return _context5.stop();
           }
@@ -477,6 +477,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
         feedbackGroupLabels: this.props.feedbackGroupLabels,
         onSubmit: this.postFeedback,
         onClose: this.props.onClose,
+        onCancel: this.props.onCancel,
         locale: this.props.locale,
         anonymousFeedback: fg('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
         selectLabel: this.props.selectLabel,

package/dist/esm/components/FeedbackForm.js

@@ -40,6 +40,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
     showDefaultTextFields = _ref2$showDefaultText === void 0 ? true : _ref2$showDefaultText,
     customContent = _ref2.customContent,
     onClose = _ref2.onClose,
+    onCancel = _ref2.onCancel,
     onSubmit = _ref2.onSubmit,
     feedbackTitle = _ref2.feedbackTitle,
     feedbackTitleDetails = _ref2.feedbackTitleDetails,
@@ -90,6 +91,10 @@ var FeedbackForm = function FeedbackForm(_ref2) {
   var isTypeSelected = function isTypeSelected() {
     return type !== 'empty';
   };
+  var handleCancel = function handleCancel() {
+    onCancel === null || onCancel === void 0 || onCancel();
+    onClose();
+  };
   var canShowTextField = isTypeSelected() || !showTypeField;
   var hasDescription = description || hasDescriptionDefaultValue;
   var isDisabled = isSubmitting || disableSubmitButton;
@@ -180,35 +185,35 @@ var FeedbackForm = function FeedbackForm(_ref2) {
   }, fg('platform-design_system_team-form_conversion') ? /*#__PURE__*/React.createElement(Form, {
     onSubmit: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var errors;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             errors = getValidationErrors();
             if (!(Object.keys(errors).length > 0)) {
-              _context.next = 4;
+              _context.next = 1;
               break;
             }
             setValidationErrors(errors);
             return _context.abrupt("return");
-          case 4:
+          case 1:
             setIsSubmitting(true);
-            _context.prev = 5;
-            _context.next = 8;
+            _context.prev = 2;
+            _context.next = 3;
             return onSubmit({
               canBeContacted: canBeContacted,
               description: description,
               enrollInResearchGroup: enrollInResearchGroup,
               type: type
             });
-          case 8:
-            _context.prev = 8;
+          case 3:
+            _context.prev = 3;
             setIsSubmitting(false);
-            return _context.finish(8);
-          case 11:
+            return _context.finish(3);
+          case 4:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5,, 8, 11]]);
+      }, _callee, null, [[2,, 3, 4]]);
     }))
   }, /*#__PURE__*/React.createElement(ModalHeader, {
     hasCloseButton: true
@@ -234,14 +239,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
           });
         }
       },
-      menuPortalTarget: document.body,
-      styles: {
-        menuPortal: function menuPortal(base) {
-          return _objectSpread(_objectSpread({}, base), {}, {
-            zIndex: 9999
-          });
-        }
-      },
+      menuPosition: "fixed",
       options: selectOptions
       // @ts-ignore
       ,
@@ -271,10 +269,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
       },
       value: description
     })), validationErrors.description && /*#__PURE__*/React.createElement(ErrorMessage, null, validationErrors.description));
-  }), !anonymousFeedback && /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement("legend", {
-    "aria-hidden": false,
-    hidden: true
-  }, /*#__PURE__*/React.createElement(FormattedMessage, messages.optInOptionsLegend)), /*#__PURE__*/React.createElement(Field, {
+  }), !anonymousFeedback && /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement("legend", null, /*#__PURE__*/React.createElement(FormattedMessage, messages.optInOptionsLegend)), /*#__PURE__*/React.createElement(Field, {
     name: "can-be-contacted"
   }, function (_ref6) {
     var fieldProps = _ref6.fieldProps;
@@ -319,7 +314,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
     }, feedbackIsAnonymous);
   })))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
     appearance: "subtle",
-    onClick: onClose
+    onClick: handleCancel
   }, cancelButtonLabel || /*#__PURE__*/React.createElement(FormattedMessage, messages.cancelButtonLabel)), /*#__PURE__*/React.createElement(Button, {
     appearance: "primary",
     type: "submit",
@@ -328,35 +323,35 @@ var FeedbackForm = function FeedbackForm(_ref2) {
   }, submitButtonLabel || /*#__PURE__*/React.createElement(FormattedMessage, messages.submitButtonLabel)))) : /*#__PURE__*/React.createElement(Form, {
     onSubmit: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var errors;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             errors = getValidationErrors();
             if (!(Object.keys(errors).length > 0)) {
-              _context2.next = 4;
+              _context2.next = 1;
               break;
             }
             setValidationErrors(errors);
             return _context2.abrupt("return");
-          case 4:
+          case 1:
             setIsSubmitting(true);
-            _context2.prev = 5;
-            _context2.next = 8;
+            _context2.prev = 2;
+            _context2.next = 3;
             return onSubmit({
               canBeContacted: canBeContacted,
               description: description,
               enrollInResearchGroup: enrollInResearchGroup,
               type: type
             });
-          case 8:
-            _context2.prev = 8;
+          case 3:
+            _context2.prev = 3;
             setIsSubmitting(false);
-            return _context2.finish(8);
-          case 11:
+            return _context2.finish(3);
+          case 4:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[5,, 8, 11]]);
+      }, _callee2, null, [[2,, 3, 4]]);
     }))
   }, function (_ref9) {
     var formProps = _ref9.formProps;
@@ -384,14 +379,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
             });
           }
         },
-        menuPortalTarget: document.body,
-        styles: {
-          menuPortal: function menuPortal(base) {
-            return _objectSpread(_objectSpread({}, base), {}, {
-              zIndex: 9999
-            });
-          }
-        },
+        menuPosition: "fixed",
         options: selectOptions
         // @ts-ignore
         ,
@@ -421,10 +409,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
         },
         value: description
       })), validationErrors.description && /*#__PURE__*/React.createElement(ErrorMessage, null, validationErrors.description));
-    }), !anonymousFeedback && /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement("legend", {
-      "aria-hidden": false,
-      hidden: true
-    }, /*#__PURE__*/React.createElement(FormattedMessage, messages.optInOptionsLegend)), /*#__PURE__*/React.createElement(Field, {
+    }), !anonymousFeedback && /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement("legend", null, /*#__PURE__*/React.createElement(FormattedMessage, messages.optInOptionsLegend)), /*#__PURE__*/React.createElement(Field, {
       name: "can-be-contacted"
     }, function (_ref10) {
       var fieldProps = _ref10.fieldProps;
@@ -469,7 +454,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
       }, feedbackIsAnonymous);
     })))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
       appearance: "subtle",
-      onClick: onClose
+      onClick: handleCancel
     }, cancelButtonLabel || /*#__PURE__*/React.createElement(FormattedMessage, messages.cancelButtonLabel)), /*#__PURE__*/React.createElement(Button, {
       appearance: "primary",
       type: "submit",

package/dist/esm/components/IntlProviderWithResolvedMessages.js

@@ -15,19 +15,19 @@ export var IntlProviderWithResolvedMessages = function IntlProviderWithResolvedM
     var fetchMessageLocale = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var messages;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
+        return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!locale) {
-                _context.next = 5;
+                _context.next = 2;
                 break;
               }
-              _context.next = 3;
+              _context.next = 1;
               return getMessagesForLocale(locale);
-            case 3:
+            case 1:
               messages = _context.sent;
               setResolvedMessagesForLocale(messages);
-            case 5:
+            case 2:
             case "end":
               return _context.stop();
           }

package/dist/esm/utils/i18n-get-messages-for-locale.js

@@ -14,36 +14,35 @@ function _tsRewriteRelativeImportExtensions(t, e) { return "string" == typeof t
 
 export var getMessagesForLocale = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(locale) {
-    var messages, parentLocale, _messages;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
+    var messages, parentLocale, _messages, _t, _t2;
+    return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           locale = locale.replace('-', '_');
           _context.prev = 1;
-          _context.next = 4;
+          _context.next = 2;
           return import( /* webpackChunkName: "@atlaskit-internal_feedback-collector/i18n-tranlations" */_tsRewriteRelativeImportExtensions(_tsRewriteRelativeImportExtensions("../i18n/".concat(locale))));
-        case 4:
+        case 2:
           messages = _context.sent;
           return _context.abrupt("return", messages.default);
-        case 8:
-          _context.prev = 8;
-          _context.t0 = _context["catch"](1);
-        case 10:
-          _context.prev = 10;
+        case 3:
+          _context.prev = 3;
+          _t = _context["catch"](1);
+          _context.prev = 4;
           parentLocale = locale.split(/[-_]/)[0];
-          _context.next = 14;
+          _context.next = 5;
           return import( /* webpackChunkName: "@atlaskit-internal_feedback-collector/i18n-tranlations" */_tsRewriteRelativeImportExtensions(_tsRewriteRelativeImportExtensions("../i18n/".concat(parentLocale))));
-        case 14:
+        case 5:
           _messages = _context.sent;
           return _context.abrupt("return", _messages.default);
-        case 18:
-          _context.prev = 18;
-          _context.t1 = _context["catch"](10);
-        case 20:
+        case 6:
+          _context.prev = 6;
+          _t2 = _context["catch"](4);
+        case 7:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[1, 8], [10, 18]]);
+    }, _callee, null, [[1, 3], [4, 6]]);
   }));
   return function getMessagesForLocale(_x) {
     return _ref.apply(this, arguments);

package/dist/types/components/FeedbackCollector.d.ts

@@ -88,6 +88,8 @@ export interface Props {
     feedbackGroupLabels?: Partial<Record<SelectValue, SelectOptionDetails>>;
     /** Function that will be called to initiate the exit transition. */
     onClose: () => void;
+    /** Optional function that will be called when the cancel button is clicked, in addition to onClose. */
+    onCancel?: () => void;
     /** Function that will be called optimistically after a delay when the feedback is submitted. */
     onSubmit: (formFields: FormFields) => void;
     /**  Locale for i18n */

package/dist/types/components/FeedbackForm.d.ts

@@ -1,4 +1,4 @@
-import React, { type FunctionComponent } from 'react';
+import React from 'react';
 import { type FormFields, type SelectOptionDetails, type SelectValue } from '../types';
 interface Props {
     /**  Message which will be shown as the title of the feedback dialog **/
@@ -29,6 +29,8 @@ interface Props {
     feedbackGroupLabels?: Partial<Record<SelectValue, SelectOptionDetails>>;
     /** Function that will be called to initiate the exit transition. */
     onClose: () => void;
+    /** Optional function that will be called when the cancel button is clicked, in addition to onClose. */
+    onCancel?: () => void;
     /** Function that will be called immediately after the submit action  */
     onSubmit: (formValues: FormFields) => Promise<void>;
     /**  Optional locale for i18n **/
@@ -54,7 +56,7 @@ export interface OptionType {
     label: React.ReactText;
     value: SelectValue;
 }
-declare const FeedbackFormWithIntl: FunctionComponent<Props & {
+declare const FeedbackFormWithIntl: ({ locale, ...props }: Props & {
     locale: string;
-}>;
+}) => React.ReactElement;
 export default FeedbackFormWithIntl;

package/dist/types-ts4.5/components/FeedbackCollector.d.ts

@@ -88,6 +88,8 @@ export interface Props {
     feedbackGroupLabels?: Partial<Record<SelectValue, SelectOptionDetails>>;
     /** Function that will be called to initiate the exit transition. */
     onClose: () => void;
+    /** Optional function that will be called when the cancel button is clicked, in addition to onClose. */
+    onCancel?: () => void;
     /** Function that will be called optimistically after a delay when the feedback is submitted. */
     onSubmit: (formFields: FormFields) => void;
     /**  Locale for i18n */