@atlaskit/user-picker 8.3.5 → 8.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @atlaskit/user-picker
2
2
 
3
+ ## 8.4.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`29dd0cee8cf`](https://bitbucket.org/atlassian/atlassian-frontend/commits/29dd0cee8cf) - [ux] Add support for Jira and Confluence user sources
8
+
3
9
  ## 8.3.5
4
10
 
5
11
  ### Patch Changes
@@ -25,22 +25,28 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
25
25
 
26
26
  var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
27
27
 
28
- var _colors = require("@atlaskit/theme/colors");
29
-
30
- var _tokens = require("@atlaskit/tokens");
31
-
32
28
  var _react = _interopRequireDefault(require("react"));
33
29
 
34
- var _AvatarItemOption = require("../AvatarItemOption");
35
-
36
- var _SizeableAvatar = require("../SizeableAvatar");
30
+ var _reactIntlNext = require("react-intl-next");
37
31
 
38
32
  var _panel = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/panel"));
39
33
 
34
+ var _confluenceIcon = require("@atlaskit/logo/confluence-icon");
35
+
36
+ var _jiraIcon = require("@atlaskit/logo/jira-icon");
37
+
40
38
  var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
41
39
 
42
40
  var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
43
41
 
42
+ var _colors = require("@atlaskit/theme/colors");
43
+
44
+ var _tokens = require("@atlaskit/tokens");
45
+
46
+ var _AvatarItemOption = require("../AvatarItemOption");
47
+
48
+ var _SizeableAvatar = require("../SizeableAvatar");
49
+
44
50
  var _styledComponents = _interopRequireDefault(require("styled-components"));
45
51
 
46
52
  var _slack = require("../assets/slack");
@@ -51,8 +57,6 @@ var _microsoft = require("../assets/microsoft");
51
57
 
52
58
  var _github = require("../assets/github");
53
59
 
54
- var _reactIntlNext = require("react-intl-next");
55
-
56
60
  var _i18n = require("../i18n");
57
61
 
58
62
  var _ExternalUserSourcesContainer = require("../ExternalUserSourcesContainer");
@@ -63,11 +67,11 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
63
67
 
64
68
  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; } }
65
69
 
66
- var ImageContainer = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n height: 12px;\n width: 12px;\n padding-right: 4px;\n"])));
70
+ var ImageContainer = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n height: 16px;\n width: 16px;\n padding-right: 4px;\n display: flex;\n align-items: center;\n justify-content: center;\n"])));
67
71
 
68
72
  exports.ImageContainer = ImageContainer;
69
73
 
70
- var SourcesTooltipContainer = _styledComponents.default.div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n padding-bottom: 4px;\n"])));
74
+ var SourcesTooltipContainer = _styledComponents.default.div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n padding-bottom: 4px;\n padding-right: 4px;\n"])));
71
75
 
72
76
  exports.SourcesTooltipContainer = SourcesTooltipContainer;
73
77
 
@@ -94,6 +98,18 @@ var SourcesInfoMap = new Map([['slack', {
94
98
  key: 'github',
95
99
  icon: /*#__PURE__*/_react.default.createElement(_github.GitHubIcon, null),
96
100
  label: _i18n.messages.gitHubProvider
101
+ }], ['jira', {
102
+ key: 'jira',
103
+ icon: /*#__PURE__*/_react.default.createElement(_jiraIcon.JiraIcon, {
104
+ size: 'xsmall'
105
+ }),
106
+ label: _i18n.messages.jiraSource
107
+ }], ['confluence', {
108
+ key: 'confluence',
109
+ icon: /*#__PURE__*/_react.default.createElement(_confluenceIcon.ConfluenceIcon, {
110
+ size: 'xsmall'
111
+ }),
112
+ label: _i18n.messages.confluenceSource
97
113
  }]]);
98
114
 
99
115
  var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {
@@ -98,6 +98,16 @@ var messages = (0, _reactIntlNext.defineMessages)({
98
98
  defaultMessage: 'GitHub',
99
99
  description: 'This external user is sourced from GitHub provider'
100
100
  },
101
+ jiraSource: {
102
+ id: 'fabric.elements.user-picker.source.jira',
103
+ defaultMessage: 'Jira',
104
+ description: 'This external user is sourced from Jira'
105
+ },
106
+ confluenceSource: {
107
+ id: 'fabric.elements.user-picker.source.confluence',
108
+ defaultMessage: 'Confluence',
109
+ description: 'This external user is sourced from Confluence'
110
+ },
101
111
  memberLozengeText: {
102
112
  id: 'fabric.elements.user-picker.member.lozenge.text',
103
113
  defaultMessage: 'MEMBER',
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/user-picker",
3
- "version": "8.3.5",
3
+ "version": "8.4.0",
4
4
  "sideEffects": false
5
5
  }
@@ -1,27 +1,33 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- import { B400, N200, N800 } from '@atlaskit/theme/colors';
3
- import { token } from '@atlaskit/tokens';
4
2
  import React from 'react';
5
- import { AvatarItemOption, TextWrapper } from '../AvatarItemOption';
6
- import { SizeableAvatar } from '../SizeableAvatar';
3
+ import { FormattedMessage } from 'react-intl-next';
7
4
  import EditorPanelIcon from '@atlaskit/icon/glyph/editor/panel';
5
+ import { ConfluenceIcon } from '@atlaskit/logo/confluence-icon';
6
+ import { JiraIcon } from '@atlaskit/logo/jira-icon';
8
7
  import Tooltip from '@atlaskit/tooltip';
9
8
  import Spinner from '@atlaskit/spinner';
9
+ import { B400, N200, N800 } from '@atlaskit/theme/colors';
10
+ import { token } from '@atlaskit/tokens';
11
+ import { AvatarItemOption, TextWrapper } from '../AvatarItemOption';
12
+ import { SizeableAvatar } from '../SizeableAvatar';
10
13
  import styled from 'styled-components';
11
14
  import { SlackIcon } from '../assets/slack';
12
15
  import { GoogleIcon } from '../assets/google';
13
16
  import { MicrosoftIcon } from '../assets/microsoft';
14
17
  import { GitHubIcon } from '../assets/github';
15
- import { FormattedMessage } from 'react-intl-next';
16
18
  import { messages } from '../i18n';
17
19
  import { ExternalUserSourcesContainer } from '../ExternalUserSourcesContainer';
18
20
  export const ImageContainer = styled.span`
19
- height: 12px;
20
- width: 12px;
21
+ height: 16px;
22
+ width: 16px;
21
23
  padding-right: 4px;
24
+ display: flex;
25
+ align-items: center;
26
+ justify-content: center;
22
27
  `;
23
28
  export const SourcesTooltipContainer = styled.div`
24
29
  padding-bottom: 4px;
30
+ padding-right: 4px;
25
31
  `;
26
32
  export const SourceWrapper = styled.div`
27
33
  padding-top: 4px;
@@ -47,6 +53,18 @@ const SourcesInfoMap = new Map([['slack', {
47
53
  key: 'github',
48
54
  icon: /*#__PURE__*/React.createElement(GitHubIcon, null),
49
55
  label: messages.gitHubProvider
56
+ }], ['jira', {
57
+ key: 'jira',
58
+ icon: /*#__PURE__*/React.createElement(JiraIcon, {
59
+ size: 'xsmall'
60
+ }),
61
+ label: messages.jiraSource
62
+ }], ['confluence', {
63
+ key: 'confluence',
64
+ icon: /*#__PURE__*/React.createElement(ConfluenceIcon, {
65
+ size: 'xsmall'
66
+ }),
67
+ label: messages.confluenceSource
50
68
  }]]);
51
69
  export class ExternalUserOption extends React.PureComponent {
52
70
  constructor(...args) {
@@ -90,6 +90,16 @@ export const messages = defineMessages({
90
90
  defaultMessage: 'GitHub',
91
91
  description: 'This external user is sourced from GitHub provider'
92
92
  },
93
+ jiraSource: {
94
+ id: 'fabric.elements.user-picker.source.jira',
95
+ defaultMessage: 'Jira',
96
+ description: 'This external user is sourced from Jira'
97
+ },
98
+ confluenceSource: {
99
+ id: 'fabric.elements.user-picker.source.confluence',
100
+ defaultMessage: 'Confluence',
101
+ description: 'This external user is sourced from Confluence'
102
+ },
93
103
  memberLozengeText: {
94
104
  id: 'fabric.elements.user-picker.member.lozenge.text',
95
105
  defaultMessage: 'MEMBER',
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/user-picker",
3
- "version": "8.3.5",
3
+ "version": "8.4.0",
4
4
  "sideEffects": false
5
5
  }
@@ -14,24 +14,26 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
14
14
 
15
15
  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; } }
16
16
 
17
- import { B400, N200, N800 } from '@atlaskit/theme/colors';
18
- import { token } from '@atlaskit/tokens';
19
17
  import React from 'react';
20
- import { AvatarItemOption, TextWrapper } from '../AvatarItemOption';
21
- import { SizeableAvatar } from '../SizeableAvatar';
18
+ import { FormattedMessage } from 'react-intl-next';
22
19
  import EditorPanelIcon from '@atlaskit/icon/glyph/editor/panel';
20
+ import { ConfluenceIcon } from '@atlaskit/logo/confluence-icon';
21
+ import { JiraIcon } from '@atlaskit/logo/jira-icon';
23
22
  import Tooltip from '@atlaskit/tooltip';
24
23
  import Spinner from '@atlaskit/spinner';
24
+ import { B400, N200, N800 } from '@atlaskit/theme/colors';
25
+ import { token } from '@atlaskit/tokens';
26
+ import { AvatarItemOption, TextWrapper } from '../AvatarItemOption';
27
+ import { SizeableAvatar } from '../SizeableAvatar';
25
28
  import styled from 'styled-components';
26
29
  import { SlackIcon } from '../assets/slack';
27
30
  import { GoogleIcon } from '../assets/google';
28
31
  import { MicrosoftIcon } from '../assets/microsoft';
29
32
  import { GitHubIcon } from '../assets/github';
30
- import { FormattedMessage } from 'react-intl-next';
31
33
  import { messages } from '../i18n';
32
34
  import { ExternalUserSourcesContainer } from '../ExternalUserSourcesContainer';
33
- export var ImageContainer = styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n height: 12px;\n width: 12px;\n padding-right: 4px;\n"])));
34
- export var SourcesTooltipContainer = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n padding-bottom: 4px;\n"])));
35
+ 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"])));
36
+ export var SourcesTooltipContainer = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n padding-bottom: 4px;\n padding-right: 4px;\n"])));
35
37
  export var SourceWrapper = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n padding-top: 4px;\n display: flex;\n align-items: center;\n"])));
36
38
  export var EmailDomainWrapper = styled.span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n font-weight: bold;\n"])));
37
39
  var SourcesInfoMap = new Map([['slack', {
@@ -50,6 +52,18 @@ var SourcesInfoMap = new Map([['slack', {
50
52
  key: 'github',
51
53
  icon: /*#__PURE__*/React.createElement(GitHubIcon, null),
52
54
  label: messages.gitHubProvider
55
+ }], ['jira', {
56
+ key: 'jira',
57
+ icon: /*#__PURE__*/React.createElement(JiraIcon, {
58
+ size: 'xsmall'
59
+ }),
60
+ label: messages.jiraSource
61
+ }], ['confluence', {
62
+ key: 'confluence',
63
+ icon: /*#__PURE__*/React.createElement(ConfluenceIcon, {
64
+ size: 'xsmall'
65
+ }),
66
+ label: messages.confluenceSource
53
67
  }]]);
54
68
  export var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {
55
69
  _inherits(ExternalUserOption, _React$PureComponent);
@@ -90,6 +90,16 @@ export var messages = defineMessages({
90
90
  defaultMessage: 'GitHub',
91
91
  description: 'This external user is sourced from GitHub provider'
92
92
  },
93
+ jiraSource: {
94
+ id: 'fabric.elements.user-picker.source.jira',
95
+ defaultMessage: 'Jira',
96
+ description: 'This external user is sourced from Jira'
97
+ },
98
+ confluenceSource: {
99
+ id: 'fabric.elements.user-picker.source.confluence',
100
+ defaultMessage: 'Confluence',
101
+ description: 'This external user is sourced from Confluence'
102
+ },
93
103
  memberLozengeText: {
94
104
  id: 'fabric.elements.user-picker.member.lozenge.text',
95
105
  defaultMessage: 'MEMBER',
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/user-picker",
3
- "version": "8.3.5",
3
+ "version": "8.4.0",
4
4
  "sideEffects": false
5
5
  }
@@ -89,6 +89,16 @@ export declare const messages: {
89
89
  defaultMessage: string;
90
90
  description: string;
91
91
  };
92
+ jiraSource: {
93
+ id: string;
94
+ defaultMessage: string;
95
+ description: string;
96
+ };
97
+ confluenceSource: {
98
+ id: string;
99
+ defaultMessage: string;
100
+ description: string;
101
+ };
92
102
  memberLozengeText: {
93
103
  id: string;
94
104
  defaultMessage: string;
@@ -208,7 +208,7 @@ export interface OptionData {
208
208
  lozenge?: string | LozengeProps;
209
209
  }
210
210
  export declare const UserType = "user";
211
- export declare type UserSource = 'google' | 'slack' | 'microsoft' | 'github';
211
+ export declare type UserSource = 'google' | 'slack' | 'microsoft' | 'github' | 'jira' | 'confluence';
212
212
  export interface ExternalUser extends User {
213
213
  requiresSourceHydration?: boolean;
214
214
  sources: UserSource[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/user-picker",
3
- "version": "8.3.5",
3
+ "version": "8.4.0",
4
4
  "description": "Fabric component for display a dropdown to select a user from",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -29,6 +29,7 @@
29
29
  "@atlaskit/analytics-next": "^8.2.0",
30
30
  "@atlaskit/avatar": "^20.5.0",
31
31
  "@atlaskit/icon": "^21.10.0",
32
+ "@atlaskit/logo": "^13.5.4",
32
33
  "@atlaskit/lozenge": "^11.0.0",
33
34
  "@atlaskit/popper": "^5.0.0",
34
35
  "@atlaskit/select": "^15.2.0",