@atlaskit/smart-card 26.9.17 → 26.9.19
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 +12 -0
- package/dist/cjs/version.json +1 -1
- package/dist/cjs/view/EmbedCard/views/UnauthorisedView.js +3 -3
- package/dist/cjs/view/FlexibleCard/components/container/index.js +1 -1
- package/dist/cjs/view/FlexibleCard/components/elements/avatar-group/index.js +1 -2
- package/dist/cjs/view/FlexibleCard/utils.js +3 -3
- package/dist/cjs/view/HoverCard/components/HoverCardContent.js +2 -1
- package/dist/cjs/view/InlineCard/UnauthorisedView/index.js +3 -2
- package/dist/es2019/version.json +1 -1
- package/dist/es2019/view/EmbedCard/views/UnauthorisedView.js +3 -3
- package/dist/es2019/view/FlexibleCard/components/container/index.js +1 -1
- package/dist/es2019/view/FlexibleCard/components/elements/avatar-group/index.js +3 -2
- package/dist/es2019/view/FlexibleCard/utils.js +3 -3
- package/dist/es2019/view/HoverCard/components/HoverCardContent.js +3 -2
- package/dist/es2019/view/InlineCard/UnauthorisedView/index.js +3 -2
- package/dist/esm/version.json +1 -1
- package/dist/esm/view/EmbedCard/views/UnauthorisedView.js +3 -3
- package/dist/esm/view/FlexibleCard/components/container/index.js +1 -1
- package/dist/esm/view/FlexibleCard/components/elements/avatar-group/index.js +1 -2
- package/dist/esm/view/FlexibleCard/utils.js +3 -3
- package/dist/esm/view/HoverCard/components/HoverCardContent.js +3 -2
- package/dist/esm/view/InlineCard/UnauthorisedView/index.js +3 -2
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @atlaskit/smart-card
|
|
2
2
|
|
|
3
|
+
## 26.9.19
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`928615c211b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/928615c211b) - Fix connect button appear when user cannot not connect (no auth flow)
|
|
8
|
+
|
|
9
|
+
## 26.9.18
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [`bfab8038b9c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/bfab8038b9c) - [ux] Fix for Block card avatar misalignment in Cofnluence renderer caused by a less specific css rule on our end
|
|
14
|
+
|
|
3
15
|
## 26.9.17
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
package/dist/cjs/version.json
CHANGED
|
@@ -52,12 +52,12 @@ var EmbedCardUnauthorisedView = function EmbedCardUnauthorisedView(_ref) {
|
|
|
52
52
|
title: "connect_link_account_card_name",
|
|
53
53
|
description: "connect_unauthorised_account_description",
|
|
54
54
|
context: context && context.text,
|
|
55
|
-
button: {
|
|
55
|
+
button: onAuthorise ? {
|
|
56
56
|
appearance: 'primary',
|
|
57
57
|
text: 'connect_unauthorised_account_action',
|
|
58
58
|
testId: 'connect-account'
|
|
59
|
-
},
|
|
60
|
-
onClick: handleOnAuthorizeClick,
|
|
59
|
+
} : undefined,
|
|
60
|
+
onClick: onAuthorise ? handleOnAuthorizeClick : undefined,
|
|
61
61
|
testId: testId
|
|
62
62
|
}, /*#__PURE__*/_react.default.createElement(_UnauthorisedViewContent.default, {
|
|
63
63
|
analytics: analytics,
|
|
@@ -166,7 +166,7 @@ var Container = function Container(_ref3) {
|
|
|
166
166
|
var context = (0, _react.useContext)(_flexibleUiContext.FlexibleUiContext);
|
|
167
167
|
var childrenOptions = getChildrenOptions(children, context);
|
|
168
168
|
var canShowHoverPreview = showHoverPreview && status === 'resolved';
|
|
169
|
-
var canShowAuthTooltip = showAuthTooltip && status === 'unauthorized';
|
|
169
|
+
var canShowAuthTooltip = showAuthTooltip && status === 'unauthorized' && retry !== undefined;
|
|
170
170
|
var container = (0, _react2.jsx)("div", {
|
|
171
171
|
css: getContainerStyles(size, hideBackground, hideElevation, hidePadding, clickableContainer, childrenOptions),
|
|
172
172
|
"data-smart-link-container": true,
|
|
@@ -14,8 +14,7 @@ var _templateObject, _templateObject2;
|
|
|
14
14
|
/** @jsx jsx */
|
|
15
15
|
var MAX_COUNT = 4;
|
|
16
16
|
var getStyles = function getStyles(size) {
|
|
17
|
-
|
|
18
|
-
var styles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: inline-flex;\n ul {\n margin-right: 8px;\n }\n "])));
|
|
17
|
+
var styles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: inline-flex;\n ul,\n ul {\n margin-right: 0.5rem;\n margin-top: 0;\n }\n "])));
|
|
19
18
|
switch (size) {
|
|
20
19
|
case _constants.SmartLinkSize.XLarge:
|
|
21
20
|
case _constants.SmartLinkSize.Large:
|
|
@@ -89,11 +89,11 @@ var getRetryOptions = function getRetryOptions(url, status, response, onAuthoriz
|
|
|
89
89
|
values: values
|
|
90
90
|
};
|
|
91
91
|
case _constants.SmartLinkStatus.Unauthorized:
|
|
92
|
-
return {
|
|
92
|
+
return onAuthorize ? {
|
|
93
93
|
descriptor: _messages.messages.connect_link_account_card_name,
|
|
94
|
-
onClick:
|
|
94
|
+
onClick: (0, _utils.handleOnClick)(onAuthorize),
|
|
95
95
|
values: values
|
|
96
|
-
};
|
|
96
|
+
} : undefined;
|
|
97
97
|
case _constants.SmartLinkStatus.NotFound:
|
|
98
98
|
return {
|
|
99
99
|
descriptor: _messages.messages.cannot_find_link
|
|
@@ -91,6 +91,7 @@ var HoverCardContent = function HoverCardContent(_ref) {
|
|
|
91
91
|
}, [cardState.details]);
|
|
92
92
|
var linkState = (0, _store.useSmartCardState)(url);
|
|
93
93
|
var linkStatus = (_linkState$status = linkState.status) !== null && _linkState$status !== void 0 ? _linkState$status : 'pending';
|
|
94
|
+
var services = (0, _helpers.getServices)(linkState.details);
|
|
94
95
|
var statusRef = (0, _react2.useRef)(linkStatus);
|
|
95
96
|
var analyticsRef = (0, _react2.useRef)(analytics);
|
|
96
97
|
(0, _react2.useEffect)(function () {
|
|
@@ -173,7 +174,7 @@ var HoverCardContent = function HoverCardContent(_ref) {
|
|
|
173
174
|
titleBlockProps: titleBlockProps
|
|
174
175
|
});
|
|
175
176
|
}
|
|
176
|
-
if (cardState.status === 'unauthorized') {
|
|
177
|
+
if (cardState.status === 'unauthorized' && services !== null && services !== void 0 && services.length) {
|
|
177
178
|
return (0, _react.jsx)(_unauthorised.default, {
|
|
178
179
|
analytics: analytics,
|
|
179
180
|
extensionKey: extensionKey,
|
|
@@ -79,6 +79,7 @@ var InlineCardUnauthorizedView = /*#__PURE__*/function (_React$Component) {
|
|
|
79
79
|
var _this$props3 = this.props,
|
|
80
80
|
url = _this$props3.url,
|
|
81
81
|
icon = _this$props3.icon,
|
|
82
|
+
onAuthorise = _this$props3.onAuthorise,
|
|
82
83
|
onClick = _this$props3.onClick,
|
|
83
84
|
isSelected = _this$props3.isSelected,
|
|
84
85
|
_this$props3$testId = _this$props3.testId,
|
|
@@ -96,10 +97,10 @@ var InlineCardUnauthorizedView = /*#__PURE__*/function (_React$Component) {
|
|
|
96
97
|
onClick: onClick,
|
|
97
98
|
titleColor: "var(--ds-text-subtle, ".concat(_colors.N500, ")")
|
|
98
99
|
}));
|
|
99
|
-
if (showAuthTooltip) {
|
|
100
|
+
if (onAuthorise && showAuthTooltip) {
|
|
100
101
|
return /*#__PURE__*/_react.default.createElement(_HoverCard.HoverCard, {
|
|
101
102
|
url: url,
|
|
102
|
-
onAuthorize:
|
|
103
|
+
onAuthorize: onAuthorise,
|
|
103
104
|
id: this.props.id
|
|
104
105
|
}, inlineCardUnauthenticatedView);
|
|
105
106
|
}
|
package/dist/es2019/version.json
CHANGED
|
@@ -42,12 +42,12 @@ export const EmbedCardUnauthorisedView = ({
|
|
|
42
42
|
title: "connect_link_account_card_name",
|
|
43
43
|
description: "connect_unauthorised_account_description",
|
|
44
44
|
context: context && context.text,
|
|
45
|
-
button: {
|
|
45
|
+
button: onAuthorise ? {
|
|
46
46
|
appearance: 'primary',
|
|
47
47
|
text: 'connect_unauthorised_account_action',
|
|
48
48
|
testId: 'connect-account'
|
|
49
|
-
},
|
|
50
|
-
onClick: handleOnAuthorizeClick,
|
|
49
|
+
} : undefined,
|
|
50
|
+
onClick: onAuthorise ? handleOnAuthorizeClick : undefined,
|
|
51
51
|
testId: testId
|
|
52
52
|
}, /*#__PURE__*/React.createElement(UnauthorisedViewContent, {
|
|
53
53
|
analytics: analytics,
|
|
@@ -187,7 +187,7 @@ const Container = ({
|
|
|
187
187
|
const context = useContext(FlexibleUiContext);
|
|
188
188
|
const childrenOptions = getChildrenOptions(children, context);
|
|
189
189
|
const canShowHoverPreview = showHoverPreview && status === 'resolved';
|
|
190
|
-
const canShowAuthTooltip = showAuthTooltip && status === 'unauthorized';
|
|
190
|
+
const canShowAuthTooltip = showAuthTooltip && status === 'unauthorized' && retry !== undefined;
|
|
191
191
|
const container = jsx("div", {
|
|
192
192
|
css: getContainerStyles(size, hideBackground, hideElevation, hidePadding, clickableContainer, childrenOptions),
|
|
193
193
|
"data-smart-link-container": true,
|
|
@@ -5,11 +5,12 @@ import AtlaskitAvatarGroup from '@atlaskit/avatar-group';
|
|
|
5
5
|
import { SmartLinkSize } from '../../../../../constants';
|
|
6
6
|
const MAX_COUNT = 4;
|
|
7
7
|
const getStyles = size => {
|
|
8
|
-
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
|
|
9
8
|
const styles = css`
|
|
10
9
|
display: inline-flex;
|
|
10
|
+
ul,
|
|
11
11
|
ul {
|
|
12
|
-
margin-right:
|
|
12
|
+
margin-right: 0.5rem;
|
|
13
|
+
margin-top: 0;
|
|
13
14
|
}
|
|
14
15
|
`;
|
|
15
16
|
switch (size) {
|
|
@@ -82,11 +82,11 @@ export const getRetryOptions = (url, status, response, onAuthorize) => {
|
|
|
82
82
|
values
|
|
83
83
|
};
|
|
84
84
|
case SmartLinkStatus.Unauthorized:
|
|
85
|
-
return {
|
|
85
|
+
return onAuthorize ? {
|
|
86
86
|
descriptor: messages.connect_link_account_card_name,
|
|
87
|
-
onClick:
|
|
87
|
+
onClick: handleOnClick(onAuthorize),
|
|
88
88
|
values
|
|
89
|
-
};
|
|
89
|
+
} : undefined;
|
|
90
90
|
case SmartLinkStatus.NotFound:
|
|
91
91
|
return {
|
|
92
92
|
descriptor: messages.cannot_find_link
|
|
@@ -6,7 +6,7 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react';
|
|
|
6
6
|
import { ActionName, CardDisplay, SmartLinkPosition, SmartLinkSize } from '../../../constants';
|
|
7
7
|
import { extractMetadata } from '../../../extractors/hover/extractMetadata';
|
|
8
8
|
import { useSmartLinkAnalytics } from '../../../state/analytics';
|
|
9
|
-
import { getExtensionKey } from '../../../state/helpers';
|
|
9
|
+
import { getExtensionKey, getServices } from '../../../state/helpers';
|
|
10
10
|
import { isSpecialEvent } from '../../../utils';
|
|
11
11
|
import { HoverCardContainer, flexibleUiOptions, titleBlockCss } from '../styled';
|
|
12
12
|
import { getSimulatedMetadata } from '../utils';
|
|
@@ -53,6 +53,7 @@ const HoverCardContent = ({
|
|
|
53
53
|
const extensionKey = useMemo(() => getExtensionKey(cardState.details), [cardState.details]);
|
|
54
54
|
const linkState = useSmartCardState(url);
|
|
55
55
|
const linkStatus = (_linkState$status = linkState.status) !== null && _linkState$status !== void 0 ? _linkState$status : 'pending';
|
|
56
|
+
const services = getServices(linkState.details);
|
|
56
57
|
const statusRef = useRef(linkStatus);
|
|
57
58
|
const analyticsRef = useRef(analytics);
|
|
58
59
|
useEffect(() => {
|
|
@@ -132,7 +133,7 @@ const HoverCardContent = ({
|
|
|
132
133
|
titleBlockProps: titleBlockProps
|
|
133
134
|
});
|
|
134
135
|
}
|
|
135
|
-
if (cardState.status === 'unauthorized') {
|
|
136
|
+
if (cardState.status === 'unauthorized' && services !== null && services !== void 0 && services.length) {
|
|
136
137
|
return jsx(HoverCardUnauthorisedView, {
|
|
137
138
|
analytics: analytics,
|
|
138
139
|
extensionKey: extensionKey,
|
|
@@ -56,6 +56,7 @@ export class InlineCardUnauthorizedView extends React.Component {
|
|
|
56
56
|
const {
|
|
57
57
|
url,
|
|
58
58
|
icon,
|
|
59
|
+
onAuthorise,
|
|
59
60
|
onClick,
|
|
60
61
|
isSelected,
|
|
61
62
|
testId = 'inline-card-unauthorized-view',
|
|
@@ -72,10 +73,10 @@ export class InlineCardUnauthorizedView extends React.Component {
|
|
|
72
73
|
onClick: onClick,
|
|
73
74
|
titleColor: `var(--ds-text-subtle, ${N500})`
|
|
74
75
|
}));
|
|
75
|
-
if (showAuthTooltip) {
|
|
76
|
+
if (onAuthorise && showAuthTooltip) {
|
|
76
77
|
return /*#__PURE__*/React.createElement(HoverCard, {
|
|
77
78
|
url: url,
|
|
78
|
-
onAuthorize:
|
|
79
|
+
onAuthorize: onAuthorise,
|
|
79
80
|
id: this.props.id
|
|
80
81
|
}, inlineCardUnauthenticatedView);
|
|
81
82
|
}
|
package/dist/esm/version.json
CHANGED
|
@@ -42,12 +42,12 @@ export var EmbedCardUnauthorisedView = function EmbedCardUnauthorisedView(_ref)
|
|
|
42
42
|
title: "connect_link_account_card_name",
|
|
43
43
|
description: "connect_unauthorised_account_description",
|
|
44
44
|
context: context && context.text,
|
|
45
|
-
button: {
|
|
45
|
+
button: onAuthorise ? {
|
|
46
46
|
appearance: 'primary',
|
|
47
47
|
text: 'connect_unauthorised_account_action',
|
|
48
48
|
testId: 'connect-account'
|
|
49
|
-
},
|
|
50
|
-
onClick: handleOnAuthorizeClick,
|
|
49
|
+
} : undefined,
|
|
50
|
+
onClick: onAuthorise ? handleOnAuthorizeClick : undefined,
|
|
51
51
|
testId: testId
|
|
52
52
|
}, /*#__PURE__*/React.createElement(UnauthorisedViewContent, {
|
|
53
53
|
analytics: analytics,
|
|
@@ -155,7 +155,7 @@ var Container = function Container(_ref3) {
|
|
|
155
155
|
var context = useContext(FlexibleUiContext);
|
|
156
156
|
var childrenOptions = getChildrenOptions(children, context);
|
|
157
157
|
var canShowHoverPreview = showHoverPreview && status === 'resolved';
|
|
158
|
-
var canShowAuthTooltip = showAuthTooltip && status === 'unauthorized';
|
|
158
|
+
var canShowAuthTooltip = showAuthTooltip && status === 'unauthorized' && retry !== undefined;
|
|
159
159
|
var container = jsx("div", {
|
|
160
160
|
css: getContainerStyles(size, hideBackground, hideElevation, hidePadding, clickableContainer, childrenOptions),
|
|
161
161
|
"data-smart-link-container": true,
|
|
@@ -7,8 +7,7 @@ import AtlaskitAvatarGroup from '@atlaskit/avatar-group';
|
|
|
7
7
|
import { SmartLinkSize } from '../../../../../constants';
|
|
8
8
|
var MAX_COUNT = 4;
|
|
9
9
|
var getStyles = function getStyles(size) {
|
|
10
|
-
|
|
11
|
-
var styles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n display: inline-flex;\n ul {\n margin-right: 8px;\n }\n "])));
|
|
10
|
+
var styles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n display: inline-flex;\n ul,\n ul {\n margin-right: 0.5rem;\n margin-top: 0;\n }\n "])));
|
|
12
11
|
switch (size) {
|
|
13
12
|
case SmartLinkSize.XLarge:
|
|
14
13
|
case SmartLinkSize.Large:
|
|
@@ -81,11 +81,11 @@ export var getRetryOptions = function getRetryOptions(url, status, response, onA
|
|
|
81
81
|
values: values
|
|
82
82
|
};
|
|
83
83
|
case SmartLinkStatus.Unauthorized:
|
|
84
|
-
return {
|
|
84
|
+
return onAuthorize ? {
|
|
85
85
|
descriptor: messages.connect_link_account_card_name,
|
|
86
|
-
onClick:
|
|
86
|
+
onClick: handleOnClick(onAuthorize),
|
|
87
87
|
values: values
|
|
88
|
-
};
|
|
88
|
+
} : undefined;
|
|
89
89
|
case SmartLinkStatus.NotFound:
|
|
90
90
|
return {
|
|
91
91
|
descriptor: messages.cannot_find_link
|
|
@@ -8,7 +8,7 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react';
|
|
|
8
8
|
import { ActionName, CardDisplay, SmartLinkPosition, SmartLinkSize } from '../../../constants';
|
|
9
9
|
import { extractMetadata } from '../../../extractors/hover/extractMetadata';
|
|
10
10
|
import { useSmartLinkAnalytics } from '../../../state/analytics';
|
|
11
|
-
import { getExtensionKey } from '../../../state/helpers';
|
|
11
|
+
import { getExtensionKey, getServices } from '../../../state/helpers';
|
|
12
12
|
import { isSpecialEvent } from '../../../utils';
|
|
13
13
|
import { HoverCardContainer, flexibleUiOptions, titleBlockCss } from '../styled';
|
|
14
14
|
import { getSimulatedMetadata } from '../utils';
|
|
@@ -78,6 +78,7 @@ var HoverCardContent = function HoverCardContent(_ref) {
|
|
|
78
78
|
}, [cardState.details]);
|
|
79
79
|
var linkState = useSmartCardState(url);
|
|
80
80
|
var linkStatus = (_linkState$status = linkState.status) !== null && _linkState$status !== void 0 ? _linkState$status : 'pending';
|
|
81
|
+
var services = getServices(linkState.details);
|
|
81
82
|
var statusRef = useRef(linkStatus);
|
|
82
83
|
var analyticsRef = useRef(analytics);
|
|
83
84
|
useEffect(function () {
|
|
@@ -160,7 +161,7 @@ var HoverCardContent = function HoverCardContent(_ref) {
|
|
|
160
161
|
titleBlockProps: titleBlockProps
|
|
161
162
|
});
|
|
162
163
|
}
|
|
163
|
-
if (cardState.status === 'unauthorized') {
|
|
164
|
+
if (cardState.status === 'unauthorized' && services !== null && services !== void 0 && services.length) {
|
|
164
165
|
return jsx(HoverCardUnauthorisedView, {
|
|
165
166
|
analytics: analytics,
|
|
166
167
|
extensionKey: extensionKey,
|
|
@@ -72,6 +72,7 @@ export var InlineCardUnauthorizedView = /*#__PURE__*/function (_React$Component)
|
|
|
72
72
|
var _this$props3 = this.props,
|
|
73
73
|
url = _this$props3.url,
|
|
74
74
|
icon = _this$props3.icon,
|
|
75
|
+
onAuthorise = _this$props3.onAuthorise,
|
|
75
76
|
onClick = _this$props3.onClick,
|
|
76
77
|
isSelected = _this$props3.isSelected,
|
|
77
78
|
_this$props3$testId = _this$props3.testId,
|
|
@@ -89,10 +90,10 @@ export var InlineCardUnauthorizedView = /*#__PURE__*/function (_React$Component)
|
|
|
89
90
|
onClick: onClick,
|
|
90
91
|
titleColor: "var(--ds-text-subtle, ".concat(N500, ")")
|
|
91
92
|
}));
|
|
92
|
-
if (showAuthTooltip) {
|
|
93
|
+
if (onAuthorise && showAuthTooltip) {
|
|
93
94
|
return /*#__PURE__*/React.createElement(HoverCard, {
|
|
94
95
|
url: url,
|
|
95
|
-
onAuthorize:
|
|
96
|
+
onAuthorize: onAuthorise,
|
|
96
97
|
id: this.props.id
|
|
97
98
|
}, inlineCardUnauthenticatedView);
|
|
98
99
|
}
|