@atlaskit/smart-card 36.9.0 → 36.10.1

package/dist/es2019/view/FlexibleCard/utils.js

@@ -1,11 +1,11 @@
-import { extractProvider } from '@atlaskit/link-extractors';
+import { extractProvider, extractSmartLinkProvider, isEntityPresent } from '@atlaskit/link-extractors';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { SmartLinkStatus } from '../../constants';
 import { extractRequestAccessContextImproved } from '../../extractors/common/context';
 import extractFlexibleUiContext from '../../extractors/flexible';
-import extractPreview from '../../extractors/flexible/extract-preview';
+import extractPreview, { extractSmartLinkPreviewImage } from '../../extractors/flexible/extract-preview';
 import { extractErrorIcon } from '../../extractors/flexible/icon';
-import extractProviderIcon from '../../extractors/flexible/icon/extract-provider-icon';
+import extractProviderIcon, { extractSmartLinkProviderIcon } from '../../extractors/flexible/icon/extract-provider-icon';
 import { messages } from '../../messages';
 import { handleOnClick } from '../../utils';
 import { getEmptyJsonLd, getForbiddenJsonLd } from '../../utils/jsonld';
@@ -30,15 +30,23 @@ export const getContextByStatus = params => {
     case SmartLinkStatus.Errored:
     case SmartLinkStatus.Fallback:
     default:
-      const preview = extractPreview(response === null || response === void 0 ? void 0 : response.data);
-      const linkIcon = extractErrorIcon(response, status);
-      const provider = extractProviderIcon(response === null || response === void 0 ? void 0 : response.data);
+      if (fg('smart_links_noun_support')) {
+        if (isEntityPresent(response)) {
+          return {
+            url,
+            title: url,
+            linkIcon: extractErrorIcon(response, status),
+            preview: extractSmartLinkPreviewImage(response),
+            provider: extractSmartLinkProviderIcon(response)
+          };
+        }
+      }
       return {
-        linkIcon,
-        title: url,
         url,
-        provider,
-        preview
+        title: url,
+        linkIcon: extractErrorIcon(response, status),
+        preview: extractPreview(response === null || response === void 0 ? void 0 : response.data),
+        provider: extractProviderIcon(response === null || response === void 0 ? void 0 : response.data)
       };
   }
 };
@@ -63,7 +71,7 @@ const getForbiddenMessageKey = meta => {
 export const getRetryOptions = (url, status, response, onAuthorize) => {
   var _response$meta, _access$action, _access$buttonDisable;
   const data = response && response.data || getEmptyJsonLd();
-  const provider = extractProvider(data);
+  const provider = fg('smart_links_noun_support') ? extractSmartLinkProvider(response) : extractProvider(data);
   const context = provider === null || provider === void 0 ? void 0 : provider.text;
   const values = context ? {
     context

package/dist/es2019/view/HoverCard/components/ImagePreview.js

@@ -1,15 +1,16 @@
 import React, { useCallback, useRef, useState } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
-import extractPreview from '../../../extractors/flexible/extract-preview';
+import extractPreview, { extractSmartLinkPreviewImage } from '../../../extractors/flexible/extract-preview';
 import { PreviewBlock } from '../../FlexibleCard/components/blocks';
 const ImagePreview = ({
-  data,
-  fallbackElementHeight
+  fallbackElementHeight,
+  response
 }) => {
   const transitionStarted = useRef(false);
   const previewBlockRef = useRef(null);
   const [showPreview, setShowPreview] = useState(true);
   const [dynamicStyles, setDynamicStyles] = useState({});
+  const data = response === null || response === void 0 ? void 0 : response.data;
 
   // Set Preview to a fixed height to enable transitions
   const onPreviewRender = useCallback(() => {
@@ -40,6 +41,18 @@ const ImagePreview = ({
   const onPreviewTransitionEnd = useCallback(() => {
     setShowPreview(false);
   }, []);
+  if (fg('smart_links_noun_support')) {
+    return showPreview && extractSmartLinkPreviewImage(response) ? /*#__PURE__*/React.createElement(PreviewBlock, {
+      onError: onPreviewError,
+      ignoreContainerPadding: true,
+      onTransitionEnd: onPreviewTransitionEnd,
+      blockRef: previewBlockRef,
+      onRender: onPreviewRender
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
+      ,
+      style: dynamicStyles
+    }) : null;
+  }
   return showPreview && data && extractPreview(data) ? /*#__PURE__*/React.createElement(PreviewBlock, {
     onError: onPreviewError,
     ignoreContainerPadding: true,

package/dist/es2019/view/HoverCard/components/views/forbidden/index.js

@@ -6,7 +6,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import { FormattedMessage } from 'react-intl-next';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button';
-import { extractProvider } from '@atlaskit/link-extractors';
+import { extractProvider, extractSmartLinkProvider } from '@atlaskit/link-extractors';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { SmartLinkStatus } from '../../../../../constants';
 import { extractRequestAccessContextImproved } from '../../../../../extractors/common/context/extractAccessContext';
@@ -26,7 +26,7 @@ const HoverCardForbiddenView = ({
   flexibleCardProps,
   testId = 'hover-card-forbidden-view'
 }) => {
-  var _cardState$details, _cardState$details2, _extractProvider$text, _extractProvider, _extractRequestAccess;
+  var _cardState$details, _cardState$details2, _extractSmartLinkProv, _extractSmartLinkProv2, _extractProvider$text, _extractProvider, _extractRequestAccess;
   const {
     createAnalyticsEvent
   } = useAnalyticsEvents();
@@ -36,7 +36,7 @@ const HoverCardForbiddenView = ({
   } = flexibleCardProps;
   const data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
   const meta = (_cardState$details2 = cardState.details) === null || _cardState$details2 === void 0 ? void 0 : _cardState$details2.meta;
-  const product = (_extractProvider$text = (_extractProvider = extractProvider(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text) !== null && _extractProvider$text !== void 0 ? _extractProvider$text : '';
+  const product = fg('smart_links_noun_support') ? (_extractSmartLinkProv = (_extractSmartLinkProv2 = extractSmartLinkProvider(cardState.details)) === null || _extractSmartLinkProv2 === void 0 ? void 0 : _extractSmartLinkProv2.text) !== null && _extractSmartLinkProv !== void 0 ? _extractSmartLinkProv : '' : (_extractProvider$text = (_extractProvider = extractProvider(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text) !== null && _extractProvider$text !== void 0 ? _extractProvider$text : '';
   const hostname = /*#__PURE__*/React.createElement("b", null, extractHostname(url));
   const {
     action,

package/dist/es2019/view/HoverCard/components/views/resolved/index.js

@@ -64,8 +64,8 @@ const HoverCardResolvedView = ({
     snippetHeight.current = (_snippetBlockRef$curr = (_snippetBlockRef$curr2 = snippetBlockRef.current) === null || _snippetBlockRef$curr2 === void 0 ? void 0 : _snippetBlockRef$curr2.getBoundingClientRect().height) !== null && _snippetBlockRef$curr !== void 0 ? _snippetBlockRef$curr : 0;
   }, []);
   const imagePreview = ImagePreview({
-    data: data,
-    fallbackElementHeight: snippetHeight.current
+    fallbackElementHeight: snippetHeight.current,
+    response: cardState.details
   });
   const snippet = imagePreview ? null : /*#__PURE__*/React.createElement(SnippetBlock, {
     status: SmartLinkStatus.Resolved,

package/dist/es2019/view/HoverCard/components/views/resolving/index.js

@@ -3,10 +3,9 @@ import _extends from "@babel/runtime/helpers/extends";
 import "./index.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { CustomBlock } from '../../../../FlexibleCard/components/blocks';
 import ActionGroup from '../../../../FlexibleCard/components/blocks/action-group';
-import { LoadingSkeletonNew, LoadingSkeletonOld } from '../../../../FlexibleCard/components/common/loading-skeleton';
+import { LoadingSkeleton } from '../../../../FlexibleCard/components/common/loading-skeleton';
 import Icon from '../../../../FlexibleCard/components/elements/icon';
 import { CARD_WIDTH_REM } from '../../../styled';
 const loadingViewContainer = null;
@@ -27,7 +26,6 @@ const HoverCardLoadingView = ({
     items: actions,
     visibleButtonsNum: 2
   });
-  const LoadingSkeleton = fg('platform-smart-card-icon-migration') ? LoadingSkeletonNew : LoadingSkeletonOld;
   return /*#__PURE__*/React.createElement("div", {
     "data-testid": testId,
     className: ax(["_1e0c1txw _2lx21bp4 _ca0q1e9d _u5f31e9d _n3td1e9d _19bv1e9d"])
@@ -42,28 +40,17 @@ const HoverCardLoadingView = ({
   }), /*#__PURE__*/React.createElement("span", {
     "data-testid": `${testId}-title`,
     className: ax(["_16jlkb7n _1o9zidpf _i0dl1wug _4t3i1k92 _e2oo1osq"])
-  }, fg('platform-smart-card-icon-migration') ? /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
+  }, /*#__PURE__*/React.createElement(LoadingSkeleton, {
     height: `${lineHeightRem}rem`
-  }) : /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
-    height: lineHeightRem
-  })), actionGroup), fg('platform-smart-card-icon-migration') ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
+  })), actionGroup), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LoadingSkeleton, {
     width: `${skeletonWidth}rem`,
     height: `${lineHeightRem}rem`
-  }), /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
+  }), /*#__PURE__*/React.createElement(LoadingSkeleton, {
     width: `${skeletonWidth}rem`,
     height: `${lineHeightRem * 3}rem`
-  }), /*#__PURE__*/React.createElement(LoadingSkeletonNew, {
+  }), /*#__PURE__*/React.createElement(LoadingSkeleton, {
     width: `${skeletonWidth}rem`,
     height: `${lineHeightRem}rem`
-  })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
-    width: skeletonWidth,
-    height: lineHeightRem
-  }), /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
-    width: skeletonWidth,
-    height: lineHeightRem * 3
-  }), /*#__PURE__*/React.createElement(LoadingSkeletonOld, {
-    width: skeletonWidth,
-    height: lineHeightRem
   }))));
 };
 export default HoverCardLoadingView;

package/dist/es2019/view/HoverCard/components/views/unauthorised/index.js

@@ -5,7 +5,7 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useMemo } from 'react';
 import { FormattedMessage } from 'react-intl-next';
-import { extractProvider } from '@atlaskit/link-extractors';
+import { extractProvider, extractSmartLinkProvider } from '@atlaskit/link-extractors';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnalyticsEvents } from '../../../../../common/analytics/generated/use-analytics-events';
 import { ActionName, CardDisplay } from '../../../../../constants';
@@ -29,12 +29,12 @@ const HoverCardUnauthorisedView = ({
   testId = 'hover-card-unauthorised-view',
   url
 }) => {
-  var _cardState$details, _extractProvider;
+  var _cardState$details, _extractSmartLinkProv, _extractProvider;
   const {
     cardState
   } = flexibleCardProps;
   const data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
-  const providerName = (_extractProvider = extractProvider(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text;
+  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;
   const isProductIntegrationSupported = hasAuthScopeOverrides(cardState.details);
   const {
     authorize

package/dist/es2019/view/InlineCard/ErroredView/index.js

@@ -8,12 +8,10 @@ import ErrorIconCore from '@atlaskit/icon/core/migration/error';
 import ErrorIcon from '@atlaskit/icon/utility/migration/error';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/compiled';
-import { R300 } from '@atlaskit/theme/colors';
 import { messages } from '../../../messages';
 import { HoverCard } from '../../HoverCard';
 import { ActionButton } from '../common/action-button';
 import { Frame } from '../Frame';
-import { AKIconWrapper } from '../Icon';
 import { IconAndTitleLayout } from '../IconAndTitleLayout';
 import { IconStyledButtonOldVisualRefresh } from '../styled';
 import withFrameStyleControl from '../utils/withFrameStyleControl';
@@ -29,21 +27,13 @@ const fallbackIcon = () => {
       testId: "errored-view-default-icon"
     });
   }
-  if (fg('platform-smart-card-icon-migration')) {
-    return /*#__PURE__*/React.createElement(Box, {
-      as: "span",
-      xcss: styles.iconWrapper
-    }, /*#__PURE__*/React.createElement(ErrorIcon, {
-      color: "var(--ds-icon-danger, #C9372C)",
-      label: "error",
-      LEGACY_size: "small",
-      testId: "errored-view-default-icon"
-    }));
-  }
-  return /*#__PURE__*/React.createElement(AKIconWrapper, null, /*#__PURE__*/React.createElement(ErrorIcon, {
+  return /*#__PURE__*/React.createElement(Box, {
+    as: "span",
+    xcss: styles.iconWrapper
+  }, /*#__PURE__*/React.createElement(ErrorIcon, {
+    color: "var(--ds-icon-danger, #C9372C)",
     label: "error",
     LEGACY_size: "small",
-    color: `var(--ds-icon-danger, ${R300})`,
     testId: "errored-view-default-icon"
   }));
 };

package/dist/es2019/view/InlineCard/ForbiddenView/index.js

@@ -10,12 +10,11 @@ import LegacyLockIcon from '@atlaskit/icon/glyph/lock-filled';
 import Lozenge from '@atlaskit/lozenge';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Pressable } from '@atlaskit/primitives/compiled';
-import { N500, R400 } from '@atlaskit/theme/colors';
+import { N500 } from '@atlaskit/theme/colors';
 import { messages } from '../../../messages';
 import { HoverCard } from '../../HoverCard';
 import { ActionButton } from '../common/action-button';
 import { Frame } from '../Frame';
-import { AKIconWrapper } from '../Icon';
 import { IconAndTitleLayout, LozengeWrapper } from '../IconAndTitleLayout';
 import { IconStyledButtonOldVisualRefresh } from '../styled';
 import withFrameStyleControl from '../utils/withFrameStyleControl';
@@ -33,7 +32,7 @@ const fallbackForbiddenIcon = () => {
       testId: "forbidden-view-fallback-icon"
     });
   }
-  return fg('platform-smart-card-icon-migration') ? /*#__PURE__*/React.createElement(Box, {
+  return /*#__PURE__*/React.createElement(Box, {
     as: "span",
     xcss: styles.iconWrapper
   }, /*#__PURE__*/React.createElement(LockLockedIcon, {
@@ -42,11 +41,6 @@ const fallbackForbiddenIcon = () => {
     LEGACY_fallbackIcon: LegacyLockIcon,
     LEGACY_size: "small",
     testId: "forbidden-view-fallback-icon"
-  })) : /*#__PURE__*/React.createElement(AKIconWrapper, null, /*#__PURE__*/React.createElement(LegacyLockIcon, {
-    label: "error",
-    size: "small",
-    primaryColor: `var(--ds-icon-danger, ${R400})`,
-    testId: "forbidden-view-fallback-icon"
   }));
 };
 export const InlineCardForbiddenView = ({

package/dist/es2019/view/InlineCard/Icon.compiled.css

@@ -3,7 +3,6 @@
 ._1bsb7vkz{width:1pc}
 ._1ltv1ssb{left:50%}
 ._2hwx1b66{margin-right:var(--ds-space-050,4px)}
-._2hwx1i6y{margin-right:var(--ds-space-negative-025,-2px)}
 ._4t3i7vkz{height:1pc}
 ._kqswstnw{position:absolute}
 ._t9ec1ooe{transform:translate(-50%,-50%)}

package/dist/es2019/view/InlineCard/Icon.js

@@ -22,28 +22,9 @@ export const Icon = forwardRef(({
     className: ax(["_2rkoyh40 _4t3i7vkz _1bsb7vkz _2hwx1b66 _uiztglyw _kqswstnw _154i1ssb _1ltv1ssb _t9ec1ooe", __cmplp.className])
   }));
 });
-
-// TODO: Remove on platform-smart-card-icon-migration cleanup
-// Used for 'untrue' icons which claim to be 16x16 but
-// are less than that in height/width.
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 if (process.env.NODE_ENV !== 'production') {
   Icon.displayName = 'Icon';
 }
-export const AKIconWrapper = forwardRef(({
-  as: C = "span",
-  style: __cmpls,
-  ...__cmplp
-}, __cmplr) => {
-  return /*#__PURE__*/React.createElement(C, _extends({}, __cmplp, {
-    style: __cmpls,
-    ref: __cmplr,
-    className: ax(["_2hwx1i6y", __cmplp.className])
-  }));
-});
-if (process.env.NODE_ENV !== 'production') {
-  AKIconWrapper.displayName = 'AKIconWrapper';
-}
 export const Shimmer = ({
   testId
 }) => {

package/dist/es2019/view/InlineCard/UnauthorisedView/index.js

@@ -9,13 +9,12 @@ import LockLockedIcon from '@atlaskit/icon/core/lock-locked';
 import LegacyLockIcon from '@atlaskit/icon/glyph/lock-filled';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/compiled';
-import { N500, R400 } from '@atlaskit/theme/colors';
+import { N500 } from '@atlaskit/theme/colors';
 import { useAnalyticsEvents } from '../../../common/analytics/generated/use-analytics-events';
 import { messages } from '../../../messages';
 import { HoverCard } from '../../HoverCard';
 import { ActionButton } from '../common/action-button';
 import { Frame } from '../Frame';
-import { AKIconWrapper } from '../Icon';
 import { IconAndTitleLayout } from '../IconAndTitleLayout';
 import { IconStyledButtonOldVisualRefresh } from '../styled';
 import withFrameStyleControl from '../utils/withFrameStyleControl';
@@ -31,21 +30,14 @@ const fallbackUnauthorizedIcon = () => {
       LEGACY_size: "small"
     });
   }
-  if (fg('platform-smart-card-icon-migration')) {
-    return /*#__PURE__*/React.createElement(Box, {
-      as: "span",
-      xcss: styles.iconWrapper
-    }, /*#__PURE__*/React.createElement(LockLockedIcon, {
-      color: "var(--ds-icon-danger, #C9372C)",
-      label: "error",
-      LEGACY_fallbackIcon: LegacyLockIcon,
-      LEGACY_size: "small"
-    }));
-  }
-  return /*#__PURE__*/React.createElement(AKIconWrapper, null, /*#__PURE__*/React.createElement(LegacyLockIcon, {
+  return /*#__PURE__*/React.createElement(Box, {
+    as: "span",
+    xcss: styles.iconWrapper
+  }, /*#__PURE__*/React.createElement(LockLockedIcon, {
+    color: "var(--ds-icon-danger, #C9372C)",
     label: "error",
-    size: "small",
-    primaryColor: `var(--ds-icon-danger, ${R400})`
+    LEGACY_fallbackIcon: LegacyLockIcon,
+    LEGACY_size: "small"
   }));
 };
 export const InlineCardUnauthorizedView = ({

package/dist/es2019/view/LinkUrl/index.js

@@ -10,7 +10,7 @@ import LinkWarningModal from './LinkWarningModal';
 import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
 const PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "36.9.0",
+  packageVersion: "36.10.1",
   componentName: 'linkUrl'
 };
 const Anchor = withLinkClickedEvent('a');

package/dist/esm/extractors/common/context/index.js

@@ -1 +1,38 @@
-export { extractRequestAccessContextImproved } from './extractAccessContext';
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { extractEntityProvider, extractProvider, extractProviderIcon, extractUrlFromIconJsonLd, isEntityPresent } from '@atlaskit/link-extractors';
+import { prioritiseIcon } from '../icon/prioritiseIcon';
+export { extractRequestAccessContextImproved } from './extractAccessContext';
+export function generateContext(jsonLd) {
+  var provider = extractProvider(jsonLd);
+  if (!provider) {
+    return undefined;
+  }
+
+  // If no icon is supplied, return existing context
+  if (!jsonLd.icon) {
+    return provider;
+  }
+  var generator = jsonLd.generator;
+  var icon = prioritiseIcon({
+    fileFormatIcon: undefined,
+    documentTypeIcon: undefined,
+    urlIcon: extractUrlFromIconJsonLd(jsonLd.icon),
+    // We still attempt to follow the icon priority function even if no generator (and therefore provider icon) is defined
+    providerIcon: generator && typeof generator !== 'string' && generator['@type'] !== 'Link' && extractProviderIcon(generator.icon)
+  });
+  return _objectSpread(_objectSpread({}, provider), {}, {
+    icon: icon ? icon : provider.icon
+  });
+}
+
+/**
+ * Should be moved to link-extractors when jsonLd is deprecated
+ */
+export function extractSmartLinkContext(response) {
+  if (isEntityPresent(response)) {
+    return extractEntityProvider(response);
+  }
+  return generateContext(response === null || response === void 0 ? void 0 : response.data);
+}

package/dist/esm/extractors/common/icon/extractIconFromDocument.js

@@ -1,69 +1,14 @@
 import React from 'react';
-import DocumentIconOld from '@atlaskit/icon-file-type/glyph/document/16';
-import FileIconOld from '@atlaskit/icon-file-type/glyph/generic/16';
-import PresentationIconOld from '@atlaskit/icon-file-type/glyph/presentation/16';
-import SpreadsheetIconOld from '@atlaskit/icon-file-type/glyph/spreadsheet/16';
-import BlogIconOld from '@atlaskit/icon-object/glyph/blog/16';
-import DocumentFilledIconNew from '@atlaskit/icon/core/migration/file--document-filled';
-import DocumentFilledIconOld from '@atlaskit/icon/core/migration/page--document-filled';
+import DocumentFilledIcon from '@atlaskit/icon/core/migration/file--document-filled';
 import { isConfluenceGenerator } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
-import BlogIconNew from '../../../common/ui/icons/blog-icon';
-import PresentationIconNew from '../../../common/ui/icons/chart-bar-icon';
-import FileIconNew from '../../../common/ui/icons/file-icon';
-import SpreadsheetIconNew from '../../../common/ui/icons/list-bullet-icon';
+import BlogIcon from '../../../common/ui/icons/blog-icon';
+import PresentationIcon from '../../../common/ui/icons/chart-bar-icon';
+import FileIcon from '../../../common/ui/icons/file-icon';
+import SpreadsheetIcon from '../../../common/ui/icons/list-bullet-icon';
 import LiveDocumentIcon from '../../../common/ui/icons/live-document-icon';
-import DocumentIconNew from '../../../common/ui/icons/page-icon';
+import DocumentIcon from '../../../common/ui/icons/page-icon';
 import { getIconForFileType } from '../../../utils';
 import { prioritiseIcon } from './prioritiseIcon';
-
-// TODO Delete this and rename BlogIconNew to BlogIcon when cleaning platform-smart-card-icon-migration
-var BlogIcon = function BlogIcon(props) {
-  if (fg('platform-smart-card-icon-migration')) {
-    return /*#__PURE__*/React.createElement(BlogIconNew, props);
-  }
-  return /*#__PURE__*/React.createElement(BlogIconOld, props);
-};
-
-// TODO Delete this and rename FileIconNew to FileIcon when cleaning platform-smart-card-icon-migration
-var FileIcon = function FileIcon(props) {
-  if (fg('platform-smart-card-icon-migration')) {
-    return /*#__PURE__*/React.createElement(FileIconNew, props);
-  }
-  return /*#__PURE__*/React.createElement(FileIconOld, props);
-};
-
-// TODO Delete this and rename DocumentIconNew to DocumentIcon when cleaning platform-smart-card-icon-migration
-var DocumentIcon = function DocumentIcon(props) {
-  if (fg('platform-smart-card-icon-migration')) {
-    return /*#__PURE__*/React.createElement(DocumentIconNew, props);
-  }
-  return /*#__PURE__*/React.createElement(DocumentIconOld, props);
-};
-
-// TODO Delete this and rename PresentationIconNew to PresentationIcon when cleaning platform-smart-card-icon-migration
-var PresentationIcon = function PresentationIcon(props) {
-  if (fg('platform-smart-card-icon-migration')) {
-    return /*#__PURE__*/React.createElement(PresentationIconNew, props);
-  }
-  return /*#__PURE__*/React.createElement(PresentationIconOld, props);
-};
-
-// TODO Delete this and rename SpreadsheetIconNew to SpreadsheetIcon when cleaning platform-smart-card-icon-migration
-var SpreadsheetIcon = function SpreadsheetIcon(props) {
-  if (fg('platform-smart-card-icon-migration')) {
-    return /*#__PURE__*/React.createElement(SpreadsheetIconNew, props);
-  }
-  return /*#__PURE__*/React.createElement(SpreadsheetIconOld, props);
-};
-
-// TODO Delete this and rename DocumentFilledIconNew to DocumentFilledIcon when cleaning platform-smart-card-icon-migration
-var DocumentFilledIcon = function DocumentFilledIcon(props) {
-  if (fg('platform-smart-card-icon-migration')) {
-    return /*#__PURE__*/React.createElement(DocumentFilledIconNew, props);
-  }
-  return /*#__PURE__*/React.createElement(DocumentFilledIconOld, props);
-};
 /**
  * Extracts an icon for a document pbject
  *

package/dist/esm/extractors/embed/index.js

@@ -1,10 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { extractEntityProvider, extractLink, extractPreview, extractProvider, extractProviderIcon, extractSmartLinkEmbed, extractSmartLinkTitle, extractSmartLinkUrl, extractTitle, extractUrlFromIconJsonLd, isEntityPresent } from '@atlaskit/link-extractors';
+import { extractLink, extractPreview, extractSmartLinkEmbed, extractSmartLinkTitle, extractSmartLinkUrl, extractTitle } from '@atlaskit/link-extractors';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { getEmptyJsonLd } from '../../utils/jsonld';
-import { prioritiseIcon } from '../common/icon';
+import { extractSmartLinkContext, generateContext } from '../common/context';
 import { extractIsSupportTheming } from '../common/meta/extractIsSupportTheming';
 import { extractIsTrusted } from '../common/meta/extractIsTrusted';
 var extractEmbedPreview = function extractEmbedPreview(jsonLd, platform, iframeUrlType) {
@@ -15,38 +15,6 @@ var extractEmbedPreview = function extractEmbedPreview(jsonLd, platform, iframeU
     });
   }
 };
-function generateContext(jsonLd) {
-  var provider = extractProvider(jsonLd);
-  if (!provider) {
-    return undefined;
-  }
-
-  // If no icon is supplied, return existing context
-  if (!jsonLd.icon) {
-    return provider;
-  }
-  var generator = jsonLd.generator;
-  var icon = prioritiseIcon({
-    fileFormatIcon: undefined,
-    documentTypeIcon: undefined,
-    urlIcon: extractUrlFromIconJsonLd(jsonLd.icon),
-    // We still attempt to follow the icon priority function even if no generator (and therefore provider icon) is defined
-    providerIcon: generator && typeof generator !== 'string' && generator['@type'] !== 'Link' && extractProviderIcon(generator.icon)
-  });
-  return _objectSpread(_objectSpread({}, provider), {}, {
-    icon: icon ? icon : provider.icon
-  });
-}
-
-/**
- * We can migrate this to link extractors once we have deprecated JsonLd
- */
-function extractSmartLinkContext(response) {
-  if (isEntityPresent(response)) {
-    return extractEntityProvider(response);
-  }
-  return generateContext(response === null || response === void 0 ? void 0 : response.data);
-}
 export var extractEmbedProps = function extractEmbedProps(response, platform, iframeUrlType) {
   var meta = response === null || response === void 0 ? void 0 : response.meta;
   var jsonLd = (response === null || response === void 0 ? void 0 : response.data) || getEmptyJsonLd();

package/dist/esm/extractors/flexible/extract-preview.js

@@ -1,4 +1,4 @@
-import { extractImage } from '@atlaskit/link-extractors';
+import { extractEntity, extractEntityProvider, extractImage, isEntityPresent } from '@atlaskit/link-extractors';
 import { MediaType } from '../../constants';
 var extractPreview = function extractPreview(data) {
   if (!data) {
@@ -10,4 +10,27 @@ var extractPreview = function extractPreview(data) {
     url: url
   } : undefined;
 };
-export default extractPreview;
+export default extractPreview;
+
+/**
+ * Should be moved to link-extractors when jsonLd is deprecated
+ */
+export var extractSmartLinkPreviewImage = function extractSmartLinkPreviewImage(response) {
+  if (!response || !(response !== null && response !== void 0 && response.data)) {
+    return undefined;
+  }
+  if (isEntityPresent(response)) {
+    var _entity$thumbnail;
+    var entity = extractEntity(response);
+    var url = entity === null || entity === void 0 || (_entity$thumbnail = entity.thumbnail) === null || _entity$thumbnail === void 0 ? void 0 : _entity$thumbnail.externalUrl;
+    if (!url) {
+      var provider = extractEntityProvider(response);
+      url = provider === null || provider === void 0 ? void 0 : provider.image;
+    }
+    return url ? {
+      type: MediaType.Image,
+      url: url
+    } : undefined;
+  }
+  return extractPreview(response.data);
+};

package/dist/esm/extractors/flexible/icon/extract-provider-icon.js

@@ -1,4 +1,4 @@
-import { extractTitle } from '@atlaskit/link-extractors';
+import { extractEntity, extractEntityProvider, extractTitle, isEntityPresent } from '@atlaskit/link-extractors';
 import { IconType } from '../../../constants';
 import { CONFLUENCE_GENERATOR_ID, JIRA_GENERATOR_ID } from '../../constants';
 import extractUrlIcon from './extract-url-icon';
@@ -34,4 +34,43 @@ var extractProviderIcon = function extractProviderIcon(data) {
   }
   return extractUrlIcon(icon, label);
 };
-export default extractProviderIcon;
+export default extractProviderIcon;
+
+/**
+ * Should be moved to link-extractors when jsonLd is deprecated
+ */
+export var extractSmartLinkProviderIcon = function extractSmartLinkProviderIcon(response) {
+  var _extractEntity, _generator$icon;
+  if (!response || !(response !== null && response !== void 0 && response.data)) {
+    return undefined;
+  }
+  if (isEntityPresent(response)) {
+    var provider = extractEntityProvider(response);
+    if (!provider) {
+      return undefined;
+    }
+    switch (provider.id) {
+      case CONFLUENCE_GENERATOR_ID:
+        return {
+          icon: IconType.Confluence,
+          label: provider.text || 'Confluence'
+        };
+      case JIRA_GENERATOR_ID:
+        return {
+          icon: IconType.Jira,
+          label: provider.text || 'Jira'
+        };
+      default:
+        var _ref = response.meta,
+          generator = _ref.generator;
+        if (!generator) {
+          return undefined;
+        }
+        return {
+          label: generator.name || ((_extractEntity = extractEntity(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.displayName),
+          url: (_generator$icon = generator.icon) === null || _generator$icon === void 0 ? void 0 : _generator$icon.url
+        };
+    }
+  }
+  return extractProviderIcon(response.data);
+};