@atlaskit/smart-card 18.0.1 → 18.0.4

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.
Files changed (30) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/cjs/version.json +1 -1
  3. package/dist/cjs/view/CardWithUrl/component.js +12 -6
  4. package/dist/cjs/view/FlexibleCard/components/blocks/title-block/errored/index.js +17 -36
  5. package/dist/cjs/view/FlexibleCard/components/blocks/title-block/resolved/index.js +6 -80
  6. package/dist/cjs/view/FlexibleCard/components/blocks/title-block/resolving/index.js +12 -27
  7. package/dist/cjs/view/FlexibleCard/components/blocks/title-block/utils.js +103 -0
  8. package/dist/cjs/view/HoverCard/index.js +36 -7
  9. package/dist/cjs/view/HoverCard/styled.js +2 -4
  10. package/dist/es2019/version.json +1 -1
  11. package/dist/es2019/view/CardWithUrl/component.js +11 -6
  12. package/dist/es2019/view/FlexibleCard/components/blocks/title-block/errored/index.js +14 -29
  13. package/dist/es2019/view/FlexibleCard/components/blocks/title-block/resolved/index.js +6 -60
  14. package/dist/es2019/view/FlexibleCard/components/blocks/title-block/resolving/index.js +11 -23
  15. package/dist/es2019/view/FlexibleCard/components/blocks/title-block/utils.js +69 -0
  16. package/dist/es2019/view/HoverCard/index.js +30 -9
  17. package/dist/es2019/view/HoverCard/styled.js +2 -4
  18. package/dist/esm/version.json +1 -1
  19. package/dist/esm/view/CardWithUrl/component.js +11 -6
  20. package/dist/esm/view/FlexibleCard/components/blocks/title-block/errored/index.js +15 -31
  21. package/dist/esm/view/FlexibleCard/components/blocks/title-block/resolved/index.js +6 -65
  22. package/dist/esm/view/FlexibleCard/components/blocks/title-block/resolving/index.js +11 -25
  23. package/dist/esm/view/FlexibleCard/components/blocks/title-block/utils.js +74 -0
  24. package/dist/esm/view/HoverCard/index.js +36 -9
  25. package/dist/esm/view/HoverCard/styled.js +2 -3
  26. package/dist/types/state/hooks/useSmartLink.d.ts +1 -1
  27. package/dist/types/view/Card/index.d.ts +1 -1
  28. package/dist/types/view/FlexibleCard/components/blocks/title-block/utils.d.ts +11 -0
  29. package/dist/types/view/HoverCard/styled.d.ts +1 -2
  30. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # @atlaskit/smart-card
2
2
 
3
+ ## 18.0.4
4
+
5
+ ### Patch Changes
6
+
7
+ - [`dd4ae8205d1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/dd4ae8205d1) - Add actions for non-resolved view of flexible ui
8
+
9
+ ## 18.0.3
10
+
11
+ ### Patch Changes
12
+
13
+ - [`7dc2fb8eb8b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7dc2fb8eb8b) - Handle exceptions coming from client
14
+
15
+ ## 18.0.2
16
+
17
+ ### Patch Changes
18
+
19
+ - [`cff21812950`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cff21812950) - add smart link actions to footer of hover card, plus small styling changes
20
+
3
21
  ## 18.0.1
4
22
 
5
23
  ### Patch Changes
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/smart-card",
3
- "version": "18.0.1",
3
+ "version": "18.0.4",
4
4
  "sideEffects": false
5
5
  }
@@ -29,6 +29,8 @@ var _flexible = require("../../utils/flexible");
29
29
 
30
30
  var _FlexibleCard = _interopRequireDefault(require("../FlexibleCard"));
31
31
 
32
+ var _ = require("../..");
33
+
32
34
  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); }
33
35
 
34
36
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -107,15 +109,14 @@ function CardWithUrlContent(_ref) {
107
109
  if ((0, _helpers.isFinalState)(state.status)) {
108
110
  analytics.ui.renderSuccessEvent(appearance, id, definitionId, extensionKey);
109
111
  }
110
- }, [appearance, state.details, state.status, url, definitionId, extensionKey, analytics.ui, id]); // We have to keep this last to prevent hook order from being violated
111
-
112
- if (error) {
113
- throw error;
114
- }
112
+ }, [appearance, state.details, state.status, url, definitionId, extensionKey, analytics.ui, id]);
115
113
 
116
114
  if (isFlexibleUi) {
115
+ var cardState = (error === null || error === void 0 ? void 0 : error.constructor) === _.APIError ? {
116
+ status: 'errored'
117
+ } : state;
117
118
  return /*#__PURE__*/_react.default.createElement(_FlexibleCard.default, {
118
- cardState: state,
119
+ cardState: cardState,
119
120
  onAuthorize: services.length && handleAuthorize || undefined,
120
121
  onClick: handleClickWrapper,
121
122
  renderers: renderers,
@@ -123,6 +124,11 @@ function CardWithUrlContent(_ref) {
123
124
  url: url,
124
125
  testId: testId
125
126
  }, children);
127
+ } // We have to keep this last to prevent hook order from being violated
128
+
129
+
130
+ if (error) {
131
+ throw error;
126
132
  }
127
133
 
128
134
  switch (appearance) {
@@ -9,8 +9,6 @@ exports.default = void 0;
9
9
 
10
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
11
 
12
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
-
14
12
  var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
15
13
 
16
14
  var _react = _interopRequireDefault(require("react"));
@@ -19,10 +17,6 @@ var _reactIntlNext = require("react-intl-next");
19
17
 
20
18
  var _core = require("@emotion/core");
21
19
 
22
- var _elements = require("../../../elements");
23
-
24
- var _block = _interopRequireDefault(require("../../block"));
25
-
26
20
  var _constants = require("../../../../../../constants");
27
21
 
28
22
  var _utils = require("../../../utils");
@@ -31,7 +25,7 @@ var _elementGroup = _interopRequireDefault(require("../../element-group"));
31
25
 
32
26
  var _token = require("../../../../../../utils/token");
33
27
 
34
- var _excluded = ["maxLines", "retry", "position", "testId", "theme", "text"];
28
+ var _utils2 = require("../utils");
35
29
 
36
30
  var _templateObject, _templateObject2;
37
31
 
@@ -42,42 +36,29 @@ var getMessageStyles = function getMessageStyles(size, hasAction) {
42
36
  return (0, _core.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n flex: 1 1 auto;\n justify-content: flex-end;\n ", "\n ", "\n ", "\n color: ", ";\n "])), hasAction ? actionStyles : '', sizeStyles, (0, _utils.getTruncateStyles)(1, (0, _utils.getLinkLineHeight)(size)), _token.tokens.errorMessage);
43
37
  };
44
38
 
45
- var TitleBlockErroredView = function TitleBlockErroredView(_ref) {
46
- var maxLines = _ref.maxLines,
47
- retry = _ref.retry,
48
- position = _ref.position,
49
- testId = _ref.testId,
50
- theme = _ref.theme,
51
- text = _ref.text,
52
- blockProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
53
-
54
- var _ref2 = retry || {},
55
- descriptor = _ref2.descriptor,
56
- onClick = _ref2.onClick,
57
- values = _ref2.values;
58
-
59
- var _blockProps$size = blockProps.size,
60
- size = _blockProps$size === void 0 ? _constants.SmartLinkSize.Medium : _blockProps$size;
39
+ var TitleBlockErroredView = function TitleBlockErroredView(props) {
40
+ var _props$size = props.size,
41
+ size = _props$size === void 0 ? _constants.SmartLinkSize.Medium : _props$size,
42
+ retry = props.retry,
43
+ testId = props.testId;
44
+
45
+ var _ref = retry || {},
46
+ retryDescriptor = _ref.descriptor,
47
+ onClick = _ref.onClick,
48
+ retryValues = _ref.values;
49
+
61
50
  var hasAction = onClick !== undefined;
62
- var overrideText = !!text ? {
63
- text: text
64
- } : {};
65
- return (0, _core.jsx)(_block.default, (0, _extends2.default)({}, blockProps, {
66
- testId: "".concat(testId, "-errored-view")
67
- }), (0, _core.jsx)(_elements.LinkIcon, {
68
- position: position
69
- }), (0, _core.jsx)(_elements.Title, (0, _extends2.default)({}, overrideText, {
70
- maxLines: maxLines,
71
- theme: theme
72
- })), descriptor && (0, _core.jsx)(_elementGroup.default, {
51
+ return (0, _core.jsx)(_utils2.BaseTitleBlockComponent, (0, _extends2.default)({}, props, {
52
+ blockTestIdPostfix: "errored-view"
53
+ }), retryDescriptor && (0, _core.jsx)(_elementGroup.default, {
73
54
  direction: _constants.SmartLinkDirection.Horizontal,
74
55
  align: _constants.SmartLinkAlignment.Right
75
56
  }, (0, _core.jsx)("span", {
76
57
  css: getMessageStyles(size, hasAction),
77
58
  onClick: onClick,
78
59
  "data-testid": "".concat(testId, "-errored-view-message")
79
- }, (0, _core.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, descriptor, {
80
- values: values
60
+ }, (0, _core.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, retryDescriptor, {
61
+ values: retryValues
81
62
  })))));
82
63
  };
83
64
 
@@ -2,8 +2,6 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
- var _typeof = require("@babel/runtime/helpers/typeof");
6
-
7
5
  Object.defineProperty(exports, "__esModule", {
8
6
  value: true
9
7
  });
@@ -11,88 +9,16 @@ exports.default = void 0;
11
9
 
12
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
13
11
 
14
- var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
-
16
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
17
-
18
- var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
19
-
20
- var _react = _interopRequireWildcard(require("react"));
12
+ var _react = _interopRequireDefault(require("react"));
21
13
 
22
14
  var _core = require("@emotion/core");
23
15
 
24
- var _elements = require("../../../elements");
25
-
26
- var _block = _interopRequireDefault(require("../../block"));
27
-
28
- var _elementGroup = _interopRequireDefault(require("../../element-group"));
29
-
30
- var _constants = require("../../../../../../constants");
31
-
32
- var _utils = require("../../utils");
33
-
34
- var _actionGroup = _interopRequireDefault(require("../../action-group"));
35
-
36
- var _excluded = ["maxLines", "metadata", "position", "subtitle", "actions", "testId", "theme", "onClick", "text", "showActionOnHover"];
37
-
38
- var _templateObject;
39
-
40
- 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); }
41
-
42
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
43
-
44
- var actionOnHoverOnlyStyle = (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n .action-group-more-button {\n visibility: hidden;\n }\n\n &:hover {\n .action-group-more-button {\n visibility: visible;\n }\n }\n"])));
45
-
46
- var TitleBlockResolvedView = function TitleBlockResolvedView(_ref) {
47
- var maxLines = _ref.maxLines,
48
- _ref$metadata = _ref.metadata,
49
- metadata = _ref$metadata === void 0 ? [] : _ref$metadata,
50
- position = _ref.position,
51
- _ref$subtitle = _ref.subtitle,
52
- subtitle = _ref$subtitle === void 0 ? [] : _ref$subtitle,
53
- _ref$actions = _ref.actions,
54
- actions = _ref$actions === void 0 ? [] : _ref$actions,
55
- testId = _ref.testId,
56
- theme = _ref.theme,
57
- onClick = _ref.onClick,
58
- text = _ref.text,
59
- showActionOnHover = _ref.showActionOnHover,
60
- blockProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
61
-
62
- var _useState = (0, _react.useState)(false),
63
- _useState2 = (0, _slicedToArray2.default)(_useState, 2),
64
- actionDropdownOpen = _useState2[0],
65
- setActionDropdownOpen = _useState2[1];
16
+ var _utils = require("../utils");
66
17
 
67
- var metadataElements = (0, _utils.renderElementItems)(metadata);
68
- var subtitleElements = (0, _utils.renderElementItems)(subtitle);
69
- var overrideText = !!text ? {
70
- text: text
71
- } : {};
72
- var extraCss = showActionOnHover && !actionDropdownOpen ? actionOnHoverOnlyStyle : undefined;
73
- return (0, _core.jsx)(_block.default, (0, _extends2.default)({}, blockProps, {
74
- testId: "".concat(testId, "-resolved-view"),
75
- extraCss: extraCss
76
- }), (0, _core.jsx)(_elements.LinkIcon, {
77
- position: position
78
- }), (0, _core.jsx)(_elementGroup.default, {
79
- direction: _constants.SmartLinkDirection.Vertical,
80
- width: _constants.SmartLinkWidth.Flexible
81
- }, (0, _core.jsx)(_elements.Title, (0, _extends2.default)({
82
- maxLines: maxLines,
83
- theme: theme,
84
- onClick: onClick
85
- }, overrideText)), subtitleElements && (0, _core.jsx)(_elementGroup.default, {
86
- direction: _constants.SmartLinkDirection.Horizontal
87
- }, subtitleElements)), metadataElements && (0, _core.jsx)(_elementGroup.default, {
88
- direction: _constants.SmartLinkDirection.Horizontal,
89
- align: _constants.SmartLinkAlignment.Right
90
- }, metadataElements), actions.length > 0 && (0, _core.jsx)(_actionGroup.default, {
91
- items: actions,
92
- visibleButtonsNum: showActionOnHover ? 1 : 2,
93
- onDropdownOpenChange: function onDropdownOpenChange(isOpen) {
94
- return setActionDropdownOpen(isOpen);
95
- }
18
+ /** @jsx jsx */
19
+ var TitleBlockResolvedView = function TitleBlockResolvedView(props) {
20
+ return (0, _core.jsx)(_utils.BaseTitleBlockComponent, (0, _extends2.default)({}, props, {
21
+ blockTestIdPostfix: "resolved-view"
96
22
  }));
97
23
  };
98
24
 
@@ -9,22 +9,17 @@ exports.default = void 0;
9
9
 
10
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
11
 
12
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
-
14
12
  var _react = _interopRequireDefault(require("react"));
15
13
 
16
14
  var _core = require("@emotion/core");
17
15
 
18
16
  var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
19
17
 
20
- var _elements = require("../../../elements");
21
-
22
- var _block = _interopRequireDefault(require("../../block"));
23
-
24
18
  var _constants = require("../../../../../../constants");
25
19
 
26
- var _excluded = ["maxLines", "retry", "position", "testId", "theme", "text"];
20
+ var _utils = require("../utils");
27
21
 
22
+ /** @jsx jsx */
28
23
  var getSpinnerSize = function getSpinnerSize(size) {
29
24
  // Spinner sizes should be equivalent or smaller than Icon size
30
25
  // to avoid the jumping.
@@ -44,28 +39,18 @@ var getSpinnerSize = function getSpinnerSize(size) {
44
39
  }
45
40
  };
46
41
 
47
- var TitleBlockResolvingView = function TitleBlockResolvingView(_ref) {
48
- var maxLines = _ref.maxLines,
49
- retry = _ref.retry,
50
- position = _ref.position,
51
- testId = _ref.testId,
52
- theme = _ref.theme,
53
- text = _ref.text,
54
- blockProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
55
- var _blockProps$size = blockProps.size,
56
- size = _blockProps$size === void 0 ? _constants.SmartLinkSize.Medium : _blockProps$size;
57
- var overrideText = !!text ? {
58
- text: text
59
- } : {};
60
- return (0, _core.jsx)(_block.default, (0, _extends2.default)({}, blockProps, {
61
- testId: "".concat(testId, "-resolving-view")
62
- }), (0, _core.jsx)(_spinner.default, {
42
+ var TitleBlockResolvingView = function TitleBlockResolvingView(props) {
43
+ var _props$size = props.size,
44
+ size = _props$size === void 0 ? _constants.SmartLinkSize.Medium : _props$size,
45
+ testId = props.testId;
46
+ var spinnerIcon = (0, _core.jsx)(_spinner.default, {
63
47
  size: getSpinnerSize(size),
64
48
  testId: "".concat(testId, "-resolving-spinner")
65
- }), (0, _core.jsx)(_elements.Title, (0, _extends2.default)({}, overrideText, {
66
- maxLines: maxLines,
67
- theme: theme
68
- })));
49
+ });
50
+ return (0, _core.jsx)(_utils.BaseTitleBlockComponent, (0, _extends2.default)({}, props, {
51
+ blockIcon: spinnerIcon,
52
+ blockTestIdPostfix: "resolving-view"
53
+ }));
69
54
  };
70
55
 
71
56
  var _default = TitleBlockResolvingView;
@@ -0,0 +1,103 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ var _typeof = require("@babel/runtime/helpers/typeof");
6
+
7
+ Object.defineProperty(exports, "__esModule", {
8
+ value: true
9
+ });
10
+ exports.actionOnHoverOnlyStyle = exports.BaseTitleBlockComponent = void 0;
11
+
12
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
13
+
14
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
+
16
+ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
17
+
18
+ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
19
+
20
+ var _react = _interopRequireWildcard(require("react"));
21
+
22
+ var _core = require("@emotion/core");
23
+
24
+ var _block = _interopRequireDefault(require("../block"));
25
+
26
+ var _elements = require("../../elements");
27
+
28
+ var _actionGroup = _interopRequireDefault(require("../action-group"));
29
+
30
+ var _constants = require("../../../../../constants");
31
+
32
+ var _elementGroup = _interopRequireDefault(require("../element-group"));
33
+
34
+ var _utils = require("../utils");
35
+
36
+ var _excluded = ["children", "blockTestIdPostfix", "blockIcon", "testId", "showActionOnHover", "position", "actions", "text", "maxLines", "theme", "onClick", "metadata", "subtitle"];
37
+
38
+ var _templateObject;
39
+
40
+ 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); }
41
+
42
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
43
+
44
+ var actionOnHoverOnlyStyle = (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n .action-group-more-button {\n visibility: hidden;\n }\n\n &:hover {\n .action-group-more-button {\n visibility: visible;\n }\n }\n"])));
45
+ exports.actionOnHoverOnlyStyle = actionOnHoverOnlyStyle;
46
+
47
+ var BaseTitleBlockComponent = function BaseTitleBlockComponent(_ref) {
48
+ var children = _ref.children,
49
+ blockTestIdPostfix = _ref.blockTestIdPostfix,
50
+ blockIcon = _ref.blockIcon,
51
+ testId = _ref.testId,
52
+ showActionOnHover = _ref.showActionOnHover,
53
+ position = _ref.position,
54
+ _ref$actions = _ref.actions,
55
+ actions = _ref$actions === void 0 ? [] : _ref$actions,
56
+ text = _ref.text,
57
+ maxLines = _ref.maxLines,
58
+ theme = _ref.theme,
59
+ onClick = _ref.onClick,
60
+ _ref$metadata = _ref.metadata,
61
+ metadata = _ref$metadata === void 0 ? [] : _ref$metadata,
62
+ _ref$subtitle = _ref.subtitle,
63
+ subtitle = _ref$subtitle === void 0 ? [] : _ref$subtitle,
64
+ blockProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
65
+
66
+ var _useState = (0, _react.useState)(false),
67
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
68
+ actionDropdownOpen = _useState2[0],
69
+ setActionDropdownOpen = _useState2[1];
70
+
71
+ var extraCss = showActionOnHover && !actionDropdownOpen ? actionOnHoverOnlyStyle : undefined;
72
+ var overrideText = !!text ? {
73
+ text: text
74
+ } : {};
75
+ var metadataElements = (0, _utils.renderElementItems)(metadata);
76
+ var subtitleElements = (0, _utils.renderElementItems)(subtitle);
77
+ return (0, _core.jsx)(_block.default, (0, _extends2.default)({}, blockProps, {
78
+ testId: "".concat(testId, "-").concat(blockTestIdPostfix),
79
+ extraCss: extraCss
80
+ }), blockIcon || (0, _core.jsx)(_elements.LinkIcon, {
81
+ position: position
82
+ }), (0, _core.jsx)(_elementGroup.default, {
83
+ direction: _constants.SmartLinkDirection.Vertical,
84
+ width: _constants.SmartLinkWidth.Flexible
85
+ }, (0, _core.jsx)(_elements.Title, (0, _extends2.default)({
86
+ maxLines: maxLines,
87
+ theme: theme,
88
+ onClick: onClick
89
+ }, overrideText)), subtitleElements && (0, _core.jsx)(_elementGroup.default, {
90
+ direction: _constants.SmartLinkDirection.Horizontal
91
+ }, subtitleElements)), metadataElements && (0, _core.jsx)(_elementGroup.default, {
92
+ direction: _constants.SmartLinkDirection.Horizontal,
93
+ align: _constants.SmartLinkAlignment.Right
94
+ }, metadataElements), children, actions.length > 0 && (0, _core.jsx)(_actionGroup.default, {
95
+ items: actions,
96
+ visibleButtonsNum: showActionOnHover ? 1 : 2,
97
+ onDropdownOpenChange: function onDropdownOpenChange(isOpen) {
98
+ return setActionDropdownOpen(isOpen);
99
+ }
100
+ }));
101
+ };
102
+
103
+ exports.BaseTitleBlockComponent = BaseTitleBlockComponent;
@@ -13,6 +13,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
13
13
 
14
14
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
15
 
16
+ var _core = require("@emotion/core");
17
+
16
18
  var _react = _interopRequireWildcard(require("react"));
17
19
 
18
20
  var _blocks = require("../FlexibleCard/components/blocks");
@@ -23,10 +25,15 @@ var _popup = _interopRequireDefault(require("@atlaskit/popup"));
23
25
 
24
26
  var _constants = require("../../constants");
25
27
 
28
+ var _useSmartLinkActions = require("../../state/hooks-external/useSmartLinkActions");
29
+
30
+ var _styled = require("./styled");
31
+
26
32
  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); }
27
33
 
28
34
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
29
35
 
36
+ /** @jsx jsx */
30
37
  var HoverCard = function HoverCard(_ref) {
31
38
  var children = _ref.children,
32
39
  url = _ref.url;
@@ -56,33 +63,55 @@ var HoverCard = function HoverCard(_ref) {
56
63
  fadeInTimeoutId.current = setTimeout(function () {
57
64
  setIsOpen(true);
58
65
  }, delay);
59
- }, [delay]);
66
+ }, [delay]); //TODO: EDM-2905: Add analytics events
67
+
68
+ var analyticsHandler = (0, _react.useCallback)(function () {}, []);
69
+ var linkActions = (0, _useSmartLinkActions.useSmartLinkActions)({
70
+ url: url,
71
+ appearance: 'block',
72
+ analyticsHandler: analyticsHandler
73
+ });
74
+ var actions = (0, _react.useMemo)(function () {
75
+ return linkActions.map(function (action) {
76
+ return {
77
+ content: action.text,
78
+ name: _constants.ActionName.CustomAction,
79
+ onClick: function onClick() {
80
+ return action.invoke();
81
+ },
82
+ testId: action.id
83
+ };
84
+ });
85
+ }, [linkActions]);
60
86
 
61
87
  var cardComponent = function cardComponent() {
62
- return /*#__PURE__*/_react.default.createElement("span", {
88
+ return (0, _core.jsx)("div", {
63
89
  onMouseEnter: initShowCard,
64
- onMouseLeave: initHideCard
65
- }, /*#__PURE__*/_react.default.createElement(_Card.Card, {
90
+ onMouseLeave: initHideCard,
91
+ css: _styled.HoverCardContainer
92
+ }, (0, _core.jsx)(_Card.Card, {
66
93
  appearance: "block",
67
94
  url: url,
68
95
  ui: {
69
96
  hideElevation: true,
70
97
  size: _constants.SmartLinkSize.Large
71
98
  }
72
- }, /*#__PURE__*/_react.default.createElement(_blocks.TitleBlock, null), /*#__PURE__*/_react.default.createElement(_blocks.SnippetBlock, null), /*#__PURE__*/_react.default.createElement(_blocks.FooterBlock, null)));
99
+ }, (0, _core.jsx)(_blocks.TitleBlock, null), (0, _core.jsx)(_blocks.SnippetBlock, null), (0, _core.jsx)(_blocks.FooterBlock, {
100
+ actions: actions
101
+ })));
73
102
  };
74
103
 
75
104
  var onClose = (0, _react.useCallback)(function () {
76
105
  return setIsOpen(false);
77
106
  }, []);
78
- return /*#__PURE__*/_react.default.createElement(_popup.default, {
107
+ return (0, _core.jsx)(_popup.default, {
79
108
  testId: "hover-card",
80
109
  isOpen: isOpen,
81
110
  onClose: onClose,
82
111
  placement: "bottom",
83
112
  content: cardComponent,
84
113
  trigger: function trigger(triggerProps) {
85
- return /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({}, triggerProps, {
114
+ return (0, _core.jsx)("span", (0, _extends2.default)({}, triggerProps, {
86
115
  onMouseEnter: initShowCard,
87
116
  onMouseLeave: initHideCard
88
117
  }), children);
@@ -9,11 +9,9 @@ exports.HoverCardContainer = void 0;
9
9
 
10
10
  var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
11
11
 
12
- var _styled = _interopRequireDefault(require("@emotion/styled"));
13
-
14
- var _tooltip = require("@atlaskit/tooltip");
12
+ var _core = require("@emotion/core");
15
13
 
16
14
  var _templateObject;
17
15
 
18
- var HoverCardContainer = (0, _styled.default)(_tooltip.TooltipPrimitive)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n background: none;\n border-width: 0;\n box-sizing: content-box; /* do not set this to border-box or it will break the overflow handling */\n max-width: 500px;\n padding: 0;\n"])));
16
+ var HoverCardContainer = (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n background: none;\n border-width: 0;\n max-width: 500px;\n padding: 0;\n"])));
19
17
  exports.HoverCardContainer = HoverCardContainer;
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/smart-card",
3
- "version": "18.0.1",
3
+ "version": "18.0.4",
4
4
  "sideEffects": false
5
5
  }
@@ -8,6 +8,7 @@ import { InlineCard } from '../InlineCard';
8
8
  import { EmbedCard } from '../EmbedCard';
9
9
  import { isFlexibleUiCard } from '../../utils/flexible';
10
10
  import FlexibleCard from '../FlexibleCard';
11
+ import { APIError } from '../..';
11
12
  export function CardWithUrlContent({
12
13
  id,
13
14
  url,
@@ -76,15 +77,14 @@ export function CardWithUrlContent({
76
77
  if (isFinalState(state.status)) {
77
78
  analytics.ui.renderSuccessEvent(appearance, id, definitionId, extensionKey);
78
79
  }
79
- }, [appearance, state.details, state.status, url, definitionId, extensionKey, analytics.ui, id]); // We have to keep this last to prevent hook order from being violated
80
-
81
- if (error) {
82
- throw error;
83
- }
80
+ }, [appearance, state.details, state.status, url, definitionId, extensionKey, analytics.ui, id]);
84
81
 
85
82
  if (isFlexibleUi) {
83
+ let cardState = (error === null || error === void 0 ? void 0 : error.constructor) === APIError ? {
84
+ status: 'errored'
85
+ } : state;
86
86
  return /*#__PURE__*/React.createElement(FlexibleCard, {
87
- cardState: state,
87
+ cardState: cardState,
88
88
  onAuthorize: services.length && handleAuthorize || undefined,
89
89
  onClick: handleClickWrapper,
90
90
  renderers: renderers,
@@ -92,6 +92,11 @@ export function CardWithUrlContent({
92
92
  url: url,
93
93
  testId: testId
94
94
  }, children);
95
+ } // We have to keep this last to prevent hook order from being violated
96
+
97
+
98
+ if (error) {
99
+ throw error;
95
100
  }
96
101
 
97
102
  switch (appearance) {
@@ -4,12 +4,11 @@ import _extends from "@babel/runtime/helpers/extends";
4
4
  import React from 'react';
5
5
  import { FormattedMessage } from 'react-intl-next';
6
6
  import { css, jsx } from '@emotion/core';
7
- import { LinkIcon, Title } from '../../../elements';
8
- import Block from '../../block';
9
7
  import { SmartLinkAlignment, SmartLinkDirection, SmartLinkSize } from '../../../../../../constants';
10
8
  import { getLinkLineHeight, getLinkSizeStyles, getTruncateStyles } from '../../../utils';
11
9
  import ElementGroup from '../../element-group';
12
10
  import { tokens } from '../../../../../../utils/token';
11
+ import { BaseTitleBlockComponent } from '../utils';
13
12
  const actionStyles = css`
14
13
  cursor: pointer;
15
14
  :hover {
@@ -30,43 +29,29 @@ const getMessageStyles = (size, hasAction) => {
30
29
  `;
31
30
  };
32
31
 
33
- const TitleBlockErroredView = ({
34
- maxLines,
35
- retry,
36
- position,
37
- testId,
38
- theme,
39
- text,
40
- ...blockProps
41
- }) => {
32
+ const TitleBlockErroredView = props => {
42
33
  const {
43
- descriptor,
34
+ size = SmartLinkSize.Medium,
35
+ retry,
36
+ testId
37
+ } = props;
38
+ const {
39
+ descriptor: retryDescriptor,
44
40
  onClick,
45
- values
41
+ values: retryValues
46
42
  } = retry || {};
47
- const {
48
- size = SmartLinkSize.Medium
49
- } = blockProps;
50
43
  const hasAction = onClick !== undefined;
51
- const overrideText = !!text ? {
52
- text
53
- } : {};
54
- return jsx(Block, _extends({}, blockProps, {
55
- testId: `${testId}-errored-view`
56
- }), jsx(LinkIcon, {
57
- position: position
58
- }), jsx(Title, _extends({}, overrideText, {
59
- maxLines: maxLines,
60
- theme: theme
61
- })), descriptor && jsx(ElementGroup, {
44
+ return jsx(BaseTitleBlockComponent, _extends({}, props, {
45
+ blockTestIdPostfix: "errored-view"
46
+ }), retryDescriptor && jsx(ElementGroup, {
62
47
  direction: SmartLinkDirection.Horizontal,
63
48
  align: SmartLinkAlignment.Right
64
49
  }, jsx("span", {
65
50
  css: getMessageStyles(size, hasAction),
66
51
  onClick: onClick,
67
52
  "data-testid": `${testId}-errored-view-message`
68
- }, jsx(FormattedMessage, _extends({}, descriptor, {
69
- values: values
53
+ }, jsx(FormattedMessage, _extends({}, retryDescriptor, {
54
+ values: retryValues
70
55
  })))));
71
56
  };
72
57