@atlaskit/smart-card 25.9.0 → 25.9.2

package/dist/es2019/view/FlexibleCard/components/actions/action/preview-action/index.js

@@ -1,11 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import Action from '../index';
-import ReactDOM from 'react-dom';
-import { IntlProvider } from 'react-intl-next';
 import { useFlexibleUiAnalyticsContext } from '../../../../../../state/flexible-ui-context';
 import { useSmartLinkAnalytics } from '../../../../../../state';
-import Icon from '../../../elements/icon';
+import { openPreviewModal } from '../../../../../EmbedModal/utils';
 const PreviewAction = props => {
   const {
     appearance,
@@ -22,25 +20,15 @@ const PreviewAction = props => {
   } = props;
   const defaultAnalytics = useSmartLinkAnalytics(url, () => {});
   const analytics = useFlexibleUiAnalyticsContext() || defaultAnalytics;
-  const EmbedIcon = {
-    icon: /*#__PURE__*/React.createElement(Icon, linkIcon),
-    isFlexibleUi: true
-  };
   if (src && url) {
-    const embedModal = () => previewFunction({
-      popupMountPointId: 'twp-editor-preview-iframe',
-      showModal: true,
-      iframeName: 'twp-editor-preview-iframe',
-      onClose: () => {},
-      download: downloadUrl,
-      icon: EmbedIcon,
-      providerName: providerName || 'Preview',
-      src,
+    const embedModal = () => openPreviewModal({
       title,
-      url,
+      providerName,
+      downloadUrl,
+      isSupportTheming,
       analytics,
-      origin: 'smartLinkCard',
-      isSupportTheming
+      linkIcon,
+      src
     });
     const action = {
       ...props,
@@ -60,41 +48,4 @@ const PreviewAction = props => {
     return null;
   }
 };
-
-/*
-  Explanatory note:
-  Actions don't have access to the react tree of whatever is rendered them
-  (and this concept is fraught inside editor anyway) so we want to ensure
-  it is mounting to a new unique place. This function manages that, including
-  creating an element if it doesn't exist, as well as tidying up the react tree
-  (but not the element) upon closing the modal.
-
-  This may strike you as really uncomfortable as you read it, so I wanted to note
-  that a) this was discussed and agreed upon, and b) it's definitely odd, and if
-  you find an elegant solution around this, you should definitely feel free to
-  refactor it.
-*/
-export async function previewFunction({
-  popupMountPointId,
-  ...rest
-}) {
-  let popupMountPoint;
-  popupMountPoint = document.getElementById(popupMountPointId);
-  if (!popupMountPoint) {
-    popupMountPoint = document.createElement('div');
-    popupMountPoint.id = popupMountPointId;
-    popupMountPoint.setAttribute('data-testid', 'preview-modal');
-    document.body.appendChild(popupMountPoint);
-  }
-  let Modal = await import('../../../../../EmbedModal');
-  ReactDOM.render( /*#__PURE__*/React.createElement(IntlProvider, {
-    locale: "en"
-  }, /*#__PURE__*/React.createElement(Modal.default, _extends({}, rest, {
-    onClose: _context => {
-      if (popupMountPoint) {
-        ReactDOM.unmountComponentAtNode(popupMountPoint);
-      }
-    }
-  }))), popupMountPoint);
-}
 export default PreviewAction;

package/dist/es2019/view/FlexibleCard/components/common/lozenge-action/index.js

@@ -24,6 +24,7 @@ const LozengeAction = ({
   text,
   zIndex
 }) => {
+  var _action$update;
   const [isLoaded, setIsLoaded] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [isOpen, setIsOpen] = useState(false);
@@ -31,6 +32,11 @@ const LozengeAction = ({
   const [errorMessage, setErrorMessage] = useState();
   const invoke = useInvoke();
   const reload = useResolve();
+  const {
+    url,
+    id: linkId,
+    previewData
+  } = (action === null || action === void 0 ? void 0 : (_action$update = action.update) === null || _action$update === void 0 ? void 0 : _action$update.details) || {};
   const handleOpenChange = useCallback(async args => {
     setIsOpen(args.isOpen);
     if (args.isOpen && !isLoaded && action !== null && action !== void 0 && action.read) {
@@ -71,10 +77,6 @@ const LozengeAction = ({
         setIsLoaded(false);
         setIsOpen(false);
         setItems([]);
-        const {
-          url,
-          id: linkId
-        } = updateAction.details || {};
         if (url) {
           await reload(url, true, undefined, linkId);
         }
@@ -87,12 +89,14 @@ const LozengeAction = ({
         setErrorMessage(LozengeActionErrorMessages.updateFailed);
       }
     }
-  }, [action === null || action === void 0 ? void 0 : action.update, invoke, reload]);
+  }, [action === null || action === void 0 ? void 0 : action.update, invoke, linkId, reload, url]);
   const dropdownItemGroup = useMemo(() => {
     if (errorMessage) {
       return jsx(LozengeActionError, {
         errorMessage: errorMessage,
-        testId: testId
+        testId: testId,
+        url: url,
+        previewData: previewData
       });
     }
     if (items && items.length > 0) {
@@ -105,7 +109,7 @@ const LozengeAction = ({
         testId: `${testId}-item-${idx}`
       })))));
     }
-  }, [errorMessage, handleItemClick, items, testId]);
+  }, [errorMessage, handleItemClick, items, previewData, testId, url]);
   return jsx(DropdownMenu, {
     isLoading: isLoading,
     isOpen: isOpen,

package/dist/es2019/view/FlexibleCard/components/common/lozenge-action/lozenge-action-error/index.js

@@ -1,17 +1,41 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import { Fragment, useMemo } from 'react';
+import { Fragment, useMemo, useCallback } from 'react';
+import { FormattedMessage } from 'react-intl-next';
 import { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdown-menu';
 import { R50, R500 } from '@atlaskit/theme/colors';
 import ErrorIcon from '@atlaskit/icon/glyph/error';
-import { dropdownItemGroupStyles, contentStyles, textStyles } from './styled';
+import { dropdownItemGroupStyles, contentStyles, linkStyles, textStyles } from './styled';
 import { getFormattedMessage } from '../../../utils';
+import { messages } from '../../../../../../messages';
+import { useFlexibleUiAnalyticsContext } from '../../../../../../state/flexible-ui-context';
+import { openPreviewModal } from '../../../../../EmbedModal/utils';
+import useResolve from '../../../../../../state/hooks/use-resolve';
 const MAX_LINE_NUMBER = 8;
 const LozengeActionError = ({
   errorMessage,
   testId,
-  maxLineNumber = MAX_LINE_NUMBER
+  maxLineNumber = MAX_LINE_NUMBER,
+  url,
+  previewData
 }) => {
+  const reload = useResolve();
+  const analytics = useFlexibleUiAnalyticsContext();
+  const isPreviewAvailable = previewData && previewData.src !== undefined;
+  const handlePreviewClose = useCallback(() => {
+    if (url) {
+      reload(url, true);
+    }
+  }, [reload, url]);
+  const handlePreviewOpen = useCallback(() => {
+    if (isPreviewAvailable) {
+      return openPreviewModal({
+        ...previewData,
+        analytics,
+        onClose: handlePreviewClose
+      });
+    }
+  }, [analytics, handlePreviewClose, isPreviewAvailable, previewData]);
   const content = useMemo(() => {
     return jsx(Fragment, null, jsx("div", {
       css: contentStyles
@@ -24,8 +48,14 @@ const LozengeActionError = ({
     }), jsx("span", {
       css: textStyles(maxLineNumber),
       "data-testid": `${testId}-error-message`
-    }, typeof errorMessage === 'string' ? errorMessage : getFormattedMessage(errorMessage))));
-  }, [errorMessage, maxLineNumber, testId]);
+    }, typeof errorMessage === 'string' ? errorMessage : getFormattedMessage(errorMessage))), isPreviewAvailable ? jsx("div", {
+      css: linkStyles
+    }, jsx("a", {
+      target: "_blank",
+      "data-testid": `${testId}-open-embed`,
+      onClick: handlePreviewOpen
+    }, jsx(FormattedMessage, messages.open_issue_in_jira))) : null);
+  }, [errorMessage, handlePreviewOpen, isPreviewAvailable, maxLineNumber, testId]);
   return jsx("span", {
     css: dropdownItemGroupStyles,
     "data-testid": `${testId}-error-item-group`

package/dist/es2019/view/FlexibleCard/components/common/lozenge-action/lozenge-action-error/styled.js

@@ -23,7 +23,7 @@ const sharedBlockStyles = css`
 export const contentStyles = css`
   ${sharedBlockStyles};
 
-  margin-top: 2px;
+  margin-top: ${"var(--ds-space-025, 2px)"};
   align-items: flex-start;
 
   > span,
@@ -34,6 +34,14 @@ export const contentStyles = css`
     }
   }
 `;
+export const linkStyles = css`
+  ${sharedBlockStyles};
+
+  font-size: 0.875rem;
+  margin-top: 10px;
+  margin-left: ${"var(--ds-space-400, 32px)"};
+  margin-bottom: ${"var(--ds-space-025, 2px)"};
+`;
 export const textStyles = maxLines => css`
   line-height: 1rem;
   white-space: normal;

package/dist/es2019/view/FlexibleCard/components/elements/link/index.js

@@ -15,13 +15,20 @@ const containerStyles = css`
 const getThemeStyles = theme => {
   switch (theme) {
     case SmartLinkInternalTheme.Grey:
+      // We are being specifc with the CSS selectors to ensure that Confluence overrides
+      // do not affect our internal Smart Card styles
       return css`
-        color: ${"var(--ds-text-subtlest, #626F86)"};
-        :hover {
+        a& {
           color: ${"var(--ds-text-subtlest, #626F86)"};
-          text-decoration: underline;
+          &:active,
+          &:visited,
+          &:focus,
+          &:hover {
+            color: ${"var(--ds-text-subtlest, #626F86)"};
+            text-decoration: underline;
+          }
+          font-size: 12px;
         }
-        font-size: 12px;
       `;
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
     case SmartLinkTheme.Black:

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

@@ -9,11 +9,9 @@ import { useSmartCardState as useLinkState } from '../../../state/store';
 import HoverCardContent from '../components/HoverCardContent';
 import { CARD_GAP_PX, HOVER_CARD_Z_INDEX } from '../styled';
 import { CardDisplay } from '../../../constants';
-import { SmartLinkAnalyticsContext } from '../../../utils/analytics/SmartLinkAnalyticsContext';
 export const HoverCardComponent = ({
   children,
   url,
-  id,
   analyticsHandler,
   analytics,
   canOpen = true,
@@ -114,11 +112,7 @@ export const HoverCardComponent = ({
   }, [closeOnChildClick, hideCard]);
   const content = useCallback(({
     update
-  }) => jsx(SmartLinkAnalyticsContext, {
-    url: url,
-    appearance: CardDisplay.HoverCardPreview,
-    id: id
-  }, jsx(HoverCardContent, {
+  }) => jsx(HoverCardContent, {
     onMouseEnter: initShowCard,
     onMouseLeave: initHideCard,
     analytics: analytics,
@@ -128,9 +122,8 @@ export const HoverCardComponent = ({
     onResolve: update,
     renderers: renderers,
     showServerActions: showServerActions,
-    url: url,
-    id: id
-  })), [analytics, initHideCard, initShowCard, filteredActions, linkState, onActionClick, renderers, showServerActions, url, id]);
+    url: url
+  }), [analytics, initHideCard, initShowCard, filteredActions, linkState, onActionClick, renderers, showServerActions, url]);
   const trigger = useCallback(triggerProps => jsx("span", {
     ref: parentSpan
   }, jsx("span", _extends({}, triggerProps, {

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

@@ -5,6 +5,7 @@ import { extractLozenge } from '../common/lozenge';
 import { getExtensionKey } from '../../state/helpers';
 import extractServerAction from './extract-server-action';
 import { extractLink } from '@atlaskit/linking-common/extractors';
+import { extractPreviewAction } from './actions/extract-preview-action';
 var toInvokeRequest = function toInvokeRequest(extensionKey, resourceIdentifiers, actionType, details) {
   if (!actionType) {
     return;
@@ -34,9 +35,11 @@ var extractAction = function extractAction(response, id) {
   }
   var read = toInvokeRequest(extensionKey, action.resourceIdentifiers, (_action$dataRetrieval = action.dataRetrievalAction) === null || _action$dataRetrieval === void 0 ? void 0 : _action$dataRetrieval.name);
   var url = extractLink(data);
+  var previewData = response ? extractPreviewAction(response) : null;
   var details = {
     id: id,
-    url: url
+    url: url,
+    previewData: previewData
   };
   var update = toInvokeRequest(extensionKey, action.resourceIdentifiers, (_action$dataUpdateAct = action.dataUpdateAction) === null || _action$dataUpdateAct === void 0 ? void 0 : _action$dataUpdateAct.name, details);
   return read || update ? {

package/dist/esm/state/actions/index.js

@@ -16,20 +16,13 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
     connections = _useSmartLinkContext.connections;
   var getState = store.getState,
     dispatch = store.dispatch;
-  var getSmartLinkState = useCallback(function () {
-    var _getState$url;
-    var _ref = (_getState$url = getState()[url]) !== null && _getState$url !== void 0 ? _getState$url : {
-        status: SmartLinkStatus.Pending
-      },
-      details = _ref.details,
-      status = _ref.status,
-      metadataStatus = _ref.metadataStatus;
-    return {
-      details: details,
-      status: status,
-      metadataStatus: metadataStatus
-    };
-  }, [getState, url]);
+  var _ref = getState()[url] || {
+      status: SmartLinkStatus.Pending,
+      details: undefined
+    },
+    details = _ref.details,
+    status = _ref.status,
+    metadataStatus = _ref.metadataStatus;
   var setMetadataStatus = useCallback(function (metadataStatus) {
     dispatch(cardAction(ACTION_UPDATE_METADATA_STATUS, {
       url: url
@@ -56,8 +49,6 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
     }, _callee);
   })), [id, resolveUrl, url]);
   var register = useCallback(function () {
-    var _getSmartLinkState = getSmartLinkState(),
-      details = _getSmartLinkState.details;
     if (!details) {
       dispatch(cardAction(ACTION_RESOLVING, {
         url: url
@@ -65,10 +56,8 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
       setMetadataStatus('pending');
     }
     return resolve();
-  }, [getSmartLinkState, resolve, dispatch, url, setMetadataStatus]);
+  }, [details, resolve, dispatch, url, setMetadataStatus]);
   var reload = useCallback(function () {
-    var _getSmartLinkState2 = getSmartLinkState(),
-      details = _getSmartLinkState2.details;
     var definitionId = getDefinitionId(details);
     if (definitionId) {
       getByDefinitionId(definitionId, getState()).map(function (url) {
@@ -77,20 +66,15 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
     } else {
       resolve(url, true);
     }
-  }, [getSmartLinkState, url, getState, resolve]);
+  }, [details, url, getState, resolve]);
   var loadMetadata = useCallback(function () {
-    var _getSmartLinkState3 = getSmartLinkState(),
-      metadataStatus = _getSmartLinkState3.metadataStatus;
     //metadataStatus will be undefined for SSR links only
     if (metadataStatus === undefined) {
       setMetadataStatus('pending');
       return resolve(url, false, true);
     }
-  }, [getSmartLinkState, resolve, setMetadataStatus, url]);
+  }, [metadataStatus, resolve, setMetadataStatus, url]);
   var authorize = useCallback(function (appearance) {
-    var _getSmartLinkState4 = getSmartLinkState(),
-      details = _getSmartLinkState4.details,
-      status = _getSmartLinkState4.status;
     var definitionId = getDefinitionId(details);
     var extensionKey = getExtensionKey(details);
     var services = getServices(details);
@@ -142,7 +126,7 @@ export var useSmartCardActions = function useSmartCardActions(id, url, analytics
         reload();
       });
     }
-  }, [getSmartLinkState, analytics.ui, analytics.screen, analytics.track, analytics.operational, id, reload]);
+  }, [analytics.ui, analytics.screen, analytics.track, analytics.operational, id, reload, details, status]);
   var invoke = useCallback( /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(opts, appearance) {
       var key, action, source, markName, response;

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

@@ -2,7 +2,6 @@ import _typeof from "@babel/runtime/helpers/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 import { useCallback } from 'react';
-import { unstable_batchedUpdates } from 'react-dom';
 import { addMetadataToExperience } from '../../analytics';
 import { getStatus } from '../../helpers';
 import { ACTION_ERROR, ACTION_ERROR_FALLBACK, ACTION_RELOADING, ACTION_RESOLVED, ACTION_UPDATE_METADATA_STATUS, APIError, cardAction } from '@atlaskit/linking-common';
@@ -100,26 +99,18 @@ var useResolve = function useResolve() {
       return;
     }
 
-    /**
-     * Using unstable_batchedUpdates because this store update happens async and trigers a rerender
-     * more info:
-     * https://github.com/facebook/react/blob/v18.2.0/packages/use-sync-external-store/src/useSyncExternalStoreShimClient.js#L113
-     * https://react-redux.js.org/api/batch
-     */
-    unstable_batchedUpdates(function () {
-      //if a link resolves normally, metadata will also always be resolved
-      setMetadataStatus(resourceUrl, 'resolved');
-      // Dispatch Analytics and resolved card action - including unauthorized states.
-      if (isReloading) {
-        dispatch(cardAction(ACTION_RELOADING, {
-          url: resourceUrl
-        }, response));
-      } else {
-        dispatch(cardAction(ACTION_RESOLVED, {
-          url: resourceUrl
-        }, response, undefined, undefined, isMetadataRequest));
-      }
-    });
+    //if a link resolves normally, metadata will also always be resolved
+    setMetadataStatus(resourceUrl, 'resolved');
+    // Dispatch Analytics and resolved card action - including unauthorized states.
+    if (isReloading) {
+      dispatch(cardAction(ACTION_RELOADING, {
+        url: resourceUrl
+      }, response));
+    } else {
+      dispatch(cardAction(ACTION_RESOLVED, {
+        url: resourceUrl
+      }, response, undefined, undefined, isMetadataRequest));
+    }
   }, [dispatch, handleResolvedLinkError, hasAuthFlowSupported, setMetadataStatus]);
   return useCallback( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url) {

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "25.9.0",
+	"version": "25.9.2",
 	"sideEffects": false
 }

package/dist/esm/view/CardWithUrl/component.js

@@ -12,8 +12,7 @@ import { isFlexibleUiCard } from '../../utils/flexible';
 import FlexibleCard from '../FlexibleCard';
 import { CardDisplay } from '../../constants';
 import { fireLinkClickedEvent } from '../../utils/analytics/click';
-import { SmartLinkAnalyticsContext } from '../../utils/analytics/SmartLinkAnalyticsContext';
-function Component(_ref) {
+export function CardWithUrlContent(_ref) {
   var id = _ref.id,
     url = _ref.url,
     isSelected = _ref.isSelected,
@@ -258,11 +257,4 @@ function Component(_ref) {
         onIframeFocus: onIframeFocus
       });
   }
-}
-export var CardWithUrlContent = function CardWithUrlContent(props) {
-  return /*#__PURE__*/React.createElement(SmartLinkAnalyticsContext, {
-    url: props.url,
-    appearance: props.appearance,
-    id: props.id
-  }, /*#__PURE__*/React.createElement(Component, props));
-};
+}

package/dist/esm/view/EmbedModal/components/analytics/index.js

@@ -14,23 +14,23 @@ var withAnalytics = function withAnalytics(Component) {
       onResize = props.onResize,
       origin = props.origin;
     var handleOnOpen = useCallback(function (context) {
-      analytics.screen.modalViewedEvent({
+      analytics === null || analytics === void 0 ? void 0 : analytics.screen.modalViewedEvent({
         name: 'embedPreviewModal',
         attributes: {
           origin: origin,
           size: context.size
         }
       });
-      analytics.ui.renderSuccessEvent({
+      analytics === null || analytics === void 0 ? void 0 : analytics.ui.renderSuccessEvent({
         status: 'resolved',
         display: CardDisplay.EmbedPreview
       });
       if (onOpen) {
         onOpen(context);
       }
-    }, [analytics.screen, analytics.ui, onOpen, origin]);
+    }, [analytics === null || analytics === void 0 ? void 0 : analytics.screen, analytics === null || analytics === void 0 ? void 0 : analytics.ui, onOpen, origin]);
     var handleOnOpenFailed = useCallback(function (error, errorInfo) {
-      analytics.ui.renderFailedEvent({
+      analytics === null || analytics === void 0 ? void 0 : analytics.ui.renderFailedEvent({
         display: CardDisplay.EmbedPreview,
         error: error,
         errorInfo: errorInfo
@@ -38,9 +38,9 @@ var withAnalytics = function withAnalytics(Component) {
       if (onOpenFailed) {
         onOpenFailed(error, errorInfo);
       }
-    }, [analytics.ui, onOpenFailed]);
+    }, [analytics === null || analytics === void 0 ? void 0 : analytics.ui, onOpenFailed]);
     var handleOnClose = useCallback(function (context) {
-      analytics.ui.modalClosedEvent({
+      analytics === null || analytics === void 0 ? void 0 : analytics.ui.modalClosedEvent({
         actionSubjectId: 'embedPreview',
         attributes: {
           origin: origin,
@@ -51,9 +51,9 @@ var withAnalytics = function withAnalytics(Component) {
       if (onClose) {
         onClose(context);
       }
-    }, [analytics.ui, onClose, origin]);
+    }, [analytics === null || analytics === void 0 ? void 0 : analytics.ui, onClose, origin]);
     var handleOnResize = useCallback(function (context) {
-      analytics.ui.buttonClickedEvent({
+      analytics === null || analytics === void 0 ? void 0 : analytics.ui.buttonClickedEvent({
         actionSubjectId: 'embedPreviewResize',
         attributes: {
           newSize: context.size,
@@ -64,7 +64,7 @@ var withAnalytics = function withAnalytics(Component) {
       if (onResize) {
         onResize(context);
       }
-    }, [analytics.ui, onResize, origin]);
+    }, [analytics === null || analytics === void 0 ? void 0 : analytics.ui, onResize, origin]);
     return /*#__PURE__*/React.createElement(Component, _extends({}, props, {
       onClose: handleOnClose,
       onOpen: handleOnOpen,