@atlaskit/smart-card 45.22.6 → 45.23.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/smart-card
 
+## 45.23.0
+
+### Minor Changes
+
+- [`67e2f90d073f8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/67e2f90d073f8) -
+  Refactor hover card entry points and mark its internal props that were expose unintentionally
+  durng volt migration as deprecated
+
+### Patch Changes
+
+- [`ec5808c03c48f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ec5808c03c48f) -
+  Avoid redundant full block resolves and preserve concurrent appearance payloads for
+  platform_smartlink_inline_resolve_optimization.
+- Updated dependencies
+
 ## 45.22.6
 
 ### Patch Changes

package/dist/cjs/entry-points/hover.js

@@ -0,0 +1,21 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StandaloneHoverCard = exports.HoverCard = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _HoverCard = require("../view/HoverCard");
+/* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
+
+var HoverCard = exports.HoverCard = function HoverCard(props) {
+  return /*#__PURE__*/_react.default.createElement(_HoverCard.HoverCard, props);
+};
+
+/**
+ * @deprecated Use `import { HoverCard } from '@atlaskit/smart-card/hover'` instead.
+ */
+var StandaloneHoverCard = exports.StandaloneHoverCard = function StandaloneHoverCard(props) {
+  return /*#__PURE__*/_react.default.createElement(_HoverCard.HoverCard, props);
+};

package/dist/cjs/hoverCard.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "HoverCard", {
   enumerable: true,
   get: function get() {
-    return _StandaloneHoverCard.StandaloneHoverCard;
+    return _hover.HoverCard;
   }
 });
-var _StandaloneHoverCard = require("./view/HoverCard/StandaloneHoverCard");
+var _hover = require("./entry-points/hover");

package/dist/cjs/state/hooks/use-resolve/index.js

@@ -28,7 +28,7 @@ var useResolve = function useResolve() {
     handleResolvedLinkError = _useResponse.handleResolvedLinkError;
   return (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(params) {
-      var url, _params$isReloading, isReloading, _params$isMetadataReq, isMetadataRequest, _params$id, id, appearance, isOptimizedBlockRequest, _ref2, details, hasData, shouldForceFetch, metadataStatus;
+      var url, _params$isReloading, isReloading, _params$isMetadataReq, isMetadataRequest, _params$id, id, appearance, isOptimizedBlockRequest, _ref2, details, currentMetadataStatus, hasData, needsOptimizedBlockData, shouldForceFetch, metadataStatus;
       return _regenerator.default.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -37,15 +37,17 @@ var useResolve = function useResolve() {
             _ref2 = getState()[url] || {
               status: _constants.SmartLinkStatus.Pending,
               details: undefined
-            }, details = _ref2.details;
+            }, details = _ref2.details, currentMetadataStatus = _ref2.metadataStatus;
             hasData = !!(details && details.data || (0, _isEntityPresent.isEntityPresent)(details));
-            if (!(isReloading || !hasData || isMetadataRequest || isOptimizedBlockRequest)) {
+            needsOptimizedBlockData = isOptimizedBlockRequest && currentMetadataStatus !== 'resolved';
+            if (!(isReloading || !hasData || isMetadataRequest || needsOptimizedBlockData)) {
               _context.next = 1;
               break;
             }
             // A reduced inline response can populate the shared resolver cache before an initial
-            // block request completes, so every optimized block request must bypass that cache.
-            shouldForceFetch = isReloading || isOptimizedBlockRequest;
+            // block request completes. Bypass that cache until full metadata has been resolved,
+            // then reuse the full block response for subsequent block cards with the same URL.
+            shouldForceFetch = isReloading || needsOptimizedBlockData;
             metadataStatus = appearance === 'inline' && !isMetadataRequest && (0, _fg.fg)('platform_smartlink_inline_resolve_optimization') ? 'pending' : undefined;
             return _context.abrupt("return", connections.client.fetchData(url, shouldForceFetch, appearance).then(function (response) {
               return handleResolvedLinkResponse(url, response, shouldForceFetch, isMetadataRequest, metadataStatus);

package/dist/cjs/state/hooks/use-response/index.js

@@ -80,12 +80,24 @@ var useResponse = function useResponse() {
     }
   }, [getState, setMetadataStatus, dispatch]);
   var handleResolvedLinkSuccess = (0, _react.useCallback)(function (resourceUrl, response, isReloading, isMetadataRequest) {
+    var _getState$resourceUrl;
     var metadataStatus = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'resolved';
-    // Some optimized resolves intentionally leave metadata pending so hover can fetch it.
-    // Check response status before evaluating the feature gate so non-resolved responses
-    // do not fire a gate exposure when the gate result would be ignored.
+    /**
+     * Metadata status scenarios:
+     * - Gate off, or a non-resolved response: use `resolved`, preserving legacy behavior and
+     *   avoiding a gate exposure when the result would not affect the status.
+     * - Gate on with full metadata: use the provided/default `resolved` status.
+     * - Gate on with reduced inline metadata: use the provided `pending` status so block or
+     *   hover rendering knows to request the full metadata later.
+     * - Reduced inline metadata arriving after full metadata: keep the existing `resolved`
+     *   status so an out-of-order response cannot trigger another full request.
+     * - Explicit reload: allow `pending` even after full metadata, because the caller is
+     *   intentionally replacing the existing data.
+     */
     var shouldUseProvidedMetadataStatus = (0, _getStatus.getStatus)(response) === 'resolved' && (0, _fg.fg)('platform_smartlink_inline_resolve_optimization');
-    setMetadataStatus(resourceUrl, shouldUseProvidedMetadataStatus ? metadataStatus : 'resolved');
+    var shouldPreserveResolvedMetadata = shouldUseProvidedMetadataStatus && metadataStatus === 'pending' && !isReloading && ((_getState$resourceUrl = getState()[resourceUrl]) === null || _getState$resourceUrl === void 0 ? void 0 : _getState$resourceUrl.metadataStatus) === 'resolved';
+    var nextMetadataStatus = shouldUseProvidedMetadataStatus && !shouldPreserveResolvedMetadata ? metadataStatus : 'resolved';
+    setMetadataStatus(resourceUrl, nextMetadataStatus);
     // Dispatch Analytics and resolved card action - including unauthorized states.
     if (isReloading) {
       dispatch((0, _actions.cardAction)(_actions.ACTION_RELOADING, {
@@ -96,7 +108,7 @@ var useResponse = function useResponse() {
         url: resourceUrl
       }, response, undefined, undefined, isMetadataRequest));
     }
-  }, [setMetadataStatus, dispatch]);
+  }, [getState, setMetadataStatus, dispatch]);
   var handleResolvedLinkResponse = (0, _react.useCallback)(function (resourceUrl, response) {
     var isReloading = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var isMetadataRequest = arguments.length > 3 ? arguments[3] : undefined;

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

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

package/dist/cjs/view/CardWithUrl/component-lazy/LazyIntersectionObserverCard.js

@@ -32,7 +32,7 @@ var LazyIntersectionObserverCard = exports.LazyIntersectionObserverCard = functi
     onErrorCallback = props.onError,
     ui = props.ui,
     url = props.url;
-  var prefetch = (0, _usePrefetch.usePrefetch)(url);
+  var prefetch = (0, _usePrefetch.usePrefetch)(url, appearance);
   var ComponentObserver = appearance === 'inline' ? 'span' : 'div';
   var _useSmartLinkSeenEven = (0, _useSmartLinkSeenEvent.useSmartLinkSeenEvent)({
       appearance: appearance,

package/dist/cjs/view/FlexibleCard/components/container/hover-card-control/index.js

@@ -10,7 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _constants = require("../../../../../constants");
 var _noop = require("../../../../../utils/noop");
-var _HoverCard = require("../../../../HoverCard/HoverCard");
+var _HoverCard = require("../../../../HoverCard");
 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); }
 var FLEXIBLE_HOVER_CARD_CAN_OPEN_DELAY = 100;
 var HoverCardControl = function HoverCardControl(_ref) {

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

@@ -1,19 +1,63 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "HoverCard", {
-  enumerable: true,
-  get: function get() {
-    return _HoverCard.HoverCard;
-  }
-});
-Object.defineProperty(exports, "StandaloneHoverCard", {
-  enumerable: true,
-  get: function get() {
-    return _StandaloneHoverCard.StandaloneHoverCard;
-  }
-});
-var _HoverCard = require("./HoverCard");
-var _StandaloneHoverCard = require("./StandaloneHoverCard");
+exports.HoverCard = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactErrorBoundary = require("react-error-boundary");
+var _reactMagneticDi = require("react-magnetic-di");
+var _withAnalyticsEvents = _interopRequireDefault(require("@atlaskit/analytics-next/withAnalyticsEvents"));
+var _useAnalyticsEvents2 = require("../../common/analytics/generated/use-analytics-events");
+var _constants = require("../../constants");
+var _failUfoExperience = require("../../state/analytics/failUfoExperience");
+var _startUfoExperience = require("../../state/analytics/startUfoExperience");
+var _SmartLinkModalProvider = require("../../state/modal/SmartLinkModalProvider");
+var _useSmartLinkAnalyticsContext = require("../../utils/analytics/useSmartLinkAnalyticsContext");
+var _HoverCardComponent = require("./components/HoverCardComponent");
+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); }
+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) { (0, _defineProperty2.default)(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; }
+var HoverCardWithErrorBoundary = function HoverCardWithErrorBoundary(props) {
+  var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(),
+    fireEvent = _useAnalyticsEvents.fireEvent;
+  var url = props.url,
+    id = props.id,
+    children = props.children;
+  var analyticsContext = (0, _useSmartLinkAnalyticsContext.useSmartLinkAnalyticsContext)({
+    display: _constants.CardDisplay.HoverCardPreview,
+    id: id,
+    source: _HoverCardComponent.HOVER_CARD_SOURCE,
+    url: url
+  });
+  var onError = (0, _react.useCallback)(function (error, info) {
+    (0, _startUfoExperience.startUfoExperience)('smart-link-rendered', id || 'NULL');
+    (0, _failUfoExperience.failUfoExperience)('smart-link-rendered', id || 'NULL');
+    (0, _failUfoExperience.failUfoExperience)('smart-link-authenticated', id || 'NULL');
+    fireEvent('ui.smartLink.renderFailed', _objectSpread(_objectSpread({}, analyticsContext === null || analyticsContext === void 0 ? void 0 : analyticsContext.attributes), {}, {
+      display: _constants.CardDisplay.HoverCardPreview,
+      id: id !== null && id !== void 0 ? id : null,
+      error: error,
+      errorInfo: info
+    }));
+  }, [analyticsContext, id, fireEvent]);
+  return /*#__PURE__*/_react.default.createElement(_reactErrorBoundary.ErrorBoundary, {
+    fallback: children,
+    onError: onError
+  }, /*#__PURE__*/_react.default.createElement(_SmartLinkModalProvider.SmartLinkModalProvider, null, /*#__PURE__*/_react.default.createElement(_HoverCardComponent.HoverCardComponent, props, children)));
+};
+var HoverCardWithoutAnalyticsContext = (0, _withAnalyticsEvents.default)()(HoverCardWithErrorBoundary);
+
+/**
+ * A hover preview component using within smart links,
+ * e.g. inline card's hover preview and auth tooltip, flexible card's hover preview.
+ *
+ * This component contains additional props that smart-card internal components
+ * use to configure hover preview behaviour.
+ */
+var HoverCard = exports.HoverCard = function HoverCard(props) {
+  return /*#__PURE__*/_react.default.createElement(HoverCardWithoutAnalyticsContext, props);
+};

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

@@ -11,7 +11,7 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
 var _statusError = _interopRequireDefault(require("@atlaskit/icon/core/status-error"));
 var _messages = require("../../../messages");
-var _HoverCard = require("../../HoverCard/HoverCard");
+var _HoverCard = require("../../HoverCard");
 var _Frame = require("../Frame");
 var _IconAndTitleLayout = require("../IconAndTitleLayout");
 var _actionButton = require("../common/action-button");

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

@@ -15,7 +15,7 @@ var _reactIntl = require("react-intl");
 var _lockLocked = _interopRequireDefault(require("@atlaskit/icon/core/lock-locked"));
 var _compiled = require("@atlaskit/primitives/compiled");
 var _messages = require("../../../messages");
-var _HoverCard = require("../../HoverCard/HoverCard");
+var _HoverCard = require("../../HoverCard");
 var _Frame = require("../Frame");
 var _IconAndTitleLayout = require("../IconAndTitleLayout");
 var _actionButton = require("../common/action-button");

package/dist/cjs/view/InlineCard/ResolvedView/InlineCardResolvedViewFunctional.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.InlineCardResolvedViewFunctional = InlineCardResolvedViewFunctional;
 var _react = _interopRequireDefault(require("react"));
 var _useInlineTailoredActions = _interopRequireDefault(require("../../../state/hooks/use-inline-tailored-actions"));
-var _HoverCard = require("../../HoverCard/HoverCard");
+var _HoverCard = require("../../HoverCard");
 var _Frame = require("../Frame");
 var _IconAndTitleLayout = require("../IconAndTitleLayout");
 var _rovoActionsCta = require("../common/rovo-actions-cta");

package/dist/cjs/view/InlineCard/ResolvedView/index.js

@@ -14,7 +14,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _react = _interopRequireDefault(require("react"));
 var _componentWithFg = require("@atlaskit/platform-feature-flags-react/component-with-fg");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _HoverCard = require("../../HoverCard/HoverCard");
+var _HoverCard = require("../../HoverCard");
 var _Frame = require("../Frame");
 var _IconAndTitleLayout = require("../IconAndTitleLayout");
 var _inlineLozenge = _interopRequireDefault(require("../common/inline-lozenge"));

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

@@ -20,7 +20,7 @@ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _useAnalyticsEvents2 = require("../../../common/analytics/generated/use-analytics-events");
 var _messages = require("../../../messages");
 var _getCachedProviderPctMapAndRefresh = require("../../../state/services/personalization/getCachedProviderPctMapAndRefresh");
-var _HoverCard = require("../../HoverCard/HoverCard");
+var _HoverCard = require("../../HoverCard");
 var _Frame = require("../Frame");
 var _IconAndTitleLayout = require("../IconAndTitleLayout");
 var _actionButton = require("../common/action-button");

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

@@ -19,7 +19,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId", "isLink
   _excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "45.22.5",
+  packageVersion: "45.22.6",
   componentName: 'linkUrl'
 };
 var LinkUrl = function LinkUrl(_ref) {

package/dist/es2019/entry-points/hover.js

@@ -0,0 +1,9 @@
+/* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
+import React from 'react';
+import { HoverCard as HoverCardComponent } from '../view/HoverCard';
+export const HoverCard = props => /*#__PURE__*/React.createElement(HoverCardComponent, props);
+
+/**
+ * @deprecated Use `import { HoverCard } from '@atlaskit/smart-card/hover'` instead.
+ */
+export const StandaloneHoverCard = props => /*#__PURE__*/React.createElement(HoverCardComponent, props);

package/dist/es2019/hoverCard.js

@@ -1,11 +1,9 @@
 /* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
-/** @deprecated Use @atlaskit/smart-card/hover */
 /**
  * @deprecated Use `import { HoverCard } from '@atlaskit/smart-card/hover'` instead.
  */
-export { StandaloneHoverCard as HoverCard } from './view/HoverCard/StandaloneHoverCard';
+export { HoverCard } from './entry-points/hover';
 
-/** @deprecated Use @atlaskit/smart-card/hover/types */
 /**
  * @deprecated Use `import type { HoverCardProps } from '@atlaskit/smart-card/hover/types'` instead.
  */

package/dist/es2019/state/hooks/use-resolve/index.js

@@ -31,16 +31,19 @@ const useResolve = () => {
     } = params;
     const isOptimizedBlockRequest = appearance === 'block' && fg('platform_smartlink_inline_resolve_optimization');
     const {
-      details
+      details,
+      metadataStatus: currentMetadataStatus
     } = getState()[url] || {
       status: SmartLinkStatus.Pending,
       details: undefined
     };
     const hasData = !!(details && details.data || isEntityPresent(details));
-    if (isReloading || !hasData || isMetadataRequest || isOptimizedBlockRequest) {
+    const needsOptimizedBlockData = isOptimizedBlockRequest && currentMetadataStatus !== 'resolved';
+    if (isReloading || !hasData || isMetadataRequest || needsOptimizedBlockData) {
       // A reduced inline response can populate the shared resolver cache before an initial
-      // block request completes, so every optimized block request must bypass that cache.
-      const shouldForceFetch = isReloading || isOptimizedBlockRequest;
+      // block request completes. Bypass that cache until full metadata has been resolved,
+      // then reuse the full block response for subsequent block cards with the same URL.
+      const shouldForceFetch = isReloading || needsOptimizedBlockData;
       const metadataStatus = appearance === 'inline' && !isMetadataRequest && fg('platform_smartlink_inline_resolve_optimization') ? 'pending' : undefined;
       return connections.client.fetchData(url, shouldForceFetch, appearance).then(response => handleResolvedLinkResponse(url, response, shouldForceFetch, isMetadataRequest, metadataStatus)).catch(error => handleResolvedLinkError(url, error, undefined, isMetadataRequest));
     } else {

package/dist/es2019/state/hooks/use-response/index.js

@@ -78,11 +78,23 @@ const useResponse = () => {
     }
   }, [getState, setMetadataStatus, dispatch]);
   const handleResolvedLinkSuccess = useCallback((resourceUrl, response, isReloading, isMetadataRequest, metadataStatus = 'resolved') => {
-    // Some optimized resolves intentionally leave metadata pending so hover can fetch it.
-    // Check response status before evaluating the feature gate so non-resolved responses
-    // do not fire a gate exposure when the gate result would be ignored.
+    var _getState$resourceUrl;
+    /**
+     * Metadata status scenarios:
+     * - Gate off, or a non-resolved response: use `resolved`, preserving legacy behavior and
+     *   avoiding a gate exposure when the result would not affect the status.
+     * - Gate on with full metadata: use the provided/default `resolved` status.
+     * - Gate on with reduced inline metadata: use the provided `pending` status so block or
+     *   hover rendering knows to request the full metadata later.
+     * - Reduced inline metadata arriving after full metadata: keep the existing `resolved`
+     *   status so an out-of-order response cannot trigger another full request.
+     * - Explicit reload: allow `pending` even after full metadata, because the caller is
+     *   intentionally replacing the existing data.
+     */
     const shouldUseProvidedMetadataStatus = getStatus(response) === 'resolved' && fg('platform_smartlink_inline_resolve_optimization');
-    setMetadataStatus(resourceUrl, shouldUseProvidedMetadataStatus ? metadataStatus : 'resolved');
+    const shouldPreserveResolvedMetadata = shouldUseProvidedMetadataStatus && metadataStatus === 'pending' && !isReloading && ((_getState$resourceUrl = getState()[resourceUrl]) === null || _getState$resourceUrl === void 0 ? void 0 : _getState$resourceUrl.metadataStatus) === 'resolved';
+    const nextMetadataStatus = shouldUseProvidedMetadataStatus && !shouldPreserveResolvedMetadata ? metadataStatus : 'resolved';
+    setMetadataStatus(resourceUrl, nextMetadataStatus);
     // Dispatch Analytics and resolved card action - including unauthorized states.
     if (isReloading) {
       dispatch(cardAction(ACTION_RELOADING, {
@@ -93,7 +105,7 @@ const useResponse = () => {
         url: resourceUrl
       }, response, undefined, undefined, isMetadataRequest));
     }
-  }, [setMetadataStatus, dispatch]);
+  }, [getState, setMetadataStatus, dispatch]);
   const handleResolvedLinkResponse = useCallback((resourceUrl, response, isReloading = false, isMetadataRequest, metadataStatus) => {
     if (!resourceUrl) {
       return;

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

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

package/dist/es2019/view/CardWithUrl/component-lazy/LazyIntersectionObserverCard.js

@@ -19,7 +19,7 @@ export const LazyIntersectionObserverCard = props => {
     ui,
     url
   } = props;
-  const prefetch = usePrefetch(url);
+  const prefetch = usePrefetch(url, appearance);
   const ComponentObserver = appearance === 'inline' ? 'span' : 'div';
   const {
     onIntersecting: onSeenIntersecting,

package/dist/es2019/view/FlexibleCard/components/container/hover-card-control/index.js

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { ElementName } from '../../../../../constants';
 import { noop } from '../../../../../utils/noop';
-import { HoverCard } from '../../../../HoverCard/HoverCard';
+import { HoverCard } from '../../../../HoverCard';
 const FLEXIBLE_HOVER_CARD_CAN_OPEN_DELAY = 100;
 const HoverCardControl = ({
   children,

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

@@ -1,10 +1,55 @@
-/* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
+import React, { useCallback } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
+import { di } from 'react-magnetic-di';
+import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
+import { useAnalyticsEvents } from '../../common/analytics/generated/use-analytics-events';
+import { CardDisplay } from '../../constants';
+import { failUfoExperience } from '../../state/analytics/failUfoExperience';
+import { startUfoExperience } from '../../state/analytics/startUfoExperience';
+import { SmartLinkModalProvider } from '../../state/modal/SmartLinkModalProvider';
+import { useSmartLinkAnalyticsContext } from '../../utils/analytics/useSmartLinkAnalyticsContext';
+import { HOVER_CARD_SOURCE, HoverCardComponent } from './components/HoverCardComponent';
+const HoverCardWithErrorBoundary = props => {
+  const {
+    fireEvent
+  } = useAnalyticsEvents();
+  const {
+    url,
+    id,
+    children
+  } = props;
+  const analyticsContext = useSmartLinkAnalyticsContext({
+    display: CardDisplay.HoverCardPreview,
+    id,
+    source: HOVER_CARD_SOURCE,
+    url
+  });
+  const onError = useCallback((error, info) => {
+    startUfoExperience('smart-link-rendered', id || 'NULL');
+    failUfoExperience('smart-link-rendered', id || 'NULL');
+    failUfoExperience('smart-link-authenticated', id || 'NULL');
+    fireEvent('ui.smartLink.renderFailed', {
+      ...(analyticsContext === null || analyticsContext === void 0 ? void 0 : analyticsContext.attributes),
+      display: CardDisplay.HoverCardPreview,
+      id: id !== null && id !== void 0 ? id : null,
+      error: error,
+      errorInfo: info
+    });
+  }, [analyticsContext, id, fireEvent]);
+  return /*#__PURE__*/React.createElement(ErrorBoundary, {
+    fallback: children,
+    onError: onError
+  }, /*#__PURE__*/React.createElement(SmartLinkModalProvider, null, /*#__PURE__*/React.createElement(HoverCardComponent, props, children)));
+};
+const HoverCardWithoutAnalyticsContext = withAnalyticsEvents()(HoverCardWithErrorBoundary);
 
 /**
- * @deprecated Use `import { HoverCard } from '@atlaskit/smart-card/hover-card'` instead.
+ * A hover preview component using within smart links,
+ * e.g. inline card's hover preview and auth tooltip, flexible card's hover preview.
+ *
+ * This component contains additional props that smart-card internal components
+ * use to configure hover preview behaviour.
  */
-export { HoverCard } from './HoverCard';
-/**
- * @deprecated Use `import { StandaloneHoverCard } from '@atlaskit/smart-card/hover'` instead.
- */
-export { StandaloneHoverCard } from './StandaloneHoverCard';
+export const HoverCard = props => {
+  return /*#__PURE__*/React.createElement(HoverCardWithoutAnalyticsContext, props);
+};

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

@@ -4,7 +4,7 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import ErrorIcon from '@atlaskit/icon/core/status-error';
 import { messages } from '../../../messages';
-import { HoverCard } from '../../HoverCard/HoverCard';
+import { HoverCard } from '../../HoverCard';
 import { Frame } from '../Frame';
 import { IconAndTitleLayout } from '../IconAndTitleLayout';
 import { ActionButton } from '../common/action-button';

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

@@ -7,7 +7,7 @@ import { FormattedMessage } from 'react-intl';
 import LockLockedIcon from '@atlaskit/icon/core/lock-locked';
 import { Pressable } from '@atlaskit/primitives/compiled';
 import { messages } from '../../../messages';
-import { HoverCard } from '../../HoverCard/HoverCard';
+import { HoverCard } from '../../HoverCard';
 import { Frame } from '../Frame';
 import { IconAndTitleLayout } from '../IconAndTitleLayout';
 import { ActionButton } from '../common/action-button';

package/dist/es2019/view/InlineCard/ResolvedView/InlineCardResolvedViewFunctional.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import useInlineTailoredAction from '../../../state/hooks/use-inline-tailored-actions';
-import { HoverCard } from '../../HoverCard/HoverCard';
+import { HoverCard } from '../../HoverCard';
 import { Frame } from '../Frame';
 import { IconAndTitleLayout } from '../IconAndTitleLayout';
 import { InlineRovoActionButton } from '../common/rovo-actions-cta';

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { componentWithFG } from '@atlaskit/platform-feature-flags-react/component-with-fg';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { HoverCard } from '../../HoverCard/HoverCard';
+import { HoverCard } from '../../HoverCard';
 import { Frame } from '../Frame';
 import { IconAndTitleLayout } from '../IconAndTitleLayout';
 import InlineLozenge from '../common/inline-lozenge';

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

@@ -13,7 +13,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { useAnalyticsEvents } from '../../../common/analytics/generated/use-analytics-events';
 import { messages } from '../../../messages';
 import { getCachedProviderPctMapAndRefresh } from '../../../state/services/personalization/getCachedProviderPctMapAndRefresh';
-import { HoverCard } from '../../HoverCard/HoverCard';
+import { HoverCard } from '../../HoverCard';
 import { Frame } from '../Frame';
 import { IconAndTitleLayout } from '../IconAndTitleLayout';
 import { ActionButton } from '../common/action-button';

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

@@ -9,7 +9,7 @@ import LinkWarningModal from './LinkWarningModal';
 import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
 const PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "45.22.5",
+  packageVersion: "45.22.6",
   componentName: 'linkUrl'
 };
 const LinkUrl = ({

package/dist/esm/entry-points/hover.js

@@ -0,0 +1,13 @@
+/* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
+import React from 'react';
+import { HoverCard as HoverCardComponent } from '../view/HoverCard';
+export var HoverCard = function HoverCard(props) {
+  return /*#__PURE__*/React.createElement(HoverCardComponent, props);
+};
+
+/**
+ * @deprecated Use `import { HoverCard } from '@atlaskit/smart-card/hover'` instead.
+ */
+export var StandaloneHoverCard = function StandaloneHoverCard(props) {
+  return /*#__PURE__*/React.createElement(HoverCardComponent, props);
+};

package/dist/esm/hoverCard.js

@@ -1,11 +1,9 @@
 /* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
-/** @deprecated Use @atlaskit/smart-card/hover */
 /**
  * @deprecated Use `import { HoverCard } from '@atlaskit/smart-card/hover'` instead.
  */
-export { StandaloneHoverCard as HoverCard } from './view/HoverCard/StandaloneHoverCard';
+export { HoverCard } from './entry-points/hover';
 
-/** @deprecated Use @atlaskit/smart-card/hover/types */
 /**
  * @deprecated Use `import type { HoverCardProps } from '@atlaskit/smart-card/hover/types'` instead.
  */

package/dist/esm/state/hooks/use-resolve/index.js

@@ -21,7 +21,7 @@ var useResolve = function useResolve() {
     handleResolvedLinkError = _useResponse.handleResolvedLinkError;
   return useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
-      var url, _params$isReloading, isReloading, _params$isMetadataReq, isMetadataRequest, _params$id, id, appearance, isOptimizedBlockRequest, _ref2, details, hasData, shouldForceFetch, metadataStatus;
+      var url, _params$isReloading, isReloading, _params$isMetadataReq, isMetadataRequest, _params$id, id, appearance, isOptimizedBlockRequest, _ref2, details, currentMetadataStatus, hasData, needsOptimizedBlockData, shouldForceFetch, metadataStatus;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -30,15 +30,17 @@ var useResolve = function useResolve() {
             _ref2 = getState()[url] || {
               status: SmartLinkStatus.Pending,
               details: undefined
-            }, details = _ref2.details;
+            }, details = _ref2.details, currentMetadataStatus = _ref2.metadataStatus;
             hasData = !!(details && details.data || isEntityPresent(details));
-            if (!(isReloading || !hasData || isMetadataRequest || isOptimizedBlockRequest)) {
+            needsOptimizedBlockData = isOptimizedBlockRequest && currentMetadataStatus !== 'resolved';
+            if (!(isReloading || !hasData || isMetadataRequest || needsOptimizedBlockData)) {
               _context.next = 1;
               break;
             }
             // A reduced inline response can populate the shared resolver cache before an initial
-            // block request completes, so every optimized block request must bypass that cache.
-            shouldForceFetch = isReloading || isOptimizedBlockRequest;
+            // block request completes. Bypass that cache until full metadata has been resolved,
+            // then reuse the full block response for subsequent block cards with the same URL.
+            shouldForceFetch = isReloading || needsOptimizedBlockData;
             metadataStatus = appearance === 'inline' && !isMetadataRequest && fg('platform_smartlink_inline_resolve_optimization') ? 'pending' : undefined;
             return _context.abrupt("return", connections.client.fetchData(url, shouldForceFetch, appearance).then(function (response) {
               return handleResolvedLinkResponse(url, response, shouldForceFetch, isMetadataRequest, metadataStatus);