@atlaskit/user-picker 11.13.0 → 11.13.2
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 +15 -0
- package/dist/cjs/analytics.js +1 -1
- package/dist/cjs/components/AddOptionAvatar.js +2 -2
- package/dist/cjs/components/AvatarItemOption.js +44 -1
- package/dist/cjs/components/Control.compiled.css +6 -6
- package/dist/cjs/components/Control.js +3 -3
- package/dist/cjs/components/GroupOption/main.js +1 -22
- package/dist/cjs/components/Input.compiled.css +3 -3
- package/dist/cjs/components/Input.js +1 -1
- package/dist/cjs/components/SingleValue.compiled.css +1 -1
- package/dist/cjs/components/SingleValue.js +1 -1
- package/dist/cjs/components/TeamOption/main.js +8 -38
- package/dist/cjs/components/UserOption.js +12 -1
- package/dist/cjs/components/i18n.js +0 -35
- package/dist/es2019/analytics.js +1 -1
- package/dist/es2019/components/AddOptionAvatar.js +2 -2
- package/dist/es2019/components/AvatarItemOption.js +71 -22
- package/dist/es2019/components/Control.compiled.css +6 -6
- package/dist/es2019/components/Control.js +3 -3
- package/dist/es2019/components/GroupOption/main.js +1 -22
- package/dist/es2019/components/Input.compiled.css +3 -3
- package/dist/es2019/components/Input.js +1 -1
- package/dist/es2019/components/SingleValue.compiled.css +1 -1
- package/dist/es2019/components/SingleValue.js +1 -1
- package/dist/es2019/components/TeamOption/main.js +8 -38
- package/dist/es2019/components/UserOption.js +11 -2
- package/dist/es2019/components/i18n.js +0 -35
- package/dist/esm/analytics.js +1 -1
- package/dist/esm/components/AddOptionAvatar.js +2 -2
- package/dist/esm/components/AvatarItemOption.js +44 -1
- package/dist/esm/components/Control.compiled.css +6 -6
- package/dist/esm/components/Control.js +3 -3
- package/dist/esm/components/GroupOption/main.js +1 -22
- package/dist/esm/components/Input.compiled.css +3 -3
- package/dist/esm/components/Input.js +1 -1
- package/dist/esm/components/SingleValue.compiled.css +1 -1
- package/dist/esm/components/SingleValue.js +1 -1
- package/dist/esm/components/TeamOption/main.js +8 -38
- package/dist/esm/components/UserOption.js +13 -2
- package/dist/esm/components/i18n.js +0 -35
- package/dist/types/components/GroupOption/main.d.ts +0 -1
- package/dist/types/components/TeamOption/main.d.ts +0 -1
- package/dist/types/components/i18n.d.ts +0 -35
- package/dist/types-ts4.5/components/GroupOption/main.d.ts +0 -1
- package/dist/types-ts4.5/components/TeamOption/main.d.ts +0 -1
- package/dist/types-ts4.5/components/i18n.d.ts +0 -35
- package/package.json +9 -6
|
@@ -7,10 +7,10 @@ import { components } from '@atlaskit/select';
|
|
|
7
7
|
import { cx } from '@compiled/react';
|
|
8
8
|
const controlStyles = {
|
|
9
9
|
invalid: "_1h6d1bqt _4cvx1bqt",
|
|
10
|
-
focused: "
|
|
11
|
-
disabled: "
|
|
10
|
+
focused: "_1h6d1v1w _bfhk1j9a _4cvx1v1w _irr31j9a",
|
|
11
|
+
disabled: "_irr3by5v",
|
|
12
12
|
subtle: "_1h6d1j28 _bfhk1j28 _4cvx1j28 _irr31gly",
|
|
13
|
-
root: "_ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf
|
|
13
|
+
root: "_ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _1h6drsbi _bfhk1j9a _p12f1osq _14regrf3 _4cvxrsbi _irr3l4ek _1a98zg3v",
|
|
14
14
|
compact: "_1tke1wug"
|
|
15
15
|
};
|
|
16
16
|
const Control = props => {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _extends from "@babel/runtime/helpers/extends";
|
|
2
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
2
|
/**
|
|
4
3
|
* @jsxRuntime classic
|
|
@@ -10,8 +9,6 @@ import { FormattedMessage } from 'react-intl-next';
|
|
|
10
9
|
import { css, jsx } from '@emotion/react';
|
|
11
10
|
import { N20, B400, N800, N200 } from '@atlaskit/theme/colors';
|
|
12
11
|
import PeopleIcon from '@atlaskit/icon/core/migration/people-group--people';
|
|
13
|
-
import { VerifiedTeamIcon } from '@atlaskit/people-teams-ui-public/verified-team-icon';
|
|
14
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
12
|
import { AvatarItemOption, textWrapper } from '../AvatarItemOption';
|
|
16
13
|
import { messages } from '../i18n';
|
|
17
14
|
import { HighlightText } from '../HighlightText';
|
|
@@ -54,34 +51,16 @@ export class GroupOption extends React.PureComponent {
|
|
|
54
51
|
LEGACY_size: "medium",
|
|
55
52
|
spacing: "spacious"
|
|
56
53
|
})));
|
|
57
|
-
_defineProperty(this, "renderVerifiedIcon", () => {
|
|
58
|
-
return jsx(VerifiedTeamIcon, {
|
|
59
|
-
label: "",
|
|
60
|
-
size: "small",
|
|
61
|
-
spacing: "none"
|
|
62
|
-
});
|
|
63
|
-
});
|
|
64
54
|
_defineProperty(this, "renderByline", () => {
|
|
65
55
|
const {
|
|
66
56
|
isSelected,
|
|
67
57
|
group
|
|
68
58
|
} = this.props;
|
|
69
|
-
const getGroupByline = () => {
|
|
70
|
-
if (fg('confluence_frontend_perms_exp_teams_as_principals')) {
|
|
71
|
-
return jsx(FormattedMessage, _extends({}, messages.adminManagedGroupByline, {
|
|
72
|
-
values: {
|
|
73
|
-
verifiedIcon: this.renderVerifiedIcon()
|
|
74
|
-
}
|
|
75
|
-
}));
|
|
76
|
-
} else {
|
|
77
|
-
return jsx(FormattedMessage, messages.groupByline);
|
|
78
|
-
}
|
|
79
|
-
};
|
|
80
59
|
return jsx("span", {
|
|
81
60
|
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
82
61
|
css: textWrapper(isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text-subtlest, ${N200})`),
|
|
83
62
|
"data-testid": "user-picker-group-secondary-text"
|
|
84
|
-
}, group.byline ? group.byline :
|
|
63
|
+
}, group.byline ? group.byline : jsx(FormattedMessage, messages.groupByline));
|
|
85
64
|
});
|
|
86
65
|
_defineProperty(this, "getLozengeProps", () => typeof this.props.group.lozenge === 'string' ? {
|
|
87
66
|
text: this.props.group.lozenge
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
._1ir3kb7n input::-ms-input-placeholder{opacity:1}
|
|
2
2
|
._1ir3kb7n input::placeholder{opacity:1}
|
|
3
|
-
.
|
|
4
|
-
.
|
|
5
|
-
.
|
|
3
|
+
._5ce61rpy input::-ms-input-placeholder{color:var(--ds-text-subtlest,#6b6e76)}
|
|
4
|
+
._5ce61rpy input::placeholder{color:var(--ds-text-subtlest,#6b6e76)}
|
|
5
|
+
._h5gq1rpy input:-ms-input-placeholder{color:var(--ds-text-subtlest,#6b6e76)}
|
|
@@ -6,7 +6,7 @@ import { ax, ix } from "@compiled/react/runtime";
|
|
|
6
6
|
import React from 'react';
|
|
7
7
|
import { components } from '@atlaskit/select';
|
|
8
8
|
const inputStyles = {
|
|
9
|
-
root: "
|
|
9
|
+
root: "_5ce61rpy _1ir3kb7n _h5gq1rpy"
|
|
10
10
|
};
|
|
11
11
|
export class Input extends React.Component {
|
|
12
12
|
constructor(...args) {
|
|
@@ -10,7 +10,7 @@ import { Box, Flex, Inline } from '@atlaskit/primitives/compiled';
|
|
|
10
10
|
const styles = {
|
|
11
11
|
avatarItem: "_1reo15vq _18m915vq _4cvr1h6o _1ul953f4",
|
|
12
12
|
avatarItemTextWrapper: "_16jlkb7n _1o9zkb7n _i0dl1osq _1ul9idpf _p12f1osq _bozgu2gc _vwz419ii",
|
|
13
|
-
avatarItemText: "
|
|
13
|
+
avatarItemText: "_syazi7uo _1reo15vq _1bto1l2s _o5721q9c"
|
|
14
14
|
};
|
|
15
15
|
const ElementAfter = props => {
|
|
16
16
|
const {
|
|
@@ -7,7 +7,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
|
7
7
|
import { B400, N800, N200 } from '@atlaskit/theme/colors';
|
|
8
8
|
import { Inline } from '@atlaskit/primitives/compiled';
|
|
9
9
|
import { VerifiedTeamIcon } from '@atlaskit/people-teams-ui-public/verified-team-icon';
|
|
10
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
10
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
12
11
|
import { jsx } from '@emotion/react';
|
|
13
12
|
import React from 'react';
|
|
@@ -23,7 +22,8 @@ export class TeamOption extends React.PureComponent {
|
|
|
23
22
|
const {
|
|
24
23
|
team: {
|
|
25
24
|
name,
|
|
26
|
-
highlight
|
|
25
|
+
highlight,
|
|
26
|
+
verified
|
|
27
27
|
}
|
|
28
28
|
} = this.props;
|
|
29
29
|
return [jsx("span", {
|
|
@@ -35,18 +35,16 @@ export class TeamOption extends React.PureComponent {
|
|
|
35
35
|
alignBlock: "center"
|
|
36
36
|
}, jsx(HighlightText, {
|
|
37
37
|
highlights: highlight && highlight.name
|
|
38
|
-
}, name),
|
|
38
|
+
}, name), verified && jsx(VerifiedTeamIcon, null)))];
|
|
39
39
|
});
|
|
40
40
|
_defineProperty(this, "renderByline", () => {
|
|
41
41
|
const {
|
|
42
42
|
isSelected,
|
|
43
43
|
team: {
|
|
44
44
|
memberCount,
|
|
45
|
-
includesYou
|
|
46
|
-
verified
|
|
45
|
+
includesYou
|
|
47
46
|
}
|
|
48
47
|
} = this.props;
|
|
49
|
-
const isVerified = fg('confluence_frontend_perms_exp_teams_as_principals') && verified;
|
|
50
48
|
|
|
51
49
|
// if Member count is missing, do not show the byline, regardless of the availability of includesYou
|
|
52
50
|
if (memberCount === null || typeof memberCount === 'undefined') {
|
|
@@ -54,18 +52,9 @@ export class TeamOption extends React.PureComponent {
|
|
|
54
52
|
} else {
|
|
55
53
|
if (includesYou === true) {
|
|
56
54
|
if (memberCount > 50) {
|
|
57
|
-
return this.getBylineComponent(isSelected,
|
|
58
|
-
values: {
|
|
59
|
-
verifiedIcon: this.renderVerifiedIcon()
|
|
60
|
-
}
|
|
61
|
-
})) : jsx(FormattedMessage, messages.plus50MembersWithYou));
|
|
55
|
+
return this.getBylineComponent(isSelected, jsx(FormattedMessage, messages.plus50MembersWithYou));
|
|
62
56
|
} else {
|
|
63
|
-
return this.getBylineComponent(isSelected,
|
|
64
|
-
values: {
|
|
65
|
-
verifiedIcon: this.renderVerifiedIcon(),
|
|
66
|
-
count: memberCount
|
|
67
|
-
}
|
|
68
|
-
})) : jsx(FormattedMessage, _extends({}, messages.memberCountWithYou, {
|
|
57
|
+
return this.getBylineComponent(isSelected, jsx(FormattedMessage, _extends({}, messages.memberCountWithYou, {
|
|
69
58
|
values: {
|
|
70
59
|
count: memberCount
|
|
71
60
|
}
|
|
@@ -73,18 +62,9 @@ export class TeamOption extends React.PureComponent {
|
|
|
73
62
|
}
|
|
74
63
|
} else {
|
|
75
64
|
if (memberCount > 50) {
|
|
76
|
-
return this.getBylineComponent(isSelected,
|
|
77
|
-
values: {
|
|
78
|
-
verifiedIcon: this.renderVerifiedIcon()
|
|
79
|
-
}
|
|
80
|
-
})) : jsx(FormattedMessage, messages.plus50MembersWithoutYou));
|
|
65
|
+
return this.getBylineComponent(isSelected, jsx(FormattedMessage, messages.plus50MembersWithoutYou));
|
|
81
66
|
} else {
|
|
82
|
-
return this.getBylineComponent(isSelected,
|
|
83
|
-
values: {
|
|
84
|
-
verifiedIcon: this.renderVerifiedIcon(),
|
|
85
|
-
count: memberCount
|
|
86
|
-
}
|
|
87
|
-
})) : jsx(FormattedMessage, _extends({}, messages.memberCountWithoutYou, {
|
|
67
|
+
return this.getBylineComponent(isSelected, jsx(FormattedMessage, _extends({}, messages.memberCountWithoutYou, {
|
|
88
68
|
values: {
|
|
89
69
|
count: memberCount
|
|
90
70
|
}
|
|
@@ -110,16 +90,6 @@ export class TeamOption extends React.PureComponent {
|
|
|
110
90
|
type: "team"
|
|
111
91
|
});
|
|
112
92
|
});
|
|
113
|
-
_defineProperty(this, "renderVerifiedIcon", () => {
|
|
114
|
-
if (this.props.team.verified) {
|
|
115
|
-
return jsx(VerifiedTeamIcon, {
|
|
116
|
-
label: "",
|
|
117
|
-
size: "small",
|
|
118
|
-
spacing: "none"
|
|
119
|
-
});
|
|
120
|
-
}
|
|
121
|
-
return undefined;
|
|
122
|
-
});
|
|
123
93
|
_defineProperty(this, "getLozengeProps", () => typeof this.props.team.lozenge === 'string' ? {
|
|
124
94
|
text: this.props.team.lozenge
|
|
125
95
|
} : this.props.team.lozenge);
|
|
@@ -6,13 +6,21 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
|
6
6
|
import { getAppearanceForAppType } from '@atlaskit/avatar';
|
|
7
7
|
import { B400, N800, N200 } from '@atlaskit/theme/colors';
|
|
8
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
9
|
-
import { jsx } from '@emotion/react';
|
|
9
|
+
import { css, jsx } from '@emotion/react';
|
|
10
10
|
import React from 'react';
|
|
11
11
|
import { AvatarItemOption, textWrapper } from './AvatarItemOption';
|
|
12
12
|
import { HighlightText } from './HighlightText';
|
|
13
13
|
import { SizeableAvatar } from './SizeableAvatar';
|
|
14
14
|
import { hasValue } from './utils';
|
|
15
15
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
16
|
+
const styles = color => css({
|
|
17
|
+
display: 'inline',
|
|
18
|
+
verticalAlign: 'top',
|
|
19
|
+
overflow: 'hidden',
|
|
20
|
+
whiteSpace: 'nowrap',
|
|
21
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
|
|
22
|
+
color
|
|
23
|
+
});
|
|
16
24
|
export class UserOption extends React.PureComponent {
|
|
17
25
|
constructor(...args) {
|
|
18
26
|
super(...args);
|
|
@@ -33,11 +41,12 @@ export class UserOption extends React.PureComponent {
|
|
|
33
41
|
highlights: highlight && highlight.name
|
|
34
42
|
}, name))];
|
|
35
43
|
if (hasValue(publicName) && name.trim() !== publicName.trim()) {
|
|
44
|
+
const color = this.props.isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text-subtlest, ${N200})`;
|
|
36
45
|
result.push(jsx(React.Fragment, {
|
|
37
46
|
key: "publicName"
|
|
38
47
|
}, ' ', jsx("span", {
|
|
39
48
|
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
40
|
-
css:
|
|
49
|
+
css: fg('platform_user_picker_firefox_tab_fix') ? styles(color) : textWrapper(color)
|
|
41
50
|
}, "(", jsx(HighlightText, {
|
|
42
51
|
highlights: highlight && highlight.publicName
|
|
43
52
|
}, publicName), ")")));
|
|
@@ -25,26 +25,6 @@ export const messages = defineMessages({
|
|
|
25
25
|
defaultMessage: 'Something went wrong',
|
|
26
26
|
description: 'Error message to display when options fail to load.'
|
|
27
27
|
},
|
|
28
|
-
teamByline: {
|
|
29
|
-
id: 'fabric.elements.user-picker.team.byline',
|
|
30
|
-
defaultMessage: 'Team',
|
|
31
|
-
description: 'Byline for team'
|
|
32
|
-
},
|
|
33
|
-
officialTeamByline: {
|
|
34
|
-
id: 'fabric.elements.user-picker.team.byline.official',
|
|
35
|
-
defaultMessage: 'Official team {verifiedIcon}',
|
|
36
|
-
description: 'Byline for official team'
|
|
37
|
-
},
|
|
38
|
-
officialMemberCountWithoutYou: {
|
|
39
|
-
id: 'fabric.elements.user-picker.team.member.count.official',
|
|
40
|
-
defaultMessage: 'Official team {verifiedIcon} • {count} {count, plural, one {member} other {members}}',
|
|
41
|
-
description: 'Byline to show the number of members in the team when the current user is not a member of the team'
|
|
42
|
-
},
|
|
43
|
-
officialMemberCountWithYou: {
|
|
44
|
-
id: 'fabric.elements.user-picker.team.member.count.official.including.you',
|
|
45
|
-
defaultMessage: 'Official team {verifiedIcon} • {count} {count, plural, one {member} other {members}}, including you',
|
|
46
|
-
description: 'Byline to show the number of members in the team when the current user is also a member of the team'
|
|
47
|
-
},
|
|
48
28
|
memberCountWithoutYou: {
|
|
49
29
|
id: 'fabric.elements.user-picker.team.member.count',
|
|
50
30
|
defaultMessage: 'Team • {count} {count, plural, one {member} other {members}}',
|
|
@@ -55,16 +35,6 @@ export const messages = defineMessages({
|
|
|
55
35
|
defaultMessage: 'Team • {count} {count, plural, one {member} other {members}}, including you',
|
|
56
36
|
description: 'Byline to show the number of members in the team when the current user is also a member of the team'
|
|
57
37
|
},
|
|
58
|
-
officialPlus50MembersWithoutYou: {
|
|
59
|
-
id: 'fabric.elements.user-picker.team.member.50plus.official',
|
|
60
|
-
defaultMessage: 'Official team {verifiedIcon} • 50+ members',
|
|
61
|
-
description: 'Byline to show the number of members in the team when the number exceeds 50'
|
|
62
|
-
},
|
|
63
|
-
officialPlus50MembersWithYou: {
|
|
64
|
-
id: 'fabric.elements.user-picker.team.member.50plus.official.including.you',
|
|
65
|
-
defaultMessage: 'Official team {verifiedIcon} • 50+ members, including you',
|
|
66
|
-
description: 'Byline to show the number of members in the team when the number exceeds 50 and also includes the current user'
|
|
67
|
-
},
|
|
68
38
|
plus50MembersWithoutYou: {
|
|
69
39
|
id: 'fabric.elements.user-picker.team.member.50plus',
|
|
70
40
|
defaultMessage: 'Team • 50+ members',
|
|
@@ -90,11 +60,6 @@ export const messages = defineMessages({
|
|
|
90
60
|
defaultMessage: 'Enter an email address',
|
|
91
61
|
description: 'Byline for a potentially valid email option.'
|
|
92
62
|
},
|
|
93
|
-
adminManagedGroupByline: {
|
|
94
|
-
id: 'fabric.elements.user-picker.group.byline.admin-managed',
|
|
95
|
-
defaultMessage: 'Admin group {verifiedIcon}',
|
|
96
|
-
description: 'Byline for admin-managed groups with verified icon'
|
|
97
|
-
},
|
|
98
63
|
groupByline: {
|
|
99
64
|
id: 'fabric.elements.user-picker.group.byline',
|
|
100
65
|
defaultMessage: 'Admin-managed group',
|
package/dist/esm/analytics.js
CHANGED
|
@@ -6,7 +6,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
|
|
|
6
6
|
import { v4 as uuidv4 } from 'uuid';
|
|
7
7
|
import { isCustom, isExternalUser } from './components/utils';
|
|
8
8
|
var packageName = "@atlaskit/user-picker";
|
|
9
|
-
var packageVersion = "11.
|
|
9
|
+
var packageVersion = "11.13.1";
|
|
10
10
|
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}$/;
|
|
11
11
|
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}$/;
|
|
12
12
|
var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;
|
|
@@ -10,7 +10,7 @@ import React from 'react';
|
|
|
10
10
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
11
|
var getEmailAvatarWrapperStyle = function getEmailAvatarWrapperStyle(isLozenge, isPendingAction) {
|
|
12
12
|
var padding = isLozenge ? "var(--ds-space-0, 0px)" : "var(--ds-space-050, 4px)";
|
|
13
|
-
var backgroundColor = isPendingAction && fg('twcg-444-invite-usd-improvements-m2-gate') ? "var(--ds-background-warning, #
|
|
13
|
+
var backgroundColor = isPendingAction && fg('twcg-444-invite-usd-improvements-m2-gate') ? "var(--ds-background-warning, #FFF5DB)" : "var(--ds-background-neutral, ".concat(N40, ")");
|
|
14
14
|
return css({
|
|
15
15
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
16
16
|
padding: padding,
|
|
@@ -35,7 +35,7 @@ export var AddOptionAvatar = function AddOptionAvatar(_ref) {
|
|
|
35
35
|
label: label || '',
|
|
36
36
|
LEGACY_size: isLozenge ? 'small' : 'medium',
|
|
37
37
|
LEGACY_margin: "0 0 0 -2px",
|
|
38
|
-
color: isPendingAction && fg('twcg-444-invite-usd-improvements-m2-gate') ? "var(--ds-text-warning, #
|
|
38
|
+
color: isPendingAction && fg('twcg-444-invite-usd-improvements-m2-gate') ? "var(--ds-text-warning, #9E4C00)" : "var(--ds-text-subtle, ".concat(N500, ")")
|
|
39
39
|
}))
|
|
40
40
|
);
|
|
41
41
|
};
|
|
@@ -10,6 +10,7 @@ import React from 'react';
|
|
|
10
10
|
import { css, jsx } from '@emotion/react';
|
|
11
11
|
import Lozenge from '@atlaskit/lozenge';
|
|
12
12
|
import { isLozengeText } from './utils';
|
|
13
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
14
|
var AsyncTooltip = /*#__PURE__*/React.lazy(function () {
|
|
14
15
|
return import( /* webpackChunkName: "@atlaskit-internal_@atlaskit/tooltip" */'@atlaskit/tooltip').then(function (module) {
|
|
15
16
|
return {
|
|
@@ -18,6 +19,20 @@ var AsyncTooltip = /*#__PURE__*/React.lazy(function () {
|
|
|
18
19
|
});
|
|
19
20
|
});
|
|
20
21
|
var wrapper = function wrapper(isDisabled) {
|
|
22
|
+
if (fg('platform_user_picker_firefox_tab_fix')) {
|
|
23
|
+
return css({
|
|
24
|
+
alignItems: 'center',
|
|
25
|
+
boxSizing: 'border-box',
|
|
26
|
+
display: 'flex',
|
|
27
|
+
outline: 'none',
|
|
28
|
+
margin: 0,
|
|
29
|
+
width: '100%',
|
|
30
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
31
|
+
cursor: isDisabled ? 'not-allowed' : 'pointer',
|
|
32
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
33
|
+
opacity: isDisabled ? "var(--ds-opacity-disabled, 0.4)" : undefined
|
|
34
|
+
});
|
|
35
|
+
}
|
|
21
36
|
return css({
|
|
22
37
|
alignItems: 'center',
|
|
23
38
|
boxSizing: 'border-box',
|
|
@@ -40,10 +55,26 @@ var optionWrapper = css({
|
|
|
40
55
|
lineHeight: '1.4',
|
|
41
56
|
paddingLeft: "var(--ds-space-100, 8px)"
|
|
42
57
|
});
|
|
58
|
+
var optionWrapperFix = css({
|
|
59
|
+
display: 'inline-block',
|
|
60
|
+
overflow: 'hidden',
|
|
61
|
+
minWidth: 0,
|
|
62
|
+
maxWidth: '100%',
|
|
63
|
+
paddingLeft: "var(--ds-space-100, 8px)"
|
|
64
|
+
});
|
|
43
65
|
var getTextStyle = function getTextStyle(isSecondary) {
|
|
44
66
|
var secondaryCssArgs = isSecondary ? {
|
|
45
67
|
font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
46
68
|
} : {};
|
|
69
|
+
if (fg('platform_user_picker_firefox_tab_fix')) {
|
|
70
|
+
return css(_objectSpread({
|
|
71
|
+
margin: 0,
|
|
72
|
+
maxWidth: '100%',
|
|
73
|
+
overflow: 'hidden',
|
|
74
|
+
textOverflow: 'ellipsis',
|
|
75
|
+
whiteSpace: 'nowrap'
|
|
76
|
+
}, secondaryCssArgs));
|
|
77
|
+
}
|
|
47
78
|
return css(_objectSpread({
|
|
48
79
|
margin: 0,
|
|
49
80
|
overflowX: 'hidden',
|
|
@@ -56,6 +87,18 @@ var additionalInfo = css({
|
|
|
56
87
|
marginLeft: "var(--ds-space-100, 8px)"
|
|
57
88
|
});
|
|
58
89
|
export var textWrapper = function textWrapper(color) {
|
|
90
|
+
if (fg('platform_user_picker_firefox_tab_fix')) {
|
|
91
|
+
return css({
|
|
92
|
+
display: 'inline-block',
|
|
93
|
+
verticalAlign: 'bottom',
|
|
94
|
+
maxWidth: '100%',
|
|
95
|
+
overflow: 'hidden',
|
|
96
|
+
textOverflow: 'ellipsis',
|
|
97
|
+
whiteSpace: 'nowrap',
|
|
98
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
99
|
+
color: color
|
|
100
|
+
});
|
|
101
|
+
}
|
|
59
102
|
return css({
|
|
60
103
|
overflow: 'hidden',
|
|
61
104
|
textOverflow: 'ellipsis',
|
|
@@ -90,7 +133,7 @@ export var AvatarItemOption = function AvatarItemOption(_ref) {
|
|
|
90
133
|
jsx("span", {
|
|
91
134
|
css: wrapper(isDisabled)
|
|
92
135
|
}, avatar, jsx("div", {
|
|
93
|
-
css: optionWrapper
|
|
136
|
+
css: fg('platform_user_picker_firefox_tab_fix') ? optionWrapperFix : optionWrapper
|
|
94
137
|
}, jsx("div", null, jsx("div", {
|
|
95
138
|
css: getTextStyle()
|
|
96
139
|
}, primaryText), secondaryText && jsx("div", {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
|
|
2
2
|
._1h6d1bqt{border-color:var(--ds-border-danger,#e2483d)}
|
|
3
|
-
._1h6d1elr{border-color:var(--ds-border-input,#8590a2)}
|
|
4
3
|
._1h6d1j28{border-color:transparent}
|
|
5
|
-
.
|
|
4
|
+
._1h6d1v1w{border-color:var(--ds-border-focused,#4688ec)}
|
|
5
|
+
._1h6drsbi{border-color:var(--ds-border-input,#8c8f97)}._14regrf3 .fabric-user-picker__clear-indicator{opacity:0!important}
|
|
6
6
|
._19bvidpf{padding-left:0}
|
|
7
7
|
._1a98zg3v:hover .fabric-user-picker__clear-indicator{opacity:1!important}
|
|
8
8
|
._1tke1wug{min-height:auto}
|
|
@@ -13,10 +13,10 @@
|
|
|
13
13
|
._p12f1osq{max-width:100%}
|
|
14
14
|
._u5f3idpf{padding-right:0}
|
|
15
15
|
._4cvx1bqt:hover{border-color:var(--ds-border-danger,#e2483d)}
|
|
16
|
-
._4cvx1elr:hover{border-color:var(--ds-border-input,#8590a2)}
|
|
17
16
|
._4cvx1j28:hover{border-color:transparent}
|
|
18
|
-
.
|
|
19
|
-
.
|
|
17
|
+
._4cvx1v1w:hover{border-color:var(--ds-border-focused,#4688ec)}
|
|
18
|
+
._4cvxrsbi:hover{border-color:var(--ds-border-input,#8c8f97)}
|
|
20
19
|
._irr31gly:hover{background-color:var(--ds-background-danger,#ffeceb)}
|
|
21
20
|
._irr31j9a:hover{background-color:var(--ds-background-input,#fff)}
|
|
22
|
-
.
|
|
21
|
+
._irr3by5v:hover{background-color:var(--ds-background-disabled,#17171708)}
|
|
22
|
+
._irr3l4ek:hover{background-color:var(--ds-background-input-hovered,#f8f8f8)}
|
|
@@ -7,10 +7,10 @@ import { components } from '@atlaskit/select';
|
|
|
7
7
|
import { cx } from '@compiled/react';
|
|
8
8
|
var controlStyles = {
|
|
9
9
|
invalid: "_1h6d1bqt _4cvx1bqt",
|
|
10
|
-
focused: "
|
|
11
|
-
disabled: "
|
|
10
|
+
focused: "_1h6d1v1w _bfhk1j9a _4cvx1v1w _irr31j9a",
|
|
11
|
+
disabled: "_irr3by5v",
|
|
12
12
|
subtle: "_1h6d1j28 _bfhk1j28 _4cvx1j28 _irr31gly",
|
|
13
|
-
root: "_ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf
|
|
13
|
+
root: "_ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _1h6drsbi _bfhk1j9a _p12f1osq _14regrf3 _4cvxrsbi _irr3l4ek _1a98zg3v",
|
|
14
14
|
compact: "_1tke1wug"
|
|
15
15
|
};
|
|
16
16
|
var Control = function Control(props) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _extends from "@babel/runtime/helpers/extends";
|
|
2
1
|
import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
|
|
3
2
|
import _createClass from "@babel/runtime/helpers/createClass";
|
|
4
3
|
import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
|
|
@@ -17,8 +16,6 @@ import { FormattedMessage } from 'react-intl-next';
|
|
|
17
16
|
import { css, jsx } from '@emotion/react';
|
|
18
17
|
import { N20, B400, N800, N200 } from '@atlaskit/theme/colors';
|
|
19
18
|
import PeopleIcon from '@atlaskit/icon/core/migration/people-group--people';
|
|
20
|
-
import { VerifiedTeamIcon } from '@atlaskit/people-teams-ui-public/verified-team-icon';
|
|
21
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
22
19
|
import { AvatarItemOption, textWrapper } from '../AvatarItemOption';
|
|
23
20
|
import { messages } from '../i18n';
|
|
24
21
|
import { HighlightText } from '../HighlightText';
|
|
@@ -66,33 +63,15 @@ export var GroupOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
66
63
|
spacing: "spacious"
|
|
67
64
|
}));
|
|
68
65
|
});
|
|
69
|
-
_defineProperty(_this, "renderVerifiedIcon", function () {
|
|
70
|
-
return jsx(VerifiedTeamIcon, {
|
|
71
|
-
label: "",
|
|
72
|
-
size: "small",
|
|
73
|
-
spacing: "none"
|
|
74
|
-
});
|
|
75
|
-
});
|
|
76
66
|
_defineProperty(_this, "renderByline", function () {
|
|
77
67
|
var _this$props2 = _this.props,
|
|
78
68
|
isSelected = _this$props2.isSelected,
|
|
79
69
|
group = _this$props2.group;
|
|
80
|
-
var getGroupByline = function getGroupByline() {
|
|
81
|
-
if (fg('confluence_frontend_perms_exp_teams_as_principals')) {
|
|
82
|
-
return jsx(FormattedMessage, _extends({}, messages.adminManagedGroupByline, {
|
|
83
|
-
values: {
|
|
84
|
-
verifiedIcon: _this.renderVerifiedIcon()
|
|
85
|
-
}
|
|
86
|
-
}));
|
|
87
|
-
} else {
|
|
88
|
-
return jsx(FormattedMessage, messages.groupByline);
|
|
89
|
-
}
|
|
90
|
-
};
|
|
91
70
|
return jsx("span", {
|
|
92
71
|
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
93
72
|
css: textWrapper(isSelected ? "var(--ds-text-selected, ".concat(B400, ")") : "var(--ds-text-subtlest, ".concat(N200, ")")),
|
|
94
73
|
"data-testid": "user-picker-group-secondary-text"
|
|
95
|
-
}, group.byline ? group.byline :
|
|
74
|
+
}, group.byline ? group.byline : jsx(FormattedMessage, messages.groupByline));
|
|
96
75
|
});
|
|
97
76
|
_defineProperty(_this, "getLozengeProps", function () {
|
|
98
77
|
return typeof _this.props.group.lozenge === 'string' ? {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
._1ir3kb7n input::-ms-input-placeholder{opacity:1}
|
|
2
2
|
._1ir3kb7n input::placeholder{opacity:1}
|
|
3
|
-
.
|
|
4
|
-
.
|
|
5
|
-
.
|
|
3
|
+
._5ce61rpy input::-ms-input-placeholder{color:var(--ds-text-subtlest,#6b6e76)}
|
|
4
|
+
._5ce61rpy input::placeholder{color:var(--ds-text-subtlest,#6b6e76)}
|
|
5
|
+
._h5gq1rpy input:-ms-input-placeholder{color:var(--ds-text-subtlest,#6b6e76)}
|
|
@@ -13,7 +13,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
13
13
|
import React from 'react';
|
|
14
14
|
import { components } from '@atlaskit/select';
|
|
15
15
|
var inputStyles = {
|
|
16
|
-
root: "
|
|
16
|
+
root: "_5ce61rpy _1ir3kb7n _h5gq1rpy"
|
|
17
17
|
};
|
|
18
18
|
export var Input = /*#__PURE__*/function (_React$Component) {
|
|
19
19
|
function Input() {
|
|
@@ -10,7 +10,7 @@ import { Box, Flex, Inline } from '@atlaskit/primitives/compiled';
|
|
|
10
10
|
var styles = {
|
|
11
11
|
avatarItem: "_1reo15vq _18m915vq _4cvr1h6o _1ul953f4",
|
|
12
12
|
avatarItemTextWrapper: "_16jlkb7n _1o9zkb7n _i0dl1osq _1ul9idpf _p12f1osq _bozgu2gc _vwz419ii",
|
|
13
|
-
avatarItemText: "
|
|
13
|
+
avatarItemText: "_syazi7uo _1reo15vq _1bto1l2s _o5721q9c"
|
|
14
14
|
};
|
|
15
15
|
var ElementAfter = function ElementAfter(props) {
|
|
16
16
|
var data = props.data.data;
|
|
@@ -14,7 +14,6 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
14
14
|
import { B400, N800, N200 } from '@atlaskit/theme/colors';
|
|
15
15
|
import { Inline } from '@atlaskit/primitives/compiled';
|
|
16
16
|
import { VerifiedTeamIcon } from '@atlaskit/people-teams-ui-public/verified-team-icon';
|
|
17
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
18
17
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
19
18
|
import { jsx } from '@emotion/react';
|
|
20
19
|
import React from 'react';
|
|
@@ -34,7 +33,8 @@ export var TeamOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
34
33
|
_defineProperty(_this, "getPrimaryText", function () {
|
|
35
34
|
var _this$props$team = _this.props.team,
|
|
36
35
|
name = _this$props$team.name,
|
|
37
|
-
highlight = _this$props$team.highlight
|
|
36
|
+
highlight = _this$props$team.highlight,
|
|
37
|
+
verified = _this$props$team.verified;
|
|
38
38
|
return [jsx("span", {
|
|
39
39
|
key: "name"
|
|
40
40
|
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
@@ -44,16 +44,14 @@ export var TeamOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
44
44
|
alignBlock: "center"
|
|
45
45
|
}, jsx(HighlightText, {
|
|
46
46
|
highlights: highlight && highlight.name
|
|
47
|
-
}, name),
|
|
47
|
+
}, name), verified && jsx(VerifiedTeamIcon, null)))];
|
|
48
48
|
});
|
|
49
49
|
_defineProperty(_this, "renderByline", function () {
|
|
50
50
|
var _this$props = _this.props,
|
|
51
51
|
isSelected = _this$props.isSelected,
|
|
52
52
|
_this$props$team2 = _this$props.team,
|
|
53
53
|
memberCount = _this$props$team2.memberCount,
|
|
54
|
-
includesYou = _this$props$team2.includesYou
|
|
55
|
-
verified = _this$props$team2.verified;
|
|
56
|
-
var isVerified = fg('confluence_frontend_perms_exp_teams_as_principals') && verified;
|
|
54
|
+
includesYou = _this$props$team2.includesYou;
|
|
57
55
|
|
|
58
56
|
// if Member count is missing, do not show the byline, regardless of the availability of includesYou
|
|
59
57
|
if (memberCount === null || typeof memberCount === 'undefined') {
|
|
@@ -61,18 +59,9 @@ export var TeamOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
61
59
|
} else {
|
|
62
60
|
if (includesYou === true) {
|
|
63
61
|
if (memberCount > 50) {
|
|
64
|
-
return _this.getBylineComponent(isSelected,
|
|
65
|
-
values: {
|
|
66
|
-
verifiedIcon: _this.renderVerifiedIcon()
|
|
67
|
-
}
|
|
68
|
-
})) : jsx(FormattedMessage, messages.plus50MembersWithYou));
|
|
62
|
+
return _this.getBylineComponent(isSelected, jsx(FormattedMessage, messages.plus50MembersWithYou));
|
|
69
63
|
} else {
|
|
70
|
-
return _this.getBylineComponent(isSelected,
|
|
71
|
-
values: {
|
|
72
|
-
verifiedIcon: _this.renderVerifiedIcon(),
|
|
73
|
-
count: memberCount
|
|
74
|
-
}
|
|
75
|
-
})) : jsx(FormattedMessage, _extends({}, messages.memberCountWithYou, {
|
|
64
|
+
return _this.getBylineComponent(isSelected, jsx(FormattedMessage, _extends({}, messages.memberCountWithYou, {
|
|
76
65
|
values: {
|
|
77
66
|
count: memberCount
|
|
78
67
|
}
|
|
@@ -80,18 +69,9 @@ export var TeamOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
80
69
|
}
|
|
81
70
|
} else {
|
|
82
71
|
if (memberCount > 50) {
|
|
83
|
-
return _this.getBylineComponent(isSelected,
|
|
84
|
-
values: {
|
|
85
|
-
verifiedIcon: _this.renderVerifiedIcon()
|
|
86
|
-
}
|
|
87
|
-
})) : jsx(FormattedMessage, messages.plus50MembersWithoutYou));
|
|
72
|
+
return _this.getBylineComponent(isSelected, jsx(FormattedMessage, messages.plus50MembersWithoutYou));
|
|
88
73
|
} else {
|
|
89
|
-
return _this.getBylineComponent(isSelected,
|
|
90
|
-
values: {
|
|
91
|
-
verifiedIcon: _this.renderVerifiedIcon(),
|
|
92
|
-
count: memberCount
|
|
93
|
-
}
|
|
94
|
-
})) : jsx(FormattedMessage, _extends({}, messages.memberCountWithoutYou, {
|
|
74
|
+
return _this.getBylineComponent(isSelected, jsx(FormattedMessage, _extends({}, messages.memberCountWithoutYou, {
|
|
95
75
|
values: {
|
|
96
76
|
count: memberCount
|
|
97
77
|
}
|
|
@@ -115,16 +95,6 @@ export var TeamOption = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
115
95
|
type: "team"
|
|
116
96
|
});
|
|
117
97
|
});
|
|
118
|
-
_defineProperty(_this, "renderVerifiedIcon", function () {
|
|
119
|
-
if (_this.props.team.verified) {
|
|
120
|
-
return jsx(VerifiedTeamIcon, {
|
|
121
|
-
label: "",
|
|
122
|
-
size: "small",
|
|
123
|
-
spacing: "none"
|
|
124
|
-
});
|
|
125
|
-
}
|
|
126
|
-
return undefined;
|
|
127
|
-
});
|
|
128
98
|
_defineProperty(_this, "getLozengeProps", function () {
|
|
129
99
|
return typeof _this.props.team.lozenge === 'string' ? {
|
|
130
100
|
text: _this.props.team.lozenge
|