@atlaskit/user-picker 11.19.0 → 11.20.1
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 +18 -0
- package/afm-cc/tsconfig.json +1 -1
- package/dist/cjs/analytics.js +1 -1
- package/dist/cjs/components/CustomOption/main.js +1 -3
- package/dist/cjs/components/ExternalUserOption/main.js +1 -2
- package/dist/cjs/components/GroupOption/main.js +0 -1
- package/dist/cjs/components/MultiValue.js +1 -4
- package/dist/cjs/components/SingleValue.js +1 -1
- package/dist/cjs/components/SingleValueContainer.js +1 -2
- package/dist/cjs/components/TeamOption/main.js +1 -3
- package/dist/cjs/components/UserOption.js +1 -2
- package/dist/es2019/analytics.js +1 -1
- package/dist/es2019/components/CustomOption/main.js +1 -3
- package/dist/es2019/components/ExternalUserOption/main.js +1 -2
- package/dist/es2019/components/GroupOption/main.js +0 -1
- package/dist/es2019/components/MultiValue.js +1 -4
- package/dist/es2019/components/SingleValue.js +1 -1
- package/dist/es2019/components/SingleValueContainer.js +1 -2
- package/dist/es2019/components/TeamOption/main.js +1 -3
- package/dist/es2019/components/UserOption.js +1 -2
- package/dist/esm/analytics.js +1 -1
- package/dist/esm/components/CustomOption/main.js +1 -3
- package/dist/esm/components/ExternalUserOption/main.js +1 -2
- package/dist/esm/components/GroupOption/main.js +0 -1
- package/dist/esm/components/MultiValue.js +1 -4
- package/dist/esm/components/SingleValue.js +1 -1
- package/dist/esm/components/SingleValueContainer.js +1 -2
- package/dist/esm/components/TeamOption/main.js +1 -3
- package/dist/esm/components/UserOption.js +1 -2
- package/dist/types/types.d.ts +1 -1
- package/dist/types-ts4.5/types.d.ts +1 -1
- package/package.json +4 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/user-picker
|
|
2
2
|
|
|
3
|
+
## 11.20.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`50a4ae1fff8f0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/50a4ae1fff8f0) -
|
|
8
|
+
FG cleanup for Icon as avatar support
|
|
9
|
+
|
|
10
|
+
## 11.20.0
|
|
11
|
+
|
|
12
|
+
### Minor Changes
|
|
13
|
+
|
|
14
|
+
- [`19a12355991dc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/19a12355991dc) -
|
|
15
|
+
update user types to use PendingInviteUser and improve type safety in invite logic
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 11.19.0
|
|
4
22
|
|
|
5
23
|
### Minor Changes
|
package/afm-cc/tsconfig.json
CHANGED
package/dist/cjs/analytics.js
CHANGED
|
@@ -13,7 +13,7 @@ var _utils = require("./components/utils");
|
|
|
13
13
|
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; }
|
|
14
14
|
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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
15
15
|
var packageName = "@atlaskit/user-picker";
|
|
16
|
-
var packageVersion = "
|
|
16
|
+
var packageVersion = "0.0.0-development";
|
|
17
17
|
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}$/;
|
|
18
18
|
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}$/;
|
|
19
19
|
var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;
|
|
@@ -14,7 +14,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
14
14
|
var _colors = require("@atlaskit/theme/colors");
|
|
15
15
|
var _react = require("@emotion/react");
|
|
16
16
|
var _react2 = _interopRequireDefault(require("react"));
|
|
17
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
18
17
|
var _AvatarItemOption = require("../AvatarItemOption");
|
|
19
18
|
var _HighlightText = require("../HighlightText");
|
|
20
19
|
var _AvatarOrIcon = require("../AvatarOrIcon");
|
|
@@ -64,8 +63,7 @@ var CustomOption = exports.CustomOption = /*#__PURE__*/function (_React$PureComp
|
|
|
64
63
|
avatarUrl = _this$props$data3.avatarUrl,
|
|
65
64
|
icon = _this$props$data3.icon,
|
|
66
65
|
iconColor = _this$props$data3.iconColor;
|
|
67
|
-
|
|
68
|
-
if (icon && (0, _platformFeatureFlags.fg)('atlaskit_user_picker_support_icon')) {
|
|
66
|
+
if (icon) {
|
|
69
67
|
return (0, _react.jsx)(_AvatarOrIcon.AvatarOrIcon, {
|
|
70
68
|
appearance: "big",
|
|
71
69
|
icon: icon,
|
|
@@ -106,8 +106,7 @@ var ExternalUserOptionImpl = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
106
106
|
icon = _this$props$user2.icon,
|
|
107
107
|
iconColor = _this$props$user2.iconColor,
|
|
108
108
|
status = _this$props.status;
|
|
109
|
-
|
|
110
|
-
if (icon && (0, _platformFeatureFlags.fg)('atlaskit_user_picker_support_icon')) {
|
|
109
|
+
if (icon) {
|
|
111
110
|
return (0, _react2.jsx)(_AvatarOrIcon.AvatarOrIcon, {
|
|
112
111
|
appearance: "big",
|
|
113
112
|
icon: icon,
|
|
@@ -23,7 +23,6 @@ var _SizeableAvatar = require("./SizeableAvatar");
|
|
|
23
23
|
var _utils = require("./utils");
|
|
24
24
|
var _peopleGroup = _interopRequireDefault(require("@atlaskit/icon/core/people-group"));
|
|
25
25
|
var _verifiedTeamIcon = require("@atlaskit/people-teams-ui-public/verified-team-icon");
|
|
26
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
27
26
|
var _excluded = ["children", "innerProps"];
|
|
28
27
|
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
|
|
29
28
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /**
|
|
@@ -74,9 +73,7 @@ var MultiValue = exports.MultiValue = /*#__PURE__*/function (_React$Component) {
|
|
|
74
73
|
label: "" // This element is a decorative icon and does not require a label
|
|
75
74
|
}));
|
|
76
75
|
}
|
|
77
|
-
|
|
78
|
-
// Only use icon if feature gate is enabled
|
|
79
|
-
if (data.icon && (0, _platformFeatureFlags.fg)('atlaskit_user_picker_support_icon')) {
|
|
76
|
+
if (data.icon) {
|
|
80
77
|
return (0, _react2.jsx)(_AvatarOrIcon.AvatarOrIcon, {
|
|
81
78
|
appearance: "multi",
|
|
82
79
|
icon: data.icon,
|
|
@@ -43,7 +43,7 @@ var SingleValue = exports.SingleValue = function SingleValue(props) {
|
|
|
43
43
|
isFocused = _props$selectProps.isFocused;
|
|
44
44
|
return !isFocused ? /*#__PURE__*/React.createElement(_select.components.SingleValue, props, /*#__PURE__*/React.createElement(_compiled.Flex, {
|
|
45
45
|
xcss: styles.avatarItem
|
|
46
|
-
}, data.icon
|
|
46
|
+
}, data.icon ? /*#__PURE__*/React.createElement(_AvatarOrIcon.AvatarOrIcon, {
|
|
47
47
|
icon: data.icon,
|
|
48
48
|
iconColor: data.iconColor,
|
|
49
49
|
src: (0, _utils.getAvatarUrl)(data),
|
|
@@ -53,8 +53,7 @@ var SingleValueContainer = exports.SingleValueContainer = /*#__PURE__*/function
|
|
|
53
53
|
placeholderAvatar = _this$props$selectPro.placeholderAvatar;
|
|
54
54
|
if (isFocused || !hasValue) {
|
|
55
55
|
var userData = showUserAvatar(inputValue, value) ? value.data : undefined;
|
|
56
|
-
|
|
57
|
-
if (userData !== null && userData !== void 0 && userData.icon && (0, _platformFeatureFlags.fg)('atlaskit_user_picker_support_icon')) {
|
|
56
|
+
if (userData !== null && userData !== void 0 && userData.icon) {
|
|
58
57
|
return /*#__PURE__*/_react.default.createElement(_AvatarOrIcon.AvatarOrIcon, {
|
|
59
58
|
appearance: appearance,
|
|
60
59
|
icon: userData.icon,
|
|
@@ -18,7 +18,6 @@ var _verifiedTeamIcon = require("@atlaskit/people-teams-ui-public/verified-team-
|
|
|
18
18
|
var _react = require("@emotion/react");
|
|
19
19
|
var _react2 = _interopRequireDefault(require("react"));
|
|
20
20
|
var _reactIntlNext = require("react-intl-next");
|
|
21
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
22
21
|
var _AvatarItemOption = require("../AvatarItemOption");
|
|
23
22
|
var _HighlightText = require("../HighlightText");
|
|
24
23
|
var _i18n = require("../i18n");
|
|
@@ -122,8 +121,7 @@ var TeamOption = exports.TeamOption = /*#__PURE__*/function (_React$PureComponen
|
|
|
122
121
|
avatarUrl = _this$props$team2.avatarUrl,
|
|
123
122
|
icon = _this$props$team2.icon,
|
|
124
123
|
iconColor = _this$props$team2.iconColor;
|
|
125
|
-
|
|
126
|
-
if (icon && (0, _platformFeatureFlags.fg)('atlaskit_user_picker_support_icon')) {
|
|
124
|
+
if (icon) {
|
|
127
125
|
return (0, _react.jsx)(_AvatarOrIcon.AvatarOrIcon, {
|
|
128
126
|
appearance: "big",
|
|
129
127
|
icon: icon,
|
|
@@ -86,8 +86,7 @@ var UserOption = exports.UserOption = /*#__PURE__*/function (_React$PureComponen
|
|
|
86
86
|
iconColor = _this$props$user2.iconColor,
|
|
87
87
|
status = _this$props.status;
|
|
88
88
|
var appearance = (0, _platformFeatureFlags.fg)('platform-component-visual-refresh') ? 'medium' : 'big';
|
|
89
|
-
|
|
90
|
-
if (icon && (0, _platformFeatureFlags.fg)('atlaskit_user_picker_support_icon')) {
|
|
89
|
+
if (icon) {
|
|
91
90
|
return (0, _react.jsx)(_AvatarOrIcon.AvatarOrIcon, {
|
|
92
91
|
appearance: appearance,
|
|
93
92
|
icon: icon,
|
package/dist/es2019/analytics.js
CHANGED
|
@@ -4,7 +4,7 @@ import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
|
4
4
|
import { v4 as uuidv4 } from 'uuid';
|
|
5
5
|
import { isCustom, isExternalUser } from './components/utils';
|
|
6
6
|
const packageName = "@atlaskit/user-picker";
|
|
7
|
-
const packageVersion = "
|
|
7
|
+
const packageVersion = "0.0.0-development";
|
|
8
8
|
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}$/;
|
|
9
9
|
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}$/;
|
|
10
10
|
const UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;
|
|
@@ -7,7 +7,6 @@ import { B400, N800, N200 } from '@atlaskit/theme/colors';
|
|
|
7
7
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
8
8
|
import { jsx } from '@emotion/react';
|
|
9
9
|
import React from 'react';
|
|
10
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
10
|
import { AvatarItemOption, textWrapper } from '../AvatarItemOption';
|
|
12
11
|
import { HighlightText } from '../HighlightText';
|
|
13
12
|
import { AvatarOrIcon } from '../AvatarOrIcon';
|
|
@@ -51,8 +50,7 @@ export class CustomOption extends React.PureComponent {
|
|
|
51
50
|
iconColor
|
|
52
51
|
}
|
|
53
52
|
} = this.props;
|
|
54
|
-
|
|
55
|
-
if (icon && fg('atlaskit_user_picker_support_icon')) {
|
|
53
|
+
if (icon) {
|
|
56
54
|
return jsx(AvatarOrIcon, {
|
|
57
55
|
appearance: "big",
|
|
58
56
|
icon: icon,
|
|
@@ -93,8 +93,7 @@ class ExternalUserOptionImpl extends React.PureComponent {
|
|
|
93
93
|
},
|
|
94
94
|
status
|
|
95
95
|
} = this.props;
|
|
96
|
-
|
|
97
|
-
if (icon && fg('atlaskit_user_picker_support_icon')) {
|
|
96
|
+
if (icon) {
|
|
98
97
|
return jsx(AvatarOrIcon, {
|
|
99
98
|
appearance: "big",
|
|
100
99
|
icon: icon,
|
|
@@ -16,7 +16,6 @@ import { SizeableAvatar } from './SizeableAvatar';
|
|
|
16
16
|
import { getAvatarUrl, isEmail, isGroup, isTeam } from './utils';
|
|
17
17
|
import PeopleIcon from '@atlaskit/icon/core/people-group';
|
|
18
18
|
import { VerifiedTeamIcon } from '@atlaskit/people-teams-ui-public/verified-team-icon';
|
|
19
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
20
19
|
export const scrollToValue = (valueContainer, control) => {
|
|
21
20
|
const {
|
|
22
21
|
top,
|
|
@@ -64,9 +63,7 @@ export class MultiValue extends React.Component {
|
|
|
64
63
|
label: "" // This element is a decorative icon and does not require a label
|
|
65
64
|
}));
|
|
66
65
|
}
|
|
67
|
-
|
|
68
|
-
// Only use icon if feature gate is enabled
|
|
69
|
-
if (data.icon && fg('atlaskit_user_picker_support_icon')) {
|
|
66
|
+
if (data.icon) {
|
|
70
67
|
return jsx(AvatarOrIcon, {
|
|
71
68
|
appearance: "multi",
|
|
72
69
|
icon: data.icon,
|
|
@@ -44,7 +44,7 @@ export const SingleValue = props => {
|
|
|
44
44
|
} = props;
|
|
45
45
|
return !isFocused ? /*#__PURE__*/React.createElement(components.SingleValue, props, /*#__PURE__*/React.createElement(Flex, {
|
|
46
46
|
xcss: styles.avatarItem
|
|
47
|
-
}, data.icon
|
|
47
|
+
}, data.icon ? /*#__PURE__*/React.createElement(AvatarOrIcon, {
|
|
48
48
|
icon: data.icon,
|
|
49
49
|
iconColor: data.iconColor,
|
|
50
50
|
src: getAvatarUrl(data),
|
|
@@ -33,8 +33,7 @@ export class SingleValueContainer extends React.Component {
|
|
|
33
33
|
} = this.props;
|
|
34
34
|
if (isFocused || !hasValue) {
|
|
35
35
|
const userData = showUserAvatar(inputValue, value) ? value.data : undefined;
|
|
36
|
-
|
|
37
|
-
if (userData !== null && userData !== void 0 && userData.icon && fg('atlaskit_user_picker_support_icon')) {
|
|
36
|
+
if (userData !== null && userData !== void 0 && userData.icon) {
|
|
38
37
|
return /*#__PURE__*/React.createElement(AvatarOrIcon, {
|
|
39
38
|
appearance: appearance,
|
|
40
39
|
icon: userData.icon,
|
|
@@ -11,7 +11,6 @@ import { VerifiedTeamIcon } from '@atlaskit/people-teams-ui-public/verified-team
|
|
|
11
11
|
import { jsx } from '@emotion/react';
|
|
12
12
|
import React from 'react';
|
|
13
13
|
import { FormattedMessage } from 'react-intl-next';
|
|
14
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
14
|
import { AvatarItemOption, textWrapper } from '../AvatarItemOption';
|
|
16
15
|
import { HighlightText } from '../HighlightText';
|
|
17
16
|
import { messages } from '../i18n';
|
|
@@ -110,8 +109,7 @@ export class TeamOption extends React.PureComponent {
|
|
|
110
109
|
iconColor
|
|
111
110
|
}
|
|
112
111
|
} = this.props;
|
|
113
|
-
|
|
114
|
-
if (icon && fg('atlaskit_user_picker_support_icon')) {
|
|
112
|
+
if (icon) {
|
|
115
113
|
return jsx(AvatarOrIcon, {
|
|
116
114
|
appearance: "big",
|
|
117
115
|
icon: icon,
|
|
@@ -70,8 +70,7 @@ export class UserOption extends React.PureComponent {
|
|
|
70
70
|
status
|
|
71
71
|
} = this.props;
|
|
72
72
|
const appearance = fg('platform-component-visual-refresh') ? 'medium' : 'big';
|
|
73
|
-
|
|
74
|
-
if (icon && fg('atlaskit_user_picker_support_icon')) {
|
|
73
|
+
if (icon) {
|
|
75
74
|
return jsx(AvatarOrIcon, {
|
|
76
75
|
appearance: appearance,
|
|
77
76
|
icon: icon,
|
package/dist/esm/analytics.js
CHANGED
|
@@ -7,7 +7,7 @@ import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
|
7
7
|
import { v4 as uuidv4 } from 'uuid';
|
|
8
8
|
import { isCustom, isExternalUser } from './components/utils';
|
|
9
9
|
var packageName = "@atlaskit/user-picker";
|
|
10
|
-
var packageVersion = "
|
|
10
|
+
var packageVersion = "0.0.0-development";
|
|
11
11
|
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}$/;
|
|
12
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}$/;
|
|
13
13
|
var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;
|
|
@@ -14,7 +14,6 @@ import { B400, N800, N200 } from '@atlaskit/theme/colors';
|
|
|
14
14
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
15
15
|
import { jsx } from '@emotion/react';
|
|
16
16
|
import React from 'react';
|
|
17
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
18
17
|
import { AvatarItemOption, textWrapper } from '../AvatarItemOption';
|
|
19
18
|
import { HighlightText } from '../HighlightText';
|
|
20
19
|
import { AvatarOrIcon } from '../AvatarOrIcon';
|
|
@@ -59,8 +58,7 @@ export var CustomOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
59
58
|
avatarUrl = _this$props$data3.avatarUrl,
|
|
60
59
|
icon = _this$props$data3.icon,
|
|
61
60
|
iconColor = _this$props$data3.iconColor;
|
|
62
|
-
|
|
63
|
-
if (icon && fg('atlaskit_user_picker_support_icon')) {
|
|
61
|
+
if (icon) {
|
|
64
62
|
return jsx(AvatarOrIcon, {
|
|
65
63
|
appearance: "big",
|
|
66
64
|
icon: icon,
|
|
@@ -102,8 +102,7 @@ var ExternalUserOptionImpl = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
102
102
|
icon = _this$props$user2.icon,
|
|
103
103
|
iconColor = _this$props$user2.iconColor,
|
|
104
104
|
status = _this$props.status;
|
|
105
|
-
|
|
106
|
-
if (icon && fg('atlaskit_user_picker_support_icon')) {
|
|
105
|
+
if (icon) {
|
|
107
106
|
return jsx(AvatarOrIcon, {
|
|
108
107
|
appearance: "big",
|
|
109
108
|
icon: icon,
|
|
@@ -25,7 +25,6 @@ import { SizeableAvatar } from './SizeableAvatar';
|
|
|
25
25
|
import { getAvatarUrl, isEmail, isGroup, isTeam } from './utils';
|
|
26
26
|
import PeopleIcon from '@atlaskit/icon/core/people-group';
|
|
27
27
|
import { VerifiedTeamIcon } from '@atlaskit/people-teams-ui-public/verified-team-icon';
|
|
28
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
29
28
|
export var scrollToValue = function scrollToValue(valueContainer, control) {
|
|
30
29
|
var _valueContainer$getBo = valueContainer.getBoundingClientRect(),
|
|
31
30
|
top = _valueContainer$getBo.top,
|
|
@@ -69,9 +68,7 @@ export var MultiValue = /*#__PURE__*/function (_React$Component) {
|
|
|
69
68
|
label: "" // This element is a decorative icon and does not require a label
|
|
70
69
|
}));
|
|
71
70
|
}
|
|
72
|
-
|
|
73
|
-
// Only use icon if feature gate is enabled
|
|
74
|
-
if (data.icon && fg('atlaskit_user_picker_support_icon')) {
|
|
71
|
+
if (data.icon) {
|
|
75
72
|
return jsx(AvatarOrIcon, {
|
|
76
73
|
appearance: "multi",
|
|
77
74
|
icon: data.icon,
|
|
@@ -35,7 +35,7 @@ export var SingleValue = function SingleValue(props) {
|
|
|
35
35
|
isFocused = _props$selectProps.isFocused;
|
|
36
36
|
return !isFocused ? /*#__PURE__*/React.createElement(components.SingleValue, props, /*#__PURE__*/React.createElement(Flex, {
|
|
37
37
|
xcss: styles.avatarItem
|
|
38
|
-
}, data.icon
|
|
38
|
+
}, data.icon ? /*#__PURE__*/React.createElement(AvatarOrIcon, {
|
|
39
39
|
icon: data.icon,
|
|
40
40
|
iconColor: data.iconColor,
|
|
41
41
|
src: getAvatarUrl(data),
|
|
@@ -46,8 +46,7 @@ export var SingleValueContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
46
46
|
placeholderAvatar = _this$props$selectPro.placeholderAvatar;
|
|
47
47
|
if (isFocused || !hasValue) {
|
|
48
48
|
var userData = showUserAvatar(inputValue, value) ? value.data : undefined;
|
|
49
|
-
|
|
50
|
-
if (userData !== null && userData !== void 0 && userData.icon && fg('atlaskit_user_picker_support_icon')) {
|
|
49
|
+
if (userData !== null && userData !== void 0 && userData.icon) {
|
|
51
50
|
return /*#__PURE__*/React.createElement(AvatarOrIcon, {
|
|
52
51
|
appearance: appearance,
|
|
53
52
|
icon: userData.icon,
|
|
@@ -18,7 +18,6 @@ import { VerifiedTeamIcon } from '@atlaskit/people-teams-ui-public/verified-team
|
|
|
18
18
|
import { jsx } from '@emotion/react';
|
|
19
19
|
import React from 'react';
|
|
20
20
|
import { FormattedMessage } from 'react-intl-next';
|
|
21
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
22
21
|
import { AvatarItemOption, textWrapper } from '../AvatarItemOption';
|
|
23
22
|
import { HighlightText } from '../HighlightText';
|
|
24
23
|
import { messages } from '../i18n';
|
|
@@ -117,8 +116,7 @@ export var TeamOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
117
116
|
avatarUrl = _this$props$team2.avatarUrl,
|
|
118
117
|
icon = _this$props$team2.icon,
|
|
119
118
|
iconColor = _this$props$team2.iconColor;
|
|
120
|
-
|
|
121
|
-
if (icon && fg('atlaskit_user_picker_support_icon')) {
|
|
119
|
+
if (icon) {
|
|
122
120
|
return jsx(AvatarOrIcon, {
|
|
123
121
|
appearance: "big",
|
|
124
122
|
icon: icon,
|
|
@@ -81,8 +81,7 @@ export var UserOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
81
81
|
iconColor = _this$props$user2.iconColor,
|
|
82
82
|
status = _this$props.status;
|
|
83
83
|
var appearance = fg('platform-component-visual-refresh') ? 'medium' : 'big';
|
|
84
|
-
|
|
85
|
-
if (icon && fg('atlaskit_user_picker_support_icon')) {
|
|
84
|
+
if (icon) {
|
|
86
85
|
return jsx(AvatarOrIcon, {
|
|
87
86
|
appearance: appearance,
|
|
88
87
|
icon: icon,
|
package/dist/types/types.d.ts
CHANGED
|
@@ -285,7 +285,7 @@ export interface OptionData {
|
|
|
285
285
|
}
|
|
286
286
|
export declare const UserType = "user";
|
|
287
287
|
export declare const ExternalUserType = "external_user";
|
|
288
|
-
export type UserSource = 'google' | 'slack' | 'microsoft' | 'jira' | 'confluence' | 'other-atlassian';
|
|
288
|
+
export type UserSource = 'google' | 'slack' | 'microsoft' | 'jira' | 'confluence' | 'other-atlassian' | 'email';
|
|
289
289
|
export interface ExternalUser extends User {
|
|
290
290
|
externalUserType?: 'crossSite' | 'thirdParty';
|
|
291
291
|
hasProductAccess?: boolean;
|
|
@@ -288,7 +288,7 @@ export interface OptionData {
|
|
|
288
288
|
}
|
|
289
289
|
export declare const UserType = "user";
|
|
290
290
|
export declare const ExternalUserType = "external_user";
|
|
291
|
-
export type UserSource = 'google' | 'slack' | 'microsoft' | 'jira' | 'confluence' | 'other-atlassian';
|
|
291
|
+
export type UserSource = 'google' | 'slack' | 'microsoft' | 'jira' | 'confluence' | 'other-atlassian' | 'email';
|
|
292
292
|
export interface ExternalUser extends User {
|
|
293
293
|
externalUserType?: 'crossSite' | 'thirdParty';
|
|
294
294
|
hasProductAccess?: boolean;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/user-picker",
|
|
3
|
-
"version": "11.
|
|
3
|
+
"version": "11.20.1",
|
|
4
4
|
"description": "Fabric component for display a dropdown to select a user from",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"@atlaskit/avatar": "^25.7.0",
|
|
48
48
|
"@atlaskit/feature-gate-js-client": "^5.5.0",
|
|
49
49
|
"@atlaskit/icon": "^29.4.0",
|
|
50
|
-
"@atlaskit/logo": "^19.
|
|
50
|
+
"@atlaskit/logo": "^19.10.0",
|
|
51
51
|
"@atlaskit/lozenge": "^13.3.0",
|
|
52
52
|
"@atlaskit/people-teams-ui-public": "^3.7.0",
|
|
53
53
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"@atlaskit/teams-avatar": "^2.4.0",
|
|
59
59
|
"@atlaskit/theme": "^21.0.0",
|
|
60
60
|
"@atlaskit/tokens": "^9.1.0",
|
|
61
|
-
"@atlaskit/tooltip": "^20.
|
|
61
|
+
"@atlaskit/tooltip": "^20.14.0",
|
|
62
62
|
"@atlaskit/ufo": "^0.4.0",
|
|
63
63
|
"@babel/runtime": "^7.0.0",
|
|
64
64
|
"@compiled/react": "^0.18.6",
|
|
@@ -82,8 +82,7 @@
|
|
|
82
82
|
"@emotion/styled": "^11.0.0",
|
|
83
83
|
"@testing-library/dom": "^10.1.0",
|
|
84
84
|
"@testing-library/jest-dom": "^6.4.5",
|
|
85
|
-
"@testing-library/react": "^
|
|
86
|
-
"@testing-library/react-hooks": "^8.0.1",
|
|
85
|
+
"@testing-library/react": "^16.3.0",
|
|
87
86
|
"@testing-library/user-event": "^14.4.3",
|
|
88
87
|
"@types/uuid": "^3.4.4",
|
|
89
88
|
"enzyme": "^3.10.0",
|
|
@@ -124,9 +123,6 @@
|
|
|
124
123
|
},
|
|
125
124
|
"a11y-create-team-is-not-focusable-and-has-no-btn": {
|
|
126
125
|
"type": "boolean"
|
|
127
|
-
},
|
|
128
|
-
"atlaskit_user_picker_support_icon": {
|
|
129
|
-
"type": "boolean"
|
|
130
126
|
}
|
|
131
127
|
}
|
|
132
128
|
}
|