@atlaskit/smart-card 28.3.0 → 28.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 +14 -0
- package/dist/cjs/utils/analytics/analytics.js +1 -1
- package/dist/cjs/view/InlineCard/Icon.js +3 -17
- package/dist/cjs/view/InlineCard/IconAndTitleLayout/index.js +13 -29
- package/dist/cjs/view/InlineCard/IconAndTitleLayout/styled.js +6 -43
- package/dist/cjs/view/LinkUrl/index.js +1 -1
- package/dist/es2019/utils/analytics/analytics.js +1 -1
- package/dist/es2019/view/InlineCard/Icon.js +2 -16
- package/dist/es2019/view/InlineCard/IconAndTitleLayout/index.js +15 -31
- package/dist/es2019/view/InlineCard/IconAndTitleLayout/styled.js +5 -71
- package/dist/es2019/view/LinkUrl/index.js +1 -1
- package/dist/esm/utils/analytics/analytics.js +1 -1
- package/dist/esm/view/InlineCard/Icon.js +2 -16
- package/dist/esm/view/InlineCard/IconAndTitleLayout/index.js +15 -31
- package/dist/esm/view/InlineCard/IconAndTitleLayout/styled.js +5 -42
- package/dist/esm/view/LinkUrl/index.js +1 -1
- package/dist/types/view/InlineCard/Icon.d.ts +0 -4
- package/dist/types/view/InlineCard/IconAndTitleLayout/styled.d.ts +2 -16
- package/dist/types-ts4.5/view/InlineCard/Icon.d.ts +0 -4
- package/dist/types-ts4.5/view/InlineCard/IconAndTitleLayout/styled.d.ts +2 -16
- package/package.json +4 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @atlaskit/smart-card
|
|
2
2
|
|
|
3
|
+
## 28.4.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#147041](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/147041)
|
|
8
|
+
[`d0989d8277f3f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d0989d8277f3f) -
|
|
9
|
+
Clean up inline icon size FF
|
|
10
|
+
|
|
11
|
+
## 28.3.1
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- Updated dependencies
|
|
16
|
+
|
|
3
17
|
## 28.3.0
|
|
4
18
|
|
|
5
19
|
### Minor Changes
|
|
@@ -22,7 +22,7 @@ var ANALYTICS_CHANNEL = exports.ANALYTICS_CHANNEL = 'media';
|
|
|
22
22
|
var context = exports.context = {
|
|
23
23
|
componentName: 'smart-cards',
|
|
24
24
|
packageName: "@atlaskit/smart-card",
|
|
25
|
-
packageVersion: "28.
|
|
25
|
+
packageVersion: "28.4.0"
|
|
26
26
|
};
|
|
27
27
|
var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
|
|
28
28
|
TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
|
|
@@ -4,10 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.Shimmer = exports.
|
|
7
|
+
exports.Shimmer = exports.Icon = exports.AKIconWrapper = void 0;
|
|
8
8
|
var _styled = _interopRequireDefault(require("@emotion/styled"));
|
|
9
9
|
var _linkingCommon = require("@atlaskit/linking-common");
|
|
10
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
11
10
|
var _react = _interopRequireDefault(require("react"));
|
|
12
11
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
13
12
|
|
|
@@ -18,19 +17,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
18
17
|
// to position it with appropriate whitespace from the top.
|
|
19
18
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
20
19
|
var Icon = exports.Icon = _styled.default.img({
|
|
21
|
-
height: '14px',
|
|
22
|
-
width: '14px',
|
|
23
|
-
marginRight: "var(--ds-space-050, 4px)",
|
|
24
|
-
borderRadius: '2px',
|
|
25
|
-
userSelect: 'none',
|
|
26
|
-
position: 'absolute',
|
|
27
|
-
top: '50%',
|
|
28
|
-
left: '50%',
|
|
29
|
-
transform: 'translate(-50%, -50%)'
|
|
30
|
-
});
|
|
31
|
-
|
|
32
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
33
|
-
var IconResized = exports.IconResized = _styled.default.img({
|
|
34
20
|
height: '16px',
|
|
35
21
|
width: '16px',
|
|
36
22
|
marginRight: "var(--ds-space-050, 4px)",
|
|
@@ -61,8 +47,8 @@ var Shimmer = exports.Shimmer = function Shimmer(_ref) {
|
|
|
61
47
|
marginRight: "var(--ds-space-050, 4px)"
|
|
62
48
|
};
|
|
63
49
|
return /*#__PURE__*/_react.default.createElement(_linkingCommon.SpanSkeleton, {
|
|
64
|
-
width:
|
|
65
|
-
height:
|
|
50
|
+
width: 16,
|
|
51
|
+
height: 16,
|
|
66
52
|
borderRadius: 2,
|
|
67
53
|
testId: testId
|
|
68
54
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
@@ -18,7 +18,6 @@ var _Icon = require("../Icon");
|
|
|
18
18
|
var _styled = require("./styled");
|
|
19
19
|
var _link = _interopRequireDefault(require("@atlaskit/icon/core/migration/link"));
|
|
20
20
|
var _styled2 = require("../styled");
|
|
21
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
22
21
|
function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
|
|
23
22
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
24
23
|
var IconAndTitleLayout = exports.IconAndTitleLayout = /*#__PURE__*/function (_React$Component) {
|
|
@@ -59,12 +58,12 @@ var IconAndTitleLayout = exports.IconAndTitleLayout = /*#__PURE__*/function (_Re
|
|
|
59
58
|
icon = _this$props.icon,
|
|
60
59
|
emoji = _this$props.emoji;
|
|
61
60
|
if (emoji) {
|
|
62
|
-
return
|
|
61
|
+
return /*#__PURE__*/_react.default.createElement(_styled.EmojiWrapper, null, emoji);
|
|
63
62
|
}
|
|
64
63
|
if (!icon || typeof icon === 'string') {
|
|
65
64
|
return null;
|
|
66
65
|
}
|
|
67
|
-
return
|
|
66
|
+
return /*#__PURE__*/_react.default.createElement(_styled.IconWrapper, null, icon);
|
|
68
67
|
}
|
|
69
68
|
}, {
|
|
70
69
|
key: "renderImageIcon",
|
|
@@ -73,22 +72,15 @@ var IconAndTitleLayout = exports.IconAndTitleLayout = /*#__PURE__*/function (_Re
|
|
|
73
72
|
if (!url || typeof url !== 'string') {
|
|
74
73
|
return null;
|
|
75
74
|
}
|
|
76
|
-
var icon = (0, _platformFeatureFlags.fg)('linking-platform-increase-inline-card-icon-size') ? /*#__PURE__*/_react.default.createElement(_Icon.IconResized
|
|
77
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
78
|
-
, {
|
|
79
|
-
className: "smart-link-icon",
|
|
80
|
-
src: url,
|
|
81
|
-
"data-testid": "".concat(testId, "-image")
|
|
82
|
-
}) : /*#__PURE__*/_react.default.createElement(_Icon.Icon
|
|
83
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
84
|
-
, {
|
|
85
|
-
className: "smart-link-icon",
|
|
86
|
-
src: url,
|
|
87
|
-
"data-testid": "".concat(testId, "-image")
|
|
88
|
-
});
|
|
89
75
|
return /*#__PURE__*/_react.default.createElement(_reactRenderImage.default, {
|
|
90
76
|
src: url,
|
|
91
|
-
loaded:
|
|
77
|
+
loaded: /*#__PURE__*/_react.default.createElement(_Icon.Icon
|
|
78
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
79
|
+
, {
|
|
80
|
+
className: "smart-link-icon",
|
|
81
|
+
src: url,
|
|
82
|
+
"data-testid": "".concat(testId, "-image")
|
|
83
|
+
}),
|
|
92
84
|
errored: errored,
|
|
93
85
|
loading: /*#__PURE__*/_react.default.createElement(_Icon.Shimmer, {
|
|
94
86
|
testId: "".concat(testId, "-loading")
|
|
@@ -102,14 +94,7 @@ var IconAndTitleLayout = exports.IconAndTitleLayout = /*#__PURE__*/function (_Re
|
|
|
102
94
|
if (defaultIcon) {
|
|
103
95
|
return /*#__PURE__*/_react.default.createElement(_styled.IconWrapper, null, defaultIcon);
|
|
104
96
|
}
|
|
105
|
-
return (
|
|
106
|
-
"data-testid": "".concat(testId, "-default")
|
|
107
|
-
}, /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
108
|
-
label: "link",
|
|
109
|
-
LEGACY_size: "small",
|
|
110
|
-
testId: "".concat(testId, "-default"),
|
|
111
|
-
color: "currentColor"
|
|
112
|
-
})) : /*#__PURE__*/_react.default.createElement(_styled.IconWrapper, null, /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
97
|
+
return /*#__PURE__*/_react.default.createElement(_styled.IconWrapper, null, /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
113
98
|
label: "link",
|
|
114
99
|
LEGACY_size: "small",
|
|
115
100
|
testId: "".concat(testId, "-default"),
|
|
@@ -143,12 +128,11 @@ var IconAndTitleLayout = exports.IconAndTitleLayout = /*#__PURE__*/function (_Re
|
|
|
143
128
|
rightSide = _this$props2.rightSide,
|
|
144
129
|
_this$props2$testId = _this$props2.testId,
|
|
145
130
|
testId = _this$props2$testId === void 0 ? 'inline-card-icon-and-title' : _this$props2$testId;
|
|
146
|
-
var
|
|
131
|
+
var titlePart = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styled.IconPositionWrapper, {
|
|
147
132
|
"data-testid": "icon-position-wrapper"
|
|
148
|
-
}, children || /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styled.
|
|
133
|
+
}, children || /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styled.IconEmptyWrapper, {
|
|
149
134
|
"data-testid": "icon-empty-wrapper"
|
|
150
|
-
}), this.renderIcon(testId)))
|
|
151
|
-
var titlePart = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconPart, /*#__PURE__*/_react.default.createElement(_styled.TitleWrapper
|
|
135
|
+
}), this.renderIcon(testId))), /*#__PURE__*/_react.default.createElement(_styled.TitleWrapper
|
|
152
136
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
153
137
|
, {
|
|
154
138
|
style: {
|
|
@@ -4,51 +4,34 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.TitleWrapperClassName = exports.TitleWrapper = exports.RightIconPositionWrapper = exports.LozengeWrapper = exports.
|
|
7
|
+
exports.TitleWrapperClassName = exports.TitleWrapper = exports.RightIconPositionWrapper = exports.LozengeWrapper = exports.IconWrapper = exports.IconTitleWrapper = exports.IconPositionWrapper = exports.IconOverrides = exports.IconObjectOverrides = exports.IconEmptyWrapper = exports.EmojiWrapper = void 0;
|
|
8
8
|
var _styled = _interopRequireDefault(require("@emotion/styled"));
|
|
9
9
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
10
10
|
|
|
11
|
-
// TODO: remove this override behaviour for @atlaskit/icon-object
|
|
12
|
-
// Replace with IconObjectOverridesResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
13
|
-
var IconObjectOverrides = exports.IconObjectOverrides = "\n & > span {\n height: 16px;\n width: 14px;\n position: absolute;\n top: 3px;\n left: 0;\n line-height: 14px;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
14
|
-
|
|
15
|
-
// TODO: remove this override behaviour for @atlaskit/icon
|
|
16
|
-
// Replace with IconOverridesResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
17
|
-
var IconOverrides = exports.IconOverrides = "\n\n & > * > span {\n height: 16px;\n width: 14px;\n position: absolute;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
18
|
-
|
|
19
11
|
// Wraps all icons represented in Inline Links. Icons have three sources/types:
|
|
20
12
|
// - JSON-LD: from the generator.icon property coming back from ORS.
|
|
21
13
|
// - @atlaskit/icon: for lock icons, unauthorized, etc.
|
|
22
14
|
// - @atlaskit/icon-object: for object icons, e.g. repository, branch, etc.
|
|
23
15
|
// NB: the first set of overrides style icons imported from @atlaskit/icon-object correctly.
|
|
24
16
|
// NB: the second set of overrides style icons imported from @atlaskit/icon correctly.
|
|
25
|
-
// Replace with IconWrapperResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
26
17
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
27
|
-
var IconWrapper = exports.IconWrapper = _styled.default.span({
|
|
28
|
-
userSelect: 'none'
|
|
29
|
-
},
|
|
30
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
31
|
-
IconOverrides,
|
|
32
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
33
|
-
IconObjectOverrides);
|
|
34
18
|
|
|
35
19
|
// TODO: remove this override behaviour for @atlaskit/icon-object
|
|
36
|
-
var
|
|
20
|
+
var IconObjectOverrides = exports.IconObjectOverrides = "\n & > span {\n height: 16px;\n width: 16px;\n position: absolute;\n top: 3px;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
37
21
|
|
|
38
22
|
// TODO: remove this override behaviour for @atlaskit/icon
|
|
39
|
-
var
|
|
23
|
+
var IconOverrides = exports.IconOverrides = "\n & > * > span {\n height: 16px;\n width: 16px;\n position: absolute;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
40
24
|
|
|
41
25
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
42
|
-
var
|
|
26
|
+
var IconWrapper = exports.IconWrapper = _styled.default.span({
|
|
43
27
|
userSelect: 'none'
|
|
44
28
|
},
|
|
45
29
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
46
|
-
|
|
30
|
+
IconOverrides,
|
|
47
31
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
48
|
-
|
|
32
|
+
IconObjectOverrides);
|
|
49
33
|
|
|
50
34
|
// Wraps all emoji in Inline Links similar to icon
|
|
51
|
-
// Replace with EmojiWrapperResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
52
35
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
53
36
|
var EmojiWrapper = exports.EmojiWrapper = _styled.default.span({
|
|
54
37
|
display: 'inline-block',
|
|
@@ -60,17 +43,6 @@ IconOverrides,
|
|
|
60
43
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
61
44
|
IconObjectOverrides);
|
|
62
45
|
|
|
63
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
64
|
-
var EmojiWrapperResized = exports.EmojiWrapperResized = _styled.default.span({
|
|
65
|
-
display: 'inline-block',
|
|
66
|
-
marginRight: "var(--ds-space-025, 2px)",
|
|
67
|
-
userSelect: 'none'
|
|
68
|
-
},
|
|
69
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
70
|
-
IconOverridesResized,
|
|
71
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
72
|
-
IconObjectOverridesResized);
|
|
73
|
-
|
|
74
46
|
// The main 'wrapping' element, title of the content.
|
|
75
47
|
// NB: `white-space` adds little whitespace before wrapping.
|
|
76
48
|
// NB: `word-break` line breaks as soon as an overflow takes place.
|
|
@@ -107,17 +79,8 @@ var IconPositionWrapper = exports.IconPositionWrapper = _styled.default.span({
|
|
|
107
79
|
display: 'inline-block'
|
|
108
80
|
});
|
|
109
81
|
|
|
110
|
-
// Replace with IconEmptyWrapperResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
111
82
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
112
83
|
var IconEmptyWrapper = exports.IconEmptyWrapper = _styled.default.span({
|
|
113
|
-
width: '14px',
|
|
114
|
-
height: '100%',
|
|
115
|
-
display: 'inline-block',
|
|
116
|
-
opacity: 0
|
|
117
|
-
});
|
|
118
|
-
|
|
119
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
120
|
-
var IconEmptyWrapperResized = exports.IconEmptyWrapperResized = _styled.default.span({
|
|
121
84
|
width: '16px',
|
|
122
85
|
height: '100%',
|
|
123
86
|
display: 'inline-block',
|
|
@@ -17,7 +17,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId"],
|
|
|
17
17
|
_excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
|
|
18
18
|
var PACKAGE_DATA = {
|
|
19
19
|
packageName: "@atlaskit/smart-card",
|
|
20
|
-
packageVersion: "28.
|
|
20
|
+
packageVersion: "28.4.0",
|
|
21
21
|
componentName: 'linkUrl'
|
|
22
22
|
};
|
|
23
23
|
var Link = (0, _click.withLinkClickedEvent)('a');
|
|
@@ -4,7 +4,7 @@ export const ANALYTICS_CHANNEL = 'media';
|
|
|
4
4
|
export const context = {
|
|
5
5
|
componentName: 'smart-cards',
|
|
6
6
|
packageName: "@atlaskit/smart-card",
|
|
7
|
-
packageVersion: "28.
|
|
7
|
+
packageVersion: "28.4.0"
|
|
8
8
|
};
|
|
9
9
|
export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
|
|
10
10
|
TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
2
2
|
import styled from '@emotion/styled';
|
|
3
3
|
import { SpanSkeleton } from '@atlaskit/linking-common';
|
|
4
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
4
|
import React from 'react';
|
|
6
5
|
|
|
7
6
|
// TODO: Figure out a more scalable/responsive solution
|
|
@@ -11,19 +10,6 @@ import React from 'react';
|
|
|
11
10
|
// to position it with appropriate whitespace from the top.
|
|
12
11
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
13
12
|
export const Icon = styled.img({
|
|
14
|
-
height: '14px',
|
|
15
|
-
width: '14px',
|
|
16
|
-
marginRight: "var(--ds-space-050, 4px)",
|
|
17
|
-
borderRadius: '2px',
|
|
18
|
-
userSelect: 'none',
|
|
19
|
-
position: 'absolute',
|
|
20
|
-
top: '50%',
|
|
21
|
-
left: '50%',
|
|
22
|
-
transform: 'translate(-50%, -50%)'
|
|
23
|
-
});
|
|
24
|
-
|
|
25
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
26
|
-
export const IconResized = styled.img({
|
|
27
13
|
height: '16px',
|
|
28
14
|
width: '16px',
|
|
29
15
|
marginRight: "var(--ds-space-050, 4px)",
|
|
@@ -55,8 +41,8 @@ export const Shimmer = ({
|
|
|
55
41
|
marginRight: "var(--ds-space-050, 4px)"
|
|
56
42
|
};
|
|
57
43
|
return /*#__PURE__*/React.createElement(SpanSkeleton, {
|
|
58
|
-
width:
|
|
59
|
-
height:
|
|
44
|
+
width: 16,
|
|
45
|
+
height: 16,
|
|
60
46
|
borderRadius: 2,
|
|
61
47
|
testId: testId
|
|
62
48
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import ImageLoader from 'react-render-image';
|
|
4
|
-
import { Icon,
|
|
5
|
-
import { IconEmptyWrapper, IconPositionWrapper, IconTitleWrapper, IconWrapper, TitleWrapper, EmojiWrapper, TitleWrapperClassName
|
|
4
|
+
import { Icon, Shimmer } from '../Icon';
|
|
5
|
+
import { IconEmptyWrapper, IconPositionWrapper, IconTitleWrapper, IconWrapper, TitleWrapper, EmojiWrapper, TitleWrapperClassName } from './styled';
|
|
6
6
|
import LinkIcon from '@atlaskit/icon/core/migration/link';
|
|
7
7
|
import { LinkAppearance, NoLinkAppearance } from '../styled';
|
|
8
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
8
|
export class IconAndTitleLayout extends React.Component {
|
|
10
9
|
constructor(...args) {
|
|
11
10
|
super(...args);
|
|
@@ -39,12 +38,12 @@ export class IconAndTitleLayout extends React.Component {
|
|
|
39
38
|
emoji
|
|
40
39
|
} = this.props;
|
|
41
40
|
if (emoji) {
|
|
42
|
-
return
|
|
41
|
+
return /*#__PURE__*/React.createElement(EmojiWrapper, null, emoji);
|
|
43
42
|
}
|
|
44
43
|
if (!icon || typeof icon === 'string') {
|
|
45
44
|
return null;
|
|
46
45
|
}
|
|
47
|
-
return
|
|
46
|
+
return /*#__PURE__*/React.createElement(IconWrapper, null, icon);
|
|
48
47
|
}
|
|
49
48
|
renderImageIcon(errored, testId) {
|
|
50
49
|
const {
|
|
@@ -53,22 +52,15 @@ export class IconAndTitleLayout extends React.Component {
|
|
|
53
52
|
if (!url || typeof url !== 'string') {
|
|
54
53
|
return null;
|
|
55
54
|
}
|
|
56
|
-
const icon = fg('linking-platform-increase-inline-card-icon-size') ? /*#__PURE__*/React.createElement(IconResized
|
|
57
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
58
|
-
, {
|
|
59
|
-
className: "smart-link-icon",
|
|
60
|
-
src: url,
|
|
61
|
-
"data-testid": `${testId}-image`
|
|
62
|
-
}) : /*#__PURE__*/React.createElement(Icon
|
|
63
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
64
|
-
, {
|
|
65
|
-
className: "smart-link-icon",
|
|
66
|
-
src: url,
|
|
67
|
-
"data-testid": `${testId}-image`
|
|
68
|
-
});
|
|
69
55
|
return /*#__PURE__*/React.createElement(ImageLoader, {
|
|
70
56
|
src: url,
|
|
71
|
-
loaded:
|
|
57
|
+
loaded: /*#__PURE__*/React.createElement(Icon
|
|
58
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
59
|
+
, {
|
|
60
|
+
className: "smart-link-icon",
|
|
61
|
+
src: url,
|
|
62
|
+
"data-testid": `${testId}-image`
|
|
63
|
+
}),
|
|
72
64
|
errored: errored,
|
|
73
65
|
loading: /*#__PURE__*/React.createElement(Shimmer, {
|
|
74
66
|
testId: `${testId}-loading`
|
|
@@ -82,14 +74,7 @@ export class IconAndTitleLayout extends React.Component {
|
|
|
82
74
|
if (defaultIcon) {
|
|
83
75
|
return /*#__PURE__*/React.createElement(IconWrapper, null, defaultIcon);
|
|
84
76
|
}
|
|
85
|
-
return
|
|
86
|
-
"data-testid": `${testId}-default`
|
|
87
|
-
}, /*#__PURE__*/React.createElement(LinkIcon, {
|
|
88
|
-
label: "link",
|
|
89
|
-
LEGACY_size: "small",
|
|
90
|
-
testId: `${testId}-default`,
|
|
91
|
-
color: "currentColor"
|
|
92
|
-
})) : /*#__PURE__*/React.createElement(IconWrapper, null, /*#__PURE__*/React.createElement(LinkIcon, {
|
|
77
|
+
return /*#__PURE__*/React.createElement(IconWrapper, null, /*#__PURE__*/React.createElement(LinkIcon, {
|
|
93
78
|
label: "link",
|
|
94
79
|
LEGACY_size: "small",
|
|
95
80
|
testId: `${testId}-default`,
|
|
@@ -119,12 +104,11 @@ export class IconAndTitleLayout extends React.Component {
|
|
|
119
104
|
rightSide,
|
|
120
105
|
testId = 'inline-card-icon-and-title'
|
|
121
106
|
} = this.props;
|
|
122
|
-
const
|
|
107
|
+
const titlePart = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconPositionWrapper, {
|
|
123
108
|
"data-testid": "icon-position-wrapper"
|
|
124
|
-
}, children || /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(
|
|
109
|
+
}, children || /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconEmptyWrapper, {
|
|
125
110
|
"data-testid": "icon-empty-wrapper"
|
|
126
|
-
}), this.renderIcon(testId)))
|
|
127
|
-
const titlePart = /*#__PURE__*/React.createElement(React.Fragment, null, iconPart, /*#__PURE__*/React.createElement(TitleWrapper
|
|
111
|
+
}), this.renderIcon(testId))), /*#__PURE__*/React.createElement(TitleWrapper
|
|
128
112
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
129
113
|
, {
|
|
130
114
|
style: {
|
|
@@ -1,60 +1,15 @@
|
|
|
1
1
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
2
2
|
import styled from '@emotion/styled';
|
|
3
|
-
// TODO: remove this override behaviour for @atlaskit/icon-object
|
|
4
|
-
// Replace with IconObjectOverridesResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
5
|
-
export const IconObjectOverrides = `
|
|
6
|
-
& > span {
|
|
7
|
-
height: 16px;
|
|
8
|
-
width: 14px;
|
|
9
|
-
position: absolute;
|
|
10
|
-
top: 3px;
|
|
11
|
-
left: 0;
|
|
12
|
-
line-height: 14px;
|
|
13
|
-
& > svg {
|
|
14
|
-
position: absolute;
|
|
15
|
-
top: 50%;
|
|
16
|
-
left: 50%;
|
|
17
|
-
transform: translate(-50%, -50%);
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
`;
|
|
21
|
-
|
|
22
|
-
// TODO: remove this override behaviour for @atlaskit/icon
|
|
23
|
-
// Replace with IconOverridesResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
24
|
-
export const IconOverrides = `
|
|
25
|
-
|
|
26
|
-
& > * > span {
|
|
27
|
-
height: 16px;
|
|
28
|
-
width: 14px;
|
|
29
|
-
position: absolute;
|
|
30
|
-
left: 0;
|
|
31
|
-
& > svg {
|
|
32
|
-
position: absolute;
|
|
33
|
-
top: 50%;
|
|
34
|
-
left: 50%;
|
|
35
|
-
transform: translate(-50%, -50%);
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
`;
|
|
39
|
-
|
|
40
3
|
// Wraps all icons represented in Inline Links. Icons have three sources/types:
|
|
41
4
|
// - JSON-LD: from the generator.icon property coming back from ORS.
|
|
42
5
|
// - @atlaskit/icon: for lock icons, unauthorized, etc.
|
|
43
6
|
// - @atlaskit/icon-object: for object icons, e.g. repository, branch, etc.
|
|
44
7
|
// NB: the first set of overrides style icons imported from @atlaskit/icon-object correctly.
|
|
45
8
|
// NB: the second set of overrides style icons imported from @atlaskit/icon correctly.
|
|
46
|
-
// Replace with IconWrapperResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
47
9
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
48
|
-
export const IconWrapper = styled.span({
|
|
49
|
-
userSelect: 'none'
|
|
50
|
-
},
|
|
51
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
52
|
-
IconOverrides,
|
|
53
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
54
|
-
IconObjectOverrides);
|
|
55
10
|
|
|
56
11
|
// TODO: remove this override behaviour for @atlaskit/icon-object
|
|
57
|
-
export const
|
|
12
|
+
export const IconObjectOverrides = `
|
|
58
13
|
& > span {
|
|
59
14
|
height: 16px;
|
|
60
15
|
width: 16px;
|
|
@@ -71,7 +26,7 @@ export const IconObjectOverridesResized = `
|
|
|
71
26
|
`;
|
|
72
27
|
|
|
73
28
|
// TODO: remove this override behaviour for @atlaskit/icon
|
|
74
|
-
export const
|
|
29
|
+
export const IconOverrides = `
|
|
75
30
|
& > * > span {
|
|
76
31
|
height: 16px;
|
|
77
32
|
width: 16px;
|
|
@@ -87,16 +42,15 @@ export const IconOverridesResized = `
|
|
|
87
42
|
`;
|
|
88
43
|
|
|
89
44
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
90
|
-
export const
|
|
45
|
+
export const IconWrapper = styled.span({
|
|
91
46
|
userSelect: 'none'
|
|
92
47
|
},
|
|
93
48
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
94
|
-
|
|
49
|
+
IconOverrides,
|
|
95
50
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
96
|
-
|
|
51
|
+
IconObjectOverrides);
|
|
97
52
|
|
|
98
53
|
// Wraps all emoji in Inline Links similar to icon
|
|
99
|
-
// Replace with EmojiWrapperResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
100
54
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
101
55
|
export const EmojiWrapper = styled.span({
|
|
102
56
|
display: 'inline-block',
|
|
@@ -108,17 +62,6 @@ IconOverrides,
|
|
|
108
62
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
109
63
|
IconObjectOverrides);
|
|
110
64
|
|
|
111
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
112
|
-
export const EmojiWrapperResized = styled.span({
|
|
113
|
-
display: 'inline-block',
|
|
114
|
-
marginRight: "var(--ds-space-025, 2px)",
|
|
115
|
-
userSelect: 'none'
|
|
116
|
-
},
|
|
117
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
118
|
-
IconOverridesResized,
|
|
119
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
120
|
-
IconObjectOverridesResized);
|
|
121
|
-
|
|
122
65
|
// The main 'wrapping' element, title of the content.
|
|
123
66
|
// NB: `white-space` adds little whitespace before wrapping.
|
|
124
67
|
// NB: `word-break` line breaks as soon as an overflow takes place.
|
|
@@ -155,17 +98,8 @@ export const IconPositionWrapper = styled.span({
|
|
|
155
98
|
display: 'inline-block'
|
|
156
99
|
});
|
|
157
100
|
|
|
158
|
-
// Replace with IconEmptyWrapperResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
159
101
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
160
102
|
export const IconEmptyWrapper = styled.span({
|
|
161
|
-
width: '14px',
|
|
162
|
-
height: '100%',
|
|
163
|
-
display: 'inline-block',
|
|
164
|
-
opacity: 0
|
|
165
|
-
});
|
|
166
|
-
|
|
167
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
168
|
-
export const IconEmptyWrapperResized = styled.span({
|
|
169
103
|
width: '16px',
|
|
170
104
|
height: '100%',
|
|
171
105
|
display: 'inline-block',
|
|
@@ -7,7 +7,7 @@ import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-m
|
|
|
7
7
|
import LinkWarningModal from './LinkWarningModal';
|
|
8
8
|
const PACKAGE_DATA = {
|
|
9
9
|
packageName: "@atlaskit/smart-card",
|
|
10
|
-
packageVersion: "28.
|
|
10
|
+
packageVersion: "28.4.0",
|
|
11
11
|
componentName: 'linkUrl'
|
|
12
12
|
};
|
|
13
13
|
const Link = withLinkClickedEvent('a');
|
|
@@ -15,7 +15,7 @@ export var ANALYTICS_CHANNEL = 'media';
|
|
|
15
15
|
export var context = {
|
|
16
16
|
componentName: 'smart-cards',
|
|
17
17
|
packageName: "@atlaskit/smart-card",
|
|
18
|
-
packageVersion: "28.
|
|
18
|
+
packageVersion: "28.4.0"
|
|
19
19
|
};
|
|
20
20
|
export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
|
|
21
21
|
TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
2
2
|
import styled from '@emotion/styled';
|
|
3
3
|
import { SpanSkeleton } from '@atlaskit/linking-common';
|
|
4
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
4
|
import React from 'react';
|
|
6
5
|
|
|
7
6
|
// TODO: Figure out a more scalable/responsive solution
|
|
@@ -11,19 +10,6 @@ import React from 'react';
|
|
|
11
10
|
// to position it with appropriate whitespace from the top.
|
|
12
11
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
13
12
|
export var Icon = styled.img({
|
|
14
|
-
height: '14px',
|
|
15
|
-
width: '14px',
|
|
16
|
-
marginRight: "var(--ds-space-050, 4px)",
|
|
17
|
-
borderRadius: '2px',
|
|
18
|
-
userSelect: 'none',
|
|
19
|
-
position: 'absolute',
|
|
20
|
-
top: '50%',
|
|
21
|
-
left: '50%',
|
|
22
|
-
transform: 'translate(-50%, -50%)'
|
|
23
|
-
});
|
|
24
|
-
|
|
25
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
26
|
-
export var IconResized = styled.img({
|
|
27
13
|
height: '16px',
|
|
28
14
|
width: '16px',
|
|
29
15
|
marginRight: "var(--ds-space-050, 4px)",
|
|
@@ -54,8 +40,8 @@ export var Shimmer = function Shimmer(_ref) {
|
|
|
54
40
|
marginRight: "var(--ds-space-050, 4px)"
|
|
55
41
|
};
|
|
56
42
|
return /*#__PURE__*/React.createElement(SpanSkeleton, {
|
|
57
|
-
width:
|
|
58
|
-
height:
|
|
43
|
+
width: 16,
|
|
44
|
+
height: 16,
|
|
59
45
|
borderRadius: 2,
|
|
60
46
|
testId: testId
|
|
61
47
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
@@ -9,11 +9,10 @@ function _createSuper(t) { var r = _isNativeReflectConstruct(); return function
|
|
|
9
9
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
10
10
|
import React from 'react';
|
|
11
11
|
import ImageLoader from 'react-render-image';
|
|
12
|
-
import { Icon,
|
|
13
|
-
import { IconEmptyWrapper, IconPositionWrapper, IconTitleWrapper, IconWrapper, TitleWrapper, EmojiWrapper, TitleWrapperClassName
|
|
12
|
+
import { Icon, Shimmer } from '../Icon';
|
|
13
|
+
import { IconEmptyWrapper, IconPositionWrapper, IconTitleWrapper, IconWrapper, TitleWrapper, EmojiWrapper, TitleWrapperClassName } from './styled';
|
|
14
14
|
import LinkIcon from '@atlaskit/icon/core/migration/link';
|
|
15
15
|
import { LinkAppearance, NoLinkAppearance } from '../styled';
|
|
16
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
17
16
|
export var IconAndTitleLayout = /*#__PURE__*/function (_React$Component) {
|
|
18
17
|
_inherits(IconAndTitleLayout, _React$Component);
|
|
19
18
|
var _super = _createSuper(IconAndTitleLayout);
|
|
@@ -52,12 +51,12 @@ export var IconAndTitleLayout = /*#__PURE__*/function (_React$Component) {
|
|
|
52
51
|
icon = _this$props.icon,
|
|
53
52
|
emoji = _this$props.emoji;
|
|
54
53
|
if (emoji) {
|
|
55
|
-
return
|
|
54
|
+
return /*#__PURE__*/React.createElement(EmojiWrapper, null, emoji);
|
|
56
55
|
}
|
|
57
56
|
if (!icon || typeof icon === 'string') {
|
|
58
57
|
return null;
|
|
59
58
|
}
|
|
60
|
-
return
|
|
59
|
+
return /*#__PURE__*/React.createElement(IconWrapper, null, icon);
|
|
61
60
|
}
|
|
62
61
|
}, {
|
|
63
62
|
key: "renderImageIcon",
|
|
@@ -66,22 +65,15 @@ export var IconAndTitleLayout = /*#__PURE__*/function (_React$Component) {
|
|
|
66
65
|
if (!url || typeof url !== 'string') {
|
|
67
66
|
return null;
|
|
68
67
|
}
|
|
69
|
-
var icon = fg('linking-platform-increase-inline-card-icon-size') ? /*#__PURE__*/React.createElement(IconResized
|
|
70
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
71
|
-
, {
|
|
72
|
-
className: "smart-link-icon",
|
|
73
|
-
src: url,
|
|
74
|
-
"data-testid": "".concat(testId, "-image")
|
|
75
|
-
}) : /*#__PURE__*/React.createElement(Icon
|
|
76
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
77
|
-
, {
|
|
78
|
-
className: "smart-link-icon",
|
|
79
|
-
src: url,
|
|
80
|
-
"data-testid": "".concat(testId, "-image")
|
|
81
|
-
});
|
|
82
68
|
return /*#__PURE__*/React.createElement(ImageLoader, {
|
|
83
69
|
src: url,
|
|
84
|
-
loaded:
|
|
70
|
+
loaded: /*#__PURE__*/React.createElement(Icon
|
|
71
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
72
|
+
, {
|
|
73
|
+
className: "smart-link-icon",
|
|
74
|
+
src: url,
|
|
75
|
+
"data-testid": "".concat(testId, "-image")
|
|
76
|
+
}),
|
|
85
77
|
errored: errored,
|
|
86
78
|
loading: /*#__PURE__*/React.createElement(Shimmer, {
|
|
87
79
|
testId: "".concat(testId, "-loading")
|
|
@@ -95,14 +87,7 @@ export var IconAndTitleLayout = /*#__PURE__*/function (_React$Component) {
|
|
|
95
87
|
if (defaultIcon) {
|
|
96
88
|
return /*#__PURE__*/React.createElement(IconWrapper, null, defaultIcon);
|
|
97
89
|
}
|
|
98
|
-
return
|
|
99
|
-
"data-testid": "".concat(testId, "-default")
|
|
100
|
-
}, /*#__PURE__*/React.createElement(LinkIcon, {
|
|
101
|
-
label: "link",
|
|
102
|
-
LEGACY_size: "small",
|
|
103
|
-
testId: "".concat(testId, "-default"),
|
|
104
|
-
color: "currentColor"
|
|
105
|
-
})) : /*#__PURE__*/React.createElement(IconWrapper, null, /*#__PURE__*/React.createElement(LinkIcon, {
|
|
90
|
+
return /*#__PURE__*/React.createElement(IconWrapper, null, /*#__PURE__*/React.createElement(LinkIcon, {
|
|
106
91
|
label: "link",
|
|
107
92
|
LEGACY_size: "small",
|
|
108
93
|
testId: "".concat(testId, "-default"),
|
|
@@ -136,12 +121,11 @@ export var IconAndTitleLayout = /*#__PURE__*/function (_React$Component) {
|
|
|
136
121
|
rightSide = _this$props2.rightSide,
|
|
137
122
|
_this$props2$testId = _this$props2.testId,
|
|
138
123
|
testId = _this$props2$testId === void 0 ? 'inline-card-icon-and-title' : _this$props2$testId;
|
|
139
|
-
var
|
|
124
|
+
var titlePart = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconPositionWrapper, {
|
|
140
125
|
"data-testid": "icon-position-wrapper"
|
|
141
|
-
}, children || /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(
|
|
126
|
+
}, children || /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconEmptyWrapper, {
|
|
142
127
|
"data-testid": "icon-empty-wrapper"
|
|
143
|
-
}), this.renderIcon(testId)))
|
|
144
|
-
var titlePart = /*#__PURE__*/React.createElement(React.Fragment, null, iconPart, /*#__PURE__*/React.createElement(TitleWrapper
|
|
128
|
+
}), this.renderIcon(testId))), /*#__PURE__*/React.createElement(TitleWrapper
|
|
145
129
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
146
130
|
, {
|
|
147
131
|
style: {
|
|
@@ -1,46 +1,29 @@
|
|
|
1
1
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
2
2
|
import styled from '@emotion/styled';
|
|
3
|
-
// TODO: remove this override behaviour for @atlaskit/icon-object
|
|
4
|
-
// Replace with IconObjectOverridesResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
5
|
-
export var IconObjectOverrides = "\n & > span {\n height: 16px;\n width: 14px;\n position: absolute;\n top: 3px;\n left: 0;\n line-height: 14px;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
6
|
-
|
|
7
|
-
// TODO: remove this override behaviour for @atlaskit/icon
|
|
8
|
-
// Replace with IconOverridesResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
9
|
-
export var IconOverrides = "\n\n & > * > span {\n height: 16px;\n width: 14px;\n position: absolute;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
10
|
-
|
|
11
3
|
// Wraps all icons represented in Inline Links. Icons have three sources/types:
|
|
12
4
|
// - JSON-LD: from the generator.icon property coming back from ORS.
|
|
13
5
|
// - @atlaskit/icon: for lock icons, unauthorized, etc.
|
|
14
6
|
// - @atlaskit/icon-object: for object icons, e.g. repository, branch, etc.
|
|
15
7
|
// NB: the first set of overrides style icons imported from @atlaskit/icon-object correctly.
|
|
16
8
|
// NB: the second set of overrides style icons imported from @atlaskit/icon correctly.
|
|
17
|
-
// Replace with IconWrapperResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
18
9
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
19
|
-
export var IconWrapper = styled.span({
|
|
20
|
-
userSelect: 'none'
|
|
21
|
-
},
|
|
22
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
23
|
-
IconOverrides,
|
|
24
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
25
|
-
IconObjectOverrides);
|
|
26
10
|
|
|
27
11
|
// TODO: remove this override behaviour for @atlaskit/icon-object
|
|
28
|
-
export var
|
|
12
|
+
export var IconObjectOverrides = "\n & > span {\n height: 16px;\n width: 16px;\n position: absolute;\n top: 3px;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
29
13
|
|
|
30
14
|
// TODO: remove this override behaviour for @atlaskit/icon
|
|
31
|
-
export var
|
|
15
|
+
export var IconOverrides = "\n & > * > span {\n height: 16px;\n width: 16px;\n position: absolute;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
32
16
|
|
|
33
17
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
34
|
-
export var
|
|
18
|
+
export var IconWrapper = styled.span({
|
|
35
19
|
userSelect: 'none'
|
|
36
20
|
},
|
|
37
21
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
38
|
-
|
|
22
|
+
IconOverrides,
|
|
39
23
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
40
|
-
|
|
24
|
+
IconObjectOverrides);
|
|
41
25
|
|
|
42
26
|
// Wraps all emoji in Inline Links similar to icon
|
|
43
|
-
// Replace with EmojiWrapperResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
44
27
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
45
28
|
export var EmojiWrapper = styled.span({
|
|
46
29
|
display: 'inline-block',
|
|
@@ -52,17 +35,6 @@ IconOverrides,
|
|
|
52
35
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
53
36
|
IconObjectOverrides);
|
|
54
37
|
|
|
55
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
56
|
-
export var EmojiWrapperResized = styled.span({
|
|
57
|
-
display: 'inline-block',
|
|
58
|
-
marginRight: "var(--ds-space-025, 2px)",
|
|
59
|
-
userSelect: 'none'
|
|
60
|
-
},
|
|
61
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
62
|
-
IconOverridesResized,
|
|
63
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
64
|
-
IconObjectOverridesResized);
|
|
65
|
-
|
|
66
38
|
// The main 'wrapping' element, title of the content.
|
|
67
39
|
// NB: `white-space` adds little whitespace before wrapping.
|
|
68
40
|
// NB: `word-break` line breaks as soon as an overflow takes place.
|
|
@@ -99,17 +71,8 @@ export var IconPositionWrapper = styled.span({
|
|
|
99
71
|
display: 'inline-block'
|
|
100
72
|
});
|
|
101
73
|
|
|
102
|
-
// Replace with IconEmptyWrapperResized during linking-platform-increase-inline-card-icon-size cleanup (EDM=10529)
|
|
103
74
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
104
75
|
export var IconEmptyWrapper = styled.span({
|
|
105
|
-
width: '14px',
|
|
106
|
-
height: '100%',
|
|
107
|
-
display: 'inline-block',
|
|
108
|
-
opacity: 0
|
|
109
|
-
});
|
|
110
|
-
|
|
111
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
112
|
-
export var IconEmptyWrapperResized = styled.span({
|
|
113
76
|
width: '16px',
|
|
114
77
|
height: '100%',
|
|
115
78
|
display: 'inline-block',
|
|
@@ -10,7 +10,7 @@ import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-m
|
|
|
10
10
|
import LinkWarningModal from './LinkWarningModal';
|
|
11
11
|
var PACKAGE_DATA = {
|
|
12
12
|
packageName: "@atlaskit/smart-card",
|
|
13
|
-
packageVersion: "28.
|
|
13
|
+
packageVersion: "28.4.0",
|
|
14
14
|
componentName: 'linkUrl'
|
|
15
15
|
};
|
|
16
16
|
var Link = withLinkClickedEvent('a');
|
|
@@ -3,10 +3,6 @@ export declare const Icon: import("@emotion/styled").StyledComponent<{
|
|
|
3
3
|
theme?: import("@emotion/react").Theme | undefined;
|
|
4
4
|
as?: React.ElementType<any> | undefined;
|
|
5
5
|
}, React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, {}>;
|
|
6
|
-
export declare const IconResized: import("@emotion/styled").StyledComponent<{
|
|
7
|
-
theme?: import("@emotion/react").Theme | undefined;
|
|
8
|
-
as?: React.ElementType<any> | undefined;
|
|
9
|
-
}, React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, {}>;
|
|
10
6
|
export declare const AKIconWrapper: import("@emotion/styled").StyledComponent<{
|
|
11
7
|
theme?: import("@emotion/react").Theme | undefined;
|
|
12
8
|
as?: React.ElementType<any> | undefined;
|
|
@@ -1,24 +1,14 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
export declare const IconObjectOverrides = "\n & > span {\n height: 16px;\n width:
|
|
3
|
-
export declare const IconOverrides = "\n
|
|
2
|
+
export declare const IconObjectOverrides = "\n & > span {\n height: 16px;\n width: 16px;\n position: absolute;\n top: 3px;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
3
|
+
export declare const IconOverrides = "\n & > * > span {\n height: 16px;\n width: 16px;\n position: absolute;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
4
4
|
export declare const IconWrapper: import("@emotion/styled").StyledComponent<{
|
|
5
5
|
theme?: import("@emotion/react").Theme | undefined;
|
|
6
6
|
as?: import("react").ElementType<any> | undefined;
|
|
7
7
|
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
8
|
-
export declare const IconObjectOverridesResized = "\n & > span {\n height: 16px;\n width: 16px;\n position: absolute;\n top: 3px;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
9
|
-
export declare const IconOverridesResized = "\n & > * > span {\n height: 16px;\n width: 16px;\n position: absolute;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
10
|
-
export declare const IconWrapperResized: import("@emotion/styled").StyledComponent<{
|
|
11
|
-
theme?: import("@emotion/react").Theme | undefined;
|
|
12
|
-
as?: import("react").ElementType<any> | undefined;
|
|
13
|
-
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
14
8
|
export declare const EmojiWrapper: import("@emotion/styled").StyledComponent<{
|
|
15
9
|
theme?: import("@emotion/react").Theme | undefined;
|
|
16
10
|
as?: import("react").ElementType<any> | undefined;
|
|
17
11
|
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
18
|
-
export declare const EmojiWrapperResized: import("@emotion/styled").StyledComponent<{
|
|
19
|
-
theme?: import("@emotion/react").Theme | undefined;
|
|
20
|
-
as?: import("react").ElementType<any> | undefined;
|
|
21
|
-
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
22
12
|
export declare const IconTitleWrapper: import("@emotion/styled").StyledComponent<{
|
|
23
13
|
theme?: import("@emotion/react").Theme | undefined;
|
|
24
14
|
as?: import("react").ElementType<any> | undefined;
|
|
@@ -39,10 +29,6 @@ export declare const IconEmptyWrapper: import("@emotion/styled").StyledComponent
|
|
|
39
29
|
theme?: import("@emotion/react").Theme | undefined;
|
|
40
30
|
as?: import("react").ElementType<any> | undefined;
|
|
41
31
|
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
42
|
-
export declare const IconEmptyWrapperResized: import("@emotion/styled").StyledComponent<{
|
|
43
|
-
theme?: import("@emotion/react").Theme | undefined;
|
|
44
|
-
as?: import("react").ElementType<any> | undefined;
|
|
45
|
-
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
46
32
|
export declare const TitleWrapperClassName = "smart-link-title-wrapper";
|
|
47
33
|
export declare const TitleWrapper: import("@emotion/styled").StyledComponent<{
|
|
48
34
|
theme?: import("@emotion/react").Theme | undefined;
|
|
@@ -3,10 +3,6 @@ export declare const Icon: import("@emotion/styled").StyledComponent<{
|
|
|
3
3
|
theme?: import("@emotion/react").Theme | undefined;
|
|
4
4
|
as?: React.ElementType<any> | undefined;
|
|
5
5
|
}, React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, {}>;
|
|
6
|
-
export declare const IconResized: import("@emotion/styled").StyledComponent<{
|
|
7
|
-
theme?: import("@emotion/react").Theme | undefined;
|
|
8
|
-
as?: React.ElementType<any> | undefined;
|
|
9
|
-
}, React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, {}>;
|
|
10
6
|
export declare const AKIconWrapper: import("@emotion/styled").StyledComponent<{
|
|
11
7
|
theme?: import("@emotion/react").Theme | undefined;
|
|
12
8
|
as?: React.ElementType<any> | undefined;
|
|
@@ -1,24 +1,14 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
export declare const IconObjectOverrides = "\n & > span {\n height: 16px;\n width:
|
|
3
|
-
export declare const IconOverrides = "\n
|
|
2
|
+
export declare const IconObjectOverrides = "\n & > span {\n height: 16px;\n width: 16px;\n position: absolute;\n top: 3px;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
3
|
+
export declare const IconOverrides = "\n & > * > span {\n height: 16px;\n width: 16px;\n position: absolute;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
4
4
|
export declare const IconWrapper: import("@emotion/styled").StyledComponent<{
|
|
5
5
|
theme?: import("@emotion/react").Theme | undefined;
|
|
6
6
|
as?: import("react").ElementType<any> | undefined;
|
|
7
7
|
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
8
|
-
export declare const IconObjectOverridesResized = "\n & > span {\n height: 16px;\n width: 16px;\n position: absolute;\n top: 3px;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
9
|
-
export declare const IconOverridesResized = "\n & > * > span {\n height: 16px;\n width: 16px;\n position: absolute;\n left: 0;\n & > svg {\n position: absolute;\n top: 50%;\n left: 50%;\n transform: translate(-50%, -50%);\n }\n }\n";
|
|
10
|
-
export declare const IconWrapperResized: import("@emotion/styled").StyledComponent<{
|
|
11
|
-
theme?: import("@emotion/react").Theme | undefined;
|
|
12
|
-
as?: import("react").ElementType<any> | undefined;
|
|
13
|
-
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
14
8
|
export declare const EmojiWrapper: import("@emotion/styled").StyledComponent<{
|
|
15
9
|
theme?: import("@emotion/react").Theme | undefined;
|
|
16
10
|
as?: import("react").ElementType<any> | undefined;
|
|
17
11
|
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
18
|
-
export declare const EmojiWrapperResized: import("@emotion/styled").StyledComponent<{
|
|
19
|
-
theme?: import("@emotion/react").Theme | undefined;
|
|
20
|
-
as?: import("react").ElementType<any> | undefined;
|
|
21
|
-
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
22
12
|
export declare const IconTitleWrapper: import("@emotion/styled").StyledComponent<{
|
|
23
13
|
theme?: import("@emotion/react").Theme | undefined;
|
|
24
14
|
as?: import("react").ElementType<any> | undefined;
|
|
@@ -39,10 +29,6 @@ export declare const IconEmptyWrapper: import("@emotion/styled").StyledComponent
|
|
|
39
29
|
theme?: import("@emotion/react").Theme | undefined;
|
|
40
30
|
as?: import("react").ElementType<any> | undefined;
|
|
41
31
|
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
42
|
-
export declare const IconEmptyWrapperResized: import("@emotion/styled").StyledComponent<{
|
|
43
|
-
theme?: import("@emotion/react").Theme | undefined;
|
|
44
|
-
as?: import("react").ElementType<any> | undefined;
|
|
45
|
-
}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
|
|
46
32
|
export declare const TitleWrapperClassName = "smart-link-title-wrapper";
|
|
47
33
|
export declare const TitleWrapper: import("@emotion/styled").StyledComponent<{
|
|
48
34
|
theme?: import("@emotion/react").Theme | undefined;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/smart-card",
|
|
3
|
-
"version": "28.
|
|
3
|
+
"version": "28.4.0",
|
|
4
4
|
"description": "Smart card component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@atlaskit/form": "^10.5.0",
|
|
37
37
|
"@atlaskit/frontend-utilities": "^2.7.0",
|
|
38
38
|
"@atlaskit/heading": "^2.4.0",
|
|
39
|
-
"@atlaskit/icon": "^22.
|
|
39
|
+
"@atlaskit/icon": "^22.19.0",
|
|
40
40
|
"@atlaskit/icon-file-type": "^6.5.0",
|
|
41
41
|
"@atlaskit/icon-object": "^6.5.0",
|
|
42
42
|
"@atlaskit/icon-priority": "^6.3.0",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"@atlaskit/linking-common": "^5.11.0",
|
|
47
47
|
"@atlaskit/linking-types": "^9.0.0",
|
|
48
48
|
"@atlaskit/logo": "^14.3.0",
|
|
49
|
-
"@atlaskit/lozenge": "^11.
|
|
49
|
+
"@atlaskit/lozenge": "^11.11.0",
|
|
50
50
|
"@atlaskit/menu": "^2.12.0",
|
|
51
51
|
"@atlaskit/modal-dialog": "^12.17.0",
|
|
52
52
|
"@atlaskit/outbound-auth-flow-client": "^3.4.0",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"@atlaskit/textarea": "^5.6.0",
|
|
60
60
|
"@atlaskit/textfield": "^6.5.0",
|
|
61
61
|
"@atlaskit/theme": "^13.0.0",
|
|
62
|
-
"@atlaskit/tokens": "^
|
|
62
|
+
"@atlaskit/tokens": "^2.0.0",
|
|
63
63
|
"@atlaskit/tooltip": "^18.7.0",
|
|
64
64
|
"@atlaskit/ufo": "^0.3.0",
|
|
65
65
|
"@babel/runtime": "^7.0.0",
|
|
@@ -152,9 +152,6 @@
|
|
|
152
152
|
"platform-feature-flags": {
|
|
153
153
|
"platform.linking-platform.smart-card.enable-view-related-urls-action": {
|
|
154
154
|
"type": "boolean"
|
|
155
|
-
},
|
|
156
|
-
"linking-platform-increase-inline-card-icon-size": {
|
|
157
|
-
"type": "boolean"
|
|
158
155
|
}
|
|
159
156
|
}
|
|
160
157
|
}
|