@atlaskit/user-picker 8.3.5 → 8.6.0

package/dist/es2019/components/assets/slack.js

@@ -12,33 +12,33 @@ export function SlackIcon(props) {
     clipPath: "url(#clip0)"
   }, /*#__PURE__*/React.createElement("path", {
     d: "M2.51653 7.5688C2.51653 8.26133 1.9508 8.82706 1.25826 8.82706C0.565731 8.82706 0 8.26133 0 7.5688C0 6.87627 0.565731 6.31055 1.25826 6.31055H2.51653V7.5688Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }), /*#__PURE__*/React.createElement("path", {
     d: "M3.15039 7.5688C3.15039 6.87627 3.71612 6.31055 4.40865 6.31055C5.10119 6.31055 5.66692 6.87627 5.66692 7.5688V10.7193C5.66692 11.4119 5.10119 11.9776 4.40865 11.9776C3.71612 11.9776 3.15039 11.4119 3.15039 10.7193V7.5688Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }), /*#__PURE__*/React.createElement("path", {
     d: "M4.40865 2.51651C3.71612 2.51651 3.15039 1.95079 3.15039 1.25826C3.15039 0.565728 3.71612 0 4.40865 0C5.10119 0 5.66692 0.565728 5.66692 1.25826V2.51651H4.40865Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }), /*#__PURE__*/React.createElement("path", {
     d: "M4.4088 3.15039C5.10133 3.15039 5.66706 3.71612 5.66706 4.40865C5.66706 5.10118 5.10133 5.6669 4.4088 5.6669H1.25826C0.565731 5.6669 0 5.10118 0 4.40865C0 3.71612 0.565731 3.15039 1.25826 3.15039H4.4088Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }), /*#__PURE__*/React.createElement("path", {
     d: "M9.46094 4.40865C9.46094 3.71612 10.0267 3.15039 10.7192 3.15039C11.4117 3.15039 11.9775 3.71612 11.9775 4.40865C11.9775 5.10118 11.4117 5.6669 10.7192 5.6669H9.46094V4.40865Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }), /*#__PURE__*/React.createElement("path", {
     d: "M8.8261 4.40878C8.8261 5.10131 8.26036 5.66704 7.56783 5.66704C6.8753 5.66704 6.30957 5.10131 6.30957 4.40878V1.25826C6.30957 0.565728 6.8753 0 7.56783 0C8.26036 0 8.8261 0.565728 8.8261 1.25826V4.40878Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }), /*#__PURE__*/React.createElement("path", {
     d: "M7.56881 9.46094C8.26134 9.46094 8.82707 10.0267 8.82707 10.7192C8.82707 11.4117 8.26134 11.9775 7.56881 11.9775C6.87628 11.9775 6.31055 11.4117 6.31055 10.7192V9.46094H7.56881Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }), /*#__PURE__*/React.createElement("path", {
     d: "M7.56881 8.82706C6.87628 8.82706 6.31055 8.26133 6.31055 7.5688C6.31055 6.87627 6.87628 6.31055 7.56881 6.31055H10.7193C11.4119 6.31055 11.9776 6.87627 11.9776 7.5688C11.9776 8.26133 11.4119 8.82706 10.7193 8.82706H7.56881Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   })), /*#__PURE__*/React.createElement("defs", null, /*#__PURE__*/React.createElement("clipPath", {
     id: "clip0"
   }, /*#__PURE__*/React.createElement("rect", {
     width: "12",
     height: "11.9999",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }))));
 }

package/dist/es2019/components/i18n.js

@@ -90,6 +90,16 @@ export const messages = defineMessages({
     defaultMessage: 'GitHub',
     description: 'This external user is sourced from GitHub provider'
   },
+  jiraSource: {
+    id: 'fabric.elements.user-picker.source.jira',
+    defaultMessage: 'Jira',
+    description: 'This external user is sourced from Jira'
+  },
+  confluenceSource: {
+    id: 'fabric.elements.user-picker.source.confluence',
+    defaultMessage: 'Confluence',
+    description: 'This external user is sourced from Confluence'
+  },
   memberLozengeText: {
     id: 'fabric.elements.user-picker.member.lozenge.text',
     defaultMessage: 'MEMBER',

package/dist/es2019/components/smart-user-picker/components/index.js

@@ -13,7 +13,7 @@ import getUserRecommendations from '../service/recommendationClient';
 import getUsersById from '../service/UsersClient';
 import MessagesIntlProvider from '../../MessagesIntlProvider';
 
-const hasContextChanged = (oldContext, newContext) => oldContext.siteId !== newContext.siteId || oldContext.productKey !== newContext.productKey || oldContext.principalId !== newContext.principalId || oldContext.containerId !== newContext.containerId || oldContext.objectId !== newContext.objectId || oldContext.childObjectId !== newContext.childObjectId;
+const hasContextChanged = (oldContext, newContext) => oldContext.siteId !== newContext.siteId || oldContext.orgId !== newContext.orgId || oldContext.productKey !== newContext.productKey || oldContext.principalId !== newContext.principalId || oldContext.containerId !== newContext.containerId || oldContext.objectId !== newContext.objectId || oldContext.childObjectId !== newContext.childObjectId;
 
 const stringContains = (str, substr) => {
   if (str === null || str === undefined) {
@@ -147,6 +147,7 @@ class SmartUserPicker extends React.Component {
         principalId,
         productKey,
         siteId,
+        orgId,
         baseUrl,
         includeUsers,
         includeGroups,
@@ -168,6 +169,7 @@ class SmartUserPicker extends React.Component {
           principalId,
           productKey,
           siteId,
+          orgId,
           childObjectId,
           sessionId,
           productAttributes

package/dist/es2019/components/styles.js

@@ -20,14 +20,14 @@ export const getStyles = memoizeOne((width, isMulti, overrideStyles) => {
       const isMulti = state.selectProps.isMulti;
       return { ...css,
         width,
-        borderColor: state.isFocused ? token('color.border.neutral', css.borderColor) : state.selectProps.subtle || state.selectProps.noBorder ? 'transparent' : token('color.border.neutral', N40),
-        backgroundColor: state.isFocused ? token('color.background.default', css['backgroundColor']) : state.selectProps.subtle ? 'transparent' : state.selectProps.textFieldBackgroundColor ? token('color.background.subtleBorderedNeutral.resting', N10) : token('color.background.subtleNeutral.resting', N20),
+        borderColor: state.isFocused ? token('color.border', css.borderColor) : state.selectProps.subtle || state.selectProps.noBorder ? 'transparent' : token('color.border', N40),
+        backgroundColor: state.isFocused ? token('elevation.surface', css['backgroundColor']) : state.selectProps.subtle ? 'transparent' : state.selectProps.textFieldBackgroundColor ? token('color.background.input', N10) : token('color.background.neutral', N20),
         '&:hover .fabric-user-picker__clear-indicator': {
           opacity: 1
         },
         ':hover': { ...css[':hover'],
-          borderColor: state.isFocused ? css[':hover'] ? token('color.border.focus', css[':hover'].borderColor) : token('color.border.focus', B100) : state.selectProps.subtle ? state.selectProps.hoveringClearIndicator ? token('color.iconBorder.danger', R50) : token('color.border.neutral', N30) : token('color.border.neutral', N40),
-          backgroundColor: state.selectProps.subtle && state.selectProps.hoveringClearIndicator ? token('color.background.subtleDanger.resting', R50) : state.isFocused ? css[':hover'] ? token('color.background.default', css[':hover'].backgroundColor) : token('color.background.default', N0) : state.isDisabled ? token('color.background.disabled', N10) : token('color.background.default', N30)
+          borderColor: state.isFocused ? css[':hover'] ? token('color.border.focused', css[':hover'].borderColor) : token('color.border.focused', B100) : state.selectProps.subtle ? state.selectProps.hoveringClearIndicator ? token('color.icon.danger', R50) : token('color.border', N30) : token('color.border', N40),
+          backgroundColor: state.selectProps.subtle && state.selectProps.hoveringClearIndicator ? token('color.background.danger', R50) : state.isFocused ? css[':hover'] ? token('elevation.surface', css[':hover'].backgroundColor) : token('elevation.surface', N0) : state.isDisabled ? token('color.background.disabled', N10) : token('elevation.surface', N30)
         },
         padding: 0,
         minHeight: isCompact ? 'none' : 44,
@@ -136,14 +136,14 @@ export const getStyles = memoizeOne((width, isMulti, overrideStyles) => {
       paddingLeft: isMulti ? 0 : AVATAR_PADDING,
       '& input::placeholder': {
         /* Chrome, Firefox, Opera, Safari 10.1+ */
-        color: token('color.text.lowEmphasis', N100),
+        color: token('color.text.subtlest', N100),
         opacity: 1
         /* Firefox */
 
       },
       '& input:-ms-input-placeholder': {
         /* Internet Explorer 10-11 */
-        color: token('color.text.lowEmphasis', N100)
+        color: token('color.text.subtlest', N100)
       }
     })
   };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "8.3.5",
+	"version": "8.6.0",
 	"sideEffects": false
 }

package/dist/esm/analytics.js

@@ -143,6 +143,7 @@ var createDefaultSmartPickerAttributes = function createDefaultSmartPickerAttrib
       productKey = props.productKey,
       principalId = props.principalId,
       siteId = props.siteId,
+      orgId = props.orgId,
       filterOptions = props.filterOptions;
   var sessionId = state.sessionId,
       query = state.query;
@@ -160,6 +161,7 @@ var createDefaultSmartPickerAttributes = function createDefaultSmartPickerAttrib
     productKey: productKey,
     queryLength: (query || '').length,
     siteId: siteId,
+    orgId: orgId,
     sessionId: sessionId
   };
 };

package/dist/esm/clients/UserSourceProvider.js

@@ -15,10 +15,10 @@ export var useUserSource = function useUserSource(accountId, shouldFetchSources,
   var _useContext = useContext(ExusUserSourceContext),
       fetchUserSource = _useContext.fetchUserSource;
 
-  var _useState = useState(new Set(existingSources)),
+  var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
-      sources = _useState2[0],
-      setUserSources = _useState2[1];
+      externalSources = _useState2[0],
+      setExternalSources = _useState2[1];
 
   var _useState3 = useState(true),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -50,24 +50,31 @@ export var useUserSource = function useUserSource(accountId, shouldFetchSources,
       return cleanup;
     }
 
-    if (isMounted) {
-      fetchUserSource(accountId, abortController === null || abortController === void 0 ? void 0 : abortController.signal).then(function (externalSources) {
-        setLoading(false);
-        var externalSourceTypes = externalSources.map(function (source) {
-          return source.sourceType;
-        });
-        setUserSources(new Set([].concat(_toConsumableArray(sources), _toConsumableArray(externalSourceTypes))));
-      }).catch(function (error) {
-        setLoading(false);
-        setError(error);
+    fetchUserSource(accountId, abortController === null || abortController === void 0 ? void 0 : abortController.signal).then(function (externalSources) {
+      if (!isMounted) {
+        return;
+      }
+
+      setLoading(false);
+      var externalSourceTypes = externalSources.map(function (source) {
+        return source.sourceType;
       });
-    }
+      setExternalSources(externalSourceTypes);
+    }).catch(function (error) {
+      if (!isMounted) {
+        return;
+      }
 
+      setLoading(false);
+      setError(error);
+    });
     return cleanup;
-  }, [fetchUserSource, accountId, sources, abortController, shouldFetchSources]);
-  return {
-    sources: Array.from(sources),
-    loading: loading,
-    error: error
-  };
+  }, [fetchUserSource, accountId, abortController, shouldFetchSources]);
+  return useMemo(function () {
+    return {
+      sources: Array.from(new Set([].concat(_toConsumableArray(existingSources !== null && existingSources !== void 0 ? existingSources : []), _toConsumableArray(externalSources)))),
+      loading: loading,
+      error: error
+    };
+  }, [error, existingSources, externalSources, loading]);
 };

package/dist/esm/components/AddOptionAvatar.js

@@ -9,7 +9,7 @@ import React from 'react';
 import styled from 'styled-components';
 var EmailAvatarWrapper = styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: ", "px;\n\n  background-color: ", ";\n  border-radius: 50%;\n  display: flex;\n  align-items: center;\n"])), function (props) {
   return props.isLozenge ? 0 : 4;
-}, token('color.background.subtleNeutral.resting', N40));
+}, token('color.background.neutral', N40));
 export var AddOptionAvatar = function AddOptionAvatar(_ref) {
   var isLozenge = _ref.isLozenge,
       label = _ref.label;
@@ -18,6 +18,6 @@ export var AddOptionAvatar = function AddOptionAvatar(_ref) {
   }, /*#__PURE__*/React.createElement(EmailIcon, {
     label: label,
     size: isLozenge ? 'small' : 'medium',
-    primaryColor: token('color.text.mediumEmphasis', N500)
+    primaryColor: token('color.text.subtle', N500)
   }));
 };

package/dist/esm/components/AvatarItemOption.js

@@ -17,24 +17,20 @@ var AsyncTooltip = /*#__PURE__*/React.lazy(function () {
   });
 });
 var Wrapper = styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  align-items: center;\n  box-sizing: border-box;\n  display: flex;\n  line-height: 1;\n  outline: none;\n  margin: 0;\n  width: 100%;\n  cursor: pointer;\n"])));
-var Text = styled.span(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin: 0;\n  color: ", ";\n  overflow-x: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  ", "\n"])), token('color.text.selected', B400), function (_ref) {
+var Text = styled.span(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin: 0;\n  color: ", ";\n  overflow-x: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  ", "\n"])), token('color.text.brand', B400), function (_ref) {
   var secondary = _ref.secondary;
-  return secondary && "color: ".concat(token('color.text.selected', B400), "; font-size: 0.85em;");
+  return secondary && "color: ".concat(token('color.text.brand', B400), "; font-size: 0.85em;");
 });
-var AdditionalInfo = styled.span(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  float: right;\n  ", "\n"])), function (_ref2) {
-  var withTooltip = _ref2.withTooltip;
-  return withTooltip && " padding-top: 5px;";
-});
-export var TextWrapper = styled.span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  color: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  display: inline-block;\n"])), function (_ref3) {
-  var color = _ref3.color;
+var AdditionalInfo = styled.span(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  float: right;\n"])));
+export var TextWrapper = styled.span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  color: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  display: inline-block;\n"])), function (_ref2) {
+  var color = _ref2.color;
   return color;
 });
-export var AvatarItemOption = function AvatarItemOption(_ref4) {
-  var avatar = _ref4.avatar,
-      primaryText = _ref4.primaryText,
-      secondaryText = _ref4.secondaryText,
-      lozenge = _ref4.lozenge,
-      sourcesInfoTooltip = _ref4.sourcesInfoTooltip;
+export var AvatarItemOption = function AvatarItemOption(_ref3) {
+  var avatar = _ref3.avatar,
+      primaryText = _ref3.primaryText,
+      secondaryText = _ref3.secondaryText,
+      lozenge = _ref3.lozenge;
   return /*#__PURE__*/React.createElement(Wrapper, null, avatar, /*#__PURE__*/React.createElement("div", {
     style: {
       maxWidth: '100%',
@@ -43,9 +39,7 @@ export var AvatarItemOption = function AvatarItemOption(_ref4) {
       lineHeight: '1.4',
       paddingLeft: '8px'
     }
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Text, null, primaryText), /*#__PURE__*/React.createElement(AdditionalInfo, {
-    withTooltip: Boolean(sourcesInfoTooltip)
-  }, !sourcesInfoTooltip && (lozenge === null || lozenge === void 0 ? void 0 : lozenge.text) && (lozenge !== null && lozenge !== void 0 && lozenge.tooltip ?
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Text, null, primaryText), /*#__PURE__*/React.createElement(AdditionalInfo, null, (lozenge === null || lozenge === void 0 ? void 0 : lozenge.text) && (lozenge !== null && lozenge !== void 0 && lozenge.tooltip ?
   /*#__PURE__*/
   // Note that entire Lozenge must be wrapped in the Tooltip (rather than just the
   // Lozenge text) or tooltip won't work
@@ -53,7 +47,7 @@ export var AvatarItemOption = function AvatarItemOption(_ref4) {
     fallback: /*#__PURE__*/React.createElement(Lozenge, lozenge, lozenge.text)
   }, /*#__PURE__*/React.createElement(AsyncTooltip, {
     content: lozenge.tooltip
-  }, /*#__PURE__*/React.createElement(Lozenge, lozenge, lozenge.text))) : /*#__PURE__*/React.createElement(Lozenge, lozenge, lozenge.text)), sourcesInfoTooltip)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Text, {
+  }, /*#__PURE__*/React.createElement(Lozenge, lozenge, lozenge.text))) : /*#__PURE__*/React.createElement(Lozenge, lozenge, lozenge.text)))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Text, {
     secondary: true
   }, secondaryText))));
 };

package/dist/esm/components/EmailOption/main.js

@@ -48,13 +48,13 @@ export var EmailOption = /*#__PURE__*/function (_React$PureComponent) {
       var id = _this.props.email.id;
       return /*#__PURE__*/React.createElement(TextWrapper, {
         key: "name",
-        color: _this.props.isSelected ? token('color.text.selected', B400) : token('color.text.highEmphasis', N800)
+        color: _this.props.isSelected ? token('color.text.brand', B400) : token('color.text', N800)
       }, id);
     });
 
     _defineProperty(_assertThisInitialized(_this), "renderSecondaryText", function (label) {
       return /*#__PURE__*/React.createElement(TextWrapper, {
-        color: _this.props.isSelected ? token('color.text.selected', B400) : token('color.text.lowEmphasis', N200)
+        color: _this.props.isSelected ? token('color.text.brand', B400) : token('color.text.subtlest', N200)
       }, label);
     });
 

package/dist/esm/components/ExternalUserOption/ExternalAvatarItemOption.js

@@ -0,0 +1,24 @@
+import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+
+import React from 'react';
+import styled from 'styled-components';
+import { B400 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
+var OuterWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  align-items: center;\n  box-sizing: border-box;\n  display: flex;\n  line-height: 1;\n  outline: none;\n  margin: 0;\n  width: 100%;\n  cursor: pointer;\n"])));
+var DetailsWrapper = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n  max-width: 100%;\n  min-width: 0;\n  flex: 1 1 100%;\n  line-height: 1.4;\n  padding-left: 8px;\n  align-items: center;\n"])));
+var TextSection = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  width: calc(100% - 32px);\n  flex: auto;\n"])));
+var Text = styled.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  max-width: 100%;\n  margin: 0;\n  color: ", ";\n  ", "\n  white-space: nowrap;\n\n  > span {\n    max-width: inherit;\n  }\n"])), token('color.text.selected', B400), function (_ref) {
+  var secondary = _ref.secondary;
+  return secondary && "color: ".concat(token('color.text.selected', B400), "; font-size: 0.85em;");
+});
+export var ExternalAvatarItemOption = function ExternalAvatarItemOption(_ref2) {
+  var avatar = _ref2.avatar,
+      primaryText = _ref2.primaryText,
+      secondaryText = _ref2.secondaryText,
+      sourcesInfoTooltip = _ref2.sourcesInfoTooltip;
+  return /*#__PURE__*/React.createElement(OuterWrapper, null, avatar, /*#__PURE__*/React.createElement(DetailsWrapper, null, /*#__PURE__*/React.createElement(TextSection, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Text, null, primaryText)), secondaryText && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Text, {
+    secondary: true
+  }, secondaryText))), /*#__PURE__*/React.createElement("div", null, sourcesInfoTooltip)));
+};

package/dist/esm/components/ExternalUserOption/InfoIcon.js

@@ -0,0 +1,33 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
+
+var _templateObject;
+
+import React, { useCallback, useState } from 'react';
+import styled from 'styled-components';
+import EditorPanelIcon from '@atlaskit/icon/glyph/editor/panel';
+import { N50, N200 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
+var Wrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n"])));
+export default (function () {
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      isMouseHovered = _useState2[0],
+      setHoverState = _useState2[1];
+
+  var onMouseEnter = useCallback(function () {
+    return setHoverState(true);
+  }, [setHoverState]);
+  var onMouseLeave = useCallback(function () {
+    return setHoverState(false);
+  }, [setHoverState]);
+  return /*#__PURE__*/React.createElement(Wrapper, {
+    onMouseEnter: onMouseEnter,
+    onMouseLeave: onMouseLeave
+  }, /*#__PURE__*/React.createElement(EditorPanelIcon, {
+    testId: "source-icon",
+    label: "",
+    size: "large",
+    primaryColor: token('color.text.lowEmphasis', isMouseHovered ? N200 : N50)
+  }));
+});

package/dist/esm/components/ExternalUserOption/main.js

@@ -14,24 +14,27 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
+import React from 'react';
+import { FormattedMessage } from 'react-intl-next';
+import styled from 'styled-components';
+import { ConfluenceIcon } from '@atlaskit/logo/confluence-icon';
+import { JiraIcon } from '@atlaskit/logo/jira-icon';
+import Spinner from '@atlaskit/spinner';
 import { B400, N200, N800 } from '@atlaskit/theme/colors';
 import { token } from '@atlaskit/tokens';
-import React from 'react';
-import { AvatarItemOption, TextWrapper } from '../AvatarItemOption';
-import { SizeableAvatar } from '../SizeableAvatar';
-import EditorPanelIcon from '@atlaskit/icon/glyph/editor/panel';
 import Tooltip from '@atlaskit/tooltip';
-import Spinner from '@atlaskit/spinner';
-import styled from 'styled-components';
+import { TextWrapper } from '../AvatarItemOption';
+import { SizeableAvatar } from '../SizeableAvatar';
 import { SlackIcon } from '../assets/slack';
 import { GoogleIcon } from '../assets/google';
 import { MicrosoftIcon } from '../assets/microsoft';
 import { GitHubIcon } from '../assets/github';
-import { FormattedMessage } from 'react-intl-next';
 import { messages } from '../i18n';
 import { ExternalUserSourcesContainer } from '../ExternalUserSourcesContainer';
-export var ImageContainer = styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: 12px;\n  width: 12px;\n  padding-right: 4px;\n"])));
-export var SourcesTooltipContainer = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding-bottom: 4px;\n"])));
+import InfoIcon from './InfoIcon';
+import { ExternalAvatarItemOption } from './ExternalAvatarItemOption';
+export var ImageContainer = styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: 16px;\n  width: 16px;\n  padding-right: 4px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n"])));
+export var SourcesTooltipContainer = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding-bottom: 4px;\n  padding-right: 4px;\n"])));
 export var SourceWrapper = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding-top: 4px;\n  display: flex;\n  align-items: center;\n"])));
 export var EmailDomainWrapper = styled.span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  font-weight: bold;\n"])));
 var SourcesInfoMap = new Map([['slack', {
@@ -50,6 +53,18 @@ var SourcesInfoMap = new Map([['slack', {
   key: 'github',
   icon: /*#__PURE__*/React.createElement(GitHubIcon, null),
   label: messages.gitHubProvider
+}], ['jira', {
+  key: 'jira',
+  icon: /*#__PURE__*/React.createElement(JiraIcon, {
+    size: 'xsmall'
+  }),
+  label: messages.jiraSource
+}], ['confluence', {
+  key: 'confluence',
+  icon: /*#__PURE__*/React.createElement(ConfluenceIcon, {
+    size: 'xsmall'
+  }),
+  label: messages.confluenceSource
 }]]);
 export var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(ExternalUserOption, _React$PureComponent);
@@ -71,7 +86,7 @@ export var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {
       var name = _this.props.user.name;
       return /*#__PURE__*/React.createElement(TextWrapper, {
         key: "name",
-        color: _this.props.isSelected ? token('color.text.selected', B400) : token('color.text.highEmphasis', N800)
+        color: _this.props.isSelected ? token('color.text.brand', B400) : token('color.text', N800)
       }, name);
     });
 
@@ -89,7 +104,7 @@ export var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {
 
       var emailDomainWithAt = "@".concat(emailDomain);
       return /*#__PURE__*/React.createElement(TextWrapper, {
-        color: _this.props.isSelected ? token('color.text.selected', B400) : token('color.text.lowEmphasis', N200)
+        color: _this.props.isSelected ? token('color.text.brand', B400) : token('color.text.subtlest', N200)
       }, emailUser, /*#__PURE__*/React.createElement(EmailDomainWrapper, null, emailDomainWithAt));
     });
 
@@ -111,12 +126,7 @@ export var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {
       return _this.props.user.isExternal ? /*#__PURE__*/React.createElement(Tooltip, {
         content: _this.formattedTooltipContent(),
         position: 'right-start'
-      }, /*#__PURE__*/React.createElement(EditorPanelIcon, {
-        testId: "source-icon",
-        label: "",
-        size: "large",
-        primaryColor: token('color.text.lowEmphasis', N200)
-      })) : undefined;
+      }, /*#__PURE__*/React.createElement(InfoIcon, null)) : undefined;
     });
 
     return _this;
@@ -125,7 +135,7 @@ export var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {
   _createClass(ExternalUserOption, [{
     key: "render",
     value: function render() {
-      return /*#__PURE__*/React.createElement(AvatarItemOption, {
+      return /*#__PURE__*/React.createElement(ExternalAvatarItemOption, {
         avatar: this.renderAvatar(),
         primaryText: this.getPrimaryText(),
         secondaryText: this.renderSecondaryText(),

package/dist/esm/components/ExternalUserSourcesContainer.js

@@ -4,8 +4,7 @@ export var ExternalUserSourcesContainer = function ExternalUserSourcesContainer(
   var children = _ref.children,
       accountId = _ref.accountId,
       shouldFetchSources = _ref.shouldFetchSources,
-      _ref$initialSources = _ref.initialSources,
-      initialSources = _ref$initialSources === void 0 ? [] : _ref$initialSources;
+      initialSources = _ref.initialSources;
 
   var _useUserSource = useUserSource(accountId, shouldFetchSources, initialSources),
       sources = _useUserSource.sources,

package/dist/esm/components/GroupOption/main.js

@@ -22,7 +22,7 @@ import PeopleIcon from '@atlaskit/icon/glyph/people';
 import { AvatarItemOption, TextWrapper } from '.././AvatarItemOption';
 import { messages } from '.././i18n';
 import { HighlightText } from '.././HighlightText';
-export var GroupOptionIconWrapper = styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: 2px;\n\n  > span {\n    background-color: ", ";\n    border-radius: 50%;\n    padding: 4px;\n  }\n"])), token('color.background.subtleNeutral.resting', N20));
+export var GroupOptionIconWrapper = styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: 2px;\n\n  > span {\n    background-color: ", ";\n    border-radius: 50%;\n    padding: 4px;\n  }\n"])), token('color.background.neutral', N20));
 export var GroupOption = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(GroupOption, _React$PureComponent);
 
@@ -47,7 +47,7 @@ export var GroupOption = /*#__PURE__*/function (_React$PureComponent) {
           highlight = _this$props$group.highlight;
       return [/*#__PURE__*/React.createElement(TextWrapper, {
         key: "name",
-        color: isSelected ? token('color.text.selected', B400) : token('color.text.highEmphasis', N800)
+        color: isSelected ? token('color.text.brand', B400) : token('color.text', N800)
       }, /*#__PURE__*/React.createElement(HighlightText, {
         highlights: highlight && highlight.name
       }, name))];
@@ -63,7 +63,7 @@ export var GroupOption = /*#__PURE__*/function (_React$PureComponent) {
     _defineProperty(_assertThisInitialized(_this), "renderByline", function () {
       var isSelected = _this.props.isSelected;
       return /*#__PURE__*/React.createElement(TextWrapper, {
-        color: isSelected ? token('color.text.selected', B400) : token('color.text.lowEmphasis', N200)
+        color: isSelected ? token('color.text.brand', B400) : token('color.text.subtlest', N200)
       }, /*#__PURE__*/React.createElement(FormattedMessage, messages.groupByline));
     });
 

package/dist/esm/components/PopupControl.js

@@ -25,8 +25,8 @@ var innerHeight = spacing * 2; // 16px
 var lineHeight = innerHeight / fontSize;
 var ControlWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  padding: 0px ", "px ", "px;\n"])), spacing, spacing);
 var getColor = themed({
-  light: token('color.text.lowEmphasis', N200),
-  dark: token('color.text.lowEmphasis', DN90)
+  light: token('color.text.subtlest', N200),
+  dark: token('color.text.subtlest', DN90)
 });
 
 var getPadding = function getPadding() {

package/dist/esm/components/TeamOption/main.js

@@ -41,7 +41,7 @@ export var TeamOption = /*#__PURE__*/function (_React$PureComponent) {
           highlight = _this$props$team.highlight;
       return [/*#__PURE__*/React.createElement(TextWrapper, {
         key: "name",
-        color: _this.props.isSelected ? token('color.text.selected', B400) : token('color.text.highEmphasis', N800)
+        color: _this.props.isSelected ? token('color.text.brand', B400) : token('color.text', N800)
       }, /*#__PURE__*/React.createElement(HighlightText, {
         highlights: highlight && highlight.name
       }, name))];
@@ -83,7 +83,7 @@ export var TeamOption = /*#__PURE__*/function (_React$PureComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "getBylineComponent", function (isSelected, message) {
       return /*#__PURE__*/React.createElement(TextWrapper, {
-        color: isSelected ? token('color.text.selected', B400) : token('color.text.lowEmphasis', N200)
+        color: isSelected ? token('color.text.brand', B400) : token('color.text.subtlest', N200)
       }, message);
     });
 

package/dist/esm/components/UserOption.js

@@ -40,7 +40,7 @@ export var UserOption = /*#__PURE__*/function (_React$PureComponent) {
           highlight = _this$props$user.highlight;
       var result = [/*#__PURE__*/React.createElement(TextWrapper, {
         key: "name",
-        color: _this.props.isSelected ? token('color.text.selected', B400) : token('color.text.highEmphasis', N800)
+        color: _this.props.isSelected ? token('color.text.brand', B400) : token('color.text', N800)
       }, /*#__PURE__*/React.createElement(HighlightText, {
         highlights: highlight && highlight.name
       }, name))];
@@ -49,7 +49,7 @@ export var UserOption = /*#__PURE__*/function (_React$PureComponent) {
         result.push( /*#__PURE__*/React.createElement(React.Fragment, {
           key: "publicName"
         }, ' ', /*#__PURE__*/React.createElement(TextWrapper, {
-          color: _this.props.isSelected ? token('color.text.selected', B400) : token('color.text.lowEmphasis', N200)
+          color: _this.props.isSelected ? token('color.text.brand', B400) : token('color.text.subtlest', N200)
         }, "(", /*#__PURE__*/React.createElement(HighlightText, {
           highlights: highlight && highlight.publicName
         }, publicName), ")")));
@@ -60,7 +60,7 @@ export var UserOption = /*#__PURE__*/function (_React$PureComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "renderSecondaryText", function () {
       return _this.props.user.byline ? /*#__PURE__*/React.createElement(TextWrapper, {
-        color: _this.props.isSelected ? token('color.text.selected', B400) : token('color.text.lowEmphasis', N200)
+        color: _this.props.isSelected ? token('color.text.brand', B400) : token('color.text.subtlest', N200)
       }, _this.props.user.byline) : undefined;
     });
 

package/dist/esm/components/assets/github.js

@@ -12,6 +12,6 @@ export function GitHubIcon(props) {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M11.9778 0C5.3635 0 0 5.45261 0 12.179C0 17.5601 3.432 22.1253 8.19114 23.7357C8.78975 23.8484 9.00952 23.4715 9.00952 23.1498C9.00952 22.8594 8.99841 21.9 8.99326 20.8823C5.66103 21.6191 4.95789 19.4454 4.95789 19.4454C4.41303 18.0376 3.62796 17.6633 3.62796 17.6633C2.54122 16.9074 3.70988 16.923 3.70988 16.923C4.91266 17.0089 5.54598 18.178 5.54598 18.178C6.61428 20.0399 8.34803 19.5016 9.03154 19.1904C9.13904 18.4033 9.44945 17.866 9.792 17.5619C7.13157 17.2539 4.33487 16.2096 4.33487 11.5429C4.33487 10.2133 4.80278 9.12682 5.56899 8.27391C5.44463 7.96716 5.03464 6.72844 5.68502 5.05087C5.68502 5.05087 6.69084 4.72354 8.97976 6.29927C9.9352 6.02942 10.9599 5.89409 11.9778 5.88945C12.9957 5.89409 14.0212 6.02942 14.9784 6.29927C17.2645 4.72354 18.269 5.05087 18.269 5.05087C18.9209 6.72844 18.5107 7.96716 18.3864 8.27391C19.1544 9.12682 19.6191 10.2133 19.6191 11.5429C19.6191 16.2207 16.8171 17.2507 14.1499 17.5522C14.5795 17.9301 14.9623 18.6713 14.9623 19.8076C14.9623 21.4371 14.9484 22.7487 14.9484 23.1498C14.9484 23.4739 15.164 23.8537 15.7712 23.7341C20.5277 22.1219 23.9554 17.5582 23.9554 12.179C23.9554 5.45261 18.5927 0 11.9778 0Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }));
 }

package/dist/esm/components/assets/google.js

@@ -12,21 +12,21 @@ export function GoogleIcon(props) {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M8.32062 3.21332L10.014 1.55999C8.97396 0.593331 7.62063 0 6.00062 0C3.65396 0 1.62729 1.34666 0.640625 3.30665L2.58062 4.81331C3.06729 3.36665 4.41396 2.31999 6.00062 2.31999C7.12729 2.31999 7.88729 2.80665 8.32062 3.21332Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }), /*#__PURE__*/React.createElement("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M11.76 6.13291C11.76 5.63958 11.72 5.27958 11.6333 4.90625H6V7.13291H9.30667C9.24 7.68624 8.88 8.51957 8.08 9.07957L9.97333 10.5462C11.1067 9.49956 11.76 7.95957 11.76 6.13291V6.13291V6.13291Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }), /*#__PURE__*/React.createElement("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M2.58667 7.18662C2.46 6.81329 2.38667 6.41329 2.38667 5.99996C2.38667 5.58663 2.46 5.18663 2.58 4.8133L0.64 3.30664C0.233333 4.11997 0 5.0333 0 5.99996C0 6.96662 0.233333 7.87995 0.64 8.69328L2.58667 7.18662V7.18662Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }), /*#__PURE__*/React.createElement("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M6.00079 12.0008C7.62079 12.0008 8.98079 11.4675 9.97413 10.5475L8.08079 9.08083C7.57413 9.43416 6.89413 9.68082 6.00079 9.68082C4.41413 9.68082 3.06746 8.63416 2.58746 7.1875L0.647461 8.69416C1.63413 10.6542 3.65413 12.0008 6.00079 12.0008V12.0008V12.0008Z",
-    fill: token('color.text.onBold', 'white')
+    fill: token('color.text.inverse', 'white')
   }));
 }