@atlaskit/smart-card 19.1.31 → 20.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/dist/cjs/extractors/block/index.js +9 -19
- package/dist/cjs/extractors/common/actions/extractPreviewAction.js +3 -5
- package/dist/cjs/extractors/common/byline/extractByline.js +5 -11
- package/dist/cjs/extractors/common/context/index.js +0 -16
- package/dist/cjs/extractors/common/icon/extractIcon.js +4 -8
- package/dist/cjs/extractors/common/lozenge/extractLozenge.js +2 -2
- package/dist/cjs/extractors/common/lozenge/extractTaskType.js +2 -2
- package/dist/cjs/extractors/common/primitives/index.js +0 -16
- package/dist/cjs/extractors/embed/index.js +5 -9
- package/dist/cjs/extractors/flexible/collaboratorGroup/index.js +2 -2
- package/dist/cjs/extractors/flexible/extract-preview.js +2 -2
- package/dist/cjs/extractors/flexible/extract-priority.js +2 -2
- package/dist/cjs/extractors/flexible/icon/extract-jsonld-data-icon.js +2 -2
- package/dist/cjs/extractors/flexible/icon/extract-provider-icon.js +2 -2
- package/dist/cjs/extractors/flexible/icon/extract-url-icon.js +2 -2
- package/dist/cjs/extractors/flexible/index.js +6 -10
- package/dist/cjs/extractors/flexible/utils.js +3 -3
- package/dist/cjs/extractors/inline/index.js +4 -4
- package/dist/cjs/version.json +1 -1
- package/dist/cjs/view/FlexibleCard/utils.js +3 -1
- package/dist/cjs/view/HoverCard/components/hover-card-content.js +17 -8
- package/dist/cjs/view/HoverCard/index.js +18 -12
- package/dist/cjs/view/InlineCard/index.js +5 -3
- package/dist/cjs/view/common/Modal.js +2 -1
- package/dist/es2019/extractors/block/index.js +2 -7
- package/dist/es2019/extractors/common/actions/extractPreviewAction.js +1 -2
- package/dist/es2019/extractors/common/byline/extractByline.js +1 -4
- package/dist/es2019/extractors/common/context/index.js +0 -2
- package/dist/es2019/extractors/common/icon/extractIcon.js +1 -3
- package/dist/es2019/extractors/common/lozenge/extractLozenge.js +1 -1
- package/dist/es2019/extractors/common/lozenge/extractTaskType.js +1 -1
- package/dist/es2019/extractors/common/primitives/index.js +0 -2
- package/dist/es2019/extractors/embed/index.js +1 -3
- package/dist/es2019/extractors/flexible/collaboratorGroup/index.js +1 -1
- package/dist/es2019/extractors/flexible/extract-preview.js +1 -1
- package/dist/es2019/extractors/flexible/extract-priority.js +1 -1
- package/dist/es2019/extractors/flexible/icon/extract-jsonld-data-icon.js +1 -1
- package/dist/es2019/extractors/flexible/icon/extract-provider-icon.js +1 -1
- package/dist/es2019/extractors/flexible/icon/extract-url-icon.js +1 -1
- package/dist/es2019/extractors/flexible/index.js +2 -4
- package/dist/es2019/extractors/flexible/utils.js +1 -1
- package/dist/es2019/extractors/inline/index.js +2 -2
- package/dist/es2019/version.json +1 -1
- package/dist/es2019/view/FlexibleCard/utils.js +2 -1
- package/dist/es2019/view/HoverCard/components/hover-card-content.js +17 -6
- package/dist/es2019/view/HoverCard/index.js +18 -12
- package/dist/es2019/view/InlineCard/index.js +2 -1
- package/dist/es2019/view/common/Modal.js +1 -1
- package/dist/esm/extractors/block/index.js +2 -7
- package/dist/esm/extractors/common/actions/extractPreviewAction.js +1 -2
- package/dist/esm/extractors/common/byline/extractByline.js +1 -4
- package/dist/esm/extractors/common/context/index.js +0 -2
- package/dist/esm/extractors/common/icon/extractIcon.js +1 -3
- package/dist/esm/extractors/common/lozenge/extractLozenge.js +1 -1
- package/dist/esm/extractors/common/lozenge/extractTaskType.js +1 -1
- package/dist/esm/extractors/common/primitives/index.js +0 -2
- package/dist/esm/extractors/embed/index.js +1 -3
- package/dist/esm/extractors/flexible/collaboratorGroup/index.js +1 -1
- package/dist/esm/extractors/flexible/extract-preview.js +1 -1
- package/dist/esm/extractors/flexible/extract-priority.js +1 -1
- package/dist/esm/extractors/flexible/icon/extract-jsonld-data-icon.js +1 -1
- package/dist/esm/extractors/flexible/icon/extract-provider-icon.js +1 -1
- package/dist/esm/extractors/flexible/icon/extract-url-icon.js +1 -1
- package/dist/esm/extractors/flexible/index.js +2 -4
- package/dist/esm/extractors/flexible/utils.js +1 -1
- package/dist/esm/extractors/inline/index.js +2 -2
- package/dist/esm/version.json +1 -1
- package/dist/esm/view/FlexibleCard/utils.js +2 -1
- package/dist/esm/view/HoverCard/components/hover-card-content.js +16 -7
- package/dist/esm/view/HoverCard/index.js +18 -12
- package/dist/esm/view/InlineCard/index.js +2 -1
- package/dist/esm/view/common/Modal.js +2 -1
- package/dist/types/extractors/block/index.d.ts +1 -1
- package/dist/types/extractors/common/context/index.d.ts +0 -2
- package/dist/types/extractors/common/icon/extractIcon.d.ts +1 -1
- package/dist/types/extractors/common/primitives/index.d.ts +0 -2
- package/dist/types/extractors/flexible/collaboratorGroup/index.d.ts +1 -1
- package/dist/types/state/flexible-ui-context/types.d.ts +1 -1
- package/dist/types/view/HoverCard/types.d.ts +1 -0
- package/package.json +3 -3
- package/dist/cjs/extractors/common/context/extractContext.js +0 -38
- package/dist/cjs/extractors/common/context/extractProvider.js +0 -83
- package/dist/cjs/extractors/common/date/extractDateCreated.js +0 -14
- package/dist/cjs/extractors/common/date/extractDateUpdated.js +0 -14
- package/dist/cjs/extractors/common/person/extractMembers.js +0 -37
- package/dist/cjs/extractors/common/person/extractPersonAssignedTo.js +0 -18
- package/dist/cjs/extractors/common/person/extractPersonCreatedBy.js +0 -28
- package/dist/cjs/extractors/common/person/extractPersonUpdatedBy.js +0 -18
- package/dist/cjs/extractors/common/person/index.js +0 -37
- package/dist/cjs/extractors/common/person/types.js +0 -5
- package/dist/cjs/extractors/common/preview/extractImage.js +0 -26
- package/dist/cjs/extractors/common/preview/index.js +0 -21
- package/dist/cjs/extractors/common/primitives/extractLink.js +0 -22
- package/dist/cjs/extractors/common/primitives/extractTitle.js +0 -55
- package/dist/cjs/extractors/common/primitives/extractType.js +0 -20
- package/dist/cjs/extractors/common/utils.js +0 -43
- package/dist/es2019/extractors/common/context/extractContext.js +0 -27
- package/dist/es2019/extractors/common/context/extractProvider.js +0 -65
- package/dist/es2019/extractors/common/date/extractDateCreated.js +0 -5
- package/dist/es2019/extractors/common/date/extractDateUpdated.js +0 -5
- package/dist/es2019/extractors/common/person/extractMembers.js +0 -23
- package/dist/es2019/extractors/common/person/extractPersonAssignedTo.js +0 -8
- package/dist/es2019/extractors/common/person/extractPersonCreatedBy.js +0 -16
- package/dist/es2019/extractors/common/person/extractPersonUpdatedBy.js +0 -8
- package/dist/es2019/extractors/common/person/index.js +0 -4
- package/dist/es2019/extractors/common/person/types.js +0 -1
- package/dist/es2019/extractors/common/preview/extractImage.js +0 -16
- package/dist/es2019/extractors/common/preview/index.js +0 -2
- package/dist/es2019/extractors/common/primitives/extractLink.js +0 -12
- package/dist/es2019/extractors/common/primitives/extractTitle.js +0 -37
- package/dist/es2019/extractors/common/primitives/extractType.js +0 -11
- package/dist/es2019/extractors/common/utils.js +0 -30
- package/dist/esm/extractors/common/context/extractContext.js +0 -27
- package/dist/esm/extractors/common/context/extractProvider.js +0 -65
- package/dist/esm/extractors/common/date/extractDateCreated.js +0 -5
- package/dist/esm/extractors/common/date/extractDateUpdated.js +0 -5
- package/dist/esm/extractors/common/person/extractMembers.js +0 -27
- package/dist/esm/extractors/common/person/extractPersonAssignedTo.js +0 -8
- package/dist/esm/extractors/common/person/extractPersonCreatedBy.js +0 -18
- package/dist/esm/extractors/common/person/extractPersonUpdatedBy.js +0 -8
- package/dist/esm/extractors/common/person/index.js +0 -4
- package/dist/esm/extractors/common/person/types.js +0 -1
- package/dist/esm/extractors/common/preview/extractImage.js +0 -16
- package/dist/esm/extractors/common/preview/index.js +0 -2
- package/dist/esm/extractors/common/primitives/extractLink.js +0 -12
- package/dist/esm/extractors/common/primitives/extractTitle.js +0 -41
- package/dist/esm/extractors/common/primitives/extractType.js +0 -11
- package/dist/esm/extractors/common/utils.js +0 -30
- package/dist/types/extractors/common/context/extractContext.d.ts +0 -7
- package/dist/types/extractors/common/context/extractProvider.d.ts +0 -8
- package/dist/types/extractors/common/date/extractDateCreated.d.ts +0 -3
- package/dist/types/extractors/common/date/extractDateUpdated.d.ts +0 -2
- package/dist/types/extractors/common/person/extractMembers.d.ts +0 -3
- package/dist/types/extractors/common/person/extractPersonAssignedTo.d.ts +0 -4
- package/dist/types/extractors/common/person/extractPersonCreatedBy.d.ts +0 -3
- package/dist/types/extractors/common/person/extractPersonUpdatedBy.d.ts +0 -5
- package/dist/types/extractors/common/person/index.d.ts +0 -5
- package/dist/types/extractors/common/person/types.d.ts +0 -4
- package/dist/types/extractors/common/preview/extractImage.d.ts +0 -2
- package/dist/types/extractors/common/preview/index.d.ts +0 -3
- package/dist/types/extractors/common/primitives/extractLink.d.ts +0 -2
- package/dist/types/extractors/common/primitives/extractTitle.d.ts +0 -2
- package/dist/types/extractors/common/primitives/extractType.d.ts +0 -2
- package/dist/types/extractors/common/utils.d.ts +0 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @atlaskit/smart-card
|
|
2
2
|
|
|
3
|
+
## 20.0.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`3e4f8e1490a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3e4f8e1490a) - Hover Preview: Fix Hover Preview shows on top of Preview modal
|
|
8
|
+
|
|
9
|
+
## 20.0.0
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
15
|
+
## 19.2.0
|
|
16
|
+
|
|
17
|
+
### Minor Changes
|
|
18
|
+
|
|
19
|
+
- [`cd5e63258cd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cd5e63258cd) - Moved extractors to linking-common/extractors
|
|
20
|
+
|
|
21
|
+
### Patch Changes
|
|
22
|
+
|
|
23
|
+
- Updated dependencies
|
|
24
|
+
|
|
3
25
|
## 19.1.31
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
|
@@ -15,24 +15,14 @@ var _lozenge = require("../common/lozenge");
|
|
|
15
15
|
|
|
16
16
|
var _icon = require("../common/icon");
|
|
17
17
|
|
|
18
|
-
var _extractProvider = require("../common/context/extractProvider");
|
|
19
|
-
|
|
20
18
|
var _detail = require("../common/detail");
|
|
21
19
|
|
|
22
|
-
var
|
|
23
|
-
|
|
24
|
-
var _extractPersonAssignedTo = require("../common/person/extractPersonAssignedTo");
|
|
25
|
-
|
|
26
|
-
var _extractPersonCreatedBy = require("../common/person/extractPersonCreatedBy");
|
|
27
|
-
|
|
28
|
-
var _extractPersonUpdatedBy = require("../common/person/extractPersonUpdatedBy");
|
|
20
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
29
21
|
|
|
30
22
|
var _extractByline = require("../common/byline/extractByline");
|
|
31
23
|
|
|
32
24
|
var _extractTitlePrefix = require("../common/title-prefix/extractTitlePrefix");
|
|
33
25
|
|
|
34
|
-
var _extractImage = require("../common/preview/extractImage");
|
|
35
|
-
|
|
36
26
|
var _extractActions = require("../common/actions/extractActions");
|
|
37
27
|
|
|
38
28
|
var _extractPreviewAction = require("../common/actions/extractPreviewAction");
|
|
@@ -87,22 +77,22 @@ exports.extractBlockActions = extractBlockActions;
|
|
|
87
77
|
|
|
88
78
|
var extractBlockUsers = function extractBlockUsers(jsonLd) {
|
|
89
79
|
if (jsonLd['@type'] === 'atlassian:Project') {
|
|
90
|
-
return (0,
|
|
80
|
+
return (0, _extractors.extractMembers)(jsonLd);
|
|
91
81
|
} else if (jsonLd['@type'] === 'atlassian:Task') {
|
|
92
|
-
var assignedMembers = (0,
|
|
82
|
+
var assignedMembers = (0, _extractors.extractPersonAssignedTo)(jsonLd);
|
|
93
83
|
|
|
94
84
|
if (assignedMembers) {
|
|
95
85
|
return [assignedMembers];
|
|
96
86
|
}
|
|
97
87
|
} else {
|
|
98
|
-
var updatedBy = (0,
|
|
88
|
+
var updatedBy = (0, _extractors.extractPersonUpdatedBy)(jsonLd);
|
|
99
89
|
var updatedByMembers;
|
|
100
90
|
|
|
101
91
|
if (updatedBy) {
|
|
102
92
|
updatedByMembers = [updatedBy];
|
|
103
93
|
}
|
|
104
94
|
|
|
105
|
-
var createdByMembers = (0,
|
|
95
|
+
var createdByMembers = (0, _extractors.extractPersonCreatedBy)(jsonLd);
|
|
106
96
|
return updatedByMembers || createdByMembers;
|
|
107
97
|
}
|
|
108
98
|
};
|
|
@@ -111,15 +101,15 @@ exports.extractBlockUsers = extractBlockUsers;
|
|
|
111
101
|
|
|
112
102
|
var extractBlockProps = function extractBlockProps(jsonLd, meta, opts, renderers, platform) {
|
|
113
103
|
var props = {
|
|
114
|
-
link: (0,
|
|
115
|
-
title: (0,
|
|
104
|
+
link: (0, _extractors.extractLink)(jsonLd),
|
|
105
|
+
title: (0, _extractors.extractTitle)(jsonLd),
|
|
116
106
|
titleTextColor: (0, _primitives.extractTitleTextColor)(jsonLd),
|
|
117
107
|
lozenge: (0, _lozenge.extractLozenge)(jsonLd),
|
|
118
108
|
icon: extractBlockIcon(jsonLd),
|
|
119
|
-
context: (0,
|
|
109
|
+
context: (0, _extractors.extractProvider)(jsonLd),
|
|
120
110
|
details: extractBlockDetails(jsonLd),
|
|
121
111
|
byline: (0, _primitives.extractSummary)(jsonLd) || (0, _extractByline.extractByline)(jsonLd),
|
|
122
|
-
thumbnail: (0,
|
|
112
|
+
thumbnail: (0, _extractors.extractImage)(jsonLd),
|
|
123
113
|
users: extractBlockUsers(jsonLd),
|
|
124
114
|
titlePrefix: (0, _extractTitlePrefix.extractTitlePrefix)(jsonLd, renderers, 'block'),
|
|
125
115
|
isTrusted: (0, _extractIsTrusted.extractIsTrusted)(meta)
|
|
@@ -13,9 +13,7 @@ var _analytics = require("../../../utils/analytics");
|
|
|
13
13
|
|
|
14
14
|
var _detail = require("../detail");
|
|
15
15
|
|
|
16
|
-
var
|
|
17
|
-
|
|
18
|
-
var _preview = require("../preview");
|
|
16
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
19
17
|
|
|
20
18
|
var _BlockCard = require("../../../view/BlockCard");
|
|
21
19
|
|
|
@@ -25,8 +23,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
25
23
|
|
|
26
24
|
var getMetadataFromJsonLd = function getMetadataFromJsonLd(jsonLd, platform) {
|
|
27
25
|
var download = (0, _detail.extractDownloadUrl)(jsonLd);
|
|
28
|
-
var provider = (0,
|
|
29
|
-
var preview = (0,
|
|
26
|
+
var provider = (0, _extractors.extractProvider)(jsonLd);
|
|
27
|
+
var preview = (0, _extractors.extractPreview)(jsonLd, platform);
|
|
30
28
|
return {
|
|
31
29
|
download: download,
|
|
32
30
|
providerName: provider && provider.text,
|
|
@@ -13,24 +13,18 @@ var _reactIntlNext = require("react-intl-next");
|
|
|
13
13
|
|
|
14
14
|
var _intlUtils = require("@formatjs/intl-utils");
|
|
15
15
|
|
|
16
|
-
var
|
|
17
|
-
|
|
18
|
-
var _extractPersonCreatedBy = require("../person/extractPersonCreatedBy");
|
|
19
|
-
|
|
20
|
-
var _extractDateCreated = require("../date/extractDateCreated");
|
|
21
|
-
|
|
22
|
-
var _extractDateUpdated = require("../date/extractDateUpdated");
|
|
16
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
23
17
|
|
|
24
18
|
var extractByline = function extractByline(jsonLd) {
|
|
25
|
-
var updatedAt = (0,
|
|
26
|
-
var createdAt = (0,
|
|
19
|
+
var updatedAt = (0, _extractors.extractDateUpdated)(jsonLd);
|
|
20
|
+
var createdAt = (0, _extractors.extractDateCreated)(jsonLd);
|
|
27
21
|
|
|
28
22
|
if (updatedAt) {
|
|
29
23
|
var _selectUnit = (0, _intlUtils.selectUnit)(new Date(updatedAt).getTime()),
|
|
30
24
|
value = _selectUnit.value,
|
|
31
25
|
unit = _selectUnit.unit;
|
|
32
26
|
|
|
33
|
-
var updatedBy = (0,
|
|
27
|
+
var updatedBy = (0, _extractors.extractPersonUpdatedBy)(jsonLd);
|
|
34
28
|
return /*#__PURE__*/_react.default.createElement("span", null, "Updated ", updatedBy && "by ".concat(updatedBy.name), ' ', /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedRelativeTime, {
|
|
35
29
|
value: value,
|
|
36
30
|
unit: unit
|
|
@@ -40,7 +34,7 @@ var extractByline = function extractByline(jsonLd) {
|
|
|
40
34
|
_value = _selectUnit2.value,
|
|
41
35
|
_unit = _selectUnit2.unit;
|
|
42
36
|
|
|
43
|
-
var createdBy = (0,
|
|
37
|
+
var createdBy = (0, _extractors.extractPersonCreatedBy)(jsonLd);
|
|
44
38
|
var createdByPerson = extractFirstPerson(createdBy);
|
|
45
39
|
return /*#__PURE__*/_react.default.createElement("span", null, "Created ", createdByPerson && "by ".concat(createdByPerson.name), ' ', /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedRelativeTime, {
|
|
46
40
|
value: _value,
|
|
@@ -3,18 +3,6 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
Object.defineProperty(exports, "extractContext", {
|
|
7
|
-
enumerable: true,
|
|
8
|
-
get: function get() {
|
|
9
|
-
return _extractContext.extractContext;
|
|
10
|
-
}
|
|
11
|
-
});
|
|
12
|
-
Object.defineProperty(exports, "extractProvider", {
|
|
13
|
-
enumerable: true,
|
|
14
|
-
get: function get() {
|
|
15
|
-
return _extractProvider.extractProvider;
|
|
16
|
-
}
|
|
17
|
-
});
|
|
18
6
|
Object.defineProperty(exports, "extractRequestAccessContext", {
|
|
19
7
|
enumerable: true,
|
|
20
8
|
get: function get() {
|
|
@@ -22,8 +10,4 @@ Object.defineProperty(exports, "extractRequestAccessContext", {
|
|
|
22
10
|
}
|
|
23
11
|
});
|
|
24
12
|
|
|
25
|
-
var _extractContext = require("./extractContext");
|
|
26
|
-
|
|
27
|
-
var _extractProvider = require("./extractProvider");
|
|
28
|
-
|
|
29
13
|
var _extractAccessContext = require("./extractAccessContext");
|
|
@@ -23,9 +23,7 @@ var _5 = _interopRequireDefault(require("@atlaskit/icon-object/glyph/task/16"));
|
|
|
23
23
|
|
|
24
24
|
var _priority = require("./priority");
|
|
25
25
|
|
|
26
|
-
var
|
|
27
|
-
|
|
28
|
-
var _extractTitle = require("../primitives/extractTitle");
|
|
26
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
29
27
|
|
|
30
28
|
var _extractFileFormat = require("./extractFileFormat");
|
|
31
29
|
|
|
@@ -35,17 +33,15 @@ var _extractIconFromTask = require("./extractIconFromTask");
|
|
|
35
33
|
|
|
36
34
|
var _extractTaskType = require("../lozenge/extractTaskType");
|
|
37
35
|
|
|
38
|
-
var _utils = require("../utils");
|
|
39
|
-
|
|
40
36
|
var extractIcon = function extractIcon(jsonLd) {
|
|
41
37
|
var priority = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'type';
|
|
42
38
|
var type = jsonLd['@type'];
|
|
43
39
|
var opts = {
|
|
44
|
-
title: (0,
|
|
45
|
-
provider: (0,
|
|
40
|
+
title: (0, _extractors.extractTitle)(jsonLd),
|
|
41
|
+
provider: (0, _extractors.extractProvider)(jsonLd),
|
|
46
42
|
fileFormat: (0, _extractFileFormat.extractFileFormat)(jsonLd),
|
|
47
43
|
taskType: (0, _extractTaskType.extractTaskType)(jsonLd),
|
|
48
|
-
icon: jsonLd.icon && (0,
|
|
44
|
+
icon: jsonLd.icon && (0, _extractors.extractUrlFromIconJsonLd)(jsonLd.icon),
|
|
49
45
|
priority: priority
|
|
50
46
|
};
|
|
51
47
|
|
|
@@ -11,14 +11,14 @@ var _extractTag = require("./extractTag");
|
|
|
11
11
|
|
|
12
12
|
var _extractTaskStatus = require("./extractTaskStatus");
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
15
15
|
|
|
16
16
|
var _extractTaskType = require("./extractTaskType");
|
|
17
17
|
|
|
18
18
|
var DOC_TYPES = ['schema:BlogPosting', 'schema:TextDigitalDocument', 'schema:DigitalDocument', 'schema:PresentationDigitalDocument', 'schema:SpreadsheetDigitalDocument'];
|
|
19
19
|
|
|
20
20
|
var extractLozenge = function extractLozenge(jsonLd) {
|
|
21
|
-
var type = (0,
|
|
21
|
+
var type = (0, _extractors.extractType)(jsonLd);
|
|
22
22
|
|
|
23
23
|
if (type) {
|
|
24
24
|
if (type.includes('atlassian:SourceCodePullRequest')) {
|
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.extractTaskType = void 0;
|
|
7
7
|
|
|
8
|
-
var
|
|
8
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
9
9
|
|
|
10
10
|
var extractTaskType = function extractTaskType(jsonLd) {
|
|
11
11
|
// TODO: Remove once Jira migrate to the correct type.
|
|
@@ -24,7 +24,7 @@ var extractTaskType = function extractTaskType(jsonLd) {
|
|
|
24
24
|
return {
|
|
25
25
|
id: taskType['@id'],
|
|
26
26
|
name: taskType.name,
|
|
27
|
-
icon: taskType.icon && (0,
|
|
27
|
+
icon: taskType.icon && (0, _extractors.extractUrlFromIconJsonLd)(taskType.icon)
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
}
|
|
@@ -3,24 +3,12 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
Object.defineProperty(exports, "extractLink", {
|
|
7
|
-
enumerable: true,
|
|
8
|
-
get: function get() {
|
|
9
|
-
return _extractLink.extractLink;
|
|
10
|
-
}
|
|
11
|
-
});
|
|
12
6
|
Object.defineProperty(exports, "extractSummary", {
|
|
13
7
|
enumerable: true,
|
|
14
8
|
get: function get() {
|
|
15
9
|
return _extractSummary.extractSummary;
|
|
16
10
|
}
|
|
17
11
|
});
|
|
18
|
-
Object.defineProperty(exports, "extractTitle", {
|
|
19
|
-
enumerable: true,
|
|
20
|
-
get: function get() {
|
|
21
|
-
return _extractTitle.extractTitle;
|
|
22
|
-
}
|
|
23
|
-
});
|
|
24
12
|
Object.defineProperty(exports, "extractTitleTextColor", {
|
|
25
13
|
enumerable: true,
|
|
26
14
|
get: function get() {
|
|
@@ -28,10 +16,6 @@ Object.defineProperty(exports, "extractTitleTextColor", {
|
|
|
28
16
|
}
|
|
29
17
|
});
|
|
30
18
|
|
|
31
|
-
var _extractLink = require("./extractLink");
|
|
32
|
-
|
|
33
19
|
var _extractSummary = require("./extractSummary");
|
|
34
20
|
|
|
35
|
-
var _extractTitle = require("./extractTitle");
|
|
36
|
-
|
|
37
21
|
var _extractTitleTextColor = require("./extractTitleTextColor");
|
|
@@ -9,11 +9,7 @@ exports.extractEmbedProps = void 0;
|
|
|
9
9
|
|
|
10
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
11
|
|
|
12
|
-
var
|
|
13
|
-
|
|
14
|
-
var _context = require("../common/context");
|
|
15
|
-
|
|
16
|
-
var _linkingCommon = require("@atlaskit/linking-common");
|
|
12
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
17
13
|
|
|
18
14
|
var _extractIsTrusted = require("../common/meta/extractIsTrusted");
|
|
19
15
|
|
|
@@ -22,7 +18,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
22
18
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
23
19
|
|
|
24
20
|
var extractEmbedPreview = function extractEmbedPreview(jsonLd, platform) {
|
|
25
|
-
var preview = (0,
|
|
21
|
+
var preview = (0, _extractors.extractPreview)(jsonLd, platform);
|
|
26
22
|
|
|
27
23
|
if (preview && preview.src) {
|
|
28
24
|
return _objectSpread(_objectSpread({}, preview), {}, {
|
|
@@ -33,9 +29,9 @@ var extractEmbedPreview = function extractEmbedPreview(jsonLd, platform) {
|
|
|
33
29
|
|
|
34
30
|
var extractEmbedProps = function extractEmbedProps(jsonLd, meta, platform) {
|
|
35
31
|
return {
|
|
36
|
-
link: (0,
|
|
37
|
-
title: (0,
|
|
38
|
-
context: (0,
|
|
32
|
+
link: (0, _extractors.extractLink)(jsonLd) || '',
|
|
33
|
+
title: (0, _extractors.extractTitle)(jsonLd),
|
|
34
|
+
context: (0, _extractors.extractProvider)(jsonLd),
|
|
39
35
|
preview: extractEmbedPreview(jsonLd, platform),
|
|
40
36
|
isTrusted: (0, _extractIsTrusted.extractIsTrusted)(meta)
|
|
41
37
|
};
|
|
@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.extractPersonsUpdatedBy = void 0;
|
|
7
7
|
|
|
8
|
-
var
|
|
8
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
9
9
|
|
|
10
10
|
// Temporary Extractor until https://product-fabric.atlassian.net/browse/EDM-2652 is ready
|
|
11
11
|
var extractPersonsUpdatedBy = function extractPersonsUpdatedBy(jsonLd) {
|
|
12
12
|
var updatedBy = jsonLd['atlassian:updatedBy'];
|
|
13
13
|
|
|
14
14
|
if (updatedBy) {
|
|
15
|
-
var extractedPersons = (0,
|
|
15
|
+
var extractedPersons = (0, _extractors.extractPersonFromJsonLd)(updatedBy);
|
|
16
16
|
return extractedPersons ? [extractedPersons] : undefined;
|
|
17
17
|
}
|
|
18
18
|
};
|
|
@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
|
|
8
|
-
var
|
|
8
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
9
9
|
|
|
10
10
|
var _constants = require("../../constants");
|
|
11
11
|
|
|
12
12
|
var extractPreview = function extractPreview(data) {
|
|
13
|
-
var url = (0,
|
|
13
|
+
var url = (0, _extractors.extractImage)(data);
|
|
14
14
|
return url ? {
|
|
15
15
|
type: _constants.MediaType.Image,
|
|
16
16
|
url: url
|
|
@@ -7,7 +7,7 @@ exports.default = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _constants = require("../../constants");
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
11
11
|
|
|
12
12
|
var priorityMapper = {
|
|
13
13
|
blocker: _constants.IconType.PriorityBlocker,
|
|
@@ -39,7 +39,7 @@ var extractPriority = function extractPriority(data) {
|
|
|
39
39
|
} else if (priority['@type'] === 'Object') {
|
|
40
40
|
return {
|
|
41
41
|
label: priority.name,
|
|
42
|
-
url: priority.icon && (0,
|
|
42
|
+
url: priority.icon && (0, _extractors.extractUrlFromIconJsonLd)(priority.icon)
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
}
|
|
@@ -21,7 +21,7 @@ var _extractUrlIcon = _interopRequireDefault(require("./extract-url-icon"));
|
|
|
21
21
|
|
|
22
22
|
var _lozenge = require("../../common/lozenge");
|
|
23
23
|
|
|
24
|
-
var
|
|
24
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
25
25
|
|
|
26
26
|
var _priority = require("../../common/icon/priority");
|
|
27
27
|
|
|
@@ -64,7 +64,7 @@ var isNativeProvider = function isNativeProvider(provider) {
|
|
|
64
64
|
|
|
65
65
|
var extractJsonldDataIcon = function extractJsonldDataIcon(data) {
|
|
66
66
|
var generator = data.generator;
|
|
67
|
-
var label = (0,
|
|
67
|
+
var label = (0, _extractors.extractTitle)(data);
|
|
68
68
|
var type = extractType(data);
|
|
69
69
|
var urlIcon = (0, _extractUrlIcon.default)(data.icon, label);
|
|
70
70
|
var provider = generator === null || generator === void 0 ? void 0 : generator['@id'];
|
|
@@ -13,7 +13,7 @@ var _constants2 = require("../../../constants");
|
|
|
13
13
|
|
|
14
14
|
var _extractUrlIcon = _interopRequireDefault(require("./extract-url-icon"));
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
17
17
|
|
|
18
18
|
var extractProviderIcon = function extractProviderIcon(data) {
|
|
19
19
|
if (!data) {
|
|
@@ -23,7 +23,7 @@ var extractProviderIcon = function extractProviderIcon(data) {
|
|
|
23
23
|
var generator = data.generator;
|
|
24
24
|
var provider = generator === null || generator === void 0 ? void 0 : generator['@id'];
|
|
25
25
|
var icon = generator === null || generator === void 0 ? void 0 : generator.icon;
|
|
26
|
-
var label = (generator === null || generator === void 0 ? void 0 : generator.name) || (0,
|
|
26
|
+
var label = (generator === null || generator === void 0 ? void 0 : generator.name) || (0, _extractors.extractTitle)(data);
|
|
27
27
|
|
|
28
28
|
if (provider === _constants.CONFLUENCE_GENERATOR_ID) {
|
|
29
29
|
return {
|
|
@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
|
|
8
|
-
var
|
|
8
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
9
9
|
|
|
10
10
|
var extractUrlIcon = function extractUrlIcon(icon, label) {
|
|
11
|
-
var url = icon && (0,
|
|
11
|
+
var url = icon && (0, _extractors.extractUrlFromIconJsonLd)(icon);
|
|
12
12
|
return url ? {
|
|
13
13
|
label: label,
|
|
14
14
|
url: url
|
|
@@ -15,13 +15,9 @@ var _icon = require("./icon");
|
|
|
15
15
|
|
|
16
16
|
var _utils = require("./utils");
|
|
17
17
|
|
|
18
|
-
var _person = require("../common/person");
|
|
19
|
-
|
|
20
18
|
var _collaboratorGroup = require("./collaboratorGroup");
|
|
21
19
|
|
|
22
|
-
var
|
|
23
|
-
|
|
24
|
-
var _extractDateCreated = require("../common/date/extractDateCreated");
|
|
20
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
25
21
|
|
|
26
22
|
var _extractPriority = _interopRequireDefault(require("./extract-priority"));
|
|
27
23
|
|
|
@@ -37,21 +33,21 @@ var extractFlexibleUiContext = function extractFlexibleUiContext(response, rende
|
|
|
37
33
|
}
|
|
38
34
|
|
|
39
35
|
var data = response.data;
|
|
40
|
-
var url = (0,
|
|
36
|
+
var url = (0, _extractors.extractLink)(data);
|
|
41
37
|
return {
|
|
42
|
-
authorGroup: (0,
|
|
38
|
+
authorGroup: (0, _extractors.extractPersonCreatedBy)(data),
|
|
43
39
|
collaboratorGroup: (0, _collaboratorGroup.extractPersonsUpdatedBy)(data),
|
|
44
40
|
commentCount: (0, _utils.extractCommentCount)(data),
|
|
45
41
|
viewCount: (0, _utils.extractViewCount)(data),
|
|
46
42
|
reactCount: (0, _utils.extractReactCount)(data),
|
|
47
43
|
voteCount: (0, _utils.extractVoteCount)(data),
|
|
48
44
|
createdBy: (0, _utils.extractCreatedBy)(data),
|
|
49
|
-
createdOn: (0,
|
|
45
|
+
createdOn: (0, _extractors.extractDateCreated)(data),
|
|
50
46
|
dueOn: (0, _utils.extractDueOn)(data),
|
|
51
47
|
latestCommit: (0, _latestCommit.extractLatestCommit)(data),
|
|
52
48
|
linkIcon: (0, _icon.extractLinkIcon)(response, renderers),
|
|
53
49
|
modifiedBy: (0, _utils.extractModifiedBy)(data),
|
|
54
|
-
modifiedOn: (0,
|
|
50
|
+
modifiedOn: (0, _extractors.extractDateUpdated)(data),
|
|
55
51
|
preview: (0, _extractPreview.default)(data),
|
|
56
52
|
priority: (0, _extractPriority.default)(data),
|
|
57
53
|
provider: (0, _extractProviderIcon.default)(data),
|
|
@@ -62,7 +58,7 @@ var extractFlexibleUiContext = function extractFlexibleUiContext(response, rende
|
|
|
62
58
|
state: (0, _lozenge.extractLozenge)(data),
|
|
63
59
|
subscriberCount: (0, _utils.extractSubscriberCount)(data),
|
|
64
60
|
targetBranch: (0, _utils.extractTargetBranch)(data),
|
|
65
|
-
title: (0,
|
|
61
|
+
title: (0, _extractors.extractTitle)(data) || url,
|
|
66
62
|
url: url
|
|
67
63
|
};
|
|
68
64
|
};
|
|
@@ -9,7 +9,7 @@ exports.extractVoteCount = exports.extractViewCount = exports.extractTargetBranc
|
|
|
9
9
|
|
|
10
10
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
11
11
|
|
|
12
|
-
var
|
|
12
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
13
13
|
|
|
14
14
|
var extractLinkName = function extractLinkName(link) {
|
|
15
15
|
if (link && (0, _typeof2.default)(link) === 'object' && link['@type'] === 'Link') {
|
|
@@ -52,7 +52,7 @@ var extractVoteCount = function extractVoteCount(data) {
|
|
|
52
52
|
exports.extractVoteCount = extractVoteCount;
|
|
53
53
|
|
|
54
54
|
var extractCreatedBy = function extractCreatedBy(data) {
|
|
55
|
-
var persons = (0,
|
|
55
|
+
var persons = (0, _extractors.extractPersonCreatedBy)(data);
|
|
56
56
|
|
|
57
57
|
if (persons && persons.length) {
|
|
58
58
|
return persons[0].name;
|
|
@@ -62,7 +62,7 @@ var extractCreatedBy = function extractCreatedBy(data) {
|
|
|
62
62
|
exports.extractCreatedBy = extractCreatedBy;
|
|
63
63
|
|
|
64
64
|
var extractModifiedBy = function extractModifiedBy(data) {
|
|
65
|
-
var person = (0,
|
|
65
|
+
var person = (0, _extractors.extractPersonUpdatedBy)(data);
|
|
66
66
|
|
|
67
67
|
if (person) {
|
|
68
68
|
return person.name;
|
|
@@ -13,12 +13,12 @@ var _icon = require("../common/icon");
|
|
|
13
13
|
|
|
14
14
|
var _titlePrefix = require("../common/title-prefix");
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
17
17
|
|
|
18
18
|
var _constants = require("../constants");
|
|
19
19
|
|
|
20
20
|
var extractInlineIcon = function extractInlineIcon(jsonLd) {
|
|
21
|
-
var provider = (0,
|
|
21
|
+
var provider = (0, _extractors.extractProvider)(jsonLd);
|
|
22
22
|
|
|
23
23
|
if (provider && provider.id) {
|
|
24
24
|
if (provider.id === _constants.CONFLUENCE_GENERATOR_ID || provider.id === _constants.JIRA_GENERATOR_ID) {
|
|
@@ -33,8 +33,8 @@ exports.extractInlineIcon = extractInlineIcon;
|
|
|
33
33
|
|
|
34
34
|
var extractInlineProps = function extractInlineProps(jsonLd, renderers) {
|
|
35
35
|
return {
|
|
36
|
-
link: (0,
|
|
37
|
-
title: (0,
|
|
36
|
+
link: (0, _extractors.extractLink)(jsonLd),
|
|
37
|
+
title: (0, _extractors.extractTitle)(jsonLd),
|
|
38
38
|
lozenge: (0, _lozenge.extractLozenge)(jsonLd),
|
|
39
39
|
icon: extractInlineIcon(jsonLd),
|
|
40
40
|
titleTextColor: (0, _primitives.extractTitleTextColor)(jsonLd),
|
package/dist/cjs/version.json
CHANGED
|
@@ -21,6 +21,8 @@ var _icon = require("../../extractors/flexible/icon");
|
|
|
21
21
|
|
|
22
22
|
var _utils = require("../../utils");
|
|
23
23
|
|
|
24
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
25
|
+
|
|
24
26
|
var getContextByStatus = function getContextByStatus(url, status, details, renderers) {
|
|
25
27
|
switch (status) {
|
|
26
28
|
case _constants.SmartLinkStatus.Pending:
|
|
@@ -83,7 +85,7 @@ var getRetryOptions = function getRetryOptions(url, status, details, onAuthorize
|
|
|
83
85
|
case _constants.SmartLinkStatus.Forbidden:
|
|
84
86
|
var data = details && details.data || (0, _jsonld.getEmptyJsonLd)();
|
|
85
87
|
var meta = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : (0, _jsonld.getUnauthorizedJsonLd)().meta;
|
|
86
|
-
var provider = (0,
|
|
88
|
+
var provider = (0, _extractors.extractProvider)(data);
|
|
87
89
|
var context = provider === null || provider === void 0 ? void 0 : provider.text;
|
|
88
90
|
var access = (0, _context.extractRequestAccessContext)({
|
|
89
91
|
jsonLd: meta,
|
|
@@ -31,7 +31,7 @@ var _helpers = require("../../../state/helpers");
|
|
|
31
31
|
|
|
32
32
|
var _styled = require("../styled");
|
|
33
33
|
|
|
34
|
-
var
|
|
34
|
+
var _extractors = require("@atlaskit/linking-common/extractors");
|
|
35
35
|
|
|
36
36
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
37
37
|
|
|
@@ -45,7 +45,7 @@ var flexibleUiOptions = {
|
|
|
45
45
|
hidePadding: true
|
|
46
46
|
};
|
|
47
47
|
|
|
48
|
-
var getOpenAction = function getOpenAction(url, analytics) {
|
|
48
|
+
var getOpenAction = function getOpenAction(url, analytics, onActionClick) {
|
|
49
49
|
return {
|
|
50
50
|
name: _constants.ActionName.CustomAction,
|
|
51
51
|
icon: /*#__PURE__*/_react.default.createElement(_shortcut.default, {
|
|
@@ -54,6 +54,10 @@ var getOpenAction = function getOpenAction(url, analytics) {
|
|
|
54
54
|
}),
|
|
55
55
|
iconPosition: 'before',
|
|
56
56
|
onClick: function onClick() {
|
|
57
|
+
if (onActionClick) {
|
|
58
|
+
onActionClick('open-content');
|
|
59
|
+
}
|
|
60
|
+
|
|
57
61
|
window.open(url, '_blank');
|
|
58
62
|
analytics.ui.hoverCardOpenLinkClickedEvent('card');
|
|
59
63
|
},
|
|
@@ -61,12 +65,16 @@ var getOpenAction = function getOpenAction(url, analytics) {
|
|
|
61
65
|
};
|
|
62
66
|
};
|
|
63
67
|
|
|
64
|
-
var toFooterActions = function toFooterActions(cardActions) {
|
|
68
|
+
var toFooterActions = function toFooterActions(cardActions, onActionClick) {
|
|
65
69
|
return cardActions.map(function (action) {
|
|
66
70
|
return {
|
|
67
71
|
content: action.text,
|
|
68
72
|
name: _constants.ActionName.CustomAction,
|
|
69
73
|
onClick: function onClick() {
|
|
74
|
+
if (onActionClick) {
|
|
75
|
+
onActionClick(action.id);
|
|
76
|
+
}
|
|
77
|
+
|
|
70
78
|
return action.invoke();
|
|
71
79
|
},
|
|
72
80
|
testId: action.id
|
|
@@ -81,6 +89,7 @@ var HoverCardContent = function HoverCardContent(_ref) {
|
|
|
81
89
|
_ref$cardActions = _ref.cardActions,
|
|
82
90
|
cardActions = _ref$cardActions === void 0 ? [] : _ref$cardActions,
|
|
83
91
|
cardState = _ref.cardState,
|
|
92
|
+
onActionClick = _ref.onActionClick,
|
|
84
93
|
onResolve = _ref.onResolve,
|
|
85
94
|
renderers = _ref.renderers,
|
|
86
95
|
url = _ref.url;
|
|
@@ -97,13 +106,13 @@ var HoverCardContent = function HoverCardContent(_ref) {
|
|
|
97
106
|
analytics.ui.cardClickedEvent(undefined, _utils.HOVER_CARD_ANALYTICS_DISPLAY, cardState.status, undefined, undefined, isModifierKeyPressed, undefined, undefined, undefined, 'titleGoToLink');
|
|
98
107
|
}, [cardState.status, analytics.ui]);
|
|
99
108
|
var titleActions = (0, _react.useMemo)(function () {
|
|
100
|
-
return [getOpenAction(url, analytics)];
|
|
101
|
-
}, [url, analytics]);
|
|
109
|
+
return [getOpenAction(url, analytics, onActionClick)];
|
|
110
|
+
}, [url, analytics, onActionClick]);
|
|
102
111
|
var footerActions = (0, _react.useMemo)(function () {
|
|
103
|
-
return toFooterActions(cardActions);
|
|
104
|
-
}, [cardActions]);
|
|
112
|
+
return toFooterActions(cardActions, onActionClick);
|
|
113
|
+
}, [cardActions, onActionClick]);
|
|
105
114
|
var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
|
|
106
|
-
var types = data ? (0,
|
|
115
|
+
var types = data ? (0, _extractors.extractType)(data) : undefined; //TODO: EDM-3224 deleted simulated and use real JsonLd
|
|
107
116
|
|
|
108
117
|
var _extractMetadata = (0, _extractMetadata2.extractMetadata)((0, _utils.getSimulatedMetadata)(extensionKey, types)),
|
|
109
118
|
primary = _extractMetadata.primary,
|