@atlaskit/share 4.3.0 → 4.4.0

package/dist/es2019/i18n.js

@@ -35,36 +35,92 @@ export const messages = defineMessages({
     defaultMessage: 'You do not have the ability to share.',
     description: 'Copy to show when a user can not share.'
   },
+  commentLabel: {
+    id: 'fabric.elements.share.form.comment.label',
+    defaultMessage: 'Message (optional)',
+    description: 'Label for the comment field in the Share form.'
+  },
   commentPlaceholder: {
     id: 'fabric.elements.share.form.comment.placeholder',
-    defaultMessage: 'Add a message',
+    defaultMessage: 'Anything they should know?',
     description: 'Placeholder for the comment field in Share form.'
   },
-  userPickerGenericPlaceholder: {
-    id: 'fabric.elements.share.form.user-picker.placeholder.generic',
-    defaultMessage: 'Enter name, group, team or email',
-    description: 'Generic placeholder for the user picker field in Share form.'
-  },
-  userPickerGenericExistingUserOnlyPlaceholder: {
-    id: 'fabric.elements.share.form.user-picker.placholder.generic.existingUserOnly',
-    defaultMessage: 'Enter name, group or team',
-    description: 'Existing user only placeholder for the user picker field in Share form (emails are not an option).'
-  },
-  userPickerGenericPlaceholderJira: {
+  // Email disabled (Jira)
+  userPickerLabelEmailDisabledJira: {
+    id: 'fabric.elements.share.form.user-picker.label.email-disabled-jira',
+    defaultMessage: 'Names or teams',
+    description: 'Label for the user picker field in the Share form in Jira with no email option.'
+  },
+  userPickerPlaceholderEmailDisabledJira: {
+    id: 'fabric.elements.share.form.user-picker.placeholder.email-disabled-jira',
+    defaultMessage: 'e.g. Maria, Team Orange',
+    description: 'Placeholder for the user picker field in the Share form in Jira with no email option. These examples should be localized.'
+  },
+  userPickerRequiredMessageEmailDisabledJira: {
+    id: 'fabric.elements.share.form.user-picker.validation.required-message.email-disabled-jira',
+    defaultMessage: 'Select at least one person or team',
+    description: 'Error message for the user picker field in the Share form in Jira with no email option, when no entries are selected.'
+  },
+  // Email disabled (Confluence)
+  userPickerLabelEmailDisabledConfluence: {
+    id: 'fabric.elements.share.form.user-picker.label.email-disabled-confluence',
+    defaultMessage: 'Names, teams, or groups',
+    description: 'Label for the user picker field in the Share form in Confluence with no email option.'
+  },
+  userPickerRequiredMessageEmailDisabledConfluence: {
+    id: 'fabric.elements.share.form.user-picker.validation.required-message.email-disabled-confluence',
+    defaultMessage: 'Select at least one person, team, or group',
+    description: 'Error message for the user picker field in the Share form in Confluence with no email option, when no entries are selected.'
+  },
+  // Browse users disabled
+  userPickerLabelBrowseUsersDisabled: {
+    id: 'fabric.elements.share.form.user-picker.label.email-only',
+    defaultMessage: 'Emails',
+    description: 'Label for the user picker field in the Share form when browse user permissions are disabled.'
+  },
+  userPickerPlaceholderBrowseUsersDisabled: {
+    id: 'fabric.elements.share.form.user-picker.placeholder.email-only',
+    defaultMessage: 'e.g. maria@company.com',
+    description: 'Placeholder for the user picker field in the Share form when browse user permissions are disabled. These examples should be localized.'
+  },
+  userPickerRequiredMessageBrowseUsersDisabled: {
+    id: 'fabric.elements.share.form.user-picker.validation.required-message.email-only',
+    defaultMessage: 'Select at least one email',
+    description: 'Error message for the user picker field in the Share form in when browse user permissions are disabled, when no entries are selected.'
+  },
+  // Generic (Jira)
+  userPickerLabelJira: {
+    id: 'fabric.elements.share.form.user-picker.label.jira',
+    defaultMessage: 'Names, teams, or emails',
+    description: 'Label for the user picker field in the Share form in Jira.'
+  },
+  userPickerPlaceholderJira: {
     id: 'fabric.elements.share.form.user-picker.placeholder.jira',
-    defaultMessage: 'Enter name, team or email',
-    description: 'Generic placeholder for the user picker field in Share form. ' + 'This message is used only for Jira product because Jira does not have Group concept.'
-  },
-  userPickerExistingUserOnlyPlaceholder: {
-    id: 'fabric.elements.share.form.user-picker.placeholder.existingUserOnly',
-    defaultMessage: 'Enter name or team',
-    description: 'Existing user only placeholder for the user picker field in Share form.'
-  },
-  userPickerGenericEmailOnlyPlaceholder: {
-    id: 'fabric.elements.share.form.user-picker.placeholder.emailOnly',
-    defaultMessage: 'Enter email',
-    description: 'Email only placeholder for the user picker field in Share form.'
+    defaultMessage: 'e.g. Maria, Team Orange, maria@company.com',
+    description: 'Placeholder for the user picker field in the Share form in Jira. These examples should be localized.'
   },
+  userPickerRequiredMessageJira: {
+    id: 'fabric.elements.share.form.user-picker.validation.required-message.jira',
+    defaultMessage: 'Select at least one person, team, or email',
+    description: 'Error message for the user picker field in the Share form in Jira, when no entries are selected.'
+  },
+  // Generic (Confluence)
+  userPickerLabelConfluence: {
+    id: 'fabric.elements.share.form.user-picker.label.confluence',
+    defaultMessage: 'Names, teams, groups, or emails',
+    description: 'Label for the user picker field in the Share form in Confluence.'
+  },
+  userPickerPlaceholderConfluence: {
+    id: 'fabric.elements.share.form.user-picker.placeholder.confluence',
+    defaultMessage: 'e.g. Maria, Team Orange, group-one',
+    description: 'Placeholder for the user picker field in the Share form in Confluence. These examples should be localized.'
+  },
+  userPickerRequiredMessageConfluence: {
+    id: 'fabric.elements.share.form.user-picker.validation.required-message.confluence',
+    defaultMessage: 'Select at least one person, team, group, or email',
+    description: 'Error message for the user picker field in the Share form in Confluence, when no entries are selected.'
+  },
+  // Common messages
   userPickerAddMoreMessage: {
     id: 'fabric.elements.share.form.user-picker.add-more',
     defaultMessage: 'Enter more',
@@ -75,26 +131,6 @@ export const messages = defineMessages({
     defaultMessage: 'Select at least one user, group, team or email.',
     description: 'Required error message for the user picker field in Share form.'
   },
-  userPickerRequiredMessageJira: {
-    id: 'fabric.elements.share.form.user-picker.validation.required.jira',
-    defaultMessage: 'Select at least one user, team or email.',
-    description: 'Required error message for the user picker field in Share form. ' + 'This message is used only for Jira product because Jira does not have Group concept.'
-  },
-  userPickerRequiredMessageEmailOnly: {
-    id: 'fabric.elements.share.form.user-picker.validation.required.email-only',
-    defaultMessage: 'Select at least one email.',
-    description: 'Required error message for the user picker field when email only enabled in Share form. ' + 'This message is used for both jira and confluence.'
-  },
-  userPickerRequiredExistingUserOnlyMessage: {
-    id: 'fabric.elements.share.form.user-picker.validation.required.existingUserOnly',
-    defaultMessage: 'Select at least one user, group or team.',
-    description: 'Required error message for the user picker field in Share form when email is not allowed.'
-  },
-  userPickerRequiredExistingUserOnlyMessageJira: {
-    id: 'fabric.elements.share.form.user-picker.validation.required.jira.existingUserOnly',
-    defaultMessage: 'Select at least one user or team.',
-    description: 'Required error message for the user picker field in Share form when email is not allowed. ' + 'This message is used only for Jira product because Jira does not have Group concept.'
-  },
   userPickerExistingUserOnlyNoOptionsMessage: {
     id: 'fabric.elements.share.form.user-picker.no-options.existingUserOnly',
     defaultMessage: `We couldn’t find any results for "{inputValue}".`,
@@ -164,7 +200,7 @@ export const messages = defineMessages({
     id: 'fabric.elements.share.success.message',
     defaultMessage: '{object, select,' + 'blogpost {Blog post shared}' + 'board {Board shared}' + 'calendar {Calendar shared}' + 'draft {Draft shared}' +
     // this is a placeholder for Invite to edit in Confluence
-    'filter {Filter shared}' + 'issue {Issue shared}' + 'summary {Summary shared}' + 'list {List shared}' + 'timeline {Timeline shared}' + 'form {Form shared}' + 'media {Media shared}' + 'page {Page shared}' + 'project {Project shared}' + 'pullrequest {Pull Request shared}' + 'question {Question shared}' + 'report {Report shared}' + 'repository {Repository shared}' + 'request {Request shared}' + 'roadmap {Roadmap shared}' + 'site {Site shared}' + 'space {Space shared}' + 'other {Link Shared}' + '}',
+    'filter {Filter shared}' + 'issue {Issue shared}' + 'summary {Summary shared}' + 'list {List shared}' + 'timeline {Timeline shared}' + 'form {Form shared}' + 'media {Media shared}' + 'page {Page shared}' + 'project {Project shared}' + 'pullrequest {Pull Request shared}' + 'question {Question shared}' + 'report {Report shared}' + 'repository {Repository shared}' + 'request {Request shared}' + 'roadmap {Timeline shared}' + 'site {Site shared}' + 'space {Space shared}' + 'other {Link Shared}' + '}',
     description: 'Default text for share success message displayed in a flag'
   },
   shareToIntegrationButtonText: {

package/dist/es2019/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/share",
-	"version": "4.3.0"
+	"version": "4.4.0"
 }

package/dist/esm/components/CommentField.js

@@ -9,7 +9,8 @@ export var CommentField = function CommentField(_ref) {
   var intl = useIntl();
   return /*#__PURE__*/React.createElement(Field, {
     name: "comment",
-    defaultValue: defaultValue
+    defaultValue: defaultValue,
+    label: intl.formatMessage(messages.commentLabel)
   }, function (_ref2) {
     var fieldProps = _ref2.fieldProps;
     return /*#__PURE__*/React.createElement(TextArea, _extends({}, fieldProps, {

package/dist/esm/components/ShareButton.js

@@ -1,10 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["text"];
+var _excluded = ["text", "aria-haspopup"];
 import React from 'react';
 import Button from '@atlaskit/button/custom-theme-button';
-export var ShareButton = /*#__PURE__*/React.forwardRef(function ShareButton(_ref, ref) {
+export var ShareButton = /*#__PURE__*/React.forwardRef(
+// Discard aria-haspopup
+function ShareButton(_ref, ref) {
   var text = _ref.text,
+    _ariaHasPopup = _ref['aria-haspopup'],
     props = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React.createElement(Button, _extends({
     ref: ref,

package/dist/esm/components/UserPickerField.js

@@ -18,6 +18,9 @@ import { MAX_PICKER_HEIGHT } from './styles';
 import { allowEmails, getMenuPortalTargetCurrentHTML } from './utils';
 export var REQUIRED = 'REQUIRED';
 var DEBOUNCE_MS = 150;
+var USER_PICKER_FIELD_LABEL = 'share-user-picker-field-label';
+var USER_PICKER_FIELD_PLACEHOLDER = 'share-user-picker-field-placeholder';
+var USER_PICKER_ARIA_LABEL = "".concat(USER_PICKER_FIELD_LABEL, " ").concat(USER_PICKER_FIELD_PLACEHOLDER);
 var validate = function validate(value) {
   return value && value instanceof Array && value.length > 0 ? undefined : REQUIRED;
 };
@@ -43,34 +46,61 @@ var getPlaceHolderMessageDescriptor = function getPlaceHolderMessageDescriptor()
   var isBrowseUsersDisabled = arguments.length > 2 ? arguments[2] : undefined;
   if (!allowEmail) {
     var _placeholderMessage = {
-      jira: messages.userPickerExistingUserOnlyPlaceholder,
-      confluence: messages.userPickerGenericExistingUserOnlyPlaceholder
+      jira: messages.userPickerPlaceholderEmailDisabledJira,
+      // We can use the same message as when emails are not disabled, since
+      // emails are not mentioned in this placeholder as it would be too long
+      confluence: messages.userPickerPlaceholderConfluence
     };
     return _placeholderMessage[product];
   }
   if (isBrowseUsersDisabled) {
-    return messages.userPickerGenericEmailOnlyPlaceholder;
+    return messages.userPickerPlaceholderBrowseUsersDisabled;
   }
   var placeholderMessage = {
-    jira: messages.userPickerGenericPlaceholderJira,
-    confluence: messages.userPickerGenericPlaceholder
+    jira: messages.userPickerPlaceholderJira,
+    confluence: messages.userPickerPlaceholderConfluence
   };
   return placeholderMessage[product];
 };
-var requiredMessagesWithEmail = {
-  confluence: messages.userPickerRequiredMessage,
-  jira: messages.userPickerRequiredMessageJira
-};
-var requiredMessagesWithoutEmail = {
-  confluence: messages.userPickerRequiredExistingUserOnlyMessage,
-  jira: messages.userPickerRequiredExistingUserOnlyMessageJira
+var getLabelMessageDescriptor = function getLabelMessageDescriptor() {
+  var product = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'confluence';
+  var allowEmail = arguments.length > 1 ? arguments[1] : undefined;
+  var isBrowseUsersDisabled = arguments.length > 2 ? arguments[2] : undefined;
+  if (!allowEmail) {
+    var _labelMessage = {
+      jira: messages.userPickerLabelEmailDisabledJira,
+      confluence: messages.userPickerLabelEmailDisabledConfluence
+    };
+    return _labelMessage[product];
+  }
+  if (isBrowseUsersDisabled) {
+    return messages.userPickerLabelBrowseUsersDisabled;
+  }
+  var labelMessage = {
+    jira: messages.userPickerLabelJira,
+    confluence: messages.userPickerLabelConfluence
+  };
+  return labelMessage[product];
 };
-var getRequiredMessage = function getRequiredMessage(product, allowEmail, isBrowseUsersDisabled) {
+var getRequiredMessage = function getRequiredMessage() {
+  var product = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'confluence';
+  var allowEmail = arguments.length > 1 ? arguments[1] : undefined;
+  var isBrowseUsersDisabled = arguments.length > 2 ? arguments[2] : undefined;
+  if (!allowEmail) {
+    var _requiredMessage = {
+      jira: messages.userPickerRequiredMessageEmailDisabledJira,
+      confluence: messages.userPickerRequiredMessageEmailDisabledConfluence
+    };
+    return _requiredMessage[product];
+  }
   if (isBrowseUsersDisabled) {
-    return messages.userPickerRequiredMessageEmailOnly;
+    return messages.userPickerRequiredMessageBrowseUsersDisabled;
   }
-  var emailMessages = allowEmail ? requiredMessagesWithEmail : requiredMessagesWithoutEmail;
-  return emailMessages[product];
+  var requiredMessage = {
+    jira: messages.userPickerRequiredMessageJira,
+    confluence: messages.userPickerRequiredMessageConfluence
+  };
+  return requiredMessage[product];
 };
 
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -149,7 +179,6 @@ export var UserPickerFieldComponent = /*#__PURE__*/function (_React$Component) {
         loadOptions: this.loadOptions,
         isMulti: true,
         width: '100%',
-        placeholder: /*#__PURE__*/React.createElement(FormattedMessage, getPlaceHolderMessageDescriptor(product, allowEmail, isBrowseUsersDisabled)),
         allowEmail: allowEmail,
         noOptionsMessage: getNoOptionsMessage(isPublicLink, allowEmail),
         isLoading: isLoading,
@@ -160,10 +189,14 @@ export var UserPickerFieldComponent = /*#__PURE__*/function (_React$Component) {
       var UserPickerComponent = enableSmartUserPicker && !isBrowseUsersDisabled ? SmartUserPicker : UserPicker;
       var menuPortalTarget = getMenuPortalTargetCurrentHTML(selectPortalRef);
       return /*#__PURE__*/React.createElement(Field, {
+        label: /*#__PURE__*/React.createElement("span", {
+          id: USER_PICKER_FIELD_LABEL
+        }, /*#__PURE__*/React.createElement(FormattedMessage, getLabelMessageDescriptor(product, allowEmail, isBrowseUsersDisabled))),
         name: "users",
         validate: validate,
         defaultValue: defaultValue,
-        transform: this.handleUserPickerTransform
+        transform: this.handleUserPickerTransform,
+        isRequired: true
       }, function (_ref2) {
         var fieldProps = _ref2.fieldProps,
           fieldValidationError = _ref2.error,
@@ -172,7 +205,12 @@ export var UserPickerFieldComponent = /*#__PURE__*/function (_React$Component) {
         var addMoreMessage = shareError !== null && shareError !== void 0 && shareError.errorCode ? null : intl.formatMessage(messages.userPickerAddMoreMessage);
         var wasValidationOrShareError = !!fieldValidationError || !!shareError;
         return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(UserPickerComponent, _extends({}, fieldProps, commonPickerProps, smartUserPickerProps, {
+          "aria-labelledby": USER_PICKER_ARIA_LABEL,
+          "aria-required": true,
           addMoreMessage: addMoreMessage,
+          placeholder: /*#__PURE__*/React.createElement("span", {
+            id: USER_PICKER_FIELD_PLACEHOLDER
+          }, /*#__PURE__*/React.createElement(FormattedMessage, getPlaceHolderMessageDescriptor(product, allowEmail, isBrowseUsersDisabled))),
           menuPortalTarget: menuPortalTarget
         })), helperMessage && !wasValidationOrShareError && /*#__PURE__*/React.createElement(HelperMessage, null, helperMessage), !fieldValid && fieldValidationError === REQUIRED && /*#__PURE__*/React.createElement(ErrorMessage, null, /*#__PURE__*/React.createElement(FormattedMessage, requiredMessage)), shareError && shareError.errorCode && /*#__PURE__*/React.createElement(ErrorMessage, null, shareError.message, "\xA0", shareError.helpUrl && /*#__PURE__*/React.createElement("a", {
           target: "_blank",

package/dist/esm/components/analytics/analytics.js

@@ -6,7 +6,7 @@ var buildAttributes = function buildAttributes() {
   var attributes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return _objectSpread({
     packageName: "@atlaskit/share",
-    packageVersion: "4.3.0"
+    packageVersion: "4.4.0"
   }, attributes);
 };
 var createEvent = function createEvent(eventType, source, action, actionSubject, actionSubjectId) {

package/dist/esm/i18n/en.js

@@ -12,7 +12,7 @@ export default {
   'fabric.elements.share.copypubliclink.button.text': 'Copy public link',
   'fabric.elements.share.failure.icon.label': 'Error icon',
   'fabric.elements.share.failure.message': 'Unable to share',
-  'fabric.elements.share.form.comment.placeholder': 'Add a message',
+  'fabric.elements.share.form.comment.placeholder': 'Anything they should know?',
   'fabric.elements.share.form.info.message.no.invite.confluence': 'Recipients will see the name of the page and your message',
   'fabric.elements.share.form.info.message.no.invite.jira': 'Recipients will see the name of the issue and your message',
   'fabric.elements.share.form.no-permissions': 'You do not have the ability to share.',

package/dist/esm/i18n.js

@@ -35,36 +35,92 @@ export var messages = defineMessages({
     defaultMessage: 'You do not have the ability to share.',
     description: 'Copy to show when a user can not share.'
   },
+  commentLabel: {
+    id: 'fabric.elements.share.form.comment.label',
+    defaultMessage: 'Message (optional)',
+    description: 'Label for the comment field in the Share form.'
+  },
   commentPlaceholder: {
     id: 'fabric.elements.share.form.comment.placeholder',
-    defaultMessage: 'Add a message',
+    defaultMessage: 'Anything they should know?',
     description: 'Placeholder for the comment field in Share form.'
   },
-  userPickerGenericPlaceholder: {
-    id: 'fabric.elements.share.form.user-picker.placeholder.generic',
-    defaultMessage: 'Enter name, group, team or email',
-    description: 'Generic placeholder for the user picker field in Share form.'
-  },
-  userPickerGenericExistingUserOnlyPlaceholder: {
-    id: 'fabric.elements.share.form.user-picker.placholder.generic.existingUserOnly',
-    defaultMessage: 'Enter name, group or team',
-    description: 'Existing user only placeholder for the user picker field in Share form (emails are not an option).'
-  },
-  userPickerGenericPlaceholderJira: {
+  // Email disabled (Jira)
+  userPickerLabelEmailDisabledJira: {
+    id: 'fabric.elements.share.form.user-picker.label.email-disabled-jira',
+    defaultMessage: 'Names or teams',
+    description: 'Label for the user picker field in the Share form in Jira with no email option.'
+  },
+  userPickerPlaceholderEmailDisabledJira: {
+    id: 'fabric.elements.share.form.user-picker.placeholder.email-disabled-jira',
+    defaultMessage: 'e.g. Maria, Team Orange',
+    description: 'Placeholder for the user picker field in the Share form in Jira with no email option. These examples should be localized.'
+  },
+  userPickerRequiredMessageEmailDisabledJira: {
+    id: 'fabric.elements.share.form.user-picker.validation.required-message.email-disabled-jira',
+    defaultMessage: 'Select at least one person or team',
+    description: 'Error message for the user picker field in the Share form in Jira with no email option, when no entries are selected.'
+  },
+  // Email disabled (Confluence)
+  userPickerLabelEmailDisabledConfluence: {
+    id: 'fabric.elements.share.form.user-picker.label.email-disabled-confluence',
+    defaultMessage: 'Names, teams, or groups',
+    description: 'Label for the user picker field in the Share form in Confluence with no email option.'
+  },
+  userPickerRequiredMessageEmailDisabledConfluence: {
+    id: 'fabric.elements.share.form.user-picker.validation.required-message.email-disabled-confluence',
+    defaultMessage: 'Select at least one person, team, or group',
+    description: 'Error message for the user picker field in the Share form in Confluence with no email option, when no entries are selected.'
+  },
+  // Browse users disabled
+  userPickerLabelBrowseUsersDisabled: {
+    id: 'fabric.elements.share.form.user-picker.label.email-only',
+    defaultMessage: 'Emails',
+    description: 'Label for the user picker field in the Share form when browse user permissions are disabled.'
+  },
+  userPickerPlaceholderBrowseUsersDisabled: {
+    id: 'fabric.elements.share.form.user-picker.placeholder.email-only',
+    defaultMessage: 'e.g. maria@company.com',
+    description: 'Placeholder for the user picker field in the Share form when browse user permissions are disabled. These examples should be localized.'
+  },
+  userPickerRequiredMessageBrowseUsersDisabled: {
+    id: 'fabric.elements.share.form.user-picker.validation.required-message.email-only',
+    defaultMessage: 'Select at least one email',
+    description: 'Error message for the user picker field in the Share form in when browse user permissions are disabled, when no entries are selected.'
+  },
+  // Generic (Jira)
+  userPickerLabelJira: {
+    id: 'fabric.elements.share.form.user-picker.label.jira',
+    defaultMessage: 'Names, teams, or emails',
+    description: 'Label for the user picker field in the Share form in Jira.'
+  },
+  userPickerPlaceholderJira: {
     id: 'fabric.elements.share.form.user-picker.placeholder.jira',
-    defaultMessage: 'Enter name, team or email',
-    description: 'Generic placeholder for the user picker field in Share form. ' + 'This message is used only for Jira product because Jira does not have Group concept.'
-  },
-  userPickerExistingUserOnlyPlaceholder: {
-    id: 'fabric.elements.share.form.user-picker.placeholder.existingUserOnly',
-    defaultMessage: 'Enter name or team',
-    description: 'Existing user only placeholder for the user picker field in Share form.'
-  },
-  userPickerGenericEmailOnlyPlaceholder: {
-    id: 'fabric.elements.share.form.user-picker.placeholder.emailOnly',
-    defaultMessage: 'Enter email',
-    description: 'Email only placeholder for the user picker field in Share form.'
+    defaultMessage: 'e.g. Maria, Team Orange, maria@company.com',
+    description: 'Placeholder for the user picker field in the Share form in Jira. These examples should be localized.'
   },
+  userPickerRequiredMessageJira: {
+    id: 'fabric.elements.share.form.user-picker.validation.required-message.jira',
+    defaultMessage: 'Select at least one person, team, or email',
+    description: 'Error message for the user picker field in the Share form in Jira, when no entries are selected.'
+  },
+  // Generic (Confluence)
+  userPickerLabelConfluence: {
+    id: 'fabric.elements.share.form.user-picker.label.confluence',
+    defaultMessage: 'Names, teams, groups, or emails',
+    description: 'Label for the user picker field in the Share form in Confluence.'
+  },
+  userPickerPlaceholderConfluence: {
+    id: 'fabric.elements.share.form.user-picker.placeholder.confluence',
+    defaultMessage: 'e.g. Maria, Team Orange, group-one',
+    description: 'Placeholder for the user picker field in the Share form in Confluence. These examples should be localized.'
+  },
+  userPickerRequiredMessageConfluence: {
+    id: 'fabric.elements.share.form.user-picker.validation.required-message.confluence',
+    defaultMessage: 'Select at least one person, team, group, or email',
+    description: 'Error message for the user picker field in the Share form in Confluence, when no entries are selected.'
+  },
+  // Common messages
   userPickerAddMoreMessage: {
     id: 'fabric.elements.share.form.user-picker.add-more',
     defaultMessage: 'Enter more',
@@ -75,26 +131,6 @@ export var messages = defineMessages({
     defaultMessage: 'Select at least one user, group, team or email.',
     description: 'Required error message for the user picker field in Share form.'
   },
-  userPickerRequiredMessageJira: {
-    id: 'fabric.elements.share.form.user-picker.validation.required.jira',
-    defaultMessage: 'Select at least one user, team or email.',
-    description: 'Required error message for the user picker field in Share form. ' + 'This message is used only for Jira product because Jira does not have Group concept.'
-  },
-  userPickerRequiredMessageEmailOnly: {
-    id: 'fabric.elements.share.form.user-picker.validation.required.email-only',
-    defaultMessage: 'Select at least one email.',
-    description: 'Required error message for the user picker field when email only enabled in Share form. ' + 'This message is used for both jira and confluence.'
-  },
-  userPickerRequiredExistingUserOnlyMessage: {
-    id: 'fabric.elements.share.form.user-picker.validation.required.existingUserOnly',
-    defaultMessage: 'Select at least one user, group or team.',
-    description: 'Required error message for the user picker field in Share form when email is not allowed.'
-  },
-  userPickerRequiredExistingUserOnlyMessageJira: {
-    id: 'fabric.elements.share.form.user-picker.validation.required.jira.existingUserOnly',
-    defaultMessage: 'Select at least one user or team.',
-    description: 'Required error message for the user picker field in Share form when email is not allowed. ' + 'This message is used only for Jira product because Jira does not have Group concept.'
-  },
   userPickerExistingUserOnlyNoOptionsMessage: {
     id: 'fabric.elements.share.form.user-picker.no-options.existingUserOnly',
     defaultMessage: "We couldn\u2019t find any results for \"{inputValue}\".",
@@ -164,7 +200,7 @@ export var messages = defineMessages({
     id: 'fabric.elements.share.success.message',
     defaultMessage: '{object, select,' + 'blogpost {Blog post shared}' + 'board {Board shared}' + 'calendar {Calendar shared}' + 'draft {Draft shared}' +
     // this is a placeholder for Invite to edit in Confluence
-    'filter {Filter shared}' + 'issue {Issue shared}' + 'summary {Summary shared}' + 'list {List shared}' + 'timeline {Timeline shared}' + 'form {Form shared}' + 'media {Media shared}' + 'page {Page shared}' + 'project {Project shared}' + 'pullrequest {Pull Request shared}' + 'question {Question shared}' + 'report {Report shared}' + 'repository {Repository shared}' + 'request {Request shared}' + 'roadmap {Roadmap shared}' + 'site {Site shared}' + 'space {Space shared}' + 'other {Link Shared}' + '}',
+    'filter {Filter shared}' + 'issue {Issue shared}' + 'summary {Summary shared}' + 'list {List shared}' + 'timeline {Timeline shared}' + 'form {Form shared}' + 'media {Media shared}' + 'page {Page shared}' + 'project {Project shared}' + 'pullrequest {Pull Request shared}' + 'question {Question shared}' + 'report {Report shared}' + 'repository {Repository shared}' + 'request {Request shared}' + 'roadmap {Timeline shared}' + 'site {Site shared}' + 'space {Space shared}' + 'other {Link Shared}' + '}',
     description: 'Default text for share success message displayed in a flag'
   },
   shareToIntegrationButtonText: {

package/dist/esm/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/share",
-	"version": "4.3.0"
+	"version": "4.4.0"
 }

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

@@ -8,6 +8,7 @@ export type Props = {
     isDisabled?: boolean;
     onClick: (e: React.MouseEvent<HTMLElement>) => void;
     text?: React.ReactNode;
+    'aria-haspopup'?: boolean;
 };
 export declare const ShareButton: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLElement>>;
 export default ShareButton;

package/dist/types/i18n.d.ts

@@ -34,42 +34,62 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    commentLabel: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     commentPlaceholder: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    userPickerGenericPlaceholder: {
+    userPickerLabelEmailDisabledJira: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    userPickerGenericExistingUserOnlyPlaceholder: {
+    userPickerPlaceholderEmailDisabledJira: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    userPickerGenericPlaceholderJira: {
+    userPickerRequiredMessageEmailDisabledJira: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    userPickerExistingUserOnlyPlaceholder: {
+    userPickerLabelEmailDisabledConfluence: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    userPickerGenericEmailOnlyPlaceholder: {
+    userPickerRequiredMessageEmailDisabledConfluence: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    userPickerAddMoreMessage: {
+    userPickerLabelBrowseUsersDisabled: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    userPickerRequiredMessage: {
+    userPickerPlaceholderBrowseUsersDisabled: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    userPickerRequiredMessageBrowseUsersDisabled: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    userPickerLabelJira: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    userPickerPlaceholderJira: {
         id: string;
         defaultMessage: string;
         description: string;
@@ -79,17 +99,27 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
-    userPickerRequiredMessageEmailOnly: {
+    userPickerLabelConfluence: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    userPickerPlaceholderConfluence: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    userPickerRequiredExistingUserOnlyMessage: {
+    userPickerRequiredMessageConfluence: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    userPickerRequiredExistingUserOnlyMessageJira: {
+    userPickerAddMoreMessage: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    userPickerRequiredMessage: {
         id: string;
         defaultMessage: string;
         description: string;

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

@@ -8,6 +8,7 @@ export type Props = {
     isDisabled?: boolean;
     onClick: (e: React.MouseEvent<HTMLElement>) => void;
     text?: React.ReactNode;
+    'aria-haspopup'?: boolean;
 };
 export declare const ShareButton: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLElement>>;
 export default ShareButton;