@atlaskit/share 4.20.5 → 4.20.6

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/share
 
+## 4.20.6
+
+### Patch Changes
+
+- [#156181](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/156181)
+  [`48acf4f55ef4a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/48acf4f55ef4a) -
+  Export isGroup & use it in share analytics
+- [#154357](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/154357)
+  [`f85ffbbc5c2d7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f85ffbbc5c2d7) -
+  Use typography components
+
 ## 4.20.5
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -33,6 +33,9 @@
         {
             "path": "../../../design-system/icon/afm-cc/tsconfig.json"
         },
+        {
+            "path": "../../../design-system/link/afm-cc/tsconfig.json"
+        },
         {
             "path": "../../../design-system/menu/afm-cc/tsconfig.json"
         },

package/afm-jira/tsconfig.json

@@ -32,6 +32,9 @@
     {
       "path": "../../../design-system/icon/afm-jira/tsconfig.json"
     },
+    {
+      "path": "../../../design-system/link/afm-jira/tsconfig.json"
+    },
     {
       "path": "../../../design-system/menu/afm-jira/tsconfig.json"
     },

package/dist/cjs/components/LazyShareForm/LazyShareForm.js

@@ -9,6 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _analyticsNext = require("@atlaskit/analytics-next");
+var _primitives = require("@atlaskit/primitives");
 var _constants = require("@atlaskit/theme/constants");
 var _i18n = require("../../i18n");
 var _analytics = require("../analytics/analytics");
@@ -134,6 +135,8 @@ function LazyShareForm(props) {
     onMenuItemChange: onMenuItemChange,
     isBrowseUsersDisabled: isBrowseUsersDisabled,
     userPickerOptions: userPickerOptions
-  }) : (0, _react2.jsx)("p", null, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.formNoPermissions))));
+  }) : (0, _react2.jsx)(_primitives.Text, {
+    as: "p"
+  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.formNoPermissions))));
 }
 var _default = exports.default = LazyShareForm;

package/dist/cjs/components/UserPickerField.js

@@ -18,6 +18,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _form = require("@atlaskit/form");
+var _link = _interopRequireDefault(require("@atlaskit/link"));
+var _primitives = require("@atlaskit/primitives");
 var _smartUserPicker = _interopRequireWildcard(require("@atlaskit/smart-user-picker"));
 var _userPicker = _interopRequireDefault(require("@atlaskit/user-picker"));
 var _i18n = require("../i18n");
@@ -275,7 +277,7 @@ var UserPickerFieldComponent = exports.UserPickerFieldComponent = /*#__PURE__*/f
       var UserPickerComponent = enableSmartUserPicker && !isBrowseUsersDisabled ? _smartUserPicker.default : _userPicker.default;
       var menuPortalTarget = (0, _utils.getMenuPortalTargetCurrentHTML)(selectPortalRef);
       return /*#__PURE__*/_react.default.createElement(_form.Field, {
-        label: /*#__PURE__*/_react.default.createElement("span", {
+        label: /*#__PURE__*/_react.default.createElement(_primitives.Text, {
           id: USER_PICKER_FIELD_LABEL
         }, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, getLabelMessage(product, allowEmail, isBrowseUsersDisabled))),
         name: "users",
@@ -294,12 +296,12 @@ var UserPickerFieldComponent = exports.UserPickerFieldComponent = /*#__PURE__*/f
           "aria-labelledby": USER_PICKER_ARIA_LABEL,
           required: true,
           addMoreMessage: addMoreMessage,
-          placeholder: /*#__PURE__*/_react.default.createElement("span", {
+          placeholder: /*#__PURE__*/_react.default.createElement(_primitives.Text, {
             id: USER_PICKER_FIELD_PLACEHOLDER
           }, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, getPlaceHolderMessage(product, allowEmail, isBrowseUsersDisabled))),
           menuPortalTarget: menuPortalTarget,
           inputId: fieldProps.id
-        })), helperMessage && !wasValidationOrShareError && /*#__PURE__*/_react.default.createElement(_form.HelperMessage, null, helperMessage), !fieldValid && fieldValidationError === REQUIRED && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, requiredMessage)), shareError && shareError.errorCode && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, shareError.message, "\xA0", shareError.helpUrl && /*#__PURE__*/_react.default.createElement("a", {
+        })), helperMessage && !wasValidationOrShareError && /*#__PURE__*/_react.default.createElement(_form.HelperMessage, null, helperMessage), !fieldValid && fieldValidationError === REQUIRED && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, requiredMessage)), shareError && shareError.errorCode && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, shareError.message, "\xA0", shareError.helpUrl && /*#__PURE__*/_react.default.createElement(_link.default, {
           target: "_blank",
           href: shareError.helpUrl,
           rel: "help"

package/dist/cjs/components/analytics/analytics.js

@@ -13,7 +13,7 @@ var buildAttributes = function buildAttributes() {
   var attributes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return _objectSpread({
     packageName: "@atlaskit/share",
-    packageVersion: "4.20.5"
+    packageVersion: "4.20.6"
   }, attributes);
 };
 var createEvent = function createEvent(eventType, source, action, actionSubject, actionSubjectId) {
@@ -127,6 +127,7 @@ var formShareSubmitted = exports.formShareSubmitted = function formShareSubmitte
     isPublicLink = _ref3$isPublicLink === void 0 ? false : _ref3$isPublicLink;
   var users = extractIdsByType(data, _smartUserPicker.isUser);
   var externalUsers = extractIdsByType(data, _smartUserPicker.isExternalUser);
+  var groups = extractIdsByType(data, _smartUserPicker.isGroup);
   var teams = extractIdsByType(data, _smartUserPicker.isTeam);
   var teamUserCounts = extractMemberCountsFromTeams(data, _smartUserPicker.isTeam);
   var emails = extractIdsByType(data, _smartUserPicker.isEmail);
@@ -138,10 +139,12 @@ var formShareSubmitted = exports.formShareSubmitted = function formShareSubmitte
     emailCount: emails.length,
     teamCount: teams.length,
     userCount: users.length,
+    groupCount: groups.length,
     externalUserCount: externalUsers.length,
     users: users,
     teams: teams,
     teamUserCounts: teamUserCounts,
+    groups: groups,
     messageLength: data.comment && data.comment.format === 'plain_text' ? data.comment.value.length : 0,
     isMessageEnabled: true,
     isPublicLink: isPublicLink

package/dist/es2019/components/LazyShareForm/LazyShareForm.js

@@ -9,6 +9,7 @@ import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
+import { Text } from '@atlaskit/primitives';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
 import { messages } from '../../i18n';
@@ -130,6 +131,8 @@ function LazyShareForm(props) {
     onMenuItemChange: onMenuItemChange,
     isBrowseUsersDisabled: isBrowseUsersDisabled,
     userPickerOptions: userPickerOptions
-  }) : jsx("p", null, jsx(FormattedMessage, messages.formNoPermissions))));
+  }) : jsx(Text, {
+    as: "p"
+  }, jsx(FormattedMessage, messages.formNoPermissions))));
 }
 export default LazyShareForm;

package/dist/es2019/components/UserPickerField.js

@@ -3,6 +3,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl-next';
 import { ErrorMessage, Field, HelperMessage } from '@atlaskit/form';
+import Link from '@atlaskit/link';
+import { Text } from '@atlaskit/primitives';
 import SmartUserPicker, { isValidEmail } from '@atlaskit/smart-user-picker';
 import UserPicker from '@atlaskit/user-picker';
 import { messages } from '../i18n';
@@ -225,7 +227,7 @@ export class UserPickerFieldComponent extends React.Component {
     const UserPickerComponent = enableSmartUserPicker && !isBrowseUsersDisabled ? SmartUserPicker : UserPicker;
     const menuPortalTarget = getMenuPortalTargetCurrentHTML(selectPortalRef);
     return /*#__PURE__*/React.createElement(Field, {
-      label: /*#__PURE__*/React.createElement("span", {
+      label: /*#__PURE__*/React.createElement(Text, {
         id: USER_PICKER_FIELD_LABEL
       }, /*#__PURE__*/React.createElement(FormattedMessage, getLabelMessage(product, allowEmail, isBrowseUsersDisabled))),
       name: "users",
@@ -247,12 +249,12 @@ export class UserPickerFieldComponent extends React.Component {
         "aria-labelledby": USER_PICKER_ARIA_LABEL,
         required: true,
         addMoreMessage: addMoreMessage,
-        placeholder: /*#__PURE__*/React.createElement("span", {
+        placeholder: /*#__PURE__*/React.createElement(Text, {
           id: USER_PICKER_FIELD_PLACEHOLDER
         }, /*#__PURE__*/React.createElement(FormattedMessage, getPlaceHolderMessage(product, allowEmail, isBrowseUsersDisabled))),
         menuPortalTarget: menuPortalTarget,
         inputId: fieldProps.id
-      })), 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", {
+      })), 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(Link, {
         target: "_blank",
         href: shareError.helpUrl,
         rel: "help"

package/dist/es2019/components/analytics/analytics.js

@@ -1,7 +1,7 @@
-import { isEmail, isExternalUser, isTeam, isUser } from '@atlaskit/smart-user-picker';
+import { isEmail, isExternalUser, isGroup, isTeam, isUser } from '@atlaskit/smart-user-picker';
 const buildAttributes = (attributes = {}) => ({
   packageName: "@atlaskit/share",
-  packageVersion: "4.20.5",
+  packageVersion: "4.20.6",
   ...attributes
 });
 const createEvent = (eventType, source, action, actionSubject, actionSubjectId, attributes = {}) => ({
@@ -87,6 +87,7 @@ export const formShareSubmitted = ({
 }) => {
   const users = extractIdsByType(data, isUser);
   const externalUsers = extractIdsByType(data, isExternalUser);
+  const groups = extractIdsByType(data, isGroup);
   const teams = extractIdsByType(data, isTeam);
   const teamUserCounts = extractMemberCountsFromTeams(data, isTeam);
   const emails = extractIdsByType(data, isEmail);
@@ -99,10 +100,12 @@ export const formShareSubmitted = ({
     emailCount: emails.length,
     teamCount: teams.length,
     userCount: users.length,
+    groupCount: groups.length,
     externalUserCount: externalUsers.length,
     users,
     teams,
     teamUserCounts,
+    groups,
     messageLength: data.comment && data.comment.format === 'plain_text' ? data.comment.value.length : 0,
     isMessageEnabled: true,
     isPublicLink

package/dist/esm/components/LazyShareForm/LazyShareForm.js

@@ -9,6 +9,7 @@ import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
+import { Text } from '@atlaskit/primitives';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
 import { messages } from '../../i18n';
@@ -125,6 +126,8 @@ function LazyShareForm(props) {
     onMenuItemChange: onMenuItemChange,
     isBrowseUsersDisabled: isBrowseUsersDisabled,
     userPickerOptions: userPickerOptions
-  }) : jsx("p", null, jsx(FormattedMessage, messages.formNoPermissions))));
+  }) : jsx(Text, {
+    as: "p"
+  }, jsx(FormattedMessage, messages.formNoPermissions))));
 }
 export default LazyShareForm;

package/dist/esm/components/UserPickerField.js

@@ -14,6 +14,8 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import React from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl-next';
 import { ErrorMessage, Field, HelperMessage } from '@atlaskit/form';
+import Link from '@atlaskit/link';
+import { Text } from '@atlaskit/primitives';
 import SmartUserPicker, { isValidEmail } from '@atlaskit/smart-user-picker';
 import UserPicker from '@atlaskit/user-picker';
 import { messages } from '../i18n';
@@ -265,7 +267,7 @@ 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", {
+        label: /*#__PURE__*/React.createElement(Text, {
           id: USER_PICKER_FIELD_LABEL
         }, /*#__PURE__*/React.createElement(FormattedMessage, getLabelMessage(product, allowEmail, isBrowseUsersDisabled))),
         name: "users",
@@ -284,12 +286,12 @@ export var UserPickerFieldComponent = /*#__PURE__*/function (_React$Component) {
           "aria-labelledby": USER_PICKER_ARIA_LABEL,
           required: true,
           addMoreMessage: addMoreMessage,
-          placeholder: /*#__PURE__*/React.createElement("span", {
+          placeholder: /*#__PURE__*/React.createElement(Text, {
             id: USER_PICKER_FIELD_PLACEHOLDER
           }, /*#__PURE__*/React.createElement(FormattedMessage, getPlaceHolderMessage(product, allowEmail, isBrowseUsersDisabled))),
           menuPortalTarget: menuPortalTarget,
           inputId: fieldProps.id
-        })), 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", {
+        })), 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(Link, {
           target: "_blank",
           href: shareError.helpUrl,
           rel: "help"

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

@@ -1,12 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { isEmail, isExternalUser, isTeam, isUser } from '@atlaskit/smart-user-picker';
+import { isEmail, isExternalUser, isGroup, isTeam, isUser } from '@atlaskit/smart-user-picker';
 var buildAttributes = function buildAttributes() {
   var attributes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return _objectSpread({
     packageName: "@atlaskit/share",
-    packageVersion: "4.20.5"
+    packageVersion: "4.20.6"
   }, attributes);
 };
 var createEvent = function createEvent(eventType, source, action, actionSubject, actionSubjectId) {
@@ -120,6 +120,7 @@ export var formShareSubmitted = function formShareSubmitted(_ref3) {
     isPublicLink = _ref3$isPublicLink === void 0 ? false : _ref3$isPublicLink;
   var users = extractIdsByType(data, isUser);
   var externalUsers = extractIdsByType(data, isExternalUser);
+  var groups = extractIdsByType(data, isGroup);
   var teams = extractIdsByType(data, isTeam);
   var teamUserCounts = extractMemberCountsFromTeams(data, isTeam);
   var emails = extractIdsByType(data, isEmail);
@@ -131,10 +132,12 @@ export var formShareSubmitted = function formShareSubmitted(_ref3) {
     emailCount: emails.length,
     teamCount: teams.length,
     userCount: users.length,
+    groupCount: groups.length,
     externalUserCount: externalUsers.length,
     users: users,
     teams: teams,
     teamUserCounts: teamUserCounts,
+    groups: groups,
     messageLength: data.comment && data.comment.format === 'plain_text' ? data.comment.value.length : 0,
     isMessageEnabled: true,
     isPublicLink: isPublicLink

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/share",
-	"version": "4.20.5",
+	"version": "4.20.6",
 	"description": "Fabric Share Element",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -39,14 +39,15 @@
 	},
 	"dependencies": {
 		"@atlaskit/analytics-next": "^10.1.0",
-		"@atlaskit/button": "^20.2.0",
-		"@atlaskit/dropdown-menu": "^12.20.0",
+		"@atlaskit/button": "^20.3.0",
+		"@atlaskit/dropdown-menu": "^12.21.0",
 		"@atlaskit/form": "^10.5.0",
-		"@atlaskit/icon": "^22.22.0",
+		"@atlaskit/icon": "^22.24.0",
+		"@atlaskit/link": "^1.2.0",
 		"@atlaskit/menu": "^2.13.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/popper": "^6.3.0",
-		"@atlaskit/popup": "^1.28.0",
+		"@atlaskit/popup": "^1.29.0",
 		"@atlaskit/portal": "^4.9.0",
 		"@atlaskit/primitives": "^12.2.0",
 		"@atlaskit/smart-user-picker": "^6.11.0",