@atlaskit/feedback-collector 15.2.1 → 15.4.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/feedback-collector
 
+## 15.4.0
+
+### Minor Changes
+
+- [`4cffc70fa1cfe`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4cffc70fa1cfe) -
+  Add onCancel callback to FeedbackCollector and FeedbackForm
+
+## 15.3.0
+
+### Minor Changes
+
+- [`ffa7b21ccc11b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ffa7b21ccc11b) -
+  A11Y fix (A11Y-31065): Remove inappropriate `aria-hidden={false}` and `hidden` attributes from
+  `<legend>` elements inside the opt-in options `<fieldset>` in FeedbackForm. The `hidden` HTML
+  attribute removes elements from the accessibility tree regardless of `aria-hidden`, causing screen
+  readers to miss the fieldset group label "Atlassian opt-in options". Replaced with a standard
+  visually-hidden CSS pattern so the legend is accessible to screen readers but not visible on
+  screen.
+
 ## 15.2.1
 
 ### Patch Changes

package/dist/cjs/components/FeedbackCollector.js

@@ -22,7 +22,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _isApiGatewayUrl = require("../utils/is-api-gateway-url");
 var _Truncate = _interopRequireDefault(require("../utils/Truncate"));
 var _FeedbackForm = _interopRequireDefault(require("./FeedbackForm"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t3 in e) "default" !== _t3 && {}.hasOwnProperty.call(e, _t3) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t3)) && (i.get || i.set) ? o(f, _t3, i) : f[_t3] = e[_t3]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -47,18 +47,18 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
     (0, _defineProperty2.default)(_this, "postFeedback", /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(formValues) {
         var entrypointId, fetchUrl, formData, body, postData;
-        return _regenerator.default.wrap(function _callee$(_context) {
+        return _regenerator.default.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({
@@ -82,7 +82,7 @@ var FeedbackCollector = exports.default = /*#__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
@@ -94,7 +94,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
               setTimeout(function () {
                 return _this.props.onSubmit(formValues);
               }, _this.props.timeoutOnSubmit);
-            case 12:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -112,17 +112,17 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
     value: function () {
       var _componentDidMount = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var anonymousFeedback;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+        return _regenerator.default.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();
           }
@@ -164,20 +164,20 @@ var FeedbackCollector = exports.default = /*#__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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
         var _entitlementDetails, _entitlementDetails2, _productName, _entitlement;
-        var url, productName, productEntitlement, entitlementDetails, productKey, _document$querySelect, hasPremium, entitlement, entitlementInformation, cloudSiteId, _entitlementDetails3;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+        var url, productName, productEntitlement, entitlementDetails, productKey, _document$querySelect, hasPremium, entitlement, entitlementInformation, cloudSiteId, _entitlementDetails3, _t;
+        return _regenerator.default.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';
@@ -185,18 +185,18 @@ var FeedbackCollector = exports.default = /*#__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';
@@ -204,8 +204,8 @@ var FeedbackCollector = exports.default = /*#__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: {
@@ -214,15 +214,15 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
               }, (0, _isApiGatewayUrl.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) {
@@ -244,11 +244,11 @@ var FeedbackCollector = exports.default = /*#__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);
@@ -276,20 +276,20 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
     key: "getAtlassianID",
     value: function () {
       var _getAtlassianID = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-        var _this$props3, atlassianAccountId, shouldGetEntitlementDetails, url, result, json;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
+        var _this$props3, atlassianAccountId, shouldGetEntitlementDetails, url, result, json, _t2;
+        return _regenerator.default.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: {
@@ -298,22 +298,22 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
               }, (0, _isApiGatewayUrl.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);
@@ -405,25 +405,25 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
       var _mapFormToJSD = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(formValues) {
         var _this$props4, _this$props5;
         var entitlementInformation, atlassianID;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
+        return _regenerator.default.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", {
@@ -456,7 +456,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
                   value: this.props.enrollInResearchDeclineValue
                 }], (0, _toConsumableArray2.default)(this.props.additionalFields)).filter(Boolean)
               });
-            case 11:
+            case 4:
             case "end":
               return _context5.stop();
           }
@@ -486,6 +486,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
         feedbackGroupLabels: this.props.feedbackGroupLabels,
         onSubmit: this.postFeedback,
         onClose: this.props.onClose,
+        onCancel: this.props.onCancel,
         locale: this.props.locale,
         anonymousFeedback: (0, _platformFeatureFlags.fg)('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
         selectLabel: this.props.selectLabel,

package/dist/cjs/components/FeedbackForm.js

@@ -49,6 +49,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,
@@ -99,6 +100,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;
@@ -189,35 +194,35 @@ var FeedbackForm = function FeedbackForm(_ref2) {
   }, (0, _platformFeatureFlags.fg)('platform-design_system_team-form_conversion') ? /*#__PURE__*/_react.default.createElement(_form.default, {
     onSubmit: /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
       var errors;
-      return _regenerator.default.wrap(function _callee$(_context) {
+      return _regenerator.default.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.default.createElement(_modalDialog.ModalHeader, {
     hasCloseButton: true
@@ -243,14 +248,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
       ,
@@ -280,10 +278,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
       },
       value: description
     })), validationErrors.description && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, validationErrors.description));
-  }), !anonymousFeedback && /*#__PURE__*/_react.default.createElement(_form.Fieldset, null, /*#__PURE__*/_react.default.createElement("legend", {
-    "aria-hidden": false,
-    hidden: true
-  }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.optInOptionsLegend)), /*#__PURE__*/_react.default.createElement(_form.Field, {
+  }), !anonymousFeedback && /*#__PURE__*/_react.default.createElement(_form.Fieldset, null, /*#__PURE__*/_react.default.createElement("legend", null, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.optInOptionsLegend)), /*#__PURE__*/_react.default.createElement(_form.Field, {
     name: "can-be-contacted"
   }, function (_ref6) {
     var fieldProps = _ref6.fieldProps;
@@ -328,7 +323,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
     }, feedbackIsAnonymous);
   })))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_standardButton.default, {
     appearance: "subtle",
-    onClick: onClose
+    onClick: handleCancel
   }, cancelButtonLabel || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.cancelButtonLabel)), /*#__PURE__*/_react.default.createElement(_standardButton.default, {
     appearance: "primary",
     type: "submit",
@@ -337,35 +332,35 @@ var FeedbackForm = function FeedbackForm(_ref2) {
   }, submitButtonLabel || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.submitButtonLabel)))) : /*#__PURE__*/_react.default.createElement(_form.default, {
     onSubmit: /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
       var errors;
-      return _regenerator.default.wrap(function _callee2$(_context2) {
+      return _regenerator.default.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;
@@ -393,14 +388,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
         ,
@@ -430,10 +418,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
         },
         value: description
       })), validationErrors.description && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, validationErrors.description));
-    }), !anonymousFeedback && /*#__PURE__*/_react.default.createElement(_form.Fieldset, null, /*#__PURE__*/_react.default.createElement("legend", {
-      "aria-hidden": false,
-      hidden: true
-    }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.optInOptionsLegend)), /*#__PURE__*/_react.default.createElement(_form.Field, {
+    }), !anonymousFeedback && /*#__PURE__*/_react.default.createElement(_form.Fieldset, null, /*#__PURE__*/_react.default.createElement("legend", null, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.optInOptionsLegend)), /*#__PURE__*/_react.default.createElement(_form.Field, {
       name: "can-be-contacted"
     }, function (_ref10) {
       var fieldProps = _ref10.fieldProps;
@@ -478,7 +463,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
       }, feedbackIsAnonymous);
     })))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_standardButton.default, {
       appearance: "subtle",
-      onClick: onClose
+      onClick: handleCancel
     }, cancelButtonLabel || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.cancelButtonLabel)), /*#__PURE__*/_react.default.createElement(_standardButton.default, {
       appearance: "primary",
       type: "submit",

package/dist/cjs/components/IntlProviderWithResolvedMessages.js

@@ -24,19 +24,19 @@ var IntlProviderWithResolvedMessages = exports.IntlProviderWithResolvedMessages
     var fetchMessageLocale = /*#__PURE__*/function () {
       var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var messages;
-        return _regenerator.default.wrap(function _callee$(_context) {
+        return _regenerator.default.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 (0, _i18nGetMessagesForLocale.getMessagesForLocale)(locale);
-            case 3:
+            case 1:
               messages = _context.sent;
               setResolvedMessagesForLocale(messages);
-            case 5:
+            case 2:
             case "end":
               return _context.stop();
           }

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

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getMessagesForLocale = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t3 in e) "default" !== _t3 && {}.hasOwnProperty.call(e, _t3) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t3)) && (i.get || i.set) ? o(f, _t3, i) : f[_t3] = e[_t3]); return f; })(e, t); }
 function _tsRewriteRelativeImportExtensions(t, e) { return "string" == typeof t && /^\.\.?\//.test(t) ? t.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+)?)\.([cm]?)ts$/i, function (t, s, r, n, o) { return s ? e ? ".jsx" : ".js" : !r || n && o ? r + n + "." + o.toLowerCase() + "js" : t; }) : t; }
 /**
  * Tries to get the most specific messages bundle for a given locale.
@@ -23,13 +23,13 @@ function _tsRewriteRelativeImportExtensions(t, e) { return "string" == typeof t
 
 var getMessagesForLocale = exports.getMessagesForLocale = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(locale) {
-    var messages, parentLocale, _messages;
-    return _regenerator.default.wrap(function _callee$(_context) {
+    var messages, parentLocale, _messages, _t, _t2;
+    return _regenerator.default.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 function (specifier) {
             return new Promise(function (r) {
               return r("".concat(specifier));
@@ -37,16 +37,15 @@ var getMessagesForLocale = exports.getMessagesForLocale = /*#__PURE__*/function
               return _interopRequireWildcard(require(s));
             });
           }( /* webpackChunkName: "@atlaskit-internal_feedback-collector/i18n-tranlations" */_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 function (specifier) {
             return new Promise(function (r) {
               return r("".concat(specifier));
@@ -54,17 +53,17 @@ var getMessagesForLocale = exports.getMessagesForLocale = /*#__PURE__*/function
               return _interopRequireWildcard(require(s));
             });
           }( /* webpackChunkName: "@atlaskit-internal_feedback-collector/i18n-tranlations" */_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/es2019/components/FeedbackCollector.js

@@ -92,7 +92,7 @@ export default class FeedbackCollector extends Component {
     return FeedbackCollector.defaultProps.url;
   }
   getPackageVersion() {
-    return "15.2.0" || 'Unknown, at least 11.0.0';
+    return "15.3.0" || 'Unknown, at least 11.0.0';
   }
   async getEntitlementInformation() {
     var _entitlementDetails, _entitlementDetails2, _productName, _entitlement, _productEntitlement;
@@ -323,6 +323,7 @@ export default class FeedbackCollector extends 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,