@atlaskit/feedback-collector 16.9.0 → 16.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/dist/cjs/components/FeedbackButton.js +4 -4
  3. package/dist/cjs/components/FeedbackCollector.js +4 -4
  4. package/dist/cjs/components/FeedbackFlag.js +4 -4
  5. package/dist/cjs/components/FeedbackForm.js +57 -48
  6. package/dist/cjs/messages.js +0 -20
  7. package/dist/es2019/components/FeedbackButton.js +2 -2
  8. package/dist/es2019/components/FeedbackCollector.js +2 -2
  9. package/dist/es2019/components/FeedbackFlag.js +2 -2
  10. package/dist/es2019/components/FeedbackForm.js +23 -14
  11. package/dist/es2019/messages.js +0 -20
  12. package/dist/esm/components/FeedbackButton.js +2 -2
  13. package/dist/esm/components/FeedbackCollector.js +2 -2
  14. package/dist/esm/components/FeedbackFlag.js +2 -2
  15. package/dist/esm/components/FeedbackForm.js +23 -14
  16. package/dist/esm/messages.js +0 -20
  17. package/dist/types/messages.d.ts +0 -20
  18. package/package.json +15 -19
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/feedback-collector
2
2
 
3
+ ## 16.9.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [`6f66af09bd361`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6f66af09bd361) -
8
+ Cleanup feature gate `ak_feedback_collector_select_escape`. The feedback type select now always
9
+ prevents Escape key propagation when its menu is open.
10
+
11
+ ## 16.9.1
12
+
13
+ ### Patch Changes
14
+
15
+ - [`2543c8b0416d7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2543c8b0416d7) -
16
+ Cleanup feature gate `fun-2435_improve_feedback_collector_copy`. The contact opt-in checkbox
17
+ always uses the copy explaining that consent is required to receive a reply.
18
+
3
19
  ## 16.9.0
4
20
 
5
21
  ### Minor Changes
package/dist/cjs/components/FeedbackButton.js CHANGED
@@ -10,8 +10,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
10
10
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
11
  var _react = _interopRequireWildcard(require("react"));
12
12
  var _reactIntl = require("react-intl");
13
- var _new = _interopRequireDefault(require("@atlaskit/button/new"));
14
- var _flag = require("@atlaskit/flag");
13
+ var _button = _interopRequireDefault(require("@atlaskit/button/default/button"));
14
+ var _flagGroup = _interopRequireDefault(require("@atlaskit/flag/flag-group"));
15
15
  var _feedback = _interopRequireDefault(require("@atlaskit/icon/core/feedback"));
16
16
  var _messages = require("../messages");
17
17
  var _FeedbackCollector = _interopRequireDefault(require("./FeedbackCollector"));
@@ -36,7 +36,7 @@ var FeedbackButton = function FeedbackButton(props) {
36
36
  atlassianAccountId = props.atlassianAccountId,
37
37
  shouldGetEntitlementDetails = props.shouldGetEntitlementDetails,
38
38
  locale = props.locale;
39
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_new.default, {
39
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_button.default, {
40
40
  onClick: function onClick() {
41
41
  return setIsOpen(true);
42
42
  },
@@ -56,7 +56,7 @@ var FeedbackButton = function FeedbackButton(props) {
56
56
  atlassianAccountId: atlassianAccountId,
57
57
  entrypointId: entrypointId,
58
58
  shouldGetEntitlementDetails: shouldGetEntitlementDetails
59
- }), /*#__PURE__*/_react.default.createElement(_flag.FlagGroup, {
59
+ }), /*#__PURE__*/_react.default.createElement(_flagGroup.default, {
60
60
  onDismissed: function onDismissed() {
61
61
  return setDisplayFlag(false);
62
62
  }
package/dist/cjs/components/FeedbackCollector.js CHANGED
@@ -18,7 +18,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
18
18
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
19
19
  var _buffer = require("buffer");
20
20
  var _react = _interopRequireWildcard(require("react"));
21
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
21
+ var _fg = require("@atlaskit/platform-feature-flags/fg");
22
22
  var _isApiGatewayUrl = require("../utils/is-api-gateway-url");
23
23
  var _Truncate = _interopRequireDefault(require("../utils/Truncate"));
24
24
  var _FeedbackForm = _interopRequireDefault(require("./FeedbackForm"));
@@ -164,7 +164,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
164
164
  }, {
165
165
  key: "getPackageVersion",
166
166
  value: function getPackageVersion() {
167
- return "16.8.1" || 'Unknown, at least 11.0.0';
167
+ return "16.9.1" || 'Unknown, at least 11.0.0';
168
168
  }
169
169
  }, {
170
170
  key: "getEntitlementInformation",
@@ -488,14 +488,14 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
488
488
  onClose: this.props.onClose,
489
489
  onCancel: this.props.onCancel,
490
490
  locale: this.props.locale,
491
- anonymousFeedback: (0, _platformFeatureFlags.fg)('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
491
+ anonymousFeedback: (0, _fg.fg)('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
492
492
  selectLabel: this.props.selectLabel,
493
493
  customTextAreaLabel: this.props.customTextAreaLabel,
494
494
  customFeedbackOptions: this.props.customFeedbackOptions,
495
495
  shouldReturnFocusRef: this.props.shouldReturnFocusRef,
496
496
  dialogRef: this.props.dialogRef,
497
497
  disableSubmitButton: this.props.disableSubmitButton
498
- }, (0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements') && {
498
+ }, (0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements') && {
499
499
  enrolInResearchLink: this.props.enrolInResearchLink,
500
500
  canBeContactedLink: this.props.canBeContactedLink
501
501
  }, {
package/dist/cjs/components/FeedbackFlag.js CHANGED
@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
  var _reactIntl = require("react-intl");
10
- var _flag = require("@atlaskit/flag");
10
+ var _autoDismissFlag = _interopRequireDefault(require("@atlaskit/flag/auto-dismiss-flag"));
11
11
  var _statusSuccess = _interopRequireDefault(require("@atlaskit/icon/core/status-success"));
12
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
12
+ var _fg = require("@atlaskit/platform-feature-flags/fg");
13
13
  var _messages = require("../messages");
14
14
  var _IntlProviderWithResolvedMessages = require("./IntlProviderWithResolvedMessages");
15
15
  var FeedbackFlag = function FeedbackFlag(_ref) {
@@ -17,14 +17,14 @@ var FeedbackFlag = function FeedbackFlag(_ref) {
17
17
  title = _ref.title;
18
18
  var _useIntl = (0, _reactIntl.useIntl)(),
19
19
  formatMessage = _useIntl.formatMessage;
20
- return /*#__PURE__*/_react.default.createElement(_flag.AutoDismissFlag, {
20
+ return /*#__PURE__*/_react.default.createElement(_autoDismissFlag.default, {
21
21
  icon: /*#__PURE__*/_react.default.createElement(_statusSuccess.default, {
22
22
  spacing: "spacious",
23
23
  color: "var(--ds-icon-success, #6A9A23)",
24
24
  label: "Success"
25
25
  }),
26
26
  id: "feedbackSent",
27
- description: description || formatMessage((0, _platformFeatureFlags.fg)('product-terminology-refresh') ? _messages.messages.feedbackSuccessFlagDescriptionAppify : _messages.messages.feedbackSuccessFlagDescription),
27
+ description: description || formatMessage((0, _fg.fg)('product-terminology-refresh') ? _messages.messages.feedbackSuccessFlagDescriptionAppify : _messages.messages.feedbackSuccessFlagDescription),
28
28
  title: title || formatMessage(_messages.messages.feedbackSuccessFlagTitle)
29
29
  });
30
30
  };
package/dist/cjs/components/FeedbackForm.js CHANGED
@@ -14,14 +14,23 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
14
14
  var _react = _interopRequireWildcard(require("react"));
15
15
  var _reactIntl = require("react-intl");
16
16
  var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
17
- var _checkbox = require("@atlaskit/checkbox");
18
- var _form = _interopRequireWildcard(require("@atlaskit/form"));
19
- var _link = _interopRequireDefault(require("@atlaskit/link"));
20
- var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
21
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
22
- var _sectionMessage = _interopRequireDefault(require("@atlaskit/section-message"));
23
- var _select = _interopRequireDefault(require("@atlaskit/select"));
24
- var _textarea = _interopRequireDefault(require("@atlaskit/textarea"));
17
+ var _checkbox = require("@atlaskit/checkbox/checkbox");
18
+ var _form = _interopRequireDefault(require("@atlaskit/form/form"));
19
+ var _errorMessage = require("@atlaskit/form/error-message");
20
+ var _field = _interopRequireDefault(require("@atlaskit/form/field"));
21
+ var _fieldset = require("@atlaskit/form/fieldset");
22
+ var _messageWrapper = require("@atlaskit/form/message-wrapper");
23
+ var _requiredAsterisk = require("@atlaskit/form/required-asterisk");
24
+ var _link = _interopRequireDefault(require("@atlaskit/link/link"));
25
+ var _modalDialog = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-dialog"));
26
+ var _modalBody = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-body"));
27
+ var _modalFooter = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-footer"));
28
+ var _modalHeader = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-header"));
29
+ var _modalTitle = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-title"));
30
+ var _fg = require("@atlaskit/platform-feature-flags/fg");
31
+ var _message = _interopRequireDefault(require("@atlaskit/section-message/message"));
32
+ var _default2 = _interopRequireDefault(require("@atlaskit/select/default"));
33
+ var _textArea = _interopRequireDefault(require("@atlaskit/textarea/text-area"));
25
34
  var _messages = require("../messages");
26
35
  var _IntlProviderWithResolvedMessages = require("./IntlProviderWithResolvedMessages");
27
36
  var _excluded = ["id"],
@@ -154,16 +163,16 @@ var FeedbackForm = function FeedbackForm(_ref2) {
154
163
  var focusRef = (0, _react.useRef)();
155
164
  var selectOptions = customFeedbackOptions.length > 0 ? customFeedbackOptions : getSelectOptions(feedbackGroupLabels);
156
165
  var renderContactLabelAppify = function renderContactLabelAppify() {
157
- if ((0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements')) {
158
- return (0, _platformFeatureFlags.fg)('fun-2435_improve_feedback_collector_copy') ? _messages.messages.canBeContactedLabelAppifyWithResponseWithoutLink : _messages.messages.canBeContactedLabelAppifyWithoutLink;
166
+ if ((0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements')) {
167
+ return _messages.messages.canBeContactedLabelAppifyWithResponseWithoutLink;
159
168
  }
160
- return (0, _platformFeatureFlags.fg)('fun-2435_improve_feedback_collector_copy') ? _messages.messages.canBeContactedLabelAppifyWithResponse : _messages.messages.canBeContactedLabelAppify;
169
+ return _messages.messages.canBeContactedLabelAppifyWithResponse;
161
170
  };
162
171
  var renderContactLabel = function renderContactLabel() {
163
- if ((0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements')) {
164
- return (0, _platformFeatureFlags.fg)('fun-2435_improve_feedback_collector_copy') ? _messages.messages.canBeContactedLabelWithResponseWithoutLink : _messages.messages.canBeContactedLabelWithoutLink;
172
+ if ((0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements')) {
173
+ return _messages.messages.canBeContactedLabelWithResponseWithoutLink;
165
174
  }
166
- return (0, _platformFeatureFlags.fg)('fun-2435_improve_feedback_collector_copy') ? _messages.messages.canBeContactedLabelWithResponse : _messages.messages.canBeContactedLabel;
175
+ return _messages.messages.canBeContactedLabelWithResponse;
167
176
  };
168
177
  var requiredFieldsSummary =
169
178
  /*#__PURE__*/
@@ -175,7 +184,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
175
184
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
176
185
  marginBottom: "var(--ds-space-300, 24px)"
177
186
  }
178
- }, formatMessage(_messages.messages.requiredFieldsSummary), /*#__PURE__*/_react.default.createElement(_form.RequiredAsterisk, null));
187
+ }, formatMessage(_messages.messages.requiredFieldsSummary), /*#__PURE__*/_react.default.createElement(_requiredAsterisk.RequiredAsterisk, null));
179
188
  var feedbackIsAnonymous =
180
189
  /*#__PURE__*/
181
190
  // eslint-disable-next-line @atlaskit/design-system/use-primitives-text
@@ -187,7 +196,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
187
196
  testId: "feedbackCollectorModalDialog",
188
197
  shouldReturnFocus: shouldReturnFocusRef,
189
198
  shouldScrollInViewport: true
190
- }, (0, _platformFeatureFlags.fg)('platform-design_system_team-form_conversion') ? /*#__PURE__*/_react.default.createElement(_form.default, {
199
+ }, (0, _fg.fg)('platform-design_system_team-form_conversion') ? /*#__PURE__*/_react.default.createElement(_form.default, {
191
200
  onSubmit: /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
192
201
  return _regenerator.default.wrap(function (_context) {
193
202
  while (1) switch (_context.prev = _context.next) {
@@ -211,9 +220,9 @@ var FeedbackForm = function FeedbackForm(_ref2) {
211
220
  }
212
221
  }, _callee, null, [[1,, 2, 3]]);
213
222
  }))
214
- }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, {
223
+ }, /*#__PURE__*/_react.default.createElement(_modalHeader.default, {
215
224
  hasCloseButton: true
216
- }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, feedbackTitle || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.feedbackTitle))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, (0, _platformFeatureFlags.fg)('ak_feedback_collector_hide_required_summary') ? showRequiredFieldsSummary && requiredFieldsSummary : requiredFieldsSummary, feedbackTitleDetails, customContent, showTypeField ? /*#__PURE__*/_react.default.createElement(_form.Field, {
225
+ }, /*#__PURE__*/_react.default.createElement(_modalTitle.default, null, feedbackTitle || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.feedbackTitle))), /*#__PURE__*/_react.default.createElement(_modalBody.default, null, (0, _fg.fg)('ak_feedback_collector_hide_required_summary') ? showRequiredFieldsSummary && requiredFieldsSummary : requiredFieldsSummary, feedbackTitleDetails, customContent, showTypeField ? /*#__PURE__*/_react.default.createElement(_field.default, {
217
226
  name: "topic",
218
227
  id: "topic",
219
228
  label: selectLabel || formatMessage(_messages.messages.selectionOptionDefaultLabel),
@@ -225,7 +234,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
225
234
  id = _ref4$fieldProps.id,
226
235
  restProps = (0, _objectWithoutProperties2.default)(_ref4$fieldProps, _excluded),
227
236
  error = _ref4.error;
228
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_select.default, (0, _extends2.default)({}, restProps, {
237
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_default2.default, (0, _extends2.default)({}, restProps, {
229
238
  value: (_selectOptions$find = selectOptions.find(function (opt) {
230
239
  return opt.value === type;
231
240
  })) !== null && _selectOptions$find !== void 0 ? _selectOptions$find : null,
@@ -239,15 +248,15 @@ var FeedbackForm = function FeedbackForm(_ref2) {
239
248
  },
240
249
  menuPosition: "fixed",
241
250
  options: selectOptions,
242
- shouldPreventEscapePropagation: (0, _platformFeatureFlags.fg)('ak_feedback_collector_select_escape')
251
+ shouldPreventEscapePropagation: true
243
252
  // @ts-ignore
244
253
  ,
245
254
  ref: focusRef,
246
255
  placeholder: getDefaultPlaceholder(feedbackGroupLabels),
247
256
  inputId: id,
248
257
  isInvalid: !!error
249
- })), /*#__PURE__*/_react.default.createElement(_form.MessageWrapper, null, error && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, error)));
250
- }) : null, showDefaultTextFields && canShowTextField && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.Field, {
258
+ })), /*#__PURE__*/_react.default.createElement(_messageWrapper.MessageWrapper, null, error && /*#__PURE__*/_react.default.createElement(_errorMessage.ErrorMessage, null, error)));
259
+ }) : null, showDefaultTextFields && canShowTextField && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_field.default, {
251
260
  label: showTypeField ? getFieldLabels(feedbackGroupLabels)[type] : customTextAreaLabel || formatMessage(_messages.messages.defaultCustomTextAreaLabel),
252
261
  isRequired: true,
253
262
  name: "description",
@@ -256,7 +265,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
256
265
  }, function (_ref5) {
257
266
  var fieldProps = _ref5.fieldProps,
258
267
  error = _ref5.error;
259
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_textarea.default, (0, _extends2.default)({}, fieldProps, {
268
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_textArea.default, (0, _extends2.default)({}, fieldProps, {
260
269
  name: "foo",
261
270
  minimumRows: 6,
262
271
  placeholder: summaryPlaceholder || undefined,
@@ -265,15 +274,15 @@ var FeedbackForm = function FeedbackForm(_ref2) {
265
274
  fieldProps.onChange(e.target.value);
266
275
  },
267
276
  value: description
268
- })), /*#__PURE__*/_react.default.createElement(_form.MessageWrapper, null, error && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, error)));
269
- }), !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, {
277
+ })), /*#__PURE__*/_react.default.createElement(_messageWrapper.MessageWrapper, null, error && /*#__PURE__*/_react.default.createElement(_errorMessage.ErrorMessage, null, error)));
278
+ }), !anonymousFeedback && /*#__PURE__*/_react.default.createElement(_fieldset.Fieldset, null, /*#__PURE__*/_react.default.createElement("legend", null, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.optInOptionsLegend)), /*#__PURE__*/_react.default.createElement(_field.default, {
270
279
  name: "can-be-contacted"
271
280
  }, function (_ref6) {
272
281
  var fieldProps = _ref6.fieldProps;
273
282
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_checkbox.Checkbox, (0, _extends2.default)({}, fieldProps, {
274
283
  "aria-describedby": undefined // JCA11Y-1988
275
284
  ,
276
- label: canBeContactedLabel || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, (0, _platformFeatureFlags.fg)('product-terminology-refresh') ? renderContactLabelAppify() : renderContactLabel(), !(0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements') && {
285
+ label: canBeContactedLabel || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, (0, _fg.fg)('product-terminology-refresh') ? renderContactLabelAppify() : renderContactLabel(), !(0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements') && {
277
286
  values: {
278
287
  a: function a(chunks) {
279
288
  return /*#__PURE__*/_react.default.createElement(_link.default, {
@@ -286,11 +295,11 @@ var FeedbackForm = function FeedbackForm(_ref2) {
286
295
  onChange: function onChange(event) {
287
296
  return setCanBeContacted(event.target.checked);
288
297
  }
289
- })), canBeContactedLabel && canBeContactedLink && (0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, canBeContactedLink), !canBeContactedLabel && (0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, /*#__PURE__*/_react.default.createElement(_link.default, {
298
+ })), canBeContactedLabel && canBeContactedLink && (0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, canBeContactedLink), !canBeContactedLabel && (0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, /*#__PURE__*/_react.default.createElement(_link.default, {
290
299
  href: "https://www.atlassian.com/legal/privacy-policy",
291
300
  target: "_blank"
292
301
  }, formatMessage(_messages.messages.privacyPolicy))));
293
- }), /*#__PURE__*/_react.default.createElement(_form.Field, {
302
+ }), /*#__PURE__*/_react.default.createElement(_field.default, {
294
303
  name: "enroll-in-research-group"
295
304
  }, function (_ref7) {
296
305
  var fieldProps = _ref7.fieldProps;
@@ -301,15 +310,15 @@ var FeedbackForm = function FeedbackForm(_ref2) {
301
310
  onChange: function onChange(event) {
302
311
  return setEnrollInResearchGroup(event.target.checked);
303
312
  }
304
- })), enrolInResearchLabel && enrolInResearchLink && (0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, enrolInResearchLink));
305
- })) || /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.Field, {
313
+ })), enrolInResearchLabel && enrolInResearchLink && (0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, enrolInResearchLink));
314
+ })) || /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_field.default, {
306
315
  name: 'anonymousFeedback'
307
316
  }, function () {
308
- return /*#__PURE__*/_react.default.createElement(_sectionMessage.default, {
317
+ return /*#__PURE__*/_react.default.createElement(_message.default, {
309
318
  title: formatMessage(_messages.messages.feedbackIsAnonymousTitle),
310
319
  appearance: 'information'
311
320
  }, feedbackIsAnonymous);
312
- })))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_standardButton.default, {
321
+ })))), /*#__PURE__*/_react.default.createElement(_modalFooter.default, null, /*#__PURE__*/_react.default.createElement(_standardButton.default, {
313
322
  appearance: "subtle",
314
323
  onClick: handleCancel
315
324
  }, cancelButtonLabel || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.cancelButtonLabel)), /*#__PURE__*/_react.default.createElement(_standardButton.default, {
@@ -343,9 +352,9 @@ var FeedbackForm = function FeedbackForm(_ref2) {
343
352
  }))
344
353
  }, function (_ref9) {
345
354
  var formProps = _ref9.formProps;
346
- return /*#__PURE__*/_react.default.createElement("form", formProps, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, {
355
+ return /*#__PURE__*/_react.default.createElement("form", formProps, /*#__PURE__*/_react.default.createElement(_modalHeader.default, {
347
356
  hasCloseButton: true
348
- }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, feedbackTitle || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.feedbackTitle))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, (0, _platformFeatureFlags.fg)('ak_feedback_collector_hide_required_summary') ? showRequiredFieldsSummary && requiredFieldsSummary : requiredFieldsSummary, feedbackTitleDetails, customContent, showTypeField ? /*#__PURE__*/_react.default.createElement(_form.Field, {
357
+ }, /*#__PURE__*/_react.default.createElement(_modalTitle.default, null, feedbackTitle || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.feedbackTitle))), /*#__PURE__*/_react.default.createElement(_modalBody.default, null, (0, _fg.fg)('ak_feedback_collector_hide_required_summary') ? showRequiredFieldsSummary && requiredFieldsSummary : requiredFieldsSummary, feedbackTitleDetails, customContent, showTypeField ? /*#__PURE__*/_react.default.createElement(_field.default, {
349
358
  name: "topic",
350
359
  id: "topic",
351
360
  label: selectLabel || formatMessage(_messages.messages.selectionOptionDefaultLabel),
@@ -357,7 +366,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
357
366
  id = _ref0$fieldProps.id,
358
367
  restProps = (0, _objectWithoutProperties2.default)(_ref0$fieldProps, _excluded2),
359
368
  error = _ref0.error;
360
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_select.default, (0, _extends2.default)({}, restProps, {
369
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_default2.default, (0, _extends2.default)({}, restProps, {
361
370
  value: (_selectOptions$find2 = selectOptions.find(function (opt) {
362
371
  return opt.value === type;
363
372
  })) !== null && _selectOptions$find2 !== void 0 ? _selectOptions$find2 : null,
@@ -371,15 +380,15 @@ var FeedbackForm = function FeedbackForm(_ref2) {
371
380
  },
372
381
  menuPosition: "fixed",
373
382
  options: selectOptions,
374
- shouldPreventEscapePropagation: (0, _platformFeatureFlags.fg)('ak_feedback_collector_select_escape')
383
+ shouldPreventEscapePropagation: true
375
384
  // @ts-ignore
376
385
  ,
377
386
  ref: focusRef,
378
387
  placeholder: getDefaultPlaceholder(feedbackGroupLabels),
379
388
  inputId: id,
380
389
  isInvalid: !!error
381
- })), /*#__PURE__*/_react.default.createElement(_form.MessageWrapper, null, error && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, error)));
382
- }) : null, showDefaultTextFields && canShowTextField && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.Field, {
390
+ })), /*#__PURE__*/_react.default.createElement(_messageWrapper.MessageWrapper, null, error && /*#__PURE__*/_react.default.createElement(_errorMessage.ErrorMessage, null, error)));
391
+ }) : null, showDefaultTextFields && canShowTextField && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_field.default, {
383
392
  label: showTypeField ? getFieldLabels(feedbackGroupLabels)[type] : customTextAreaLabel || formatMessage(_messages.messages.defaultCustomTextAreaLabel),
384
393
  isRequired: true,
385
394
  name: "description",
@@ -388,7 +397,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
388
397
  }, function (_ref1) {
389
398
  var fieldProps = _ref1.fieldProps,
390
399
  error = _ref1.error;
391
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_textarea.default, (0, _extends2.default)({}, fieldProps, {
400
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_textArea.default, (0, _extends2.default)({}, fieldProps, {
392
401
  name: "foo",
393
402
  minimumRows: 6,
394
403
  placeholder: summaryPlaceholder || undefined,
@@ -397,15 +406,15 @@ var FeedbackForm = function FeedbackForm(_ref2) {
397
406
  fieldProps.onChange(e.target.value);
398
407
  },
399
408
  value: description
400
- })), /*#__PURE__*/_react.default.createElement(_form.MessageWrapper, null, error && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, error)));
401
- }), !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, {
409
+ })), /*#__PURE__*/_react.default.createElement(_messageWrapper.MessageWrapper, null, error && /*#__PURE__*/_react.default.createElement(_errorMessage.ErrorMessage, null, error)));
410
+ }), !anonymousFeedback && /*#__PURE__*/_react.default.createElement(_fieldset.Fieldset, null, /*#__PURE__*/_react.default.createElement("legend", null, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.optInOptionsLegend)), /*#__PURE__*/_react.default.createElement(_field.default, {
402
411
  name: "can-be-contacted"
403
412
  }, function (_ref10) {
404
413
  var fieldProps = _ref10.fieldProps;
405
414
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_checkbox.Checkbox, (0, _extends2.default)({}, fieldProps, {
406
415
  "aria-describedby": undefined // JCA11Y-1988
407
416
  ,
408
- label: canBeContactedLabel || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, (0, _platformFeatureFlags.fg)('product-terminology-refresh') ? renderContactLabelAppify() : renderContactLabel(), !(0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements') && {
417
+ label: canBeContactedLabel || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, (0, _fg.fg)('product-terminology-refresh') ? renderContactLabelAppify() : renderContactLabel(), !(0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements') && {
409
418
  values: {
410
419
  a: function a(chunks) {
411
420
  return /*#__PURE__*/_react.default.createElement(_link.default, {
@@ -418,11 +427,11 @@ var FeedbackForm = function FeedbackForm(_ref2) {
418
427
  onChange: function onChange(event) {
419
428
  return setCanBeContacted(event.target.checked);
420
429
  }
421
- })), canBeContactedLabel && canBeContactedLink && (0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, canBeContactedLink), !canBeContactedLabel && (0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, /*#__PURE__*/_react.default.createElement(_link.default, {
430
+ })), canBeContactedLabel && canBeContactedLink && (0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, canBeContactedLink), !canBeContactedLabel && (0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, /*#__PURE__*/_react.default.createElement(_link.default, {
422
431
  href: "https://www.atlassian.com/legal/privacy-policy",
423
432
  target: "_blank"
424
433
  }, formatMessage(_messages.messages.privacyPolicy))));
425
- }), /*#__PURE__*/_react.default.createElement(_form.Field, {
434
+ }), /*#__PURE__*/_react.default.createElement(_field.default, {
426
435
  name: "enroll-in-research-group"
427
436
  }, function (_ref11) {
428
437
  var fieldProps = _ref11.fieldProps;
@@ -433,15 +442,15 @@ var FeedbackForm = function FeedbackForm(_ref2) {
433
442
  onChange: function onChange(event) {
434
443
  return setEnrollInResearchGroup(event.target.checked);
435
444
  }
436
- })), enrolInResearchLabel && enrolInResearchLink && (0, _platformFeatureFlags.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, enrolInResearchLink));
437
- })) || /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.Field, {
445
+ })), enrolInResearchLabel && enrolInResearchLink && (0, _fg.fg)('jfp_a11y_team_feedback_collector_nested_elements') && /*#__PURE__*/_react.default.createElement(LinkWrapper, null, enrolInResearchLink));
446
+ })) || /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_field.default, {
438
447
  name: 'anonymousFeedback'
439
448
  }, function () {
440
- return /*#__PURE__*/_react.default.createElement(_sectionMessage.default, {
449
+ return /*#__PURE__*/_react.default.createElement(_message.default, {
441
450
  title: formatMessage(_messages.messages.feedbackIsAnonymousTitle),
442
451
  appearance: 'information'
443
452
  }, feedbackIsAnonymous);
444
- })))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_standardButton.default, {
453
+ })))), /*#__PURE__*/_react.default.createElement(_modalFooter.default, null, /*#__PURE__*/_react.default.createElement(_standardButton.default, {
445
454
  appearance: "subtle",
446
455
  onClick: handleCancel
447
456
  }, cancelButtonLabel || /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _messages.messages.cancelButtonLabel)), /*#__PURE__*/_react.default.createElement(_standardButton.default, {
package/dist/cjs/messages.js CHANGED
@@ -16,16 +16,6 @@ var messages = exports.messages = (0, _reactIntl.defineMessages)({
16
16
  defaultMessage: "I'd like to participate in product research",
17
17
  description: 'The checkbox label letting users enrol themselves in future product research interviews'
18
18
  },
19
- canBeContactedLabel: {
20
- id: 'feedback-collector.can-be-contacted.label',
21
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
22
- description: 'The checkbox label to give consent to be contacted about their feedback'
23
- },
24
- canBeContactedLabelWithoutLink: {
25
- id: 'feedback-collector.can-be-contacted.label-without-link',
26
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the Atlassian Privacy Policy.',
27
- description: 'The checkbox label to give consent to be contacted about their feedback'
28
- },
29
19
  canBeContactedLabelWithResponse: {
30
20
  id: 'feedback-collector.can-be-contacted.label-with-response',
31
21
  defaultMessage: "Yes, Atlassian teams can reply to my feedback and ask for more details about my experience to improve Atlassian products and services. Without this, I won't get a response. I acknowledge the <a>Atlassian Privacy Policy</a>.",
@@ -176,16 +166,6 @@ var messages = exports.messages = (0, _reactIntl.defineMessages)({
176
166
  defaultMessage: "What's on your mind?",
177
167
  description: 'The textarea label where users can write their suggestion for custom feedback collector'
178
168
  },
179
- canBeContactedLabelAppify: {
180
- id: 'feedback-collector.can-be-contacted.label-appify',
181
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian apps and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
182
- description: 'The checkbox label to give consent to be contacted about their feedback'
183
- },
184
- canBeContactedLabelAppifyWithoutLink: {
185
- id: 'feedback-collector.can-be-contacted.label-appify-without-link',
186
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian apps and services. I acknowledge the Atlassian Privacy Policy.',
187
- description: 'The checkbox label to give consent to be contacted about their feedback'
188
- },
189
169
  canBeContactedLabelAppifyWithResponse: {
190
170
  id: 'feedback-collector.can-be-contacted.label-appify-with-response',
191
171
  defaultMessage: "Yes, Atlassian teams can reply to my feedback and ask for more details about my experience to improve Atlassian apps and services. Without this, I won't get a response. I acknowledge the <a>Atlassian Privacy Policy</a>.",
package/dist/es2019/components/FeedbackButton.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import React, { useState } from 'react';
3
3
  import { useIntl } from 'react-intl';
4
- import Button from '@atlaskit/button/new';
5
- import { FlagGroup } from '@atlaskit/flag';
4
+ import Button from '@atlaskit/button/default/button';
5
+ import FlagGroup from '@atlaskit/flag/flag-group';
6
6
  import FeedbackIcon from '@atlaskit/icon/core/feedback';
7
7
  import { messages } from '../messages';
8
8
  import FeedbackCollector from './FeedbackCollector';
package/dist/es2019/components/FeedbackCollector.js CHANGED
@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
3
  import { Buffer } from 'buffer';
4
4
  import React, { Component } from 'react';
5
- import { fg } from '@atlaskit/platform-feature-flags';
5
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
6
6
  import { isApiGatewayUrl } from '../utils/is-api-gateway-url';
7
7
  import truncate from '../utils/Truncate';
8
8
  import FeedbackForm from './FeedbackForm';
@@ -92,7 +92,7 @@ export default class FeedbackCollector extends Component {
92
92
  return FeedbackCollector.defaultProps.url;
93
93
  }
94
94
  getPackageVersion() {
95
- return "16.8.1" || 'Unknown, at least 11.0.0';
95
+ return "16.9.1" || 'Unknown, at least 11.0.0';
96
96
  }
97
97
  async getEntitlementInformation() {
98
98
  var _entitlementDetails, _entitlementDetails2, _productName, _entitlement, _productEntitlement;
package/dist/es2019/components/FeedbackFlag.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import React from 'react';
2
2
  import { useIntl } from 'react-intl';
3
- import { AutoDismissFlag } from '@atlaskit/flag';
3
+ import AutoDismissFlag from '@atlaskit/flag/auto-dismiss-flag';
4
4
  import SuccessIcon from '@atlaskit/icon/core/status-success';
5
- import { fg } from '@atlaskit/platform-feature-flags';
5
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
6
6
  import { messages } from '../messages';
7
7
  import { IntlProviderWithResolvedMessages } from './IntlProviderWithResolvedMessages';
8
8
  const FeedbackFlag = ({
package/dist/es2019/components/FeedbackForm.js CHANGED
@@ -2,14 +2,23 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import React, { useRef, useState } from 'react';
3
3
  import { FormattedMessage, useIntl } from 'react-intl';
4
4
  import Button from '@atlaskit/button/standard-button';
5
- import { Checkbox } from '@atlaskit/checkbox';
6
- import Form, { ErrorMessage, Field, Fieldset, MessageWrapper, RequiredAsterisk } from '@atlaskit/form';
7
- import Link from '@atlaskit/link';
8
- import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
9
- import { fg } from '@atlaskit/platform-feature-flags';
10
- import SectionMessage from '@atlaskit/section-message';
11
- import Select from '@atlaskit/select';
12
- import TextArea from '@atlaskit/textarea';
5
+ import { Checkbox } from '@atlaskit/checkbox/checkbox';
6
+ import Form from '@atlaskit/form/form';
7
+ import { ErrorMessage } from '@atlaskit/form/error-message';
8
+ import Field from '@atlaskit/form/field';
9
+ import { Fieldset } from '@atlaskit/form/fieldset';
10
+ import { MessageWrapper } from '@atlaskit/form/message-wrapper';
11
+ import { RequiredAsterisk } from '@atlaskit/form/required-asterisk';
12
+ import Link from '@atlaskit/link/link';
13
+ import Modal from '@atlaskit/modal-dialog/modal-dialog';
14
+ import ModalBody from '@atlaskit/modal-dialog/modal-body';
15
+ import ModalFooter from '@atlaskit/modal-dialog/modal-footer';
16
+ import ModalHeader from '@atlaskit/modal-dialog/modal-header';
17
+ import ModalTitle from '@atlaskit/modal-dialog/modal-title';
18
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
19
+ import SectionMessage from '@atlaskit/section-message/message';
20
+ import Select from '@atlaskit/select/default';
21
+ import TextArea from '@atlaskit/textarea/text-area';
13
22
  import { messages } from '../messages';
14
23
  import { IntlProviderWithResolvedMessages } from './IntlProviderWithResolvedMessages';
15
24
  const LinkWrapper = ({
@@ -116,15 +125,15 @@ const FeedbackForm = ({
116
125
  const selectOptions = customFeedbackOptions.length > 0 ? customFeedbackOptions : getSelectOptions(feedbackGroupLabels);
117
126
  const renderContactLabelAppify = () => {
118
127
  if (fg('jfp_a11y_team_feedback_collector_nested_elements')) {
119
- return fg('fun-2435_improve_feedback_collector_copy') ? messages.canBeContactedLabelAppifyWithResponseWithoutLink : messages.canBeContactedLabelAppifyWithoutLink;
128
+ return messages.canBeContactedLabelAppifyWithResponseWithoutLink;
120
129
  }
121
- return fg('fun-2435_improve_feedback_collector_copy') ? messages.canBeContactedLabelAppifyWithResponse : messages.canBeContactedLabelAppify;
130
+ return messages.canBeContactedLabelAppifyWithResponse;
122
131
  };
123
132
  const renderContactLabel = () => {
124
133
  if (fg('jfp_a11y_team_feedback_collector_nested_elements')) {
125
- return fg('fun-2435_improve_feedback_collector_copy') ? messages.canBeContactedLabelWithResponseWithoutLink : messages.canBeContactedLabelWithoutLink;
134
+ return messages.canBeContactedLabelWithResponseWithoutLink;
126
135
  }
127
- return fg('fun-2435_improve_feedback_collector_copy') ? messages.canBeContactedLabelWithResponse : messages.canBeContactedLabel;
136
+ return messages.canBeContactedLabelWithResponse;
128
137
  };
129
138
  const requiredFieldsSummary =
130
139
  /*#__PURE__*/
@@ -190,7 +199,7 @@ const FeedbackForm = ({
190
199
  },
191
200
  menuPosition: "fixed",
192
201
  options: selectOptions,
193
- shouldPreventEscapePropagation: fg('ak_feedback_collector_select_escape')
202
+ shouldPreventEscapePropagation: true
194
203
  // @ts-ignore
195
204
  ,
196
205
  ref: focusRef,
@@ -301,7 +310,7 @@ const FeedbackForm = ({
301
310
  },
302
311
  menuPosition: "fixed",
303
312
  options: selectOptions,
304
- shouldPreventEscapePropagation: fg('ak_feedback_collector_select_escape')
313
+ shouldPreventEscapePropagation: true
305
314
  // @ts-ignore
306
315
  ,
307
316
  ref: focusRef,
package/dist/es2019/messages.js CHANGED
@@ -10,16 +10,6 @@ export const messages = defineMessages({
10
10
  defaultMessage: "I'd like to participate in product research",
11
11
  description: 'The checkbox label letting users enrol themselves in future product research interviews'
12
12
  },
13
- canBeContactedLabel: {
14
- id: 'feedback-collector.can-be-contacted.label',
15
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
16
- description: 'The checkbox label to give consent to be contacted about their feedback'
17
- },
18
- canBeContactedLabelWithoutLink: {
19
- id: 'feedback-collector.can-be-contacted.label-without-link',
20
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the Atlassian Privacy Policy.',
21
- description: 'The checkbox label to give consent to be contacted about their feedback'
22
- },
23
13
  canBeContactedLabelWithResponse: {
24
14
  id: 'feedback-collector.can-be-contacted.label-with-response',
25
15
  defaultMessage: "Yes, Atlassian teams can reply to my feedback and ask for more details about my experience to improve Atlassian products and services. Without this, I won't get a response. I acknowledge the <a>Atlassian Privacy Policy</a>.",
@@ -170,16 +160,6 @@ export const messages = defineMessages({
170
160
  defaultMessage: "What's on your mind?",
171
161
  description: 'The textarea label where users can write their suggestion for custom feedback collector'
172
162
  },
173
- canBeContactedLabelAppify: {
174
- id: 'feedback-collector.can-be-contacted.label-appify',
175
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian apps and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
176
- description: 'The checkbox label to give consent to be contacted about their feedback'
177
- },
178
- canBeContactedLabelAppifyWithoutLink: {
179
- id: 'feedback-collector.can-be-contacted.label-appify-without-link',
180
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian apps and services. I acknowledge the Atlassian Privacy Policy.',
181
- description: 'The checkbox label to give consent to be contacted about their feedback'
182
- },
183
163
  canBeContactedLabelAppifyWithResponse: {
184
164
  id: 'feedback-collector.can-be-contacted.label-appify-with-response',
185
165
  defaultMessage: "Yes, Atlassian teams can reply to my feedback and ask for more details about my experience to improve Atlassian apps and services. Without this, I won't get a response. I acknowledge the <a>Atlassian Privacy Policy</a>.",
package/dist/esm/components/FeedbackButton.js CHANGED
@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
3
3
  import React, { useState } from 'react';
4
4
  import { useIntl } from 'react-intl';
5
- import Button from '@atlaskit/button/new';
6
- import { FlagGroup } from '@atlaskit/flag';
5
+ import Button from '@atlaskit/button/default/button';
6
+ import FlagGroup from '@atlaskit/flag/flag-group';
7
7
  import FeedbackIcon from '@atlaskit/icon/core/feedback';
8
8
  import { messages } from '../messages';
9
9
  import FeedbackCollector from './FeedbackCollector';
package/dist/esm/components/FeedbackCollector.js CHANGED
@@ -14,7 +14,7 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
14
14
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
15
15
  import { Buffer } from 'buffer';
16
16
  import React, { Component } from 'react';
17
- import { fg } from '@atlaskit/platform-feature-flags';
17
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
18
18
  import { isApiGatewayUrl } from '../utils/is-api-gateway-url';
19
19
  import truncate from '../utils/Truncate';
20
20
  import FeedbackForm from './FeedbackForm';
@@ -155,7 +155,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
155
155
  }, {
156
156
  key: "getPackageVersion",
157
157
  value: function getPackageVersion() {
158
- return "16.8.1" || 'Unknown, at least 11.0.0';
158
+ return "16.9.1" || 'Unknown, at least 11.0.0';
159
159
  }
160
160
  }, {
161
161
  key: "getEntitlementInformation",
package/dist/esm/components/FeedbackFlag.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import React from 'react';
2
2
  import { useIntl } from 'react-intl';
3
- import { AutoDismissFlag } from '@atlaskit/flag';
3
+ import AutoDismissFlag from '@atlaskit/flag/auto-dismiss-flag';
4
4
  import SuccessIcon from '@atlaskit/icon/core/status-success';
5
- import { fg } from '@atlaskit/platform-feature-flags';
5
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
6
6
  import { messages } from '../messages';
7
7
  import { IntlProviderWithResolvedMessages } from './IntlProviderWithResolvedMessages';
8
8
  var FeedbackFlag = function FeedbackFlag(_ref) {
package/dist/esm/components/FeedbackForm.js CHANGED
@@ -9,14 +9,23 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
9
9
  import React, { useRef, useState } from 'react';
10
10
  import { FormattedMessage, useIntl } from 'react-intl';
11
11
  import Button from '@atlaskit/button/standard-button';
12
- import { Checkbox } from '@atlaskit/checkbox';
13
- import Form, { ErrorMessage, Field, Fieldset, MessageWrapper, RequiredAsterisk } from '@atlaskit/form';
14
- import Link from '@atlaskit/link';
15
- import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
16
- import { fg } from '@atlaskit/platform-feature-flags';
17
- import SectionMessage from '@atlaskit/section-message';
18
- import Select from '@atlaskit/select';
19
- import TextArea from '@atlaskit/textarea';
12
+ import { Checkbox } from '@atlaskit/checkbox/checkbox';
13
+ import Form from '@atlaskit/form/form';
14
+ import { ErrorMessage } from '@atlaskit/form/error-message';
15
+ import Field from '@atlaskit/form/field';
16
+ import { Fieldset } from '@atlaskit/form/fieldset';
17
+ import { MessageWrapper } from '@atlaskit/form/message-wrapper';
18
+ import { RequiredAsterisk } from '@atlaskit/form/required-asterisk';
19
+ import Link from '@atlaskit/link/link';
20
+ import Modal from '@atlaskit/modal-dialog/modal-dialog';
21
+ import ModalBody from '@atlaskit/modal-dialog/modal-body';
22
+ import ModalFooter from '@atlaskit/modal-dialog/modal-footer';
23
+ import ModalHeader from '@atlaskit/modal-dialog/modal-header';
24
+ import ModalTitle from '@atlaskit/modal-dialog/modal-title';
25
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
26
+ import SectionMessage from '@atlaskit/section-message/message';
27
+ import Select from '@atlaskit/select/default';
28
+ import TextArea from '@atlaskit/textarea/text-area';
20
29
  import { messages } from '../messages';
21
30
  import { IntlProviderWithResolvedMessages } from './IntlProviderWithResolvedMessages';
22
31
  var LinkWrapper = function LinkWrapper(_ref) {
@@ -146,15 +155,15 @@ var FeedbackForm = function FeedbackForm(_ref2) {
146
155
  var selectOptions = customFeedbackOptions.length > 0 ? customFeedbackOptions : getSelectOptions(feedbackGroupLabels);
147
156
  var renderContactLabelAppify = function renderContactLabelAppify() {
148
157
  if (fg('jfp_a11y_team_feedback_collector_nested_elements')) {
149
- return fg('fun-2435_improve_feedback_collector_copy') ? messages.canBeContactedLabelAppifyWithResponseWithoutLink : messages.canBeContactedLabelAppifyWithoutLink;
158
+ return messages.canBeContactedLabelAppifyWithResponseWithoutLink;
150
159
  }
151
- return fg('fun-2435_improve_feedback_collector_copy') ? messages.canBeContactedLabelAppifyWithResponse : messages.canBeContactedLabelAppify;
160
+ return messages.canBeContactedLabelAppifyWithResponse;
152
161
  };
153
162
  var renderContactLabel = function renderContactLabel() {
154
163
  if (fg('jfp_a11y_team_feedback_collector_nested_elements')) {
155
- return fg('fun-2435_improve_feedback_collector_copy') ? messages.canBeContactedLabelWithResponseWithoutLink : messages.canBeContactedLabelWithoutLink;
164
+ return messages.canBeContactedLabelWithResponseWithoutLink;
156
165
  }
157
- return fg('fun-2435_improve_feedback_collector_copy') ? messages.canBeContactedLabelWithResponse : messages.canBeContactedLabel;
166
+ return messages.canBeContactedLabelWithResponse;
158
167
  };
159
168
  var requiredFieldsSummary =
160
169
  /*#__PURE__*/
@@ -230,7 +239,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
230
239
  },
231
240
  menuPosition: "fixed",
232
241
  options: selectOptions,
233
- shouldPreventEscapePropagation: fg('ak_feedback_collector_select_escape')
242
+ shouldPreventEscapePropagation: true
234
243
  // @ts-ignore
235
244
  ,
236
245
  ref: focusRef,
@@ -362,7 +371,7 @@ var FeedbackForm = function FeedbackForm(_ref2) {
362
371
  },
363
372
  menuPosition: "fixed",
364
373
  options: selectOptions,
365
- shouldPreventEscapePropagation: fg('ak_feedback_collector_select_escape')
374
+ shouldPreventEscapePropagation: true
366
375
  // @ts-ignore
367
376
  ,
368
377
  ref: focusRef,
package/dist/esm/messages.js CHANGED
@@ -10,16 +10,6 @@ export var messages = defineMessages({
10
10
  defaultMessage: "I'd like to participate in product research",
11
11
  description: 'The checkbox label letting users enrol themselves in future product research interviews'
12
12
  },
13
- canBeContactedLabel: {
14
- id: 'feedback-collector.can-be-contacted.label',
15
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
16
- description: 'The checkbox label to give consent to be contacted about their feedback'
17
- },
18
- canBeContactedLabelWithoutLink: {
19
- id: 'feedback-collector.can-be-contacted.label-without-link',
20
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the Atlassian Privacy Policy.',
21
- description: 'The checkbox label to give consent to be contacted about their feedback'
22
- },
23
13
  canBeContactedLabelWithResponse: {
24
14
  id: 'feedback-collector.can-be-contacted.label-with-response',
25
15
  defaultMessage: "Yes, Atlassian teams can reply to my feedback and ask for more details about my experience to improve Atlassian products and services. Without this, I won't get a response. I acknowledge the <a>Atlassian Privacy Policy</a>.",
@@ -170,16 +160,6 @@ export var messages = defineMessages({
170
160
  defaultMessage: "What's on your mind?",
171
161
  description: 'The textarea label where users can write their suggestion for custom feedback collector'
172
162
  },
173
- canBeContactedLabelAppify: {
174
- id: 'feedback-collector.can-be-contacted.label-appify',
175
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian apps and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
176
- description: 'The checkbox label to give consent to be contacted about their feedback'
177
- },
178
- canBeContactedLabelAppifyWithoutLink: {
179
- id: 'feedback-collector.can-be-contacted.label-appify-without-link',
180
- defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian apps and services. I acknowledge the Atlassian Privacy Policy.',
181
- description: 'The checkbox label to give consent to be contacted about their feedback'
182
- },
183
163
  canBeContactedLabelAppifyWithResponse: {
184
164
  id: 'feedback-collector.can-be-contacted.label-appify-with-response',
185
165
  defaultMessage: "Yes, Atlassian teams can reply to my feedback and ask for more details about my experience to improve Atlassian apps and services. Without this, I won't get a response. I acknowledge the <a>Atlassian Privacy Policy</a>.",
package/dist/types/messages.d.ts CHANGED
@@ -9,16 +9,6 @@ export declare const messages: {
9
9
  defaultMessage: string;
10
10
  description: string;
11
11
  };
12
- canBeContactedLabel: {
13
- id: string;
14
- defaultMessage: string;
15
- description: string;
16
- };
17
- canBeContactedLabelWithoutLink: {
18
- id: string;
19
- defaultMessage: string;
20
- description: string;
21
- };
22
12
  canBeContactedLabelWithResponse: {
23
13
  id: string;
24
14
  defaultMessage: string;
@@ -169,16 +159,6 @@ export declare const messages: {
169
159
  defaultMessage: string;
170
160
  description: string;
171
161
  };
172
- canBeContactedLabelAppify: {
173
- id: string;
174
- defaultMessage: string;
175
- description: string;
176
- };
177
- canBeContactedLabelAppifyWithoutLink: {
178
- id: string;
179
- defaultMessage: string;
180
- description: string;
181
- };
182
162
  canBeContactedLabelAppifyWithResponse: {
183
163
  id: string;
184
164
  defaultMessage: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/feedback-collector",
3
- "version": "16.9.0",
3
+ "version": "16.9.2",
4
4
  "description": "A component that collects feedback across Atlassian products.",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -25,19 +25,19 @@
25
25
  },
26
26
  "dependencies": {
27
27
  "@atlaskit/afm-i18n-platform-web-platform-feedback-collector": "2.210.0",
28
- "@atlaskit/button": "^25.0.0",
29
- "@atlaskit/checkbox": "^19.0.0",
30
- "@atlaskit/flag": "^18.2.0",
31
- "@atlaskit/form": "^17.0.0",
32
- "@atlaskit/icon": "^37.3.0",
33
- "@atlaskit/link": "^5.0.0",
34
- "@atlaskit/modal-dialog": "^16.3.0",
28
+ "@atlaskit/button": "^25.2.0",
29
+ "@atlaskit/checkbox": "^19.1.0",
30
+ "@atlaskit/flag": "^18.4.0",
31
+ "@atlaskit/form": "^17.1.0",
32
+ "@atlaskit/icon": "^37.5.0",
33
+ "@atlaskit/link": "^5.1.0",
34
+ "@atlaskit/modal-dialog": "^16.5.0",
35
35
  "@atlaskit/platform-feature-flags": "^2.1.0",
36
- "@atlaskit/section-message": "^10.0.0",
37
- "@atlaskit/select": "^22.6.0",
38
- "@atlaskit/textarea": "^10.0.0",
39
- "@atlaskit/tokens": "^16.7.0",
40
- "@atlaskit/visually-hidden": "^4.2.0",
36
+ "@atlaskit/section-message": "^10.1.0",
37
+ "@atlaskit/select": "^22.10.0",
38
+ "@atlaskit/textarea": "^10.1.0",
39
+ "@atlaskit/tokens": "^16.9.0",
40
+ "@atlaskit/visually-hidden": "^4.3.0",
41
41
  "@babel/runtime": "^7.0.0"
42
42
  },
43
43
  "peerDependencies": {
@@ -47,7 +47,9 @@
47
47
  },
48
48
  "devDependencies": {
49
49
  "@af/visual-regression": "workspace:^",
50
+ "@atlaskit/primitives": "^22.4.0",
50
51
  "@atlaskit/ssr": "workspace:^",
52
+ "@atlaskit/textfield": "^10.1.0",
51
53
  "@atlassian/feature-flags-test-utils": "^1.2.0",
52
54
  "@testing-library/react": "^16.3.0",
53
55
  "buffer": "^6.0.3",
@@ -89,12 +91,6 @@
89
91
  },
90
92
  "ak_feedback_collector_hide_required_summary": {
91
93
  "type": "boolean"
92
- },
93
- "ak_feedback_collector_select_escape": {
94
- "type": "boolean"
95
- },
96
- "fun-2435_improve_feedback_collector_copy": {
97
- "type": "boolean"
98
94
  }
99
95
  }
100
96
  }