@atlaskit/feedback-collector 15.3.0 → 15.5.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/feedback-collector
 
+## 15.5.0
+
+### Minor Changes
+
+- [`7bbde375a3b30`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7bbde375a3b30) -
+  Add onCancel callback to FeedbackCollector and FeedbackForm
+
+## 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

package/dist/cjs/components/FeedbackCollector.js

@@ -164,7 +164,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "15.2.1" || 'Unknown, at least 11.0.0';
+      return "15.4.0" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",
@@ -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,17 @@ var FeedbackForm = function FeedbackForm(_ref2) {
   var isTypeSelected = function isTypeSelected() {
     return type !== 'empty';
   };
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  var handleCancel = function handleCancel() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    onCancel === null || onCancel === void 0 || onCancel.apply(void 0, args);
+    // Forward every arg the click handler received so consumers retain the full
+    // pre-change runtime contract (originating event + Atlaskit UI analytics event).
+    onClose.apply(void 0, args);
+  };
   var canShowTextField = isTypeSelected() || !showTypeField;
   var hasDescription = description || hasDescriptionDefaultValue;
   var isDisabled = isSubmitting || disableSubmitButton;
@@ -318,7 +330,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",
@@ -458,7 +470,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/es2019/components/FeedbackCollector.js

@@ -92,7 +92,7 @@ export default class FeedbackCollector extends Component {
     return FeedbackCollector.defaultProps.url;
   }
   getPackageVersion() {
-    return "15.2.1" || 'Unknown, at least 11.0.0';
+    return "15.4.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,

package/dist/es2019/components/FeedbackForm.js

@@ -29,6 +29,7 @@ const FeedbackForm = ({
   showDefaultTextFields = true,
   customContent,
   onClose,
+  onCancel,
   onSubmit,
   feedbackTitle,
   feedbackTitleDetails,
@@ -59,6 +60,14 @@ const FeedbackForm = ({
     formatMessage
   } = useIntl();
   const isTypeSelected = () => type !== 'empty';
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const handleCancel = (...args) => {
+    onCancel === null || onCancel === void 0 ? void 0 : onCancel(...args);
+    // Forward every arg the click handler received so consumers retain the full
+    // pre-change runtime contract (originating event + Atlaskit UI analytics event).
+    onClose(...args);
+  };
   const canShowTextField = isTypeSelected() || !showTypeField;
   const hasDescription = description || hasDescriptionDefaultValue;
   const isDisabled = isSubmitting || disableSubmitButton;
@@ -251,7 +260,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",
@@ -364,7 +373,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

@@ -155,7 +155,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "15.2.1" || 'Unknown, at least 11.0.0';
+      return "15.4.0" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",
@@ -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,17 @@ var FeedbackForm = function FeedbackForm(_ref2) {
   var isTypeSelected = function isTypeSelected() {
     return type !== 'empty';
   };
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  var handleCancel = function handleCancel() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    onCancel === null || onCancel === void 0 || onCancel.apply(void 0, args);
+    // Forward every arg the click handler received so consumers retain the full
+    // pre-change runtime contract (originating event + Atlaskit UI analytics event).
+    onClose.apply(void 0, args);
+  };
   var canShowTextField = isTypeSelected() || !showTypeField;
   var hasDescription = description || hasDescriptionDefaultValue;
   var isDisabled = isSubmitting || disableSubmitButton;
@@ -309,7 +321,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",
@@ -449,7 +461,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/types/components/FeedbackCollector.d.ts

@@ -86,8 +86,16 @@ export interface Props {
     cancelButtonLabel?: string;
     /**  Message for select option labels and field labels */
     feedbackGroupLabels?: Partial<Record<SelectValue, SelectOptionDetails>>;
-    /** Function that will be called to initiate the exit transition. */
-    onClose: () => void;
+    /**
+     * Function that will be called to initiate the exit transition.
+     * When triggered by the cancel button the originating event and Atlaskit UI analytics
+     * event are forwarded; programmatic close paths (e.g. after submit) invoke it with no
+     * arguments. Typed as a variadic `any[]` to maximise backward compatibility with
+     * consumers that declared any conceivable signature for this callback.
+     */
+    onClose: (...args: any[]) => void;
+    /** Optional function that will be called when the cancel button is clicked, in addition to onClose. */
+    onCancel?: (...args: any[]) => void;
     /** Function that will be called optimistically after a delay when the feedback is submitted. */
     onSubmit: (formFields: FormFields) => void;
     /**  Locale for i18n */
@@ -166,7 +174,7 @@ export default class FeedbackCollector extends Component<Props> {
         showTypeField: boolean;
         showDefaultTextFields: boolean;
         anonymousFeedback: boolean;
-        onClose: () => void;
+        onClose: (...args: any[]) => void;
         onSubmit: () => void;
     };
     getGatewayUrl(): string;

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

@@ -27,8 +27,16 @@ interface Props {
     cancelButtonLabel?: string;
     /**  Message for select option labels and field labels **/
     feedbackGroupLabels?: Partial<Record<SelectValue, SelectOptionDetails>>;
-    /** Function that will be called to initiate the exit transition. */
-    onClose: () => void;
+    /**
+     * Function that will be called to initiate the exit transition.
+     * When triggered by the cancel button the originating event and Atlaskit UI analytics
+     * event are forwarded; programmatic close paths (e.g. after submit) invoke it with no
+     * arguments. Typed as a variadic `any[]` to maximise backward compatibility with
+     * consumers that declared any conceivable signature for this callback.
+     */
+    onClose: (...args: any[]) => void;
+    /** Optional function that will be called when the cancel button is clicked, in addition to onClose. */
+    onCancel?: (...args: any[]) => void;
     /** Function that will be called immediately after the submit action  */
     onSubmit: (formValues: FormFields) => Promise<void>;
     /**  Optional locale for i18n **/

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

@@ -86,8 +86,16 @@ export interface Props {
     cancelButtonLabel?: string;
     /**  Message for select option labels and field labels */
     feedbackGroupLabels?: Partial<Record<SelectValue, SelectOptionDetails>>;
-    /** Function that will be called to initiate the exit transition. */
-    onClose: () => void;
+    /**
+     * Function that will be called to initiate the exit transition.
+     * When triggered by the cancel button the originating event and Atlaskit UI analytics
+     * event are forwarded; programmatic close paths (e.g. after submit) invoke it with no
+     * arguments. Typed as a variadic `any[]` to maximise backward compatibility with
+     * consumers that declared any conceivable signature for this callback.
+     */
+    onClose: (...args: any[]) => void;
+    /** Optional function that will be called when the cancel button is clicked, in addition to onClose. */
+    onCancel?: (...args: any[]) => void;
     /** Function that will be called optimistically after a delay when the feedback is submitted. */
     onSubmit: (formFields: FormFields) => void;
     /**  Locale for i18n */
@@ -166,7 +174,7 @@ export default class FeedbackCollector extends Component<Props> {
         showTypeField: boolean;
         showDefaultTextFields: boolean;
         anonymousFeedback: boolean;
-        onClose: () => void;
+        onClose: (...args: any[]) => void;
         onSubmit: () => void;
     };
     getGatewayUrl(): string;

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

@@ -27,8 +27,16 @@ interface Props {
     cancelButtonLabel?: string;
     /**  Message for select option labels and field labels **/
     feedbackGroupLabels?: Partial<Record<SelectValue, SelectOptionDetails>>;
-    /** Function that will be called to initiate the exit transition. */
-    onClose: () => void;
+    /**
+     * Function that will be called to initiate the exit transition.
+     * When triggered by the cancel button the originating event and Atlaskit UI analytics
+     * event are forwarded; programmatic close paths (e.g. after submit) invoke it with no
+     * arguments. Typed as a variadic `any[]` to maximise backward compatibility with
+     * consumers that declared any conceivable signature for this callback.
+     */
+    onClose: (...args: any[]) => void;
+    /** Optional function that will be called when the cancel button is clicked, in addition to onClose. */
+    onCancel?: (...args: any[]) => void;
     /** Function that will be called immediately after the submit action  */
     onSubmit: (formValues: FormFields) => Promise<void>;
     /**  Optional locale for i18n **/

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/feedback-collector",
-	"version": "15.3.0",
+	"version": "15.5.0",
 	"description": "A component that collects feedback across Atlassian products.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -44,7 +44,7 @@
 		"@atlaskit/section-message": "^8.13.0",
 		"@atlaskit/select": "^21.12.0",
 		"@atlaskit/textarea": "^8.3.0",
-		"@atlaskit/tokens": "^13.1.0",
+		"@atlaskit/tokens": "^13.3.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {