@atlaskit/user-picker 11.2.2 → 11.3.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/user-picker
 
+## 11.3.0
+
+### Minor Changes
+
+- [#175242](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/175242)
+  [`f01b0e8dbc8ba`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f01b0e8dbc8ba) -
+  [ux] add a new props: groupByTypeOrder to allow group the options by type
+
+### Patch Changes
+
+- Updated dependencies
+
+## 11.2.3
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 11.2.2
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -4,7 +4,7 @@
         "declaration": true,
         "target": "es5",
         "composite": true,
-        "outDir": "../dist",
+        "outDir": "../../../../../confluence/tsDist/@atlaskit__user-picker",
         "rootDir": "../"
     },
     "include": [
@@ -26,9 +26,6 @@
         {
             "path": "../../../design-system/icon/afm-cc/tsconfig.json"
         },
-        {
-            "path": "../../../design-system/link/afm-cc/tsconfig.json"
-        },
         {
             "path": "../../../design-system/logo/afm-cc/tsconfig.json"
         },

package/afm-jira/tsconfig.json

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

package/afm-post-office/tsconfig.json

@@ -26,9 +26,6 @@
 		{
 			"path": "../../../design-system/icon/afm-post-office/tsconfig.json"
 		},
-		{
-			"path": "../../../design-system/link/afm-post-office/tsconfig.json"
-		},
 		{
 			"path": "../../../design-system/logo/afm-post-office/tsconfig.json"
 		},

package/afm-townsquare/tsconfig.json

@@ -0,0 +1,69 @@
+{
+	"extends": "../../../../tsconfig.entry-points.townsquare.json",
+	"compilerOptions": {
+		"declaration": true,
+		"target": "es5",
+		"outDir": "../../../../../townsquare/tsDist/@atlaskit__user-picker/app",
+		"rootDir": "../",
+		"composite": true
+	},
+	"include": [
+		"../src/**/*.ts",
+		"../src/**/*.tsx"
+	],
+	"exclude": [
+		"../src/**/__tests__/*",
+		"../src/**/*.test.*",
+		"../src/**/test.*"
+	],
+	"references": [
+		{
+			"path": "../../../analytics/analytics-next/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/avatar/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/icon/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/logo/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/lozenge/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../people-and-teams/people-teams-ui-public/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../platform/feature-flags/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/popper/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/primitives/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/select/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/spinner/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../people-and-teams/teams-avatar/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/theme/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/tokens/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/tooltip/afm-townsquare/tsconfig.json"
+		},
+		{
+			"path": "../../../data/ufo-external/afm-townsquare/tsconfig.json"
+		}
+	]
+}

package/dist/cjs/analytics.js

@@ -12,7 +12,7 @@ var _utils = require("./components/utils");
 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) { (0, _defineProperty2.default)(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; }
 var packageName = "@atlaskit/user-picker";
-var packageVersion = "11.2.2";
+var packageVersion = "11.2.3";
 var UUID_REGEXP_TEAMS_GROUPS = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
 var UUID_REGEXP_OLD_AAID = /^[a-fA-F0-9]{1,8}:[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
 var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;

package/dist/cjs/components/AvatarItemOption.js

@@ -45,7 +45,6 @@ var wrapper = function wrapper(isDisabled) {
 var optionWrapper = (0, _react2.css)({
   maxWidth: '100%',
   minWidth: 0,
-  flex: '1 1 100%',
   // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: '1.4',
   paddingLeft: "var(--ds-space-100, 8px)"
@@ -62,7 +61,8 @@ var getTextStyle = function getTextStyle(isSecondary) {
   }, secondaryCssArgs));
 };
 var additionalInfo = (0, _react2.css)({
-  float: 'right'
+  float: 'right',
+  marginLeft: "var(--ds-space-100, 8px)"
 });
 var textWrapper = exports.textWrapper = function textWrapper(color) {
   return (0, _react2.css)({

package/dist/cjs/components/BaseUserPicker.js

@@ -13,6 +13,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analyticsNext = require("@atlaskit/analytics-next");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ufo = require("@atlaskit/ufo");
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _react = _interopRequireDefault(require("react"));
@@ -22,6 +23,7 @@ var _analytics = require("../analytics");
 var _batch = require("./batch");
 var _i18n = require("./i18n");
 var _utils = require("./utils");
+var _groupOptionsByType = require("../util/group-options-by-type");
 var _ufoExperiences = require("../util/ufoExperiences");
 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) { (0, _defineProperty2.default)(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; }
@@ -332,7 +334,8 @@ var BaseUserPickerWithoutAnalytics = exports.BaseUserPickerWithoutAnalytics = /*
       var options = (0, _utils.getOptions)(_this.state.options) || [];
       var _this$props2 = _this.props,
         maxOptions = _this$props2.maxOptions,
-        isMulti = _this$props2.isMulti;
+        isMulti = _this$props2.isMulti,
+        groupByTypeOrder = _this$props2.groupByTypeOrder;
       if (maxOptions === 0) {
         return [];
       }
@@ -348,9 +351,9 @@ var BaseUserPickerWithoutAnalytics = exports.BaseUserPickerWithoutAnalytics = /*
             return valueIds.indexOf(option.data.id) === -1;
           });
         }
-        return filteredOptions.slice(0, maxOptions);
+        return groupByTypeOrder && (0, _platformFeatureFlags.fg)('support_group_by_type_for_user_picker') ? (0, _groupOptionsByType.groupOptionsByType)(filteredOptions.slice(0, maxOptions), groupByTypeOrder) : filteredOptions.slice(0, maxOptions);
       }
-      return options;
+      return groupByTypeOrder && (0, _platformFeatureFlags.fg)('support_group_by_type_for_user_picker') ? (0, _groupOptionsByType.groupOptionsByType)(options, groupByTypeOrder) : options;
     });
     (0, _defineProperty2.default)(_this, "getAppearance", function () {
       return _this.props.appearance ? _this.props.appearance : 'normal';

package/dist/cjs/components/Control.compiled.css

@@ -2,9 +2,10 @@
 ._1h6d1bqt{border-color:var(--ds-border-danger,#e2483d)}
 ._1h6d1elr{border-color:var(--ds-border-input,#8590a2)}
 ._1h6d1j28{border-color:transparent}
-._1h6d1p6i{border-color:var(--ds-border-focused,#388bff)}._19bvidpf{padding-left:0}
+._1h6d1p6i{border-color:var(--ds-border-focused,#388bff)}._14regrf3 .fabric-user-picker__clear-indicator{opacity:0!important}
+._19bvidpf{padding-left:0}
 ._1a98zg3v:hover .fabric-user-picker__clear-indicator{opacity:1!important}
-._1fkdidpf .-IndicatorsContainer{opacity:0}
+._1tke1wug{min-height:auto}
 ._bfhk1j28{background-color:transparent}
 ._bfhk1j9a{background-color:var(--ds-background-input,#fff)}
 ._ca0qidpf{padding-top:0}

package/dist/cjs/components/Control.js

@@ -19,11 +19,13 @@ var controlStyles = {
   focused: "_1h6d1p6i _bfhk1j9a _4cvx1p6i _irr31j9a",
   disabled: "_irr3syzs",
   subtle: "_1h6d1j28 _bfhk1j28 _4cvx1j28 _irr31gly",
-  root: "_ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _1h6d1elr _bfhk1j9a _p12f1osq _1fkdidpf _4cvx1elr _irr31d5g _1a98zg3v"
+  root: "_ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _1h6d1elr _bfhk1j9a _p12f1osq _14regrf3 _4cvx1elr _irr31d5g _1a98zg3v",
+  compact: "_1tke1wug"
 };
 var Control = function Control(props) {
+  var isCompact = props.appearance === 'compact';
   return /*#__PURE__*/React.createElement(_select.components.Control, (0, _extends2.default)({}, props, {
-    xcss: (0, _react2.cx)(controlStyles.root, (props.selectProps.subtle || props.selectProps.noBorder) && controlStyles.subtle, props.isFocused && controlStyles.focused, props.isInvalid && controlStyles.invalid, props.isDisabled && controlStyles.disabled)
+    xcss: (0, _react2.cx)(controlStyles.root, isCompact && controlStyles.compact, (props.selectProps.subtle || props.selectProps.noBorder) && controlStyles.subtle, props.isFocused && controlStyles.focused, props.isInvalid && controlStyles.invalid, props.isDisabled && controlStyles.disabled)
   }));
 };
 var _default = exports.default = Control;

package/dist/cjs/components/i18n.js

@@ -135,5 +135,40 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     id: 'fabric.elements.user-picker.guest.lozenge.tooltip.group',
     defaultMessage: 'Guest groups can only access certain spaces and have limited access to user info.',
     description: 'Tooltip text for lozenge showing that a group is for guests in Confluence'
+  },
+  userTypeLabel: {
+    id: 'fabric.elements.user-picker.user.type.label',
+    defaultMessage: 'People',
+    description: 'Label for user type'
+  },
+  teamTypeLabel: {
+    id: 'fabric.elements.user-picker.team.type.label',
+    defaultMessage: 'Teams',
+    description: 'Label for team type'
+  },
+  emailTypeLabel: {
+    id: 'fabric.elements.user-picker.email.type.label',
+    defaultMessage: 'Emails',
+    description: 'Label for email type'
+  },
+  groupTypeLabel: {
+    id: 'fabric.elements.user-picker.group.type.label',
+    defaultMessage: 'Groups',
+    description: 'Label for group type'
+  },
+  externalUserTypeLabel: {
+    id: 'fabric.elements.user-picker.external.user.type.label',
+    defaultMessage: 'External Users',
+    description: 'Label for external user type'
+  },
+  customTypeLabel: {
+    id: 'fabric.elements.user-picker.custom.type.label',
+    defaultMessage: 'Customs',
+    description: 'Label for custom type'
+  },
+  otherTypeLabel: {
+    id: 'fabric.elements.user-picker.other.type.label',
+    defaultMessage: 'Others',
+    description: 'Label for other type'
   }
 });

package/dist/cjs/util/group-options-by-type/index.js

@@ -0,0 +1,55 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.groupOptionsByType = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _memoizeOne = _interopRequireDefault(require("memoize-one"));
+var _i18n = require("../../components/i18n");
+var getLabelForType = function getLabelForType(type) {
+  switch (type) {
+    case 'user':
+      return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _i18n.messages.userTypeLabel);
+    case 'team':
+      return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _i18n.messages.teamTypeLabel);
+    case 'group':
+      return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _i18n.messages.groupTypeLabel);
+    case 'custom':
+      return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _i18n.messages.customTypeLabel);
+    case 'external_user':
+      return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _i18n.messages.externalUserTypeLabel);
+    default:
+      return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _i18n.messages.otherTypeLabel);
+  }
+};
+var groupOptionsByType = exports.groupOptionsByType = (0, _memoizeOne.default)(function (options, groupByTypeOrder) {
+  // If groupByTypeOrder is empty, just return the original options
+  if (groupByTypeOrder.length === 0) {
+    return options;
+  }
+  var groupedMap = new Map();
+  options.forEach(function (option) {
+    var type = option.data.type || 'other';
+    if (!groupedMap.has(type)) {
+      groupedMap.set(type, []);
+    }
+    groupedMap.get(type).push(option);
+  });
+  var result = [];
+
+  // add groups in the specified order
+  // type is not in groupByTypeOrder, don't add it to the result
+  groupByTypeOrder.forEach(function (type) {
+    if (groupedMap.has(type)) {
+      result.push({
+        label: getLabelForType(type),
+        options: groupedMap.get(type)
+      });
+      groupedMap.delete(type);
+    }
+  });
+  return result;
+});

package/dist/es2019/analytics.js

@@ -2,7 +2,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
 import { v4 as uuidv4 } from 'uuid';
 import { isCustom, isExternalUser } from './components/utils';
 const packageName = "@atlaskit/user-picker";
-const packageVersion = "11.2.2";
+const packageVersion = "11.2.3";
 const UUID_REGEXP_TEAMS_GROUPS = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
 const UUID_REGEXP_OLD_AAID = /^[a-fA-F0-9]{1,8}:[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
 const UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;

package/dist/es2019/components/AvatarItemOption.js

@@ -29,7 +29,6 @@ const wrapper = isDisabled => css({
 const optionWrapper = css({
   maxWidth: '100%',
   minWidth: 0,
-  flex: '1 1 100%',
   // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: '1.4',
   paddingLeft: "var(--ds-space-100, 8px)"
@@ -48,7 +47,8 @@ const getTextStyle = isSecondary => {
   });
 };
 const additionalInfo = css({
-  float: 'right'
+  float: 'right',
+  marginLeft: "var(--ds-space-100, 8px)"
 });
 export const textWrapper = color => css({
   overflow: 'hidden',

package/dist/es2019/components/BaseUserPicker.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { UFOExperienceState } from '@atlaskit/ufo';
 import debounce from 'lodash/debounce';
 import React from 'react';
@@ -10,6 +11,7 @@ import { cancelEvent, clearEvent, createAndFireEventInElementsChannel, deleteEve
 import { batchByKey } from './batch';
 import { messages } from './i18n';
 import { callCallback, extractOptionValue, getOptions, isIterable, isPopupUserPickerByComponent, isDefaultValuePopulated, isSingleValue, optionToSelectableOptions } from './utils';
+import { groupOptionsByType } from "../util/group-options-by-type";
 import { userPickerOptionsShownUfoExperience } from '../util/ufoExperiences';
 const loadingMessage = () => null;
 const classNamePrefix = 'fabric-user-picker';
@@ -323,7 +325,8 @@ export class BaseUserPickerWithoutAnalytics extends React.Component {
       const options = getOptions(this.state.options) || [];
       const {
         maxOptions,
-        isMulti
+        isMulti,
+        groupByTypeOrder
       } = this.props;
       if (maxOptions === 0) {
         return [];
@@ -338,9 +341,9 @@ export class BaseUserPickerWithoutAnalytics extends React.Component {
           const valueIds = value.map(item => item.data.id);
           filteredOptions = options.filter(option => valueIds.indexOf(option.data.id) === -1);
         }
-        return filteredOptions.slice(0, maxOptions);
+        return groupByTypeOrder && fg('support_group_by_type_for_user_picker') ? groupOptionsByType(filteredOptions.slice(0, maxOptions), groupByTypeOrder) : filteredOptions.slice(0, maxOptions);
       }
-      return options;
+      return groupByTypeOrder && fg('support_group_by_type_for_user_picker') ? groupOptionsByType(options, groupByTypeOrder) : options;
     });
     _defineProperty(this, "getAppearance", () => this.props.appearance ? this.props.appearance : 'normal');
     _defineProperty(this, "handleClickDraggableParentComponent", () => {

package/dist/es2019/components/Control.compiled.css

@@ -2,9 +2,10 @@
 ._1h6d1bqt{border-color:var(--ds-border-danger,#e2483d)}
 ._1h6d1elr{border-color:var(--ds-border-input,#8590a2)}
 ._1h6d1j28{border-color:transparent}
-._1h6d1p6i{border-color:var(--ds-border-focused,#388bff)}._19bvidpf{padding-left:0}
+._1h6d1p6i{border-color:var(--ds-border-focused,#388bff)}._14regrf3 .fabric-user-picker__clear-indicator{opacity:0!important}
+._19bvidpf{padding-left:0}
 ._1a98zg3v:hover .fabric-user-picker__clear-indicator{opacity:1!important}
-._1fkdidpf .-IndicatorsContainer{opacity:0}
+._1tke1wug{min-height:auto}
 ._bfhk1j28{background-color:transparent}
 ._bfhk1j9a{background-color:var(--ds-background-input,#fff)}
 ._ca0qidpf{padding-top:0}

package/dist/es2019/components/Control.js

@@ -10,11 +10,13 @@ const controlStyles = {
   focused: "_1h6d1p6i _bfhk1j9a _4cvx1p6i _irr31j9a",
   disabled: "_irr3syzs",
   subtle: "_1h6d1j28 _bfhk1j28 _4cvx1j28 _irr31gly",
-  root: "_ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _1h6d1elr _bfhk1j9a _p12f1osq _1fkdidpf _4cvx1elr _irr31d5g _1a98zg3v"
+  root: "_ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _1h6d1elr _bfhk1j9a _p12f1osq _14regrf3 _4cvx1elr _irr31d5g _1a98zg3v",
+  compact: "_1tke1wug"
 };
 const Control = props => {
+  const isCompact = props.appearance === 'compact';
   return /*#__PURE__*/React.createElement(components.Control, _extends({}, props, {
-    xcss: cx(controlStyles.root, (props.selectProps.subtle || props.selectProps.noBorder) && controlStyles.subtle, props.isFocused && controlStyles.focused, props.isInvalid && controlStyles.invalid, props.isDisabled && controlStyles.disabled)
+    xcss: cx(controlStyles.root, isCompact && controlStyles.compact, (props.selectProps.subtle || props.selectProps.noBorder) && controlStyles.subtle, props.isFocused && controlStyles.focused, props.isInvalid && controlStyles.invalid, props.isDisabled && controlStyles.disabled)
   }));
 };
 export default Control;

package/dist/es2019/components/i18n.js

@@ -129,5 +129,40 @@ export const messages = defineMessages({
     id: 'fabric.elements.user-picker.guest.lozenge.tooltip.group',
     defaultMessage: 'Guest groups can only access certain spaces and have limited access to user info.',
     description: 'Tooltip text for lozenge showing that a group is for guests in Confluence'
+  },
+  userTypeLabel: {
+    id: 'fabric.elements.user-picker.user.type.label',
+    defaultMessage: 'People',
+    description: 'Label for user type'
+  },
+  teamTypeLabel: {
+    id: 'fabric.elements.user-picker.team.type.label',
+    defaultMessage: 'Teams',
+    description: 'Label for team type'
+  },
+  emailTypeLabel: {
+    id: 'fabric.elements.user-picker.email.type.label',
+    defaultMessage: 'Emails',
+    description: 'Label for email type'
+  },
+  groupTypeLabel: {
+    id: 'fabric.elements.user-picker.group.type.label',
+    defaultMessage: 'Groups',
+    description: 'Label for group type'
+  },
+  externalUserTypeLabel: {
+    id: 'fabric.elements.user-picker.external.user.type.label',
+    defaultMessage: 'External Users',
+    description: 'Label for external user type'
+  },
+  customTypeLabel: {
+    id: 'fabric.elements.user-picker.custom.type.label',
+    defaultMessage: 'Customs',
+    description: 'Label for custom type'
+  },
+  otherTypeLabel: {
+    id: 'fabric.elements.user-picker.other.type.label',
+    defaultMessage: 'Others',
+    description: 'Label for other type'
   }
 });

package/dist/es2019/util/group-options-by-type/index.js

@@ -0,0 +1,48 @@
+import React from "react";
+import { FormattedMessage } from "react-intl-next";
+import memoizeOne from "memoize-one";
+import { messages } from "../../components/i18n";
+const getLabelForType = type => {
+  switch (type) {
+    case 'user':
+      return /*#__PURE__*/React.createElement(FormattedMessage, messages.userTypeLabel);
+    case 'team':
+      return /*#__PURE__*/React.createElement(FormattedMessage, messages.teamTypeLabel);
+    case 'group':
+      return /*#__PURE__*/React.createElement(FormattedMessage, messages.groupTypeLabel);
+    case 'custom':
+      return /*#__PURE__*/React.createElement(FormattedMessage, messages.customTypeLabel);
+    case 'external_user':
+      return /*#__PURE__*/React.createElement(FormattedMessage, messages.externalUserTypeLabel);
+    default:
+      return /*#__PURE__*/React.createElement(FormattedMessage, messages.otherTypeLabel);
+  }
+};
+export const groupOptionsByType = memoizeOne((options, groupByTypeOrder) => {
+  // If groupByTypeOrder is empty, just return the original options
+  if (groupByTypeOrder.length === 0) {
+    return options;
+  }
+  const groupedMap = new Map();
+  options.forEach(option => {
+    const type = option.data.type || 'other';
+    if (!groupedMap.has(type)) {
+      groupedMap.set(type, []);
+    }
+    groupedMap.get(type).push(option);
+  });
+  const result = [];
+
+  // add groups in the specified order
+  // type is not in groupByTypeOrder, don't add it to the result
+  groupByTypeOrder.forEach(type => {
+    if (groupedMap.has(type)) {
+      result.push({
+        label: getLabelForType(type),
+        options: groupedMap.get(type)
+      });
+      groupedMap.delete(type);
+    }
+  });
+  return result;
+});

package/dist/esm/analytics.js

@@ -5,7 +5,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
 import { v4 as uuidv4 } from 'uuid';
 import { isCustom, isExternalUser } from './components/utils';
 var packageName = "@atlaskit/user-picker";
-var packageVersion = "11.2.2";
+var packageVersion = "11.2.3";
 var UUID_REGEXP_TEAMS_GROUPS = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
 var UUID_REGEXP_OLD_AAID = /^[a-fA-F0-9]{1,8}:[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
 var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;

package/dist/esm/components/AvatarItemOption.js

@@ -36,7 +36,6 @@ var wrapper = function wrapper(isDisabled) {
 var optionWrapper = css({
   maxWidth: '100%',
   minWidth: 0,
-  flex: '1 1 100%',
   // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: '1.4',
   paddingLeft: "var(--ds-space-100, 8px)"
@@ -53,7 +52,8 @@ var getTextStyle = function getTextStyle(isSecondary) {
   }, secondaryCssArgs));
 };
 var additionalInfo = css({
-  float: 'right'
+  float: 'right',
+  marginLeft: "var(--ds-space-100, 8px)"
 });
 export var textWrapper = function textWrapper(color) {
   return css({

package/dist/esm/components/BaseUserPicker.js

@@ -13,6 +13,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { UFOExperienceState } from '@atlaskit/ufo';
 import debounce from 'lodash/debounce';
 import React from 'react';
@@ -22,6 +23,7 @@ import { cancelEvent, clearEvent, createAndFireEventInElementsChannel, deleteEve
 import { batchByKey } from './batch';
 import { messages } from './i18n';
 import { callCallback, extractOptionValue, getOptions, isIterable, isPopupUserPickerByComponent, isDefaultValuePopulated, isSingleValue, optionToSelectableOptions } from './utils';
+import { groupOptionsByType } from "../util/group-options-by-type";
 import { userPickerOptionsShownUfoExperience } from '../util/ufoExperiences';
 var loadingMessage = function loadingMessage() {
   return null;
@@ -325,7 +327,8 @@ export var BaseUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compon
       var options = getOptions(_this.state.options) || [];
       var _this$props2 = _this.props,
         maxOptions = _this$props2.maxOptions,
-        isMulti = _this$props2.isMulti;
+        isMulti = _this$props2.isMulti,
+        groupByTypeOrder = _this$props2.groupByTypeOrder;
       if (maxOptions === 0) {
         return [];
       }
@@ -341,9 +344,9 @@ export var BaseUserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Compon
             return valueIds.indexOf(option.data.id) === -1;
           });
         }
-        return filteredOptions.slice(0, maxOptions);
+        return groupByTypeOrder && fg('support_group_by_type_for_user_picker') ? groupOptionsByType(filteredOptions.slice(0, maxOptions), groupByTypeOrder) : filteredOptions.slice(0, maxOptions);
       }
-      return options;
+      return groupByTypeOrder && fg('support_group_by_type_for_user_picker') ? groupOptionsByType(options, groupByTypeOrder) : options;
     });
     _defineProperty(_this, "getAppearance", function () {
       return _this.props.appearance ? _this.props.appearance : 'normal';

package/dist/esm/components/Control.compiled.css

@@ -2,9 +2,10 @@
 ._1h6d1bqt{border-color:var(--ds-border-danger,#e2483d)}
 ._1h6d1elr{border-color:var(--ds-border-input,#8590a2)}
 ._1h6d1j28{border-color:transparent}
-._1h6d1p6i{border-color:var(--ds-border-focused,#388bff)}._19bvidpf{padding-left:0}
+._1h6d1p6i{border-color:var(--ds-border-focused,#388bff)}._14regrf3 .fabric-user-picker__clear-indicator{opacity:0!important}
+._19bvidpf{padding-left:0}
 ._1a98zg3v:hover .fabric-user-picker__clear-indicator{opacity:1!important}
-._1fkdidpf .-IndicatorsContainer{opacity:0}
+._1tke1wug{min-height:auto}
 ._bfhk1j28{background-color:transparent}
 ._bfhk1j9a{background-color:var(--ds-background-input,#fff)}
 ._ca0qidpf{padding-top:0}

package/dist/esm/components/Control.js

@@ -10,11 +10,13 @@ var controlStyles = {
   focused: "_1h6d1p6i _bfhk1j9a _4cvx1p6i _irr31j9a",
   disabled: "_irr3syzs",
   subtle: "_1h6d1j28 _bfhk1j28 _4cvx1j28 _irr31gly",
-  root: "_ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _1h6d1elr _bfhk1j9a _p12f1osq _1fkdidpf _4cvx1elr _irr31d5g _1a98zg3v"
+  root: "_ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _1h6d1elr _bfhk1j9a _p12f1osq _14regrf3 _4cvx1elr _irr31d5g _1a98zg3v",
+  compact: "_1tke1wug"
 };
 var Control = function Control(props) {
+  var isCompact = props.appearance === 'compact';
   return /*#__PURE__*/React.createElement(components.Control, _extends({}, props, {
-    xcss: cx(controlStyles.root, (props.selectProps.subtle || props.selectProps.noBorder) && controlStyles.subtle, props.isFocused && controlStyles.focused, props.isInvalid && controlStyles.invalid, props.isDisabled && controlStyles.disabled)
+    xcss: cx(controlStyles.root, isCompact && controlStyles.compact, (props.selectProps.subtle || props.selectProps.noBorder) && controlStyles.subtle, props.isFocused && controlStyles.focused, props.isInvalid && controlStyles.invalid, props.isDisabled && controlStyles.disabled)
   }));
 };
 export default Control;