@atlaskit/feedback-collector 13.3.8 → 13.4.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/feedback-collector
 
+## 13.4.1
+
+### Patch Changes
+
+- [#119140](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/119140)
+  [`dbda45aec4c30`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dbda45aec4c30) -
+  Migrated usages of deprecated button `UNSAFE` icon size props to new render prop.
+
+## 13.4.0
+
+### Minor Changes
+
+- [#115204](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/115204)
+  [`5e05d478b8261`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5e05d478b8261) -
+  Add customFeedbackoptions to feedback collector as a prop
+
 ## 13.3.8
 
 ### Patch Changes

package/dist/cjs/components/FeedbackButton.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
@@ -39,8 +40,11 @@ var FeedbackButton = function FeedbackButton(props) {
     onClick: function onClick() {
       return setIsOpen(true);
     },
-    iconBefore: _feedback.default,
-    UNSAFE_iconBefore_size: "small"
+    iconBefore: function iconBefore(iconProps) {
+      return /*#__PURE__*/_react.default.createElement(_feedback.default, (0, _extends2.default)({}, iconProps, {
+        size: "small"
+      }));
+    }
   }, formatMessage(_messages.messages.giveFeedback)), isOpen && /*#__PURE__*/_react.default.createElement(_FeedbackCollector.default, {
     onClose: function onClose() {
       return setIsOpen(false);

package/dist/cjs/components/FeedbackCollector.js

@@ -166,7 +166,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "13.3.8" || 'Unknown, at least 11.0.0';
+      return "13.4.1" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",
@@ -475,9 +475,10 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
         onSubmit: this.postFeedback,
         onClose: this.props.onClose,
         locale: this.props.locale,
-        anonymousFeedback: (0, _platformFeatureFlags.getBooleanFF)('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
+        anonymousFeedback: (0, _platformFeatureFlags.fg)('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
         selectLabel: this.props.selectLabel,
-        customTextAreaLabel: this.props.customTextAreaLabel
+        customTextAreaLabel: this.props.customTextAreaLabel,
+        customFeedbackOptions: this.props.customFeedbackOptions
       });
     }
   }]);

package/dist/cjs/components/FeedbackForm.js

@@ -19,6 +19,7 @@ var _checkbox = require("@atlaskit/checkbox");
 var _form = _interopRequireWildcard(require("@atlaskit/form"));
 var _close = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/close"));
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _sectionMessage = _interopRequireDefault(require("@atlaskit/section-message"));
 var _select = _interopRequireDefault(require("@atlaskit/select"));
 var _textarea = _interopRequireDefault(require("@atlaskit/textarea"));
@@ -50,7 +51,9 @@ var FeedbackForm = function FeedbackForm(_ref) {
     anonymousFeedback = _ref.anonymousFeedback,
     hasDescriptionDefaultValue = _ref.hasDescriptionDefaultValue,
     selectLabel = _ref.selectLabel,
-    customTextAreaLabel = _ref.customTextAreaLabel;
+    customTextAreaLabel = _ref.customTextAreaLabel,
+    _ref$customFeedbackOp = _ref.customFeedbackOptions,
+    customFeedbackOptions = _ref$customFeedbackOp === void 0 ? [] : _ref$customFeedbackOp;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     canBeContacted = _useState2[0],
@@ -107,6 +110,7 @@ var FeedbackForm = function FeedbackForm(_ref) {
     return (record === null || record === void 0 ? void 0 : record.empty.selectOptionLabel) || formatMessage(_messages.messages.selectionOptionDefaultPlaceholder);
   };
   var focusRef = (0, _react.useRef)();
+  var selectOptions = customFeedbackOptions.length > 0 && (0, _platformFeatureFlags.fg)('platform.custom-select-feedback-options_c61l9') ? customFeedbackOptions : getSelectOptions(feedbackGroupLabels);
   return /*#__PURE__*/_react.default.createElement(_modalDialog.default, {
     shouldCloseOnOverlayClick: false,
     shouldCloseOnEscapePress: false,
@@ -180,7 +184,7 @@ var FeedbackForm = function FeedbackForm(_ref) {
             });
           }
         },
-        options: getSelectOptions(feedbackGroupLabels)
+        options: selectOptions
         // @ts-ignore
         ,
         ref: focusRef,

package/dist/es2019/components/FeedbackButton.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import React, { useState } from 'react';
 import { useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/new';
@@ -23,8 +24,9 @@ const FeedbackButton = props => {
   } = props;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     onClick: () => setIsOpen(true),
-    iconBefore: FeedbackIcon,
-    UNSAFE_iconBefore_size: "small"
+    iconBefore: iconProps => /*#__PURE__*/React.createElement(FeedbackIcon, _extends({}, iconProps, {
+      size: "small"
+    }))
   }, formatMessage(messages.giveFeedback)), isOpen && /*#__PURE__*/React.createElement(FeedbackCollector, {
     onClose: () => setIsOpen(false),
     onSubmit: () => setDisplayFlag(true),

package/dist/es2019/components/FeedbackCollector.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Buffer } from 'buffer';
 import React, { Component } from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { isApiGatewayUrl } from '../utils/is-api-gateway-url';
 import truncate from '../utils/Truncate';
 import FeedbackForm from './FeedbackForm';
@@ -91,7 +91,7 @@ export default class FeedbackCollector extends Component {
     return FeedbackCollector.defaultProps.url;
   }
   getPackageVersion() {
-    return "13.3.8" || 'Unknown, at least 11.0.0';
+    return "13.4.1" || 'Unknown, at least 11.0.0';
   }
   async getEntitlementInformation() {
     var _entitlementDetails, _entitlementDetails2, _productName, _entitlement, _productEntitlement;
@@ -310,9 +310,10 @@ export default class FeedbackCollector extends Component {
       onSubmit: this.postFeedback,
       onClose: this.props.onClose,
       locale: this.props.locale,
-      anonymousFeedback: getBooleanFF('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
+      anonymousFeedback: fg('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
       selectLabel: this.props.selectLabel,
-      customTextAreaLabel: this.props.customTextAreaLabel
+      customTextAreaLabel: this.props.customTextAreaLabel,
+      customFeedbackOptions: this.props.customFeedbackOptions
     });
   }
 }

package/dist/es2019/components/FeedbackForm.js

@@ -6,6 +6,7 @@ import { Checkbox } from '@atlaskit/checkbox';
 import Form, { Field, RequiredAsterisk } from '@atlaskit/form';
 import EditorCloseIcon from '@atlaskit/icon/glyph/editor/close';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
+import { fg } from '@atlaskit/platform-feature-flags';
 import SectionMessage from '@atlaskit/section-message';
 import Select from '@atlaskit/select';
 import TextArea from '@atlaskit/textarea';
@@ -29,7 +30,8 @@ const FeedbackForm = ({
   anonymousFeedback,
   hasDescriptionDefaultValue,
   selectLabel,
-  customTextAreaLabel
+  customTextAreaLabel,
+  customFeedbackOptions = []
 }) => {
   const [canBeContacted, setCanBeContacted] = useState(false);
   const [description, setDescription] = useState('');
@@ -65,6 +67,7 @@ const FeedbackForm = ({
   }];
   const getDefaultPlaceholder = record => (record === null || record === void 0 ? void 0 : record.empty.selectOptionLabel) || formatMessage(messages.selectionOptionDefaultPlaceholder);
   const focusRef = useRef();
+  const selectOptions = customFeedbackOptions.length > 0 && fg('platform.custom-select-feedback-options_c61l9') ? customFeedbackOptions : getSelectOptions(feedbackGroupLabels);
   return /*#__PURE__*/React.createElement(Modal, {
     shouldCloseOnOverlayClick: false,
     shouldCloseOnEscapePress: false,
@@ -128,7 +131,7 @@ const FeedbackForm = ({
         zIndex: 9999
       })
     },
-    options: getSelectOptions(feedbackGroupLabels)
+    options: selectOptions
     // @ts-ignore
     ,
     ref: focusRef,

package/dist/esm/components/FeedbackButton.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useState } from 'react';
 import { useIntl } from 'react-intl-next';
@@ -29,8 +30,11 @@ var FeedbackButton = function FeedbackButton(props) {
     onClick: function onClick() {
       return setIsOpen(true);
     },
-    iconBefore: FeedbackIcon,
-    UNSAFE_iconBefore_size: "small"
+    iconBefore: function iconBefore(iconProps) {
+      return /*#__PURE__*/React.createElement(FeedbackIcon, _extends({}, iconProps, {
+        size: "small"
+      }));
+    }
   }, formatMessage(messages.giveFeedback)), isOpen && /*#__PURE__*/React.createElement(FeedbackCollector, {
     onClose: function onClose() {
       return setIsOpen(false);

package/dist/esm/components/FeedbackCollector.js

@@ -14,7 +14,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { Buffer } from 'buffer';
 import React, { Component } from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { isApiGatewayUrl } from '../utils/is-api-gateway-url';
 import truncate from '../utils/Truncate';
 import FeedbackForm from './FeedbackForm';
@@ -156,7 +156,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "13.3.8" || 'Unknown, at least 11.0.0';
+      return "13.4.1" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",
@@ -465,9 +465,10 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
         onSubmit: this.postFeedback,
         onClose: this.props.onClose,
         locale: this.props.locale,
-        anonymousFeedback: getBooleanFF('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
+        anonymousFeedback: fg('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
         selectLabel: this.props.selectLabel,
-        customTextAreaLabel: this.props.customTextAreaLabel
+        customTextAreaLabel: this.props.customTextAreaLabel,
+        customFeedbackOptions: this.props.customFeedbackOptions
       });
     }
   }]);

package/dist/esm/components/FeedbackForm.js

@@ -15,6 +15,7 @@ import { Checkbox } from '@atlaskit/checkbox';
 import Form, { Field, RequiredAsterisk } from '@atlaskit/form';
 import EditorCloseIcon from '@atlaskit/icon/glyph/editor/close';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
+import { fg } from '@atlaskit/platform-feature-flags';
 import SectionMessage from '@atlaskit/section-message';
 import Select from '@atlaskit/select';
 import TextArea from '@atlaskit/textarea';
@@ -40,7 +41,9 @@ var FeedbackForm = function FeedbackForm(_ref) {
     anonymousFeedback = _ref.anonymousFeedback,
     hasDescriptionDefaultValue = _ref.hasDescriptionDefaultValue,
     selectLabel = _ref.selectLabel,
-    customTextAreaLabel = _ref.customTextAreaLabel;
+    customTextAreaLabel = _ref.customTextAreaLabel,
+    _ref$customFeedbackOp = _ref.customFeedbackOptions,
+    customFeedbackOptions = _ref$customFeedbackOp === void 0 ? [] : _ref$customFeedbackOp;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     canBeContacted = _useState2[0],
@@ -97,6 +100,7 @@ var FeedbackForm = function FeedbackForm(_ref) {
     return (record === null || record === void 0 ? void 0 : record.empty.selectOptionLabel) || formatMessage(messages.selectionOptionDefaultPlaceholder);
   };
   var focusRef = useRef();
+  var selectOptions = customFeedbackOptions.length > 0 && fg('platform.custom-select-feedback-options_c61l9') ? customFeedbackOptions : getSelectOptions(feedbackGroupLabels);
   return /*#__PURE__*/React.createElement(Modal, {
     shouldCloseOnOverlayClick: false,
     shouldCloseOnEscapePress: false,
@@ -170,7 +174,7 @@ var FeedbackForm = function FeedbackForm(_ref) {
             });
           }
         },
-        options: getSelectOptions(feedbackGroupLabels)
+        options: selectOptions
         // @ts-ignore
         ,
         ref: focusRef,

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

@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import { type FormFields, type SelectOptionDetails, type SelectValue } from '../types';
+import { type OptionType } from './FeedbackForm';
 type FieldValueType = string | Object | Object[];
 export type FieldType = {
     id: string;
@@ -101,6 +102,8 @@ export interface Props {
     selectLabel?: string;
     /** Optional custom label for TextArea when showTypeField is false*/
     customTextAreaLabel?: string;
+    /** Custom Select feedback options */
+    customFeedbackOptions?: OptionType[];
 }
 export default class FeedbackCollector extends Component<Props> {
     state: {

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

@@ -37,6 +37,8 @@ interface Props {
     selectLabel?: string;
     /** Optional custom label for TextArea when showTypeField is false*/
     customTextAreaLabel?: string;
+    /** Custom Select feedback options */
+    customFeedbackOptions?: OptionType[];
 }
 export interface OptionType {
     label: React.ReactText;

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

@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import { type FormFields, type SelectOptionDetails, type SelectValue } from '../types';
+import { type OptionType } from './FeedbackForm';
 type FieldValueType = string | Object | Object[];
 export type FieldType = {
     id: string;
@@ -101,6 +102,8 @@ export interface Props {
     selectLabel?: string;
     /** Optional custom label for TextArea when showTypeField is false*/
     customTextAreaLabel?: string;
+    /** Custom Select feedback options */
+    customFeedbackOptions?: OptionType[];
 }
 export default class FeedbackCollector extends Component<Props> {
     state: {

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

@@ -37,6 +37,8 @@ interface Props {
     selectLabel?: string;
     /** Optional custom label for TextArea when showTypeField is false*/
     customTextAreaLabel?: string;
+    /** Custom Select feedback options */
+    customFeedbackOptions?: OptionType[];
 }
 export interface OptionType {
     label: React.ReactText;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/feedback-collector",
-	"version": "13.3.8",
+	"version": "13.4.1",
 	"description": "A component that collects feedback across Atlassian products.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -41,11 +41,11 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@atlaskit/button": "^18.0.0",
+		"@atlaskit/button": "^18.3.0",
 		"@atlaskit/checkbox": "^13.5.0",
-		"@atlaskit/flag": "^15.6.0",
+		"@atlaskit/flag": "^15.7.0",
 		"@atlaskit/form": "^10.4.0",
-		"@atlaskit/icon": "^22.5.0",
+		"@atlaskit/icon": "^22.6.0",
 		"@atlaskit/modal-dialog": "^12.14.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/section-message": "^6.5.0",
@@ -62,6 +62,7 @@
 	"devDependencies": {
 		"@af/visual-regression": "*",
 		"@atlaskit/ssr": "*",
+		"@atlassian/feature-flags-test-utils": "*",
 		"@testing-library/react": "^12.1.5",
 		"@testing-library/react-hooks": "^8.0.1",
 		"buffer": "^6.0.3",
@@ -91,6 +92,9 @@
 	"platform-feature-flags": {
 		"platform.proforma-form-builder-feedback_hupaz": {
 			"type": "boolean"
+		},
+		"platform.custom-select-feedback-options_c61l9": {
+			"type": "boolean"
 		}
 	}
 }