@atlaskit/rovo-agent-components 2.5.0 → 2.6.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 +20 -0
- package/dist/cjs/ui/agent-avatar/generated-avatars/assets/workflow-builder.js +35 -25
- package/dist/cjs/ui/agent-avatar/index.compiled.css +2 -0
- package/dist/cjs/ui/agent-avatar/index.js +3 -1
- package/dist/es2019/ui/agent-avatar/generated-avatars/assets/workflow-builder.js +35 -25
- package/dist/es2019/ui/agent-avatar/index.compiled.css +2 -0
- package/dist/es2019/ui/agent-avatar/index.js +3 -1
- package/dist/esm/ui/agent-avatar/generated-avatars/assets/workflow-builder.js +35 -25
- package/dist/esm/ui/agent-avatar/index.compiled.css +2 -0
- package/dist/esm/ui/agent-avatar/index.js +3 -1
- package/package.json +5 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @atlaskit/rovo-agent-components
|
|
2
2
|
|
|
3
|
+
## 2.6.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#137721](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/137721)
|
|
8
|
+
[`37f0da49fa1ba`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/37f0da49fa1ba) -
|
|
9
|
+
Prevent agent avatar from squishing when next to longer text in the AgentCard
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
15
|
+
## 2.5.1
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- [#137252](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/137252)
|
|
20
|
+
[`a2f2ec2381e22`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a2f2ec2381e22) -
|
|
21
|
+
Change non-production icon to use new design icon
|
|
22
|
+
|
|
3
23
|
## 2.5.0
|
|
4
24
|
|
|
5
25
|
### Minor Changes
|
|
@@ -14,37 +14,47 @@ var _default = exports.default = function _default(_ref) {
|
|
|
14
14
|
return /*#__PURE__*/_react.default.createElement("svg", {
|
|
15
15
|
width: size,
|
|
16
16
|
height: size,
|
|
17
|
-
viewBox: "0 0
|
|
17
|
+
viewBox: "0 0 42 48",
|
|
18
18
|
fill: "none",
|
|
19
19
|
xmlns: "http://www.w3.org/2000/svg"
|
|
20
20
|
}, /*#__PURE__*/_react.default.createElement("path", {
|
|
21
|
-
d: "
|
|
22
|
-
fill: "#
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
21
|
+
d: "M19.0069 1.14492C20.241 0.435704 21.759 0.435705 22.9931 1.14493L39.9931 10.9147C41.2346 11.6282 42 12.9509 42 14.3828V33.8905C42 35.3224 41.2346 36.6451 39.9931 37.3586L22.9931 47.1284C21.759 47.8376 20.241 47.8376 19.0069 47.1284L2.00691 37.3586C0.765414 36.6451 0 35.3224 0 33.8905V14.3828C0 12.9509 0.765415 11.6282 2.00691 10.9147L19.0069 1.14492Z",
|
|
22
|
+
fill: "#1868DB"
|
|
23
|
+
}), /*#__PURE__*/_react.default.createElement("mask", {
|
|
24
|
+
id: "mask0_0_281",
|
|
25
|
+
style: {
|
|
26
|
+
maskType: 'luminance'
|
|
27
|
+
},
|
|
28
|
+
maskUnits: "userSpaceOnUse",
|
|
29
|
+
x: "0",
|
|
30
|
+
y: "0",
|
|
31
|
+
width: "43",
|
|
32
|
+
height: "48"
|
|
33
|
+
}, /*#__PURE__*/_react.default.createElement("path", {
|
|
34
|
+
d: "M19.01 1.13248C20.24 0.422476 21.76 0.422476 23 1.13248L40 10.9025C41.24 11.6125 42.01 12.9425 42.01 14.3725V33.8825C42.01 35.3125 41.24 36.6325 40 37.3525L23 47.1225C21.77 47.8325 20.25 47.8325 19.01 47.1225L2.01 37.3525C0.769998 36.6425 0 35.3125 0 33.8825V14.3725C0 12.9425 0.769998 11.6225 2.01 10.9025L19.01 1.13248Z",
|
|
29
35
|
fill: "white"
|
|
36
|
+
})), /*#__PURE__*/_react.default.createElement("g", {
|
|
37
|
+
mask: "url(#mask0_0_281)"
|
|
38
|
+
}, /*#__PURE__*/_react.default.createElement("path", {
|
|
39
|
+
d: "M67.9198 6.94275H34.8398V28.2528H67.9198V6.94275Z",
|
|
40
|
+
fill: "#101214"
|
|
41
|
+
}), /*#__PURE__*/_react.default.createElement("path", {
|
|
42
|
+
d: "M17.7915 14.9025C16.1615 14.9625 16.1615 15.5225 17.7915 15.5725C20.1015 15.6525 22.5415 15.7025 25.6615 15.7025C26.5415 15.7025 27.2515 15.6825 27.8715 15.6825C28.4515 15.6825 28.9415 15.7625 29.3815 15.8425C30.2515 16.0525 31.0215 16.3125 31.8915 17.0325C32.6215 17.6225 33.2915 18.5825 33.3815 19.6925C33.4915 20.8025 32.9615 21.9425 32.1415 22.6825C31.3315 23.4425 30.3215 23.8725 29.4815 24.0725C28.6315 24.2825 27.9415 24.2725 27.5515 24.2725H26.8215C25.9515 24.2725 23.5915 24.2925 20.6315 24.3225C19.8815 24.3325 19.1515 24.3125 18.2715 24.3625C17.4215 24.4325 16.5515 24.6325 15.7315 25.0025C14.9115 25.3625 14.1315 25.8825 13.5015 26.5625C12.8715 27.2425 12.4215 28.1225 12.2815 29.0525C12.0915 30.3725 12.5515 31.5925 13.1915 32.4125C13.8315 33.2525 14.6015 33.7925 15.3215 34.1525C16.7715 34.8725 17.9715 34.9625 18.7615 34.9925C22.3415 34.9925 24.9815 34.9225 27.6015 34.8225C29.0315 34.7625 29.0315 34.2725 27.6015 34.2225C24.9915 34.1125 22.3215 34.0725 18.7815 34.0625C18.1315 34.0425 17.0915 33.9225 15.9315 33.3325C15.3515 33.0425 14.7515 32.6225 14.2415 32.0325C13.7515 31.4425 13.3615 30.6825 13.3315 29.8225C13.3115 29.2625 13.4215 28.7025 13.6615 28.1825C14.1615 27.0425 15.3615 26.1125 16.6715 25.6725C17.9915 25.1925 19.4115 25.3025 20.7015 25.2725C23.2515 25.2725 25.0915 25.2725 25.0915 25.2725C25.0915 25.2725 25.7815 25.2725 26.8815 25.2725C27.4215 25.2725 28.1115 25.2925 28.8715 25.1725C29.6215 25.0525 30.4415 24.8125 31.2315 24.4125C32.0115 24.0025 32.7615 23.4125 33.3315 22.6525C33.9015 21.8925 34.2215 20.9225 34.2215 19.9925C34.2115 19.0525 33.8715 18.1725 33.4115 17.5125C32.9515 16.8425 32.3815 16.3625 31.8615 16.0225C30.2815 14.9925 28.8615 14.8425 27.8415 14.7925C26.8315 14.7725 26.1715 14.7925 25.6515 14.7925C22.5215 14.7925 20.0915 14.8425 17.7815 14.9225L17.7915 14.9025Z",
|
|
43
|
+
fill: "#8FB8F6"
|
|
30
44
|
}), /*#__PURE__*/_react.default.createElement("path", {
|
|
31
|
-
d: "
|
|
32
|
-
fill: "#
|
|
45
|
+
d: "M14.9112 -4.70731C13.5212 -4.64731 13.5212 -4.08731 14.9112 -4.03731C16.8812 -3.95731 18.9412 -3.90731 21.6012 -3.90731C23.1012 -3.91731 24.0412 -3.95731 24.8612 -3.98731C25.6312 -4.00731 26.3112 -3.96731 27.2312 -3.66731C28.0012 -3.40731 28.8712 -2.95731 29.5412 -2.24731C30.2312 -1.55731 30.6512 -0.607309 30.6512 0.292691C30.6512 1.20269 30.2812 2.00269 29.8212 2.54269C29.3712 3.09269 28.8912 3.41269 28.6212 3.58269C28.4612 3.68269 28.2912 3.77269 28.1312 3.87269C27.1312 5.12269 20.6212 4.51269 14.8612 4.83269C12.7712 5.19269 11.2412 6.25269 10.4312 7.39269C9.60116 8.55269 9.50115 9.69269 9.56115 10.4027C9.72115 12.1527 10.8312 13.3527 11.9112 14.0427C13.0212 14.7527 14.1912 15.0727 15.3512 15.1427C16.6312 15.1727 16.5712 14.6827 15.4212 14.5427C14.3612 14.3727 13.3312 14.0027 12.3912 13.3327C11.4712 12.6827 10.6112 11.6627 10.5012 10.3127C10.4612 9.80269 10.5412 8.95269 11.1712 8.08269C11.7912 7.22269 12.9412 6.39269 14.4912 6.01269C15.0012 5.90269 15.5112 5.80269 16.0312 5.77269C18.4012 5.66269 21.1912 5.64269 23.3512 5.63269C23.8912 5.63269 24.3912 5.63269 24.8512 5.63269C25.3212 5.63269 25.7412 5.59269 26.0912 5.54269C26.7812 5.44269 27.1712 5.31269 27.1712 5.31269C27.1712 5.31269 27.3212 5.28269 27.5812 5.18269C27.8412 5.09269 28.2212 4.94269 28.6612 4.71269C29.5112 4.24269 30.7112 3.36269 31.2712 1.87269C31.5412 1.14269 31.6112 0.292691 31.4412 -0.507309C31.2712 -1.30731 30.8612 -2.04731 30.3412 -2.62731C29.3012 -3.79731 27.9412 -4.34731 26.9512 -4.60731C26.1912 -4.79731 25.5112 -4.85731 24.9212 -4.86731C24.3612 -4.86731 23.8712 -4.86731 23.4512 -4.86731C22.6112 -4.86731 22.0412 -4.86731 21.6012 -4.86731C18.9512 -4.86731 16.8812 -4.81731 14.9112 -4.73731V-4.70731Z",
|
|
46
|
+
fill: "#8FB8F6"
|
|
33
47
|
}), /*#__PURE__*/_react.default.createElement("path", {
|
|
34
|
-
d: "
|
|
35
|
-
fill: "#
|
|
48
|
+
d: "M25.9427 33.8326C24.5227 33.7826 24.5927 34.3526 25.8627 34.5026C26.7627 34.6526 27.6527 34.9626 28.4927 35.4926C29.3127 36.0126 30.1127 36.7926 30.4527 37.8726C30.8227 39.1026 30.5327 39.9526 30.2427 40.5826C29.9027 41.2126 29.4827 41.7226 28.7127 42.2426C28.0627 42.6826 27.1727 43.0226 26.2127 43.1826C25.2727 43.3526 24.2027 43.2426 23.1927 43.2426C21.1827 43.1926 19.4227 43.1526 18.7427 43.1326H18.1327C17.7727 43.1326 17.1027 43.1426 16.2127 43.1526C15.2727 43.1726 14.0827 43.3426 12.8827 43.9126C11.7027 44.4526 10.4627 45.4426 9.87266 46.9026C9.25266 48.3626 9.60266 50.1726 10.5627 51.3326C11.2227 52.1826 12.0427 52.7126 12.7927 53.0726C13.5527 53.4326 14.2827 53.6326 14.9327 53.7326C16.2627 53.9126 17.1527 53.8126 17.7827 53.8326C20.7327 53.8326 22.9327 53.7626 25.0927 53.6526C26.2827 53.5926 26.2827 53.1026 25.0927 53.0526C22.9327 52.9526 20.7327 52.9026 17.7827 52.9026C17.2227 52.8826 16.2927 52.9226 15.2427 52.7626C14.1927 52.5726 12.8427 52.1226 11.7727 51.0526C11.4227 50.7126 11.1327 50.3226 10.9227 49.9026C10.4427 49.0026 10.4327 47.8026 10.9627 46.8326C11.4827 45.8526 12.4327 45.1526 13.3227 44.7426C14.2227 44.3226 15.0927 44.2026 15.7027 44.1426C16.3027 44.1126 16.6927 44.1226 16.6927 44.1226C16.6927 44.1226 18.9627 44.1226 21.7227 44.1226C22.4127 44.1226 23.1327 44.1226 23.8527 44.1226C24.5627 44.1226 25.3127 44.1526 26.0427 44.0426C27.5027 43.8526 28.7727 43.2326 29.5827 42.5926C30.8127 41.6326 31.3227 40.4526 31.4627 39.5726C31.6127 38.6726 31.4527 38.0426 31.3127 37.5926C30.8627 36.2126 29.8727 35.3126 28.9127 34.7526C27.9327 34.1826 26.9127 33.9126 25.9227 33.8326H25.9427Z",
|
|
49
|
+
fill: "#8FB8F6"
|
|
36
50
|
}), /*#__PURE__*/_react.default.createElement("path", {
|
|
37
|
-
d: "
|
|
38
|
-
fill: "#
|
|
39
|
-
}), /*#__PURE__*/_react.default.createElement("
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
cx: "8.44342",
|
|
46
|
-
cy: "10.0948",
|
|
47
|
-
r: "1.27936",
|
|
48
|
-
fill: "black"
|
|
51
|
+
d: "M7.13078 20.8827H-25.9492V42.1927H7.13078V20.8827Z",
|
|
52
|
+
fill: "#101214"
|
|
53
|
+
}), /*#__PURE__*/_react.default.createElement("path", {
|
|
54
|
+
d: "M24.3608 9.74268H7.14078V20.8427H24.3608V9.74268Z",
|
|
55
|
+
fill: "white"
|
|
56
|
+
}), /*#__PURE__*/_react.default.createElement("path", {
|
|
57
|
+
d: "M34.8489 28.4027H17.6289V39.5027H34.8489V28.4027Z",
|
|
58
|
+
fill: "white"
|
|
49
59
|
})));
|
|
50
60
|
};
|
|
@@ -13,6 +13,7 @@ var _runtime = require("@compiled/react/runtime");
|
|
|
13
13
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
14
14
|
var _reactIntlNext = require("react-intl-next");
|
|
15
15
|
var _avatar = require("@atlaskit/avatar");
|
|
16
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
17
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
17
18
|
var _generatedAvatars = require("./generated-avatars");
|
|
18
19
|
var _messages = require("./messages");
|
|
@@ -22,6 +23,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
22
23
|
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; }
|
|
23
24
|
var styles = {
|
|
24
25
|
agentAvatar: "_1e0c1txw _1bah1h6o _4cvr1h6o _mkrz1k6g",
|
|
26
|
+
agentAvatarPreventSquish: "_1e0c1txw _1bah1h6o _4cvr1h6o _mkrz1k6g _1ul9zwfg _1tkezwfg",
|
|
25
27
|
image: "_5ral1dfr _4t3i1osq _1bsb1osq",
|
|
26
28
|
avatarContentContainer: "_1bsb1osq _4t3i1osq _1e0c1txw _1bah1h6o _4cvr1h6o"
|
|
27
29
|
};
|
|
@@ -46,7 +48,7 @@ var AgentAvatar = exports.AgentAvatar = function AgentAvatar(_ref) {
|
|
|
46
48
|
var imgUrl = isForgeAgent && forgeAgentIconUrl ? forgeAgentIconUrl : imageUrl;
|
|
47
49
|
return /*#__PURE__*/React.createElement(_compiled.Box, {
|
|
48
50
|
"aria-label": label,
|
|
49
|
-
xcss: styles.agentAvatar,
|
|
51
|
+
xcss: (0, _platformFeatureFlags.fg)('rovo_chat_bugfix_agent_avatar_squish') ? styles.agentAvatarPreventSquish : styles.agentAvatar,
|
|
50
52
|
style: _objectSpread({
|
|
51
53
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values
|
|
52
54
|
height: _avatar.AVATAR_SIZES[size],
|
|
@@ -7,36 +7,46 @@ export default (({
|
|
|
7
7
|
}) => /*#__PURE__*/React.createElement("svg", {
|
|
8
8
|
width: size,
|
|
9
9
|
height: size,
|
|
10
|
-
viewBox: "0 0
|
|
10
|
+
viewBox: "0 0 42 48",
|
|
11
11
|
fill: "none",
|
|
12
12
|
xmlns: "http://www.w3.org/2000/svg"
|
|
13
13
|
}, /*#__PURE__*/React.createElement("path", {
|
|
14
|
-
d: "
|
|
15
|
-
fill: "#
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
14
|
+
d: "M19.0069 1.14492C20.241 0.435704 21.759 0.435705 22.9931 1.14493L39.9931 10.9147C41.2346 11.6282 42 12.9509 42 14.3828V33.8905C42 35.3224 41.2346 36.6451 39.9931 37.3586L22.9931 47.1284C21.759 47.8376 20.241 47.8376 19.0069 47.1284L2.00691 37.3586C0.765414 36.6451 0 35.3224 0 33.8905V14.3828C0 12.9509 0.765415 11.6282 2.00691 10.9147L19.0069 1.14492Z",
|
|
15
|
+
fill: "#1868DB"
|
|
16
|
+
}), /*#__PURE__*/React.createElement("mask", {
|
|
17
|
+
id: "mask0_0_281",
|
|
18
|
+
style: {
|
|
19
|
+
maskType: 'luminance'
|
|
20
|
+
},
|
|
21
|
+
maskUnits: "userSpaceOnUse",
|
|
22
|
+
x: "0",
|
|
23
|
+
y: "0",
|
|
24
|
+
width: "43",
|
|
25
|
+
height: "48"
|
|
26
|
+
}, /*#__PURE__*/React.createElement("path", {
|
|
27
|
+
d: "M19.01 1.13248C20.24 0.422476 21.76 0.422476 23 1.13248L40 10.9025C41.24 11.6125 42.01 12.9425 42.01 14.3725V33.8825C42.01 35.3125 41.24 36.6325 40 37.3525L23 47.1225C21.77 47.8325 20.25 47.8325 19.01 47.1225L2.01 37.3525C0.769998 36.6425 0 35.3125 0 33.8825V14.3725C0 12.9425 0.769998 11.6225 2.01 10.9025L19.01 1.13248Z",
|
|
22
28
|
fill: "white"
|
|
29
|
+
})), /*#__PURE__*/React.createElement("g", {
|
|
30
|
+
mask: "url(#mask0_0_281)"
|
|
31
|
+
}, /*#__PURE__*/React.createElement("path", {
|
|
32
|
+
d: "M67.9198 6.94275H34.8398V28.2528H67.9198V6.94275Z",
|
|
33
|
+
fill: "#101214"
|
|
34
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
35
|
+
d: "M17.7915 14.9025C16.1615 14.9625 16.1615 15.5225 17.7915 15.5725C20.1015 15.6525 22.5415 15.7025 25.6615 15.7025C26.5415 15.7025 27.2515 15.6825 27.8715 15.6825C28.4515 15.6825 28.9415 15.7625 29.3815 15.8425C30.2515 16.0525 31.0215 16.3125 31.8915 17.0325C32.6215 17.6225 33.2915 18.5825 33.3815 19.6925C33.4915 20.8025 32.9615 21.9425 32.1415 22.6825C31.3315 23.4425 30.3215 23.8725 29.4815 24.0725C28.6315 24.2825 27.9415 24.2725 27.5515 24.2725H26.8215C25.9515 24.2725 23.5915 24.2925 20.6315 24.3225C19.8815 24.3325 19.1515 24.3125 18.2715 24.3625C17.4215 24.4325 16.5515 24.6325 15.7315 25.0025C14.9115 25.3625 14.1315 25.8825 13.5015 26.5625C12.8715 27.2425 12.4215 28.1225 12.2815 29.0525C12.0915 30.3725 12.5515 31.5925 13.1915 32.4125C13.8315 33.2525 14.6015 33.7925 15.3215 34.1525C16.7715 34.8725 17.9715 34.9625 18.7615 34.9925C22.3415 34.9925 24.9815 34.9225 27.6015 34.8225C29.0315 34.7625 29.0315 34.2725 27.6015 34.2225C24.9915 34.1125 22.3215 34.0725 18.7815 34.0625C18.1315 34.0425 17.0915 33.9225 15.9315 33.3325C15.3515 33.0425 14.7515 32.6225 14.2415 32.0325C13.7515 31.4425 13.3615 30.6825 13.3315 29.8225C13.3115 29.2625 13.4215 28.7025 13.6615 28.1825C14.1615 27.0425 15.3615 26.1125 16.6715 25.6725C17.9915 25.1925 19.4115 25.3025 20.7015 25.2725C23.2515 25.2725 25.0915 25.2725 25.0915 25.2725C25.0915 25.2725 25.7815 25.2725 26.8815 25.2725C27.4215 25.2725 28.1115 25.2925 28.8715 25.1725C29.6215 25.0525 30.4415 24.8125 31.2315 24.4125C32.0115 24.0025 32.7615 23.4125 33.3315 22.6525C33.9015 21.8925 34.2215 20.9225 34.2215 19.9925C34.2115 19.0525 33.8715 18.1725 33.4115 17.5125C32.9515 16.8425 32.3815 16.3625 31.8615 16.0225C30.2815 14.9925 28.8615 14.8425 27.8415 14.7925C26.8315 14.7725 26.1715 14.7925 25.6515 14.7925C22.5215 14.7925 20.0915 14.8425 17.7815 14.9225L17.7915 14.9025Z",
|
|
36
|
+
fill: "#8FB8F6"
|
|
23
37
|
}), /*#__PURE__*/React.createElement("path", {
|
|
24
|
-
d: "
|
|
25
|
-
fill: "#
|
|
38
|
+
d: "M14.9112 -4.70731C13.5212 -4.64731 13.5212 -4.08731 14.9112 -4.03731C16.8812 -3.95731 18.9412 -3.90731 21.6012 -3.90731C23.1012 -3.91731 24.0412 -3.95731 24.8612 -3.98731C25.6312 -4.00731 26.3112 -3.96731 27.2312 -3.66731C28.0012 -3.40731 28.8712 -2.95731 29.5412 -2.24731C30.2312 -1.55731 30.6512 -0.607309 30.6512 0.292691C30.6512 1.20269 30.2812 2.00269 29.8212 2.54269C29.3712 3.09269 28.8912 3.41269 28.6212 3.58269C28.4612 3.68269 28.2912 3.77269 28.1312 3.87269C27.1312 5.12269 20.6212 4.51269 14.8612 4.83269C12.7712 5.19269 11.2412 6.25269 10.4312 7.39269C9.60116 8.55269 9.50115 9.69269 9.56115 10.4027C9.72115 12.1527 10.8312 13.3527 11.9112 14.0427C13.0212 14.7527 14.1912 15.0727 15.3512 15.1427C16.6312 15.1727 16.5712 14.6827 15.4212 14.5427C14.3612 14.3727 13.3312 14.0027 12.3912 13.3327C11.4712 12.6827 10.6112 11.6627 10.5012 10.3127C10.4612 9.80269 10.5412 8.95269 11.1712 8.08269C11.7912 7.22269 12.9412 6.39269 14.4912 6.01269C15.0012 5.90269 15.5112 5.80269 16.0312 5.77269C18.4012 5.66269 21.1912 5.64269 23.3512 5.63269C23.8912 5.63269 24.3912 5.63269 24.8512 5.63269C25.3212 5.63269 25.7412 5.59269 26.0912 5.54269C26.7812 5.44269 27.1712 5.31269 27.1712 5.31269C27.1712 5.31269 27.3212 5.28269 27.5812 5.18269C27.8412 5.09269 28.2212 4.94269 28.6612 4.71269C29.5112 4.24269 30.7112 3.36269 31.2712 1.87269C31.5412 1.14269 31.6112 0.292691 31.4412 -0.507309C31.2712 -1.30731 30.8612 -2.04731 30.3412 -2.62731C29.3012 -3.79731 27.9412 -4.34731 26.9512 -4.60731C26.1912 -4.79731 25.5112 -4.85731 24.9212 -4.86731C24.3612 -4.86731 23.8712 -4.86731 23.4512 -4.86731C22.6112 -4.86731 22.0412 -4.86731 21.6012 -4.86731C18.9512 -4.86731 16.8812 -4.81731 14.9112 -4.73731V-4.70731Z",
|
|
39
|
+
fill: "#8FB8F6"
|
|
26
40
|
}), /*#__PURE__*/React.createElement("path", {
|
|
27
|
-
d: "
|
|
28
|
-
fill: "#
|
|
41
|
+
d: "M25.9427 33.8326C24.5227 33.7826 24.5927 34.3526 25.8627 34.5026C26.7627 34.6526 27.6527 34.9626 28.4927 35.4926C29.3127 36.0126 30.1127 36.7926 30.4527 37.8726C30.8227 39.1026 30.5327 39.9526 30.2427 40.5826C29.9027 41.2126 29.4827 41.7226 28.7127 42.2426C28.0627 42.6826 27.1727 43.0226 26.2127 43.1826C25.2727 43.3526 24.2027 43.2426 23.1927 43.2426C21.1827 43.1926 19.4227 43.1526 18.7427 43.1326H18.1327C17.7727 43.1326 17.1027 43.1426 16.2127 43.1526C15.2727 43.1726 14.0827 43.3426 12.8827 43.9126C11.7027 44.4526 10.4627 45.4426 9.87266 46.9026C9.25266 48.3626 9.60266 50.1726 10.5627 51.3326C11.2227 52.1826 12.0427 52.7126 12.7927 53.0726C13.5527 53.4326 14.2827 53.6326 14.9327 53.7326C16.2627 53.9126 17.1527 53.8126 17.7827 53.8326C20.7327 53.8326 22.9327 53.7626 25.0927 53.6526C26.2827 53.5926 26.2827 53.1026 25.0927 53.0526C22.9327 52.9526 20.7327 52.9026 17.7827 52.9026C17.2227 52.8826 16.2927 52.9226 15.2427 52.7626C14.1927 52.5726 12.8427 52.1226 11.7727 51.0526C11.4227 50.7126 11.1327 50.3226 10.9227 49.9026C10.4427 49.0026 10.4327 47.8026 10.9627 46.8326C11.4827 45.8526 12.4327 45.1526 13.3227 44.7426C14.2227 44.3226 15.0927 44.2026 15.7027 44.1426C16.3027 44.1126 16.6927 44.1226 16.6927 44.1226C16.6927 44.1226 18.9627 44.1226 21.7227 44.1226C22.4127 44.1226 23.1327 44.1226 23.8527 44.1226C24.5627 44.1226 25.3127 44.1526 26.0427 44.0426C27.5027 43.8526 28.7727 43.2326 29.5827 42.5926C30.8127 41.6326 31.3227 40.4526 31.4627 39.5726C31.6127 38.6726 31.4527 38.0426 31.3127 37.5926C30.8627 36.2126 29.8727 35.3126 28.9127 34.7526C27.9327 34.1826 26.9127 33.9126 25.9227 33.8326H25.9427Z",
|
|
42
|
+
fill: "#8FB8F6"
|
|
29
43
|
}), /*#__PURE__*/React.createElement("path", {
|
|
30
|
-
d: "
|
|
31
|
-
fill: "#
|
|
32
|
-
}), /*#__PURE__*/React.createElement("
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
cx: "8.44342",
|
|
39
|
-
cy: "10.0948",
|
|
40
|
-
r: "1.27936",
|
|
41
|
-
fill: "black"
|
|
44
|
+
d: "M7.13078 20.8827H-25.9492V42.1927H7.13078V20.8827Z",
|
|
45
|
+
fill: "#101214"
|
|
46
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
47
|
+
d: "M24.3608 9.74268H7.14078V20.8427H24.3608V9.74268Z",
|
|
48
|
+
fill: "white"
|
|
49
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
50
|
+
d: "M34.8489 28.4027H17.6289V39.5027H34.8489V28.4027Z",
|
|
51
|
+
fill: "white"
|
|
42
52
|
}))));
|
|
@@ -4,11 +4,13 @@ import * as React from 'react';
|
|
|
4
4
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
5
|
import { useIntl } from 'react-intl-next';
|
|
6
6
|
import { AVATAR_SIZES } from '@atlaskit/avatar';
|
|
7
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
8
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
8
9
|
import { GeneratedAvatar } from './generated-avatars';
|
|
9
10
|
import { messages } from './messages';
|
|
10
11
|
const styles = {
|
|
11
12
|
agentAvatar: "_1e0c1txw _1bah1h6o _4cvr1h6o _mkrz1k6g",
|
|
13
|
+
agentAvatarPreventSquish: "_1e0c1txw _1bah1h6o _4cvr1h6o _mkrz1k6g _1ul9zwfg _1tkezwfg",
|
|
12
14
|
image: "_5ral1dfr _4t3i1osq _1bsb1osq",
|
|
13
15
|
avatarContentContainer: "_1bsb1osq _4t3i1osq _1e0c1txw _1bah1h6o _4cvr1h6o"
|
|
14
16
|
};
|
|
@@ -33,7 +35,7 @@ export const AgentAvatar = ({
|
|
|
33
35
|
const imgUrl = isForgeAgent && forgeAgentIconUrl ? forgeAgentIconUrl : imageUrl;
|
|
34
36
|
return /*#__PURE__*/React.createElement(Box, {
|
|
35
37
|
"aria-label": label,
|
|
36
|
-
xcss: styles.agentAvatar,
|
|
38
|
+
xcss: fg('rovo_chat_bugfix_agent_avatar_squish') ? styles.agentAvatarPreventSquish : styles.agentAvatar,
|
|
37
39
|
style: {
|
|
38
40
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values
|
|
39
41
|
height: AVATAR_SIZES[size],
|
|
@@ -7,37 +7,47 @@ export default (function (_ref) {
|
|
|
7
7
|
return /*#__PURE__*/React.createElement("svg", {
|
|
8
8
|
width: size,
|
|
9
9
|
height: size,
|
|
10
|
-
viewBox: "0 0
|
|
10
|
+
viewBox: "0 0 42 48",
|
|
11
11
|
fill: "none",
|
|
12
12
|
xmlns: "http://www.w3.org/2000/svg"
|
|
13
13
|
}, /*#__PURE__*/React.createElement("path", {
|
|
14
|
-
d: "
|
|
15
|
-
fill: "#
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
14
|
+
d: "M19.0069 1.14492C20.241 0.435704 21.759 0.435705 22.9931 1.14493L39.9931 10.9147C41.2346 11.6282 42 12.9509 42 14.3828V33.8905C42 35.3224 41.2346 36.6451 39.9931 37.3586L22.9931 47.1284C21.759 47.8376 20.241 47.8376 19.0069 47.1284L2.00691 37.3586C0.765414 36.6451 0 35.3224 0 33.8905V14.3828C0 12.9509 0.765415 11.6282 2.00691 10.9147L19.0069 1.14492Z",
|
|
15
|
+
fill: "#1868DB"
|
|
16
|
+
}), /*#__PURE__*/React.createElement("mask", {
|
|
17
|
+
id: "mask0_0_281",
|
|
18
|
+
style: {
|
|
19
|
+
maskType: 'luminance'
|
|
20
|
+
},
|
|
21
|
+
maskUnits: "userSpaceOnUse",
|
|
22
|
+
x: "0",
|
|
23
|
+
y: "0",
|
|
24
|
+
width: "43",
|
|
25
|
+
height: "48"
|
|
26
|
+
}, /*#__PURE__*/React.createElement("path", {
|
|
27
|
+
d: "M19.01 1.13248C20.24 0.422476 21.76 0.422476 23 1.13248L40 10.9025C41.24 11.6125 42.01 12.9425 42.01 14.3725V33.8825C42.01 35.3125 41.24 36.6325 40 37.3525L23 47.1225C21.77 47.8325 20.25 47.8325 19.01 47.1225L2.01 37.3525C0.769998 36.6425 0 35.3125 0 33.8825V14.3725C0 12.9425 0.769998 11.6225 2.01 10.9025L19.01 1.13248Z",
|
|
22
28
|
fill: "white"
|
|
29
|
+
})), /*#__PURE__*/React.createElement("g", {
|
|
30
|
+
mask: "url(#mask0_0_281)"
|
|
31
|
+
}, /*#__PURE__*/React.createElement("path", {
|
|
32
|
+
d: "M67.9198 6.94275H34.8398V28.2528H67.9198V6.94275Z",
|
|
33
|
+
fill: "#101214"
|
|
34
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
35
|
+
d: "M17.7915 14.9025C16.1615 14.9625 16.1615 15.5225 17.7915 15.5725C20.1015 15.6525 22.5415 15.7025 25.6615 15.7025C26.5415 15.7025 27.2515 15.6825 27.8715 15.6825C28.4515 15.6825 28.9415 15.7625 29.3815 15.8425C30.2515 16.0525 31.0215 16.3125 31.8915 17.0325C32.6215 17.6225 33.2915 18.5825 33.3815 19.6925C33.4915 20.8025 32.9615 21.9425 32.1415 22.6825C31.3315 23.4425 30.3215 23.8725 29.4815 24.0725C28.6315 24.2825 27.9415 24.2725 27.5515 24.2725H26.8215C25.9515 24.2725 23.5915 24.2925 20.6315 24.3225C19.8815 24.3325 19.1515 24.3125 18.2715 24.3625C17.4215 24.4325 16.5515 24.6325 15.7315 25.0025C14.9115 25.3625 14.1315 25.8825 13.5015 26.5625C12.8715 27.2425 12.4215 28.1225 12.2815 29.0525C12.0915 30.3725 12.5515 31.5925 13.1915 32.4125C13.8315 33.2525 14.6015 33.7925 15.3215 34.1525C16.7715 34.8725 17.9715 34.9625 18.7615 34.9925C22.3415 34.9925 24.9815 34.9225 27.6015 34.8225C29.0315 34.7625 29.0315 34.2725 27.6015 34.2225C24.9915 34.1125 22.3215 34.0725 18.7815 34.0625C18.1315 34.0425 17.0915 33.9225 15.9315 33.3325C15.3515 33.0425 14.7515 32.6225 14.2415 32.0325C13.7515 31.4425 13.3615 30.6825 13.3315 29.8225C13.3115 29.2625 13.4215 28.7025 13.6615 28.1825C14.1615 27.0425 15.3615 26.1125 16.6715 25.6725C17.9915 25.1925 19.4115 25.3025 20.7015 25.2725C23.2515 25.2725 25.0915 25.2725 25.0915 25.2725C25.0915 25.2725 25.7815 25.2725 26.8815 25.2725C27.4215 25.2725 28.1115 25.2925 28.8715 25.1725C29.6215 25.0525 30.4415 24.8125 31.2315 24.4125C32.0115 24.0025 32.7615 23.4125 33.3315 22.6525C33.9015 21.8925 34.2215 20.9225 34.2215 19.9925C34.2115 19.0525 33.8715 18.1725 33.4115 17.5125C32.9515 16.8425 32.3815 16.3625 31.8615 16.0225C30.2815 14.9925 28.8615 14.8425 27.8415 14.7925C26.8315 14.7725 26.1715 14.7925 25.6515 14.7925C22.5215 14.7925 20.0915 14.8425 17.7815 14.9225L17.7915 14.9025Z",
|
|
36
|
+
fill: "#8FB8F6"
|
|
23
37
|
}), /*#__PURE__*/React.createElement("path", {
|
|
24
|
-
d: "
|
|
25
|
-
fill: "#
|
|
38
|
+
d: "M14.9112 -4.70731C13.5212 -4.64731 13.5212 -4.08731 14.9112 -4.03731C16.8812 -3.95731 18.9412 -3.90731 21.6012 -3.90731C23.1012 -3.91731 24.0412 -3.95731 24.8612 -3.98731C25.6312 -4.00731 26.3112 -3.96731 27.2312 -3.66731C28.0012 -3.40731 28.8712 -2.95731 29.5412 -2.24731C30.2312 -1.55731 30.6512 -0.607309 30.6512 0.292691C30.6512 1.20269 30.2812 2.00269 29.8212 2.54269C29.3712 3.09269 28.8912 3.41269 28.6212 3.58269C28.4612 3.68269 28.2912 3.77269 28.1312 3.87269C27.1312 5.12269 20.6212 4.51269 14.8612 4.83269C12.7712 5.19269 11.2412 6.25269 10.4312 7.39269C9.60116 8.55269 9.50115 9.69269 9.56115 10.4027C9.72115 12.1527 10.8312 13.3527 11.9112 14.0427C13.0212 14.7527 14.1912 15.0727 15.3512 15.1427C16.6312 15.1727 16.5712 14.6827 15.4212 14.5427C14.3612 14.3727 13.3312 14.0027 12.3912 13.3327C11.4712 12.6827 10.6112 11.6627 10.5012 10.3127C10.4612 9.80269 10.5412 8.95269 11.1712 8.08269C11.7912 7.22269 12.9412 6.39269 14.4912 6.01269C15.0012 5.90269 15.5112 5.80269 16.0312 5.77269C18.4012 5.66269 21.1912 5.64269 23.3512 5.63269C23.8912 5.63269 24.3912 5.63269 24.8512 5.63269C25.3212 5.63269 25.7412 5.59269 26.0912 5.54269C26.7812 5.44269 27.1712 5.31269 27.1712 5.31269C27.1712 5.31269 27.3212 5.28269 27.5812 5.18269C27.8412 5.09269 28.2212 4.94269 28.6612 4.71269C29.5112 4.24269 30.7112 3.36269 31.2712 1.87269C31.5412 1.14269 31.6112 0.292691 31.4412 -0.507309C31.2712 -1.30731 30.8612 -2.04731 30.3412 -2.62731C29.3012 -3.79731 27.9412 -4.34731 26.9512 -4.60731C26.1912 -4.79731 25.5112 -4.85731 24.9212 -4.86731C24.3612 -4.86731 23.8712 -4.86731 23.4512 -4.86731C22.6112 -4.86731 22.0412 -4.86731 21.6012 -4.86731C18.9512 -4.86731 16.8812 -4.81731 14.9112 -4.73731V-4.70731Z",
|
|
39
|
+
fill: "#8FB8F6"
|
|
26
40
|
}), /*#__PURE__*/React.createElement("path", {
|
|
27
|
-
d: "
|
|
28
|
-
fill: "#
|
|
41
|
+
d: "M25.9427 33.8326C24.5227 33.7826 24.5927 34.3526 25.8627 34.5026C26.7627 34.6526 27.6527 34.9626 28.4927 35.4926C29.3127 36.0126 30.1127 36.7926 30.4527 37.8726C30.8227 39.1026 30.5327 39.9526 30.2427 40.5826C29.9027 41.2126 29.4827 41.7226 28.7127 42.2426C28.0627 42.6826 27.1727 43.0226 26.2127 43.1826C25.2727 43.3526 24.2027 43.2426 23.1927 43.2426C21.1827 43.1926 19.4227 43.1526 18.7427 43.1326H18.1327C17.7727 43.1326 17.1027 43.1426 16.2127 43.1526C15.2727 43.1726 14.0827 43.3426 12.8827 43.9126C11.7027 44.4526 10.4627 45.4426 9.87266 46.9026C9.25266 48.3626 9.60266 50.1726 10.5627 51.3326C11.2227 52.1826 12.0427 52.7126 12.7927 53.0726C13.5527 53.4326 14.2827 53.6326 14.9327 53.7326C16.2627 53.9126 17.1527 53.8126 17.7827 53.8326C20.7327 53.8326 22.9327 53.7626 25.0927 53.6526C26.2827 53.5926 26.2827 53.1026 25.0927 53.0526C22.9327 52.9526 20.7327 52.9026 17.7827 52.9026C17.2227 52.8826 16.2927 52.9226 15.2427 52.7626C14.1927 52.5726 12.8427 52.1226 11.7727 51.0526C11.4227 50.7126 11.1327 50.3226 10.9227 49.9026C10.4427 49.0026 10.4327 47.8026 10.9627 46.8326C11.4827 45.8526 12.4327 45.1526 13.3227 44.7426C14.2227 44.3226 15.0927 44.2026 15.7027 44.1426C16.3027 44.1126 16.6927 44.1226 16.6927 44.1226C16.6927 44.1226 18.9627 44.1226 21.7227 44.1226C22.4127 44.1226 23.1327 44.1226 23.8527 44.1226C24.5627 44.1226 25.3127 44.1526 26.0427 44.0426C27.5027 43.8526 28.7727 43.2326 29.5827 42.5926C30.8127 41.6326 31.3227 40.4526 31.4627 39.5726C31.6127 38.6726 31.4527 38.0426 31.3127 37.5926C30.8627 36.2126 29.8727 35.3126 28.9127 34.7526C27.9327 34.1826 26.9127 33.9126 25.9227 33.8326H25.9427Z",
|
|
42
|
+
fill: "#8FB8F6"
|
|
29
43
|
}), /*#__PURE__*/React.createElement("path", {
|
|
30
|
-
d: "
|
|
31
|
-
fill: "#
|
|
32
|
-
}), /*#__PURE__*/React.createElement("
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
cx: "8.44342",
|
|
39
|
-
cy: "10.0948",
|
|
40
|
-
r: "1.27936",
|
|
41
|
-
fill: "black"
|
|
44
|
+
d: "M7.13078 20.8827H-25.9492V42.1927H7.13078V20.8827Z",
|
|
45
|
+
fill: "#101214"
|
|
46
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
47
|
+
d: "M24.3608 9.74268H7.14078V20.8427H24.3608V9.74268Z",
|
|
48
|
+
fill: "white"
|
|
49
|
+
}), /*#__PURE__*/React.createElement("path", {
|
|
50
|
+
d: "M34.8489 28.4027H17.6289V39.5027H34.8489V28.4027Z",
|
|
51
|
+
fill: "white"
|
|
42
52
|
})));
|
|
43
53
|
});
|
|
@@ -7,11 +7,13 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
7
7
|
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) { _defineProperty(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; }
|
|
8
8
|
import { useIntl } from 'react-intl-next';
|
|
9
9
|
import { AVATAR_SIZES } from '@atlaskit/avatar';
|
|
10
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
10
11
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
11
12
|
import { GeneratedAvatar } from './generated-avatars';
|
|
12
13
|
import { messages } from './messages';
|
|
13
14
|
var styles = {
|
|
14
15
|
agentAvatar: "_1e0c1txw _1bah1h6o _4cvr1h6o _mkrz1k6g",
|
|
16
|
+
agentAvatarPreventSquish: "_1e0c1txw _1bah1h6o _4cvr1h6o _mkrz1k6g _1ul9zwfg _1tkezwfg",
|
|
15
17
|
image: "_5ral1dfr _4t3i1osq _1bsb1osq",
|
|
16
18
|
avatarContentContainer: "_1bsb1osq _4t3i1osq _1e0c1txw _1bah1h6o _4cvr1h6o"
|
|
17
19
|
};
|
|
@@ -36,7 +38,7 @@ export var AgentAvatar = function AgentAvatar(_ref) {
|
|
|
36
38
|
var imgUrl = isForgeAgent && forgeAgentIconUrl ? forgeAgentIconUrl : imageUrl;
|
|
37
39
|
return /*#__PURE__*/React.createElement(Box, {
|
|
38
40
|
"aria-label": label,
|
|
39
|
-
xcss: styles.agentAvatar,
|
|
41
|
+
xcss: fg('rovo_chat_bugfix_agent_avatar_squish') ? styles.agentAvatarPreventSquish : styles.agentAvatar,
|
|
40
42
|
style: _objectSpread({
|
|
41
43
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values
|
|
42
44
|
height: AVATAR_SIZES[size],
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/rovo-agent-components",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.6.0",
|
|
4
4
|
"description": "This package host public components related to rovo agents, the components here are needed for other public atlaskit packages",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
49
49
|
"@atlaskit/primitives": "^14.3.0",
|
|
50
50
|
"@atlaskit/skeleton": "^2.0.0",
|
|
51
|
-
"@atlaskit/tokens": "^4.
|
|
51
|
+
"@atlaskit/tokens": "^4.7.0",
|
|
52
52
|
"@atlaskit/tooltip": "^20.0.0",
|
|
53
53
|
"@babel/runtime": "^7.0.0",
|
|
54
54
|
"@compiled/react": "^0.18.3",
|
|
@@ -112,6 +112,9 @@
|
|
|
112
112
|
"platform-feature-flags": {
|
|
113
113
|
"rovo_chat_add_template_tab_to_modal": {
|
|
114
114
|
"type": "boolean"
|
|
115
|
+
},
|
|
116
|
+
"rovo_chat_bugfix_agent_avatar_squish": {
|
|
117
|
+
"type": "boolean"
|
|
115
118
|
}
|
|
116
119
|
}
|
|
117
120
|
}
|