@atlaskit/smart-card 26.50.1 → 26.50.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/smart-card
 
+## 26.50.2
+
+### Patch Changes
+
+- [#80939](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/80939) [`fd0808b220fd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fd0808b220fd) - Use the URL provided by the smart card for AI Link Summary in Hover Card to avoid inconsistencies between the short and resolved links.
+- Updated dependencies
+
 ## 26.50.1
 
 ### Patch Changes

package/dist/cjs/utils/analytics/analytics.js

@@ -22,7 +22,7 @@ var ANALYTICS_CHANNEL = exports.ANALYTICS_CHANNEL = 'media';
 var context = exports.context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.50.1"
+  packageVersion: "26.50.2"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/cjs/view/HoverCard/components/ContentContainer.js

@@ -15,18 +15,23 @@ var _styled = require("../styled");
 var _aiPrism = _interopRequireDefault(require("../../common/ai-prism"));
 var _HoverCardContent = require("./HoverCardContent");
 var _useAiSummary = require("../../../state/hooks/use-ai-summary");
+var _store = require("../../../state/store");
+var _linkExtractors = require("@atlaskit/link-extractors");
 var _excluded = ["children", "isAIEnabled", "testId", "url"],
   _excluded2 = ["children", "isAIEnabled", "testId", "url"];
 /** @jsx jsx */
 var ConnectedAIPrismContainer = function ConnectedAIPrismContainer(_ref) {
+  var _extractLink, _cardState$details;
   var children = _ref.children,
     _ref$isAIEnabled = _ref.isAIEnabled,
     isAIEnabled = _ref$isAIEnabled === void 0 ? false : _ref$isAIEnabled,
     testId = _ref.testId,
     url = _ref.url,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var cardState = (0, _store.useSmartCardState)(url);
+  var dataUrl = (_extractLink = (0, _linkExtractors.extractLink)(cardState === null || cardState === void 0 || (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data)) !== null && _extractLink !== void 0 ? _extractLink : '';
   var _useAISummary = (0, _useAiSummary.useAISummary)({
-      url: url
+      url: dataUrl
     }),
     status = _useAISummary.state.status;
   var _useState = (0, _react2.useState)(status === 'loading'),

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

@@ -21,6 +21,7 @@ var _reactIntlNext = require("react-intl-next");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _helpers = require("../../../../../state/helpers");
 var _useAiSummary = require("../../../../../state/hooks/use-ai-summary");
+var _linkExtractors = require("@atlaskit/link-extractors");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var toFooterActions = exports.toFooterActions = function toFooterActions(cardActions, onActionClick) {
@@ -61,16 +62,14 @@ var toFooterActions = exports.toFooterActions = function toFooterActions(cardAct
 //This component encapsulates useAISummary hook under the AI Summary FF 'platform.linking-platform.smart-card.hover-card-ai-summaries'
 var ConnectedAIBlock = function ConnectedAIBlock(_ref) {
   var bottomPrimary = _ref.bottomPrimary,
-    url = _ref.url,
-    imagePreview = _ref.imagePreview;
+    imagePreview = _ref.imagePreview,
+    url = _ref.url;
   var aiSummary = (0, _useAiSummary.useAISummary)({
     url: url
   });
   var aiStatus = aiSummary.state.status;
   var showData = aiStatus === 'ready' || aiStatus === 'error';
-  return showData ? /*#__PURE__*/_react.default.createElement(_blocks.CustomBlock, {
-    direction: _constants.SmartLinkDirection.Vertical
-  }, !imagePreview && /*#__PURE__*/_react.default.createElement(_blocks.SnippetBlock, {
+  return showData ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !imagePreview && /*#__PURE__*/_react.default.createElement(_blocks.SnippetBlock, {
     status: _constants.SmartLinkStatus.Resolved
   }), /*#__PURE__*/_react.default.createElement(_blocks.MetadataBlock, {
     primary: bottomPrimary,
@@ -81,7 +80,7 @@ var ConnectedAIBlock = function ConnectedAIBlock(_ref) {
   })) : null;
 };
 var HoverCardResolvedView = function HoverCardResolvedView(_ref2) {
-  var _cardState$details;
+  var _cardState$details, _extractLink;
   var flexibleCardProps = _ref2.flexibleCardProps,
     titleBlockProps = _ref2.titleBlockProps,
     analytics = _ref2.analytics,
@@ -106,6 +105,7 @@ var HoverCardResolvedView = function HoverCardResolvedView(_ref2) {
     return toFooterActions(cardActions, onActionClick);
   }, [cardActions, onActionClick]);
   var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
+  var dataUrl = (_extractLink = (0, _linkExtractors.extractLink)(data)) !== null && _extractLink !== void 0 ? _extractLink : '';
   var _useMemo = (0, _react.useMemo)(function () {
       var betterMetadata = (0, _utils.getSimulatedBetterMetadata)(extensionKey, data);
       return {
@@ -154,7 +154,7 @@ var HoverCardResolvedView = function HoverCardResolvedView(_ref2) {
     blockRef: connectedAIBlockRef
   }, /*#__PURE__*/_react.default.createElement(ConnectedAIBlock, {
     imagePreview: !!imagePreview,
-    url: url,
+    url: dataUrl,
     bottomPrimary: bottomPrimary
   })), !isAISummaryEnabled && !imagePreview && /*#__PURE__*/_react.default.createElement(_blocks.SnippetBlock, {
     status: _constants.SmartLinkStatus.Resolved

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

@@ -17,7 +17,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId"],
   _excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.50.1",
+  packageVersion: "26.50.2",
   componentName: 'linkUrl'
 };
 var Link = (0, _click.withLinkClickedEvent)('a');

package/dist/es2019/utils/analytics/analytics.js

@@ -4,7 +4,7 @@ export const ANALYTICS_CHANNEL = 'media';
 export const context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.50.1"
+  packageVersion: "26.50.2"
 };
 export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

@@ -7,6 +7,8 @@ import { HoverCardContainer, popupContainerStyles } from '../styled';
 import AIPrism from '../../common/ai-prism';
 import { hoverCardClassName } from './HoverCardContent';
 import { useAISummary } from '../../../state/hooks/use-ai-summary';
+import { useSmartCardState } from '../../../state/store';
+import { extractLink } from '@atlaskit/link-extractors';
 const ConnectedAIPrismContainer = ({
   children,
   isAIEnabled = false,
@@ -14,12 +16,15 @@ const ConnectedAIPrismContainer = ({
   url,
   ...props
 }) => {
+  var _extractLink, _cardState$details;
+  const cardState = useSmartCardState(url);
+  const dataUrl = (_extractLink = extractLink(cardState === null || cardState === void 0 ? void 0 : (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data)) !== null && _extractLink !== void 0 ? _extractLink : '';
   const {
     state: {
       status
     }
   } = useAISummary({
-    url
+    url: dataUrl
   });
   const [showPrism, setShowPrism] = useState(status === 'loading');
   useEffect(() => {

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

@@ -12,6 +12,7 @@ import { FormattedMessage } from 'react-intl-next';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getCanBeDatasource } from '../../../../../state/helpers';
 import { useAISummary } from '../../../../../state/hooks/use-ai-summary';
+import { extractLink } from '@atlaskit/link-extractors';
 import { SmartLinkStatus } from '../../../../../constants';
 export const toFooterActions = (cardActions, onActionClick) => {
   const followAction = {
@@ -51,17 +52,15 @@ export const toFooterActions = (cardActions, onActionClick) => {
 //This component encapsulates useAISummary hook under the AI Summary FF 'platform.linking-platform.smart-card.hover-card-ai-summaries'
 const ConnectedAIBlock = ({
   bottomPrimary,
-  url,
-  imagePreview
+  imagePreview,
+  url
 }) => {
   const aiSummary = useAISummary({
     url
   });
   const aiStatus = aiSummary.state.status;
   const showData = aiStatus === 'ready' || aiStatus === 'error';
-  return showData ? /*#__PURE__*/React.createElement(CustomBlock, {
-    direction: SmartLinkDirection.Vertical
-  }, !imagePreview && /*#__PURE__*/React.createElement(SnippetBlock, {
+  return showData ? /*#__PURE__*/React.createElement(React.Fragment, null, !imagePreview && /*#__PURE__*/React.createElement(SnippetBlock, {
     status: SmartLinkStatus.Resolved
   }), /*#__PURE__*/React.createElement(MetadataBlock, {
     primary: bottomPrimary,
@@ -82,7 +81,7 @@ const HoverCardResolvedView = ({
   extensionKey,
   url
 }) => {
-  var _cardState$details;
+  var _cardState$details, _extractLink;
   const canBeDatasource = getCanBeDatasource(cardState.details);
   useEffect(() => {
     // Since this hover view is only rendered on resolved status,
@@ -95,6 +94,7 @@ const HoverCardResolvedView = ({
   }, [analytics.ui, cardState.status, canBeDatasource]);
   const footerActions = useMemo(() => toFooterActions(cardActions, onActionClick), [cardActions, onActionClick]);
   const data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
+  const dataUrl = (_extractLink = extractLink(data)) !== null && _extractLink !== void 0 ? _extractLink : '';
   const {
     topPrimary,
     topSecondary,
@@ -144,7 +144,7 @@ const HoverCardResolvedView = ({
     blockRef: connectedAIBlockRef
   }, /*#__PURE__*/React.createElement(ConnectedAIBlock, {
     imagePreview: !!imagePreview,
-    url: url,
+    url: dataUrl,
     bottomPrimary: bottomPrimary
   })), !isAISummaryEnabled && !imagePreview && /*#__PURE__*/React.createElement(SnippetBlock, {
     status: SmartLinkStatus.Resolved

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

@@ -7,7 +7,7 @@ import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-m
 import LinkWarningModal from './LinkWarningModal';
 const PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.50.1",
+  packageVersion: "26.50.2",
   componentName: 'linkUrl'
 };
 const Link = withLinkClickedEvent('a');

package/dist/esm/utils/analytics/analytics.js

@@ -15,7 +15,7 @@ export var ANALYTICS_CHANNEL = 'media';
 export var context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.50.1"
+  packageVersion: "26.50.2"
 };
 export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/esm/view/HoverCard/components/ContentContainer.js

@@ -11,15 +11,20 @@ import { HoverCardContainer, popupContainerStyles } from '../styled';
 import AIPrism from '../../common/ai-prism';
 import { hoverCardClassName } from './HoverCardContent';
 import { useAISummary } from '../../../state/hooks/use-ai-summary';
+import { useSmartCardState } from '../../../state/store';
+import { extractLink } from '@atlaskit/link-extractors';
 var ConnectedAIPrismContainer = function ConnectedAIPrismContainer(_ref) {
+  var _extractLink, _cardState$details;
   var children = _ref.children,
     _ref$isAIEnabled = _ref.isAIEnabled,
     isAIEnabled = _ref$isAIEnabled === void 0 ? false : _ref$isAIEnabled,
     testId = _ref.testId,
     url = _ref.url,
     props = _objectWithoutProperties(_ref, _excluded);
+  var cardState = useSmartCardState(url);
+  var dataUrl = (_extractLink = extractLink(cardState === null || cardState === void 0 || (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data)) !== null && _extractLink !== void 0 ? _extractLink : '';
   var _useAISummary = useAISummary({
-      url: url
+      url: dataUrl
     }),
     status = _useAISummary.state.status;
   var _useState = useState(status === 'loading'),

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

@@ -13,6 +13,7 @@ import { FormattedMessage } from 'react-intl-next';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getCanBeDatasource } from '../../../../../state/helpers';
 import { useAISummary } from '../../../../../state/hooks/use-ai-summary';
+import { extractLink } from '@atlaskit/link-extractors';
 import { SmartLinkStatus } from '../../../../../constants';
 export var toFooterActions = function toFooterActions(cardActions, onActionClick) {
   var followAction = {
@@ -52,16 +53,14 @@ export var toFooterActions = function toFooterActions(cardActions, onActionClick
 //This component encapsulates useAISummary hook under the AI Summary FF 'platform.linking-platform.smart-card.hover-card-ai-summaries'
 var ConnectedAIBlock = function ConnectedAIBlock(_ref) {
   var bottomPrimary = _ref.bottomPrimary,
-    url = _ref.url,
-    imagePreview = _ref.imagePreview;
+    imagePreview = _ref.imagePreview,
+    url = _ref.url;
   var aiSummary = useAISummary({
     url: url
   });
   var aiStatus = aiSummary.state.status;
   var showData = aiStatus === 'ready' || aiStatus === 'error';
-  return showData ? /*#__PURE__*/React.createElement(CustomBlock, {
-    direction: SmartLinkDirection.Vertical
-  }, !imagePreview && /*#__PURE__*/React.createElement(SnippetBlock, {
+  return showData ? /*#__PURE__*/React.createElement(React.Fragment, null, !imagePreview && /*#__PURE__*/React.createElement(SnippetBlock, {
     status: SmartLinkStatus.Resolved
   }), /*#__PURE__*/React.createElement(MetadataBlock, {
     primary: bottomPrimary,
@@ -72,7 +71,7 @@ var ConnectedAIBlock = function ConnectedAIBlock(_ref) {
   })) : null;
 };
 var HoverCardResolvedView = function HoverCardResolvedView(_ref2) {
-  var _cardState$details;
+  var _cardState$details, _extractLink;
   var flexibleCardProps = _ref2.flexibleCardProps,
     titleBlockProps = _ref2.titleBlockProps,
     analytics = _ref2.analytics,
@@ -97,6 +96,7 @@ var HoverCardResolvedView = function HoverCardResolvedView(_ref2) {
     return toFooterActions(cardActions, onActionClick);
   }, [cardActions, onActionClick]);
   var data = (_cardState$details = cardState.details) === null || _cardState$details === void 0 ? void 0 : _cardState$details.data;
+  var dataUrl = (_extractLink = extractLink(data)) !== null && _extractLink !== void 0 ? _extractLink : '';
   var _useMemo = useMemo(function () {
       var betterMetadata = getSimulatedBetterMetadata(extensionKey, data);
       return {
@@ -145,7 +145,7 @@ var HoverCardResolvedView = function HoverCardResolvedView(_ref2) {
     blockRef: connectedAIBlockRef
   }, /*#__PURE__*/React.createElement(ConnectedAIBlock, {
     imagePreview: !!imagePreview,
-    url: url,
+    url: dataUrl,
     bottomPrimary: bottomPrimary
   })), !isAISummaryEnabled && !imagePreview && /*#__PURE__*/React.createElement(SnippetBlock, {
     status: SmartLinkStatus.Resolved

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

@@ -10,7 +10,7 @@ import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-m
 import LinkWarningModal from './LinkWarningModal';
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.50.1",
+  packageVersion: "26.50.2",
   componentName: 'linkUrl'
 };
 var Link = withLinkClickedEvent('a');

package/dist/types/view/EmbedCard/EmbedResizeMessageListener.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 interface Props {
+    children?: React.ReactNode;
     embedIframeRef: React.RefObject<HTMLIFrameElement>;
     onHeightUpdate: (height: number) => void;
 }

package/dist/types-ts4.5/view/EmbedCard/EmbedResizeMessageListener.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 interface Props {
+    children?: React.ReactNode;
     embedIframeRef: React.RefObject<HTMLIFrameElement>;
     onHeightUpdate: (height: number) => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/smart-card",
-  "version": "26.50.1",
+  "version": "26.50.2",
   "description": "Smart card component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -43,7 +43,7 @@
     "@atlaskit/link-analytics": "^8.3.0",
     "@atlaskit/link-client-extension": "^1.8.0",
     "@atlaskit/link-extractors": "^1.2.0",
-    "@atlaskit/linking-common": "^5.4.0",
+    "@atlaskit/linking-common": "^5.5.0",
     "@atlaskit/linking-types": "^8.7.0",
     "@atlaskit/logo": "^13.15.0",
     "@atlaskit/lozenge": "^11.6.0",
@@ -51,7 +51,7 @@
     "@atlaskit/outbound-auth-flow-client": "^3.4.0",
     "@atlaskit/platform-feature-flags": "^0.2.1",
     "@atlaskit/popup": "^1.13.0",
-    "@atlaskit/primitives": "^4.1.0",
+    "@atlaskit/primitives": "^5.0.0",
     "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/tokens": "^1.41.0",