@atlaskit/smart-card 38.8.0 → 38.9.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.
Files changed (109) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/cjs/extractors/common/context/index.js +2 -1
  3. package/dist/cjs/extractors/embed/index.js +4 -16
  4. package/dist/cjs/extractors/flexible/extract-link-title.js +2 -4
  5. package/dist/cjs/extractors/flexible/index.js +12 -14
  6. package/dist/cjs/extractors/inline/index.js +7 -18
  7. package/dist/cjs/state/hooks/use-resolve/index.js +1 -2
  8. package/dist/cjs/utils/analytics/analytics.js +1 -1
  9. package/dist/cjs/view/BlockCard/index.js +4 -2
  10. package/dist/cjs/view/BlockCard/views/ForbiddenView.js +1 -1
  11. package/dist/cjs/view/BlockCard/views/NotFoundView.js +1 -1
  12. package/dist/cjs/view/BlockCard/views/ResolvedView.js +3 -1
  13. package/dist/cjs/view/BlockCard/views/UnauthorisedView.js +2 -3
  14. package/dist/cjs/view/CardWithUrl/component.js +15 -10
  15. package/dist/cjs/view/FlexibleCard/components/blocks/action-block/action-footer/index.js +3 -2
  16. package/dist/cjs/view/FlexibleCard/components/blocks/title-block/index.js +3 -1
  17. package/dist/cjs/view/FlexibleCard/components/blocks/title-block/resolved/index.js +4 -2
  18. package/dist/cjs/view/FlexibleCard/components/common/image-icon/index.js +47 -15
  19. package/dist/cjs/view/FlexibleCard/components/elements/common/base-icon-element/index.js +7 -3
  20. package/dist/cjs/view/FlexibleCard/components/elements/common/base-lozenge-element/lozenge-action/lozenge-action-trigger/index.js +5 -3
  21. package/dist/cjs/view/FlexibleCard/utils.js +5 -8
  22. package/dist/cjs/view/HoverCard/components/HoverCardComponent.js +2 -1
  23. package/dist/cjs/view/HoverCard/components/ImagePreview.js +2 -15
  24. package/dist/cjs/view/HoverCard/components/views/forbidden/index.js +3 -4
  25. package/dist/cjs/view/HoverCard/components/views/unauthorised/index.js +2 -3
  26. package/dist/cjs/view/InlineCard/ErroredView/index.js +3 -3
  27. package/dist/cjs/view/InlineCard/index.js +3 -5
  28. package/dist/cjs/view/LinkUrl/index.js +1 -1
  29. package/dist/es2019/extractors/common/context/index.js +2 -1
  30. package/dist/es2019/extractors/embed/index.js +6 -19
  31. package/dist/es2019/extractors/flexible/extract-link-title.js +3 -5
  32. package/dist/es2019/extractors/flexible/index.js +15 -15
  33. package/dist/es2019/extractors/inline/index.js +8 -22
  34. package/dist/es2019/state/hooks/use-resolve/index.js +1 -2
  35. package/dist/es2019/utils/analytics/analytics.js +1 -1
  36. package/dist/es2019/view/BlockCard/index.js +4 -2
  37. package/dist/es2019/view/BlockCard/views/ForbiddenView.js +2 -2
  38. package/dist/es2019/view/BlockCard/views/NotFoundView.js +2 -2
  39. package/dist/es2019/view/BlockCard/views/ResolvedView.js +3 -1
  40. package/dist/es2019/view/BlockCard/views/UnauthorisedView.js +3 -4
  41. package/dist/es2019/view/CardWithUrl/component.js +16 -11
  42. package/dist/es2019/view/FlexibleCard/components/blocks/action-block/action-footer/index.js +3 -2
  43. package/dist/es2019/view/FlexibleCard/components/blocks/title-block/index.js +2 -0
  44. package/dist/es2019/view/FlexibleCard/components/blocks/title-block/resolved/index.js +3 -1
  45. package/dist/es2019/view/FlexibleCard/components/common/image-icon/index.js +49 -22
  46. package/dist/es2019/view/FlexibleCard/components/elements/common/base-icon-element/index.js +7 -4
  47. package/dist/es2019/view/FlexibleCard/components/elements/common/base-lozenge-element/lozenge-action/lozenge-action-trigger/index.js +5 -3
  48. package/dist/es2019/view/FlexibleCard/utils.js +7 -8
  49. package/dist/es2019/view/HoverCard/components/HoverCardComponent.js +2 -1
  50. package/dist/es2019/view/HoverCard/components/ImagePreview.js +2 -15
  51. package/dist/es2019/view/HoverCard/components/views/forbidden/index.js +4 -5
  52. package/dist/es2019/view/HoverCard/components/views/unauthorised/index.js +3 -4
  53. package/dist/es2019/view/InlineCard/ErroredView/index.js +4 -4
  54. package/dist/es2019/view/InlineCard/index.js +5 -7
  55. package/dist/es2019/view/LinkUrl/index.js +1 -1
  56. package/dist/esm/extractors/common/context/index.js +2 -1
  57. package/dist/esm/extractors/embed/index.js +6 -18
  58. package/dist/esm/extractors/flexible/extract-link-title.js +3 -5
  59. package/dist/esm/extractors/flexible/index.js +15 -15
  60. package/dist/esm/extractors/inline/index.js +8 -21
  61. package/dist/esm/state/hooks/use-resolve/index.js +1 -2
  62. package/dist/esm/utils/analytics/analytics.js +1 -1
  63. package/dist/esm/view/BlockCard/index.js +4 -2
  64. package/dist/esm/view/BlockCard/views/ForbiddenView.js +2 -2
  65. package/dist/esm/view/BlockCard/views/NotFoundView.js +2 -2
  66. package/dist/esm/view/BlockCard/views/ResolvedView.js +3 -1
  67. package/dist/esm/view/BlockCard/views/UnauthorisedView.js +3 -4
  68. package/dist/esm/view/CardWithUrl/component.js +16 -11
  69. package/dist/esm/view/FlexibleCard/components/blocks/action-block/action-footer/index.js +3 -2
  70. package/dist/esm/view/FlexibleCard/components/blocks/title-block/index.js +3 -1
  71. package/dist/esm/view/FlexibleCard/components/blocks/title-block/resolved/index.js +4 -2
  72. package/dist/esm/view/FlexibleCard/components/common/image-icon/index.js +46 -14
  73. package/dist/esm/view/FlexibleCard/components/elements/common/base-icon-element/index.js +7 -3
  74. package/dist/esm/view/FlexibleCard/components/elements/common/base-lozenge-element/lozenge-action/lozenge-action-trigger/index.js +5 -3
  75. package/dist/esm/view/FlexibleCard/utils.js +7 -8
  76. package/dist/esm/view/HoverCard/components/HoverCardComponent.js +2 -1
  77. package/dist/esm/view/HoverCard/components/ImagePreview.js +2 -15
  78. package/dist/esm/view/HoverCard/components/views/forbidden/index.js +4 -5
  79. package/dist/esm/view/HoverCard/components/views/unauthorised/index.js +3 -4
  80. package/dist/esm/view/InlineCard/ErroredView/index.js +4 -4
  81. package/dist/esm/view/InlineCard/index.js +5 -7
  82. package/dist/esm/view/LinkUrl/index.js +1 -1
  83. package/dist/types/ssr.d.ts +1 -0
  84. package/dist/types/view/BlockCard/index.d.ts +1 -1
  85. package/dist/types/view/BlockCard/types.d.ts +1 -0
  86. package/dist/types/view/BlockCard/views/types.d.ts +1 -1
  87. package/dist/types/view/Card/types.d.ts +1 -0
  88. package/dist/types/view/CardWithUrl/types.d.ts +1 -0
  89. package/dist/types/view/FlexibleCard/components/blocks/title-block/index.d.ts +1 -1
  90. package/dist/types/view/FlexibleCard/components/blocks/title-block/resolved/index.d.ts +1 -1
  91. package/dist/types/view/FlexibleCard/components/blocks/types.d.ts +4 -0
  92. package/dist/types/view/FlexibleCard/components/common/image-icon/index.d.ts +1 -1
  93. package/dist/types/view/FlexibleCard/components/common/image-icon/types.d.ts +1 -0
  94. package/dist/types/view/FlexibleCard/components/elements/common/base-icon-element/index.d.ts +5 -1
  95. package/dist/types/view/FlexibleCard/types.d.ts +4 -0
  96. package/dist/types-ts4.5/ssr.d.ts +1 -0
  97. package/dist/types-ts4.5/view/BlockCard/index.d.ts +1 -1
  98. package/dist/types-ts4.5/view/BlockCard/types.d.ts +1 -0
  99. package/dist/types-ts4.5/view/BlockCard/views/types.d.ts +1 -1
  100. package/dist/types-ts4.5/view/Card/types.d.ts +1 -0
  101. package/dist/types-ts4.5/view/CardWithUrl/types.d.ts +1 -0
  102. package/dist/types-ts4.5/view/FlexibleCard/components/blocks/title-block/index.d.ts +1 -1
  103. package/dist/types-ts4.5/view/FlexibleCard/components/blocks/title-block/resolved/index.d.ts +1 -1
  104. package/dist/types-ts4.5/view/FlexibleCard/components/blocks/types.d.ts +4 -0
  105. package/dist/types-ts4.5/view/FlexibleCard/components/common/image-icon/index.d.ts +1 -1
  106. package/dist/types-ts4.5/view/FlexibleCard/components/common/image-icon/types.d.ts +1 -0
  107. package/dist/types-ts4.5/view/FlexibleCard/components/elements/common/base-icon-element/index.d.ts +5 -1
  108. package/dist/types-ts4.5/view/FlexibleCard/types.d.ts +4 -0
  109. package/package.json +10 -4
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
- var _typeof = require("@babel/runtime/helpers/typeof");
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
@@ -13,13 +12,12 @@ var _constants = require("../../constants");
13
12
  var _context = require("../../extractors/common/context");
14
13
  var _flexible = _interopRequireDefault(require("../../extractors/flexible"));
15
14
  var _extractLinkTitle = _interopRequireDefault(require("../../extractors/flexible/extract-link-title"));
16
- var _extractPreview = _interopRequireWildcard(require("../../extractors/flexible/extract-preview"));
15
+ var _extractPreview = require("../../extractors/flexible/extract-preview");
17
16
  var _icon = require("../../extractors/flexible/icon");
18
- var _extractProviderIcon = _interopRequireWildcard(require("../../extractors/flexible/icon/extract-provider-icon"));
17
+ var _extractProviderIcon = require("../../extractors/flexible/icon/extract-provider-icon");
19
18
  var _messages = require("../../messages");
20
19
  var _utils = require("../../utils");
21
20
  var _jsonld = require("../../utils/jsonld");
22
- function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
23
21
  var getContextByStatus = exports.getContextByStatus = function getContextByStatus(params) {
24
22
  var _ref = params !== null && params !== void 0 ? params : {},
25
23
  onClick = _ref.onClick,
@@ -49,8 +47,8 @@ var getContextByStatus = exports.getContextByStatus = function getContextByStatu
49
47
  title: (0, _platformFeatureFlags.fg)('platform-linking-flexible-card-context') ? undefined : url,
50
48
  linkIcon: (0, _icon.extractErrorIcon)(response, status),
51
49
  linkTitle: (0, _platformFeatureFlags.fg)('platform-linking-flexible-card-context') ? (0, _extractLinkTitle.default)(status, url, response, onClick) : undefined,
52
- preview: (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _extractPreview.extractSmartLinkPreviewImage)(response) : (0, _extractPreview.default)(response === null || response === void 0 ? void 0 : response.data),
53
- provider: (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _extractProviderIcon.extractSmartLinkProviderIcon)(response) : (0, _extractProviderIcon.default)(response === null || response === void 0 ? void 0 : response.data),
50
+ preview: (0, _extractPreview.extractSmartLinkPreviewImage)(response),
51
+ provider: (0, _extractProviderIcon.extractSmartLinkProviderIcon)(response),
54
52
  actions: (0, _platformFeatureFlags.fg)('platform-linking-flexible-card-unresolved-action') ? (0, _defineProperty2.default)({}, _constants.InternalActionName.UnresolvedAction, getRetryOptions(url, status, response, params.onAuthorize)) : undefined
55
53
  };
56
54
  }
@@ -75,8 +73,7 @@ var getForbiddenMessageKey = function getForbiddenMessageKey(meta) {
75
73
  };
76
74
  var getRetryOptions = exports.getRetryOptions = function getRetryOptions(url, status, response, onAuthorize) {
77
75
  var _response$meta, _access$action, _access$buttonDisable;
78
- var data = response && response.data || (0, _jsonld.getEmptyJsonLd)();
79
- var provider = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkProvider)(response) : (0, _linkExtractors.extractProvider)(data);
76
+ var provider = (0, _linkExtractors.extractSmartLinkProvider)(response);
80
77
  var context = provider === null || provider === void 0 ? void 0 : provider.text;
81
78
  var values = context ? {
82
79
  context: context
@@ -241,6 +241,7 @@ var HoverCardComponent = exports.HoverCardComponent = function HoverCardComponen
241
241
  label: label
242
242
  // @ts-ignore: [PIT-1685] Fails in post-office due to backwards incompatibility issue with React 18
243
243
  ,
244
- popupComponent: _CustomPopupContainer.default
244
+ popupComponent: _CustomPopupContainer.default,
245
+ shouldRenderToParent: (0, _platformFeatureFlags.fg)('should-render-to-parent-should-be-true-linking-pla')
245
246
  });
246
247
  };
@@ -10,7 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
10
10
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
11
  var _react = _interopRequireWildcard(require("react"));
12
12
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
13
- var _extractPreview = _interopRequireWildcard(require("../../../extractors/flexible/extract-preview"));
13
+ var _extractPreview = require("../../../extractors/flexible/extract-preview");
14
14
  var _blocks = require("../../FlexibleCard/components/blocks");
15
15
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
16
16
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -28,7 +28,6 @@ var ImagePreview = function ImagePreview(_ref) {
28
28
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
29
29
  dynamicStyles = _useState4[0],
30
30
  setDynamicStyles = _useState4[1];
31
- var data = response === null || response === void 0 ? void 0 : response.data;
32
31
 
33
32
  // Set Preview to a fixed height to enable transitions
34
33
  var onPreviewRender = (0, _react.useCallback)(function () {
@@ -58,19 +57,7 @@ var ImagePreview = function ImagePreview(_ref) {
58
57
  var onPreviewTransitionEnd = (0, _react.useCallback)(function () {
59
58
  setShowPreview(false);
60
59
  }, []);
61
- if ((0, _platformFeatureFlags.fg)('smart_links_noun_support')) {
62
- return showPreview && (0, _extractPreview.extractSmartLinkPreviewImage)(response) ? /*#__PURE__*/_react.default.createElement(_blocks.PreviewBlock, {
63
- onError: onPreviewError,
64
- ignoreContainerPadding: true,
65
- onTransitionEnd: onPreviewTransitionEnd,
66
- blockRef: previewBlockRef,
67
- onRender: onPreviewRender
68
- // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
69
- ,
70
- style: dynamicStyles
71
- }) : null;
72
- }
73
- return showPreview && data && (0, _extractPreview.default)(data) ? /*#__PURE__*/_react.default.createElement(_blocks.PreviewBlock, {
60
+ return showPreview && (0, _extractPreview.extractSmartLinkPreviewImage)(response) ? /*#__PURE__*/_react.default.createElement(_blocks.PreviewBlock, {
74
61
  onError: onPreviewError,
75
62
  ignoreContainerPadding: true,
76
63
  onTransitionEnd: onPreviewTransitionEnd,
@@ -33,7 +33,7 @@ var connectButtonStyles = null;
33
33
  var basePreviewStylesOld = null;
34
34
  var basePreviewStyles = null;
35
35
  var HoverCardForbiddenView = function HoverCardForbiddenView(_ref) {
36
- var _cardState$details, _cardState$details2, _extractSmartLinkProv, _extractSmartLinkProv2, _extractProvider$text, _extractProvider, _extractRequestAccess;
36
+ var _cardState$details, _extractSmartLinkProv, _extractSmartLinkProv2, _extractRequestAccess;
37
37
  var flexibleCardProps = _ref.flexibleCardProps,
38
38
  _ref$testId = _ref.testId,
39
39
  testId = _ref$testId === void 0 ? 'hover-card-forbidden-view' : _ref$testId;
@@ -41,9 +41,8 @@ var HoverCardForbiddenView = function HoverCardForbiddenView(_ref) {
41
41
  createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
42
42
  var cardState = flexibleCardProps.cardState,
43
43
  url = flexibleCardProps.url;
44
- var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
45
- var meta = (_cardState$details2 = cardState.details) === null || _cardState$details2 === void 0 ? void 0 : _cardState$details2.meta;
46
- var product = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (_extractSmartLinkProv = (_extractSmartLinkProv2 = (0, _linkExtractors.extractSmartLinkProvider)(cardState.details)) === null || _extractSmartLinkProv2 === void 0 ? void 0 : _extractSmartLinkProv2.text) !== null && _extractSmartLinkProv !== void 0 ? _extractSmartLinkProv : '' : (_extractProvider$text = (_extractProvider = (0, _linkExtractors.extractProvider)(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text) !== null && _extractProvider$text !== void 0 ? _extractProvider$text : '';
44
+ var meta = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.meta;
45
+ var product = (_extractSmartLinkProv = (_extractSmartLinkProv2 = (0, _linkExtractors.extractSmartLinkProvider)(cardState.details)) === null || _extractSmartLinkProv2 === void 0 ? void 0 : _extractSmartLinkProv2.text) !== null && _extractSmartLinkProv !== void 0 ? _extractSmartLinkProv : '';
47
46
  var hostname = /*#__PURE__*/React.createElement("b", null, (0, _extractHostname.default)(url));
48
47
  var _ref2 = (_extractRequestAccess = (0, _extractAccessContext.extractRequestAccessContextImproved)({
49
48
  jsonLd: meta,
@@ -33,7 +33,7 @@ var titleBlockStyles = null;
33
33
  var mainTextStylesOld = null;
34
34
  var mainTextStyles = null;
35
35
  var HoverCardUnauthorisedView = function HoverCardUnauthorisedView(_ref) {
36
- var _cardState$details, _extractSmartLinkProv, _extractProvider;
36
+ var _extractSmartLinkProv;
37
37
  var _ref$id = _ref.id,
38
38
  id = _ref$id === void 0 ? '' : _ref$id,
39
39
  flexibleCardProps = _ref.flexibleCardProps,
@@ -41,8 +41,7 @@ var HoverCardUnauthorisedView = function HoverCardUnauthorisedView(_ref) {
41
41
  testId = _ref$testId === void 0 ? 'hover-card-unauthorised-view' : _ref$testId,
42
42
  url = _ref.url;
43
43
  var cardState = flexibleCardProps.cardState;
44
- var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
45
- var providerName = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (_extractSmartLinkProv = (0, _linkExtractors.extractSmartLinkProvider)(cardState.details)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text : (_extractProvider = (0, _linkExtractors.extractProvider)(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text;
44
+ var providerName = (_extractSmartLinkProv = (0, _linkExtractors.extractSmartLinkProvider)(cardState.details)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text;
46
45
  var isProductIntegrationSupported = (0, _helpers.hasAuthScopeOverrides)(cardState.details);
47
46
  var _useSmartCardActions = (0, _actions.useSmartCardActions)(id, url),
48
47
  authorize = _useSmartCardActions.authorize;
@@ -12,7 +12,6 @@ var _react = _interopRequireDefault(require("react"));
12
12
  var _reactIntlNext = require("react-intl-next");
13
13
  var _button = _interopRequireDefault(require("@atlaskit/button"));
14
14
  var _error = _interopRequireDefault(require("@atlaskit/icon/core/migration/error"));
15
- var _error2 = _interopRequireDefault(require("@atlaskit/icon/utility/migration/error"));
16
15
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
17
16
  var _compiled = require("@atlaskit/primitives/compiled");
18
17
  var _messages = require("../../../messages");
@@ -37,11 +36,12 @@ var fallbackIcon = function fallbackIcon() {
37
36
  return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
38
37
  as: "span",
39
38
  xcss: styles.iconWrapper
40
- }, /*#__PURE__*/_react.default.createElement(_error2.default, {
39
+ }, /*#__PURE__*/_react.default.createElement(_error.default, {
41
40
  color: "var(--ds-icon-danger, #C9372C)",
42
41
  label: "error",
43
42
  LEGACY_size: "small",
44
- testId: "errored-view-default-icon"
43
+ testId: "errored-view-default-icon",
44
+ size: "small"
45
45
  }));
46
46
  };
47
47
  var InlineCardErroredView = exports.InlineCardErroredView = function InlineCardErroredView(_ref) {
@@ -40,7 +40,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
40
40
  var _react = _interopRequireWildcard(require("react"));
41
41
  var _analyticsNext = require("@atlaskit/analytics-next");
42
42
  var _linkExtractors = require("@atlaskit/link-extractors");
43
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
44
43
  var _constants = require("../../constants");
45
44
  var _extractAccessContext = require("../../extractors/common/context/extractAccessContext");
46
45
  var _inline = require("../../extractors/inline");
@@ -77,7 +76,6 @@ var InlineCard = exports.InlineCard = function InlineCard(_ref) {
77
76
  createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
78
77
  var status = cardState.status,
79
78
  details = cardState.details;
80
- var cardDetails = details && details.data || (0, _jsonld.getEmptyJsonLd)();
81
79
  var extensionKey = (0, _helpers.getExtensionKey)(details);
82
80
  var testIdWithStatus = testId ? "".concat(testId, "-").concat(status, "-view") : undefined;
83
81
  var resolvedProps = status === _constants.SmartLinkStatus.Resolved ? (0, _inline.extractInlineProps)(details, renderers, removeTextHighlightingFromTitle, false) : {};
@@ -129,7 +127,7 @@ var InlineCard = exports.InlineCard = function InlineCard(_ref) {
129
127
  truncateInline: truncateInline
130
128
  }));
131
129
  case 'unauthorized':
132
- var provider = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkProvider)(details) : (0, _linkExtractors.extractProvider)(cardDetails);
130
+ var provider = (0, _linkExtractors.extractSmartLinkProvider)(details);
133
131
  return /*#__PURE__*/_react.default.createElement(_UnauthorisedView.InlineCardUnauthorizedView, {
134
132
  icon: provider && provider.icon,
135
133
  context: provider && provider.text,
@@ -144,7 +142,7 @@ var InlineCard = exports.InlineCard = function InlineCard(_ref) {
144
142
  truncateInline: truncateInline
145
143
  });
146
144
  case 'forbidden':
147
- var providerForbidden = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkProvider)(details) : (0, _linkExtractors.extractProvider)(cardDetails);
145
+ var providerForbidden = (0, _linkExtractors.extractSmartLinkProvider)(details);
148
146
  var cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : (0, _jsonld.getForbiddenJsonLd)().meta;
149
147
  var requestAccessContext = (0, _extractAccessContext.extractRequestAccessContextImproved)({
150
148
  jsonLd: cardMetadata,
@@ -165,7 +163,7 @@ var InlineCard = exports.InlineCard = function InlineCard(_ref) {
165
163
  truncateInline: truncateInline
166
164
  });
167
165
  case 'not_found':
168
- var providerNotFound = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkProvider)(details) : (0, _linkExtractors.extractProvider)(cardDetails);
166
+ var providerNotFound = (0, _linkExtractors.extractSmartLinkProvider)(details);
169
167
  return /*#__PURE__*/_react.default.createElement(_ErroredView.InlineCardErroredView, {
170
168
  url: url,
171
169
  icon: providerNotFound && providerNotFound.icon,
@@ -20,7 +20,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId", "isLink
20
20
  _excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
21
21
  var PACKAGE_DATA = {
22
22
  packageName: "@atlaskit/smart-card",
23
- packageVersion: "38.8.0",
23
+ packageVersion: "38.9.1",
24
24
  componentName: 'linkUrl'
25
25
  };
26
26
  var Anchor = (0, _click.withLinkClickedEvent)('a');
@@ -1,4 +1,5 @@
1
1
  import { extractEntityProvider, extractProvider, extractProviderIcon, extractUrlFromIconJsonLd, isEntityPresent } from '@atlaskit/link-extractors';
2
+ import { getEmptyJsonLd } from '../../../utils/jsonld';
2
3
  import { prioritiseIcon } from '../icon/prioritiseIcon';
3
4
  export { extractRequestAccessContextImproved } from './extractAccessContext';
4
5
  export function generateContext(jsonLd) {
@@ -32,5 +33,5 @@ export function extractSmartLinkContext(response) {
32
33
  if (isEntityPresent(response)) {
33
34
  return extractEntityProvider(response);
34
35
  }
35
- return generateContext(response === null || response === void 0 ? void 0 : response.data);
36
+ return generateContext((response === null || response === void 0 ? void 0 : response.data) || getEmptyJsonLd());
36
37
  }
@@ -1,7 +1,7 @@
1
- import { extractLink, extractPreview, extractSmartLinkEmbed, extractSmartLinkTitle, extractSmartLinkUrl, extractTitle, extractType } from '@atlaskit/link-extractors';
1
+ import { extractPreview, extractSmartLinkEmbed, extractSmartLinkTitle, extractSmartLinkUrl, extractType } from '@atlaskit/link-extractors';
2
2
  import { fg } from '@atlaskit/platform-feature-flags';
3
3
  import { getEmptyJsonLd } from '../../utils/jsonld';
4
- import { extractSmartLinkContext, generateContext } from '../common/context';
4
+ import { extractSmartLinkContext } from '../common/context';
5
5
  import { extractIsSupportTheming } from '../common/meta/extractIsSupportTheming';
6
6
  import { extractIsTrusted } from '../common/meta/extractIsTrusted';
7
7
  const extractEmbedPreview = (jsonLd, platform, iframeUrlType) => {
@@ -16,24 +16,11 @@ const extractEmbedPreview = (jsonLd, platform, iframeUrlType) => {
16
16
  export const extractEmbedProps = (response, platform, iframeUrlType) => {
17
17
  const meta = response === null || response === void 0 ? void 0 : response.meta;
18
18
  const jsonLd = (response === null || response === void 0 ? void 0 : response.data) || getEmptyJsonLd();
19
- if (fg('smart_links_noun_support')) {
20
- return {
21
- link: extractSmartLinkUrl(response) || '',
22
- title: extractSmartLinkTitle(response),
23
- context: extractSmartLinkContext(response),
24
- preview: extractSmartLinkEmbed(response, iframeUrlType),
25
- isTrusted: extractIsTrusted(meta),
26
- isSupportTheming: extractIsSupportTheming(meta),
27
- ...(fg('platform-linking-visual-refresh-v2') && {
28
- type: extractType(jsonLd)
29
- })
30
- };
31
- }
32
19
  return {
33
- link: extractLink(jsonLd) || '',
34
- title: extractTitle(jsonLd),
35
- context: generateContext(jsonLd),
36
- preview: extractEmbedPreview(jsonLd, platform, iframeUrlType),
20
+ link: extractSmartLinkUrl(response) || '',
21
+ title: extractSmartLinkTitle(response),
22
+ context: extractSmartLinkContext(response),
23
+ preview: fg('smart_links_noun_support') ? extractSmartLinkEmbed(response, iframeUrlType) : extractEmbedPreview(jsonLd, platform, iframeUrlType),
37
24
  isTrusted: extractIsTrusted(meta),
38
25
  isSupportTheming: extractIsSupportTheming(meta),
39
26
  ...(fg('platform-linking-visual-refresh-v2') && {
@@ -1,12 +1,10 @@
1
- import { extractTitle as extractJsonLdTitle, extractLink, extractSmartLinkTitle, extractSmartLinkUrl } from '@atlaskit/link-extractors';
2
- import { fg } from '@atlaskit/platform-feature-flags';
1
+ import { extractSmartLinkTitle, extractSmartLinkUrl } from '@atlaskit/link-extractors';
3
2
  import { SmartLinkStatus } from '../../constants';
4
3
  const extractLinkTitle = (status, propUrl, response, onClick) => {
5
4
  var _ref;
6
- const data = response === null || response === void 0 ? void 0 : response.data;
7
- const responseUrl = fg('smart_links_noun_support') ? extractSmartLinkUrl(response) : extractLink(data);
5
+ const responseUrl = extractSmartLinkUrl(response);
8
6
  const url = status === SmartLinkStatus.Resolved ? responseUrl !== null && responseUrl !== void 0 ? responseUrl : propUrl : propUrl;
9
- const name = fg('smart_links_noun_support') ? extractSmartLinkTitle(response) : extractJsonLdTitle(data);
7
+ const name = extractSmartLinkTitle(response);
10
8
  const text = status === SmartLinkStatus.Resolved ? (_ref = name !== null && name !== void 0 ? name : responseUrl) !== null && _ref !== void 0 ? _ref : propUrl : propUrl;
11
9
  return {
12
10
  onClick,
@@ -1,16 +1,16 @@
1
- import { extractAri, extractDateCreated, extractDateUpdated, extractLink, extractPersonCreatedBy, extractPersonOwnedBy, extractSmartLinkAri, extractSmartLinkCreatedBy, extractSmartLinkCreatedOn, extractSmartLinkModifiedBy, extractSmartLinkModifiedOn, extractSmartLinkTitle, extractSmartLinkUrl, extractTitle, extractType } from '@atlaskit/link-extractors';
1
+ import { extractPersonCreatedBy, extractPersonOwnedBy, extractSmartLinkAri, extractSmartLinkCreatedBy, extractSmartLinkCreatedOn, extractSmartLinkModifiedBy, extractSmartLinkModifiedOn, extractSmartLinkTitle, extractSmartLinkUrl, extractType } from '@atlaskit/link-extractors';
2
2
  import { fg } from '@atlaskit/platform-feature-flags';
3
3
  import { extractSummary } from '../common/primitives';
4
4
  import { extractFlexibleCardActions } from './actions';
5
5
  import { extractPersonsUpdatedBy } from './collaboratorGroup';
6
6
  import extractLinkTitle from './extract-link-title';
7
- import extractPreview, { extractSmartLinkPreviewImage } from './extract-preview';
7
+ import { extractSmartLinkPreviewImage } from './extract-preview';
8
8
  import extractPriority from './extract-priority';
9
9
  import extractState from './extract-state';
10
- import { extractLinkIcon, extractSmartLinkIcon } from './icon';
11
- import extractProviderIcon, { extractSmartLinkProviderIcon } from './icon/extract-provider-icon';
10
+ import { extractSmartLinkIcon } from './icon';
11
+ import { extractSmartLinkProviderIcon } from './icon/extract-provider-icon';
12
12
  import { extractLatestCommit } from './latest-commit';
13
- import { extractAppliedToComponentsCount, extractAssignedTo, extractAttachmentCount, extractChecklistProgress, extractCommentCount, extractCreatedBy, extractDueOn, extractLocation, extractMetaObjectId, extractMetaResourceType, extractMetaTenantId, extractModifiedBy, extractOwnedBy, extractPersonAssignedToAsArray, extractProgrammingLanguage, extractReactCount, extractReadTime, extractSentOn, extractSourceBranch, extractStoryPoints, extractSubscriberCount, extractSubTasksProgress, extractTargetBranch, extractViewCount, extractVoteCount } from './utils';
13
+ import { extractAppliedToComponentsCount, extractAssignedTo, extractAttachmentCount, extractChecklistProgress, extractCommentCount, extractDueOn, extractLocation, extractMetaObjectId, extractMetaResourceType, extractMetaTenantId, extractOwnedBy, extractPersonAssignedToAsArray, extractProgrammingLanguage, extractReactCount, extractReadTime, extractSentOn, extractSourceBranch, extractStoryPoints, extractSubscriberCount, extractSubTasksProgress, extractTargetBranch, extractViewCount, extractVoteCount } from './utils';
14
14
  const extractFlexibleUiContext = ({
15
15
  appearance,
16
16
  fireEvent,
@@ -30,7 +30,7 @@ const extractFlexibleUiContext = ({
30
30
  }
31
31
  const data = response.data;
32
32
  const meta = response.meta;
33
- const url = fg('smart_links_noun_support') ? extractSmartLinkUrl(response) : extractLink(data);
33
+ const url = extractSmartLinkUrl(response);
34
34
  return {
35
35
  actions: extractFlexibleCardActions({
36
36
  actionOptions,
@@ -53,22 +53,22 @@ const extractFlexibleUiContext = ({
53
53
  reactCount: extractReactCount(data),
54
54
  voteCount: extractVoteCount(data),
55
55
  checklistProgress: extractChecklistProgress(data),
56
- createdBy: fg('smart_links_noun_support') ? extractSmartLinkCreatedBy(response) : extractCreatedBy(data),
56
+ createdBy: extractSmartLinkCreatedBy(response),
57
57
  ownedBy: extractOwnedBy(data),
58
58
  assignedTo: extractAssignedTo(data),
59
- createdOn: fg('smart_links_noun_support') ? extractSmartLinkCreatedOn(response) : extractDateCreated(data),
59
+ createdOn: extractSmartLinkCreatedOn(response),
60
60
  dueOn: extractDueOn(data),
61
61
  latestCommit: extractLatestCommit(data),
62
- linkIcon: fg('smart_links_noun_support') ? extractSmartLinkIcon(response) : extractLinkIcon(response, renderers),
62
+ linkIcon: extractSmartLinkIcon(response),
63
63
  ...(fg('platform-linking-flexible-card-context') && {
64
64
  linkTitle: extractLinkTitle(status, props.url, response, onClick)
65
65
  }),
66
66
  location: extractLocation(data),
67
- modifiedBy: fg('smart_links_noun_support') ? extractSmartLinkModifiedBy(response) : extractModifiedBy(data),
68
- modifiedOn: fg('smart_links_noun_support') ? extractSmartLinkModifiedOn(response) : extractDateUpdated(data),
69
- preview: fg('smart_links_noun_support') ? extractSmartLinkPreviewImage(response) : extractPreview(data),
67
+ modifiedBy: extractSmartLinkModifiedBy(response),
68
+ modifiedOn: extractSmartLinkModifiedOn(response),
69
+ preview: extractSmartLinkPreviewImage(response),
70
70
  priority: extractPriority(data),
71
- provider: fg('smart_links_noun_support') ? extractSmartLinkProviderIcon(response) : extractProviderIcon(data),
71
+ provider: extractSmartLinkProviderIcon(response),
72
72
  programmingLanguage: extractProgrammingLanguage(data),
73
73
  readTime: extractReadTime(data),
74
74
  sentOn: extractSentOn(data),
@@ -81,10 +81,10 @@ const extractFlexibleUiContext = ({
81
81
  storyPoints: extractStoryPoints(data),
82
82
  targetBranch: extractTargetBranch(data),
83
83
  ...(fg('platform-linking-flexible-card-context') ? undefined : {
84
- title: fg('smart_links_noun_support') ? extractSmartLinkTitle(response) || url : extractTitle(data) || url
84
+ title: extractSmartLinkTitle(response) || url
85
85
  }),
86
86
  url,
87
- ari: fg('smart_links_noun_support') ? extractSmartLinkAri(response) : extractAri(data),
87
+ ari: extractSmartLinkAri(response),
88
88
  ...(fg('platform-linking-visual-refresh-v2') && {
89
89
  type: extractType(data)
90
90
  }),
@@ -1,7 +1,6 @@
1
- import { extractEntityProvider, extractLink, extractProvider,
2
- // extractSmartLinkIcon,
3
- extractSmartLinkTitle, extractSmartLinkUrl, extractTitle, extractType, isEntityPresent } from '@atlaskit/link-extractors';
1
+ import { extractEntityProvider, extractProvider, extractSmartLinkTitle, extractSmartLinkUrl, extractType, isEntityPresent } from '@atlaskit/link-extractors';
4
2
  import { fg } from '@atlaskit/platform-feature-flags';
3
+ import { getEmptyJsonLd } from '../../utils/jsonld';
5
4
  import { extractIcon } from '../common/icon';
6
5
  import { extractLozenge } from '../common/lozenge';
7
6
  import { extractTitleTextColor } from '../common/primitives';
@@ -32,29 +31,16 @@ const extractSmartLinkInlineIcon = (response, showLabel = true) => {
32
31
  // see: https://product-fabric.atlassian.net/browse/EDM-12375
33
32
  // return extractSmartLinkIcon(response);
34
33
  }
35
- return extractInlineIcon(response === null || response === void 0 ? void 0 : response.data, showLabel);
34
+ return extractInlineIcon((response === null || response === void 0 ? void 0 : response.data) || getEmptyJsonLd(), showLabel);
36
35
  };
37
36
  export const extractInlineProps = (response, renderers, removeTextHighlightingFromTitle, showLabel = true) => {
38
- const jsonLd = response === null || response === void 0 ? void 0 : response.data;
39
- if (fg('smart_links_noun_support')) {
40
- return {
41
- link: extractSmartLinkUrl(response),
42
- title: extractSmartLinkTitle(response, removeTextHighlightingFromTitle),
43
- icon: extractSmartLinkInlineIcon(response, showLabel),
44
- // As we migrate to support more entities we can incorporate these fields
45
- lozenge: extractLozenge(jsonLd),
46
- titleTextColor: extractTitleTextColor(jsonLd),
47
- titlePrefix: extractTitlePrefix(jsonLd, renderers, 'inline'),
48
- ...(fg('platform-linking-visual-refresh-v2') && {
49
- type: extractType(jsonLd)
50
- })
51
- };
52
- }
37
+ const jsonLd = (response === null || response === void 0 ? void 0 : response.data) || getEmptyJsonLd();
53
38
  return {
54
- link: extractLink(jsonLd),
55
- title: extractTitle(jsonLd, removeTextHighlightingFromTitle),
39
+ link: extractSmartLinkUrl(response),
40
+ title: extractSmartLinkTitle(response, removeTextHighlightingFromTitle),
41
+ icon: extractSmartLinkInlineIcon(response, showLabel),
42
+ // As we migrate to support more entities we can incorporate these fields
56
43
  lozenge: extractLozenge(jsonLd),
57
- icon: extractInlineIcon(jsonLd, showLabel),
58
44
  titleTextColor: extractTitleTextColor(jsonLd),
59
45
  titlePrefix: extractTitlePrefix(jsonLd, renderers, 'inline'),
60
46
  ...(fg('platform-linking-visual-refresh-v2') && {
@@ -1,7 +1,6 @@
1
1
  import { useCallback } from 'react';
2
2
  import { isEntityPresent } from '@atlaskit/link-extractors';
3
3
  import { useSmartLinkContext } from '@atlaskit/link-provider';
4
- import { fg } from '@atlaskit/platform-feature-flags';
5
4
  import { SmartLinkStatus } from '../../../constants';
6
5
  import { addMetadataToExperience } from '../../analytics';
7
6
  import useResponse from '../use-response';
@@ -28,7 +27,7 @@ const useResolve = () => {
28
27
  status: SmartLinkStatus.Pending,
29
28
  details: undefined
30
29
  };
31
- const hasData = fg('smart_links_noun_support') ? !!(details && details.data || isEntityPresent(details)) : !!(details && details.data);
30
+ const hasData = !!(details && details.data || isEntityPresent(details));
32
31
  if (isReloading || !hasData || isMetadataRequest) {
33
32
  return connections.client.fetchData(url, isReloading).then(response => handleResolvedLinkResponse(url, response, isReloading, isMetadataRequest)).catch(error => handleResolvedLinkError(url, error, undefined, isMetadataRequest));
34
33
  } else {
@@ -2,7 +2,7 @@ export const ANALYTICS_CHANNEL = 'media';
2
2
  export const context = {
3
3
  componentName: 'smart-cards',
4
4
  packageName: "@atlaskit/smart-card",
5
- packageVersion: "38.8.0"
5
+ packageVersion: "38.9.1"
6
6
  };
7
7
  export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
8
8
  TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
@@ -23,7 +23,8 @@ export const BlockCard = ({
23
23
  onError,
24
24
  testId,
25
25
  actionOptions,
26
- CompetitorPrompt
26
+ CompetitorPrompt,
27
+ hideIconLoadingSkeleton
27
28
  }) => {
28
29
  const {
29
30
  status
@@ -38,7 +39,8 @@ export const BlockCard = ({
38
39
  onResolve,
39
40
  renderers,
40
41
  actionOptions,
41
- CompetitorPrompt
42
+ CompetitorPrompt,
43
+ hideIconLoadingSkeleton
42
44
  };
43
45
  const {
44
46
  shouldControlDataExport = false
@@ -8,7 +8,7 @@ import { useIntl } from 'react-intl-next';
8
8
  import { useAnalyticsEvents } from '@atlaskit/analytics-next';
9
9
  import LockLockedIcon from '@atlaskit/icon/core/lock-locked';
10
10
  import LegacyLockIcon from '@atlaskit/icon/glyph/lock';
11
- import { extractProvider, extractSmartLinkProvider } from '@atlaskit/link-extractors';
11
+ import { extractSmartLinkProvider } from '@atlaskit/link-extractors';
12
12
  import { fg } from '@atlaskit/platform-feature-flags';
13
13
  import { extractRequestAccessContextImproved } from '../../../extractors/common/context/extractAccessContext';
14
14
  import extractHostname from '../../../extractors/common/hostname/extractHostname';
@@ -44,7 +44,7 @@ const ForbiddenView = ({
44
44
  } = props;
45
45
  const details = cardState === null || cardState === void 0 ? void 0 : cardState.details;
46
46
  const cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : getForbiddenJsonLd().meta;
47
- const provider = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(details === null || details === void 0 ? void 0 : details.data);
47
+ const provider = extractSmartLinkProvider(details);
48
48
  const providerName = (provider === null || provider === void 0 ? void 0 : provider.text) || '';
49
49
  const messageContext = useMemo(() => {
50
50
  const hostname = /*#__PURE__*/React.createElement("b", null, extractHostname(url));
@@ -7,7 +7,7 @@ import { useMemo } from 'react';
7
7
  import { useIntl } from 'react-intl-next';
8
8
  import LockLockedIcon from '@atlaskit/icon/core/lock-locked';
9
9
  import LegacyLockIcon from '@atlaskit/icon/glyph/lock';
10
- import { extractProvider, extractSmartLinkProvider } from '@atlaskit/link-extractors';
10
+ import { extractSmartLinkProvider } from '@atlaskit/link-extractors';
11
11
  import { fg } from '@atlaskit/platform-feature-flags';
12
12
  import { messages } from '../../../messages';
13
13
  import Text from '../../FlexibleCard/components/elements/common/base-text-element';
@@ -33,7 +33,7 @@ const NotFoundView = ({
33
33
  } = props;
34
34
  const product = useMemo(() => {
35
35
  var _provider$text;
36
- const provider = fg('smart_links_noun_support') ? extractSmartLinkProvider(details) : extractProvider(details === null || details === void 0 ? void 0 : details.data);
36
+ const provider = extractSmartLinkProvider(details);
37
37
  return (_provider$text = provider === null || provider === void 0 ? void 0 : provider.text) !== null && _provider$text !== void 0 ? _provider$text : '';
38
38
  }, [details]);
39
39
  const title = useMemo(() => intl.formatMessage(messages.not_found_title, {
@@ -31,7 +31,8 @@ const ResolvedView = ({
31
31
  actionOptions,
32
32
  testId = 'smart-block-resolved-view',
33
33
  url,
34
- CompetitorPrompt
34
+ CompetitorPrompt,
35
+ hideIconLoadingSkeleton
35
36
  }) => {
36
37
  const [isPreviewBlockErrored, setIsPreviewBlockErrored] = useState(false);
37
38
  const {
@@ -84,6 +85,7 @@ const ResolvedView = ({
84
85
  }, {
85
86
  CompetitorPrompt: CompetitorPrompt,
86
87
  url: url,
88
+ hideIconLoadingSkeleton: hideIconLoadingSkeleton,
87
89
  className: ax([fg('platform-linking-visual-refresh-v1') ? "_zulpu2gc _13mh1pd9 _2yhz14q2" : "_zulpcxkx _13mh1pd9"])
88
90
  })), /*#__PURE__*/React.createElement(MetadataBlock, _extends({
89
91
  primary: topMetadata,
@@ -5,7 +5,7 @@ import * as React from 'react';
5
5
  import { ax, ix } from "@compiled/react/runtime";
6
6
  import { useCallback, useMemo } from 'react';
7
7
  import { FormattedMessage } from 'react-intl-next';
8
- import { extractProvider, extractSmartLinkProvider } from '@atlaskit/link-extractors';
8
+ import { extractSmartLinkProvider } from '@atlaskit/link-extractors';
9
9
  import { fg } from '@atlaskit/platform-feature-flags';
10
10
  import { useAnalyticsEvents } from '../../../common/analytics/generated/use-analytics-events';
11
11
  import { messages } from '../../../messages';
@@ -28,13 +28,12 @@ const UnauthorisedView = ({
28
28
  testId = 'smart-block-unauthorized-view',
29
29
  ...props
30
30
  }) => {
31
- var _cardState$details, _extractSmartLinkProv, _extractProvider;
31
+ var _extractSmartLinkProv;
32
32
  const {
33
33
  cardState,
34
34
  onAuthorize
35
35
  } = props;
36
- const data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
37
- const providerName = fg('smart_links_noun_support') ? (_extractSmartLinkProv = extractSmartLinkProvider(cardState.details)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text : (_extractProvider = extractProvider(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text;
36
+ const providerName = (_extractSmartLinkProv = extractSmartLinkProvider(cardState.details)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text;
38
37
  const isProductIntegrationSupported = hasAuthScopeOverrides(cardState.details);
39
38
  const {
40
39
  fireEvent
@@ -7,7 +7,7 @@ import { useSmartLink } from '../../state';
7
7
  import { succeedUfoExperience } from '../../state/analytics';
8
8
  import { getClickUrl, getDefinitionId, getExtensionKey, getObjectAri, getObjectIconUrl, getObjectName, getResourceType, getServices, isFinalState } from '../../state/helpers';
9
9
  import { SmartLinkModalProvider } from '../../state/modal';
10
- import { isSpecialEvent } from '../../utils';
10
+ import { isSpecialClick, isSpecialEvent, isSpecialKey } from '../../utils';
11
11
  import { combineActionOptions } from '../../utils/actions/combine-action-options';
12
12
  import { fireLinkClickedEvent } from '../../utils/analytics/click';
13
13
  import { SmartLinkAnalyticsContext } from '../../utils/analytics/SmartLinkAnalyticsContext';
@@ -41,7 +41,8 @@ function Component({
41
41
  removeTextHighlightingFromTitle,
42
42
  resolvingPlaceholder,
43
43
  truncateInline,
44
- CompetitorPrompt
44
+ CompetitorPrompt,
45
+ hideIconLoadingSkeleton
45
46
  }) {
46
47
  const {
47
48
  createAnalyticsEvent
@@ -73,12 +74,7 @@ function Component({
73
74
 
74
75
  // Setup UI handlers.
75
76
  const handleClickWrapper = useCallback(event => {
76
- const isModifierKeyPressed = isSpecialEvent(event);
77
- // Ctrl+left click on mac typically doesn't trigger onClick
78
- // The event could have potentially had `e.preventDefault()` called on it by now
79
- // event by smart card internally
80
- // If it has been called then only then can `isModifierKeyPressed` be true.
81
- const target = isModifierKeyPressed ? '_blank' : '_self';
77
+ const isModifierKeyPressed = isSpecialKey(event) || isSpecialClick(event);
82
78
  fireEvent('ui.smartLink.clicked', {
83
79
  id,
84
80
  display: isFlexibleUi ? CardDisplay.Flexible : appearance,
@@ -90,9 +86,11 @@ function Component({
90
86
  // delegate the click to the glance panel handler
91
87
  if (
92
88
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
93
- fg('fun-1765_wire_up_glance_panel_to_smart_cards') && target !== '_blank' && ari && isGlancePanelAvailable !== null && isGlancePanelAvailable !== void 0 && isGlancePanelAvailable({
89
+ fg('fun-1765_wire_up_glance_panel_to_smart_cards') && !isModifierKeyPressed && ari && openGlancePanel && isGlancePanelAvailable !== null && isGlancePanelAvailable !== void 0 && isGlancePanelAvailable({
94
90
  ari
95
- }) && openGlancePanel) {
91
+ })) {
92
+ event.preventDefault();
93
+ event.stopPropagation();
96
94
  openGlancePanel({
97
95
  url,
98
96
  ari,
@@ -106,6 +104,12 @@ function Component({
106
104
  });
107
105
  } else if (!onClick && !isFlexibleUi) {
108
106
  const clickUrl = getClickUrl(url, state.details);
107
+
108
+ // Ctrl+left click on mac typically doesn't trigger onClick
109
+ // The event could have potentially had `e.preventDefault()` called on it by now
110
+ // event by smart card internally
111
+ // If it has been called then only then can `isSpecialEvent` be true.
112
+ const target = isSpecialEvent(event) ? '_blank' : '_self';
109
113
  window.open(clickUrl, target);
110
114
  fireLinkClickedEvent(createAnalyticsEvent)(event, {
111
115
  attributes: {
@@ -257,7 +261,8 @@ function Component({
257
261
  onError: onError,
258
262
  testId: testId,
259
263
  actionOptions: actionOptions,
260
- CompetitorPrompt: CompetitorPrompt
264
+ CompetitorPrompt: CompetitorPrompt,
265
+ hideIconLoadingSkeleton: hideIconLoadingSkeleton
261
266
  });
262
267
  case 'embed':
263
268
  return /*#__PURE__*/React.createElement(EmbedCard, {