@atlaskit/editor-plugin-card 16.1.0 → 16.3.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @atlaskit/editor-plugin-card
 
+## 16.3.0
+
+### Minor Changes
+
+- [`85699a44bd1f8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/85699a44bd1f8) -
+  Add Confluence short-link URL expansion for native embeds. When a Confluence short link
+  (`/wiki/x/<token>`) is pasted, it is resolved to its canonical page URL via the Object Resolver
+  Service before matching against registered experience manifests, gated behind
+  `platform-native-embeds-short-link-expansion`.
+  - `NativeEmbedFacade`: new `expandShortLink`, `getExperienceIdFromUrlAsync`, and `setCardClient`
+    methods; `createExperienceForUrl` now expands short links before manifest matching.
+  - `editor-plugin-card`: exposes `resolveShortLinkUrl` action; `replaceQueuedUrlWithCard` supports
+    async `EmbedCardNodeTransformer` return values.
+  - `editor-plugin-native-embeds`: wires `cardClient` from config and passes `api` to
+    `cardToNativeEmbedNode` for async short-link resolution.
+  - `editor-common`: `EmbedCardNodeTransformer` type updated to allow `Promise` return;
+    `CardPluginActions` extended with `resolveShortLinkUrl`.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 16.2.0
+
+### Minor Changes
+
+- [`e5cdd96dcf4f9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e5cdd96dcf4f9) -
+  Clean up platform_editor_hydratable_ui experiment (shipped as enabled)
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 16.1.0
 
 ### Minor Changes

package/dist/cjs/cardPlugin.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.cardPlugin = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
@@ -173,6 +174,89 @@ var cardPlugin = exports.cardPlugin = function cardPlugin(_ref) {
       registerEmbedCardTransformer: function registerEmbedCardTransformer(transformers) {
         instanceEmbedCardTransformers = transformers;
       },
+      resolveShortLinkUrl: function () {
+        var _resolveShortLinkUrl = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(url) {
+          var provider, clientHolder, client, response, data, urlField, _linkObj$Id, linkObj, id;
+          return _regenerator.default.wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                if (options.provider) {
+                  _context2.next = 2;
+                  break;
+                }
+                return _context2.abrupt("return", undefined);
+              case 2:
+                _context2.prev = 2;
+                _context2.next = 5;
+                return options.provider;
+              case 5:
+                provider = _context2.sent;
+                // EditorCardProvider holds a CardClient instance internally. We access it
+                // directly to call fetchData, which gives us the raw ORS JSON-LD response
+                // including the canonical url field — something provider.resolve() does not
+                // surface. This is intentionally a structural cast rather than a typed
+                // dependency on EditorCardProvider's private API.
+                clientHolder = provider;
+                client = clientHolder.cardClient;
+                if (client) {
+                  _context2.next = 10;
+                  break;
+                }
+                return _context2.abrupt("return", undefined);
+              case 10:
+                _context2.next = 12;
+                return client.fetchData(url);
+              case 12:
+                response = _context2.sent;
+                // ORS returns a JsonLd.Response whose data union includes BaseData,
+                // BaseCollectionData, and BaseCollectionPage. We only care about the
+                // `url` field which is present on BaseData (Primitives.Object). Cast
+                // to a minimal shape rather than accessing through the full union type.
+                data = response === null || response === void 0 ? void 0 : response.data;
+                if (data) {
+                  _context2.next = 16;
+                  break;
+                }
+                return _context2.abrupt("return", undefined);
+              case 16:
+                urlField = data.url; // Property<string | Link> can be a string, a Link object, or an array.
+                // Short-link responses always return a plain string URL.
+                if (!(typeof urlField === 'string' && urlField !== url)) {
+                  _context2.next = 19;
+                  break;
+                }
+                return _context2.abrupt("return", urlField);
+              case 19:
+                if (!(urlField && (0, _typeof2.default)(urlField) === 'object' && !Array.isArray(urlField))) {
+                  _context2.next = 24;
+                  break;
+                }
+                linkObj = urlField;
+                id = (_linkObj$Id = linkObj['@id']) !== null && _linkObj$Id !== void 0 ? _linkObj$Id : linkObj['href'];
+                if (!(typeof id === 'string' && id !== url)) {
+                  _context2.next = 24;
+                  break;
+                }
+                return _context2.abrupt("return", id);
+              case 24:
+                _context2.next = 28;
+                break;
+              case 26:
+                _context2.prev = 26;
+                _context2.t0 = _context2["catch"](2);
+              case 28:
+                return _context2.abrupt("return", undefined);
+              case 29:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2, null, [[2, 26]]);
+        }));
+        function resolveShortLinkUrl(_x2) {
+          return _resolveShortLinkUrl.apply(this, arguments);
+        }
+        return resolveShortLinkUrl;
+      }(),
       getStartingToolbarItems: (0, _toolbar.getStartingToolbarItems)(options, api),
       getEndingToolbarItems: (0, _toolbar.getEndingToolbarItems)(options, api)
     },

package/dist/cjs/pm-plugins/doc.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.updateCardViaDatasource = exports.updateCard = exports.setSelectedCardAppearance = exports.replaceQueuedUrlWithCard = exports.queueCardsFromChangedTr = exports.queueCardFromChangedTr = exports.insertDatasource = exports.handleFallbackWithAnalytics = exports.getLinkNodeType = exports.getAttrsForAppearance = exports.convertHyperlinkToSmartCard = exports.changeSelectedCardToText = exports.changeSelectedCardToLinkFallback = exports.changeSelectedCardToLink = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -14,6 +15,7 @@ var _card = require("@atlaskit/editor-common/card");
 var _link = require("@atlaskit/editor-common/link");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorHistory = require("@atlaskit/prosemirror-history");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = require("./actions");
@@ -78,13 +80,41 @@ var replaceQueuedUrlWithCard = exports.replaceQueuedUrlWithCard = function repla
 
     // If an embed card transformer is provided and the resolved card is an embedCard,
     // attempt to transform it into an alternative node representation first.
-    if (cardData.type === 'embedCard' && embedCardNodeTransformer) {
-      var _embedCardNodeTransfo;
-      cardAdf = (_embedCardNodeTransfo = embedCardNodeTransformer(schema, cardData.attrs)) !== null && _embedCardNodeTransfo !== void 0 ? _embedCardNodeTransfo : null;
+    if (cardData.type === 'embedCard' && embedCardNodeTransformer && (0, _platformFeatureFlags.fg)('platform-native-embeds-short-link-expansion')) {
+      var transformResult = embedCardNodeTransformer(schema, cardData.attrs);
+      // The transformer may return a Promise for async transformations (e.g. short-link expansion).
+      // When async, we snapshot the current requests and positions now (before any dispatch),
+      // then insert the resolved node and clean up the queue in one transaction once the
+      // Promise settles. This avoids the stale-editorState problem: rather than re-running
+      // replaceQueuedUrlWithCard with an outdated state snapshot, we capture what we need
+      // immediately and apply a targeted insert when ready.
+      if (transformResult instanceof Promise) {
+        // Snapshot requests now, while the queue still contains this URL.
+        var pendingRequests = (0, _toConsumableArray2.default)(requests);
+        transformResult.then(function (resolvedNode) {
+          var _processRawValue;
+          if (!dispatch) {
+            return;
+          }
+          // Build a fresh transaction (editorState is the snapshot at call-time; positions
+          // are mapped through it). For the async case we fall back to cardData if the
+          // transform returned nothing, mirroring what the sync path would do.
+          var asyncCardAdf = resolvedNode ? resolvedNode : (_processRawValue = (0, _utils.processRawValue)(schema, cardData)) !== null && _processRawValue !== void 0 ? _processRawValue : null;
+          var asyncTr = editorState.tr;
+          if (asyncCardAdf) {
+            pendingRequests.forEach(function (request) {
+              return replaceLinksToCards(asyncTr, asyncCardAdf, schema, request);
+            });
+          }
+          dispatch((0, _actions.resolveCard)(url)((0, _prosemirrorHistory.closeHistory)(asyncTr)));
+        });
+        return true;
+      }
+      cardAdf = transformResult !== null && transformResult !== void 0 ? transformResult : null;
     }
     if (!cardAdf) {
-      var _processRawValue;
-      cardAdf = (_processRawValue = (0, _utils.processRawValue)(schema, cardData)) !== null && _processRawValue !== void 0 ? _processRawValue : null;
+      var _processRawValue2;
+      cardAdf = (_processRawValue2 = (0, _utils.processRawValue)(schema, cardData)) !== null && _processRawValue2 !== void 0 ? _processRawValue2 : null;
     }
     var tr = editorState.tr;
     if (cardAdf) {

package/dist/cjs/ui/EditorLinkingPlatformAnalytics/index.js

@@ -12,7 +12,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _react = _interopRequireDefault(require("react"));
 var _linkProvider = require("@atlaskit/link-provider");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _EditorAnalyticsContext = require("../EditorAnalyticsContext");
 var _DatasourceEvents = require("./DatasourceEvents");
 var _LinkEvents = require("./LinkEvents");
@@ -28,7 +27,7 @@ var EditorLinkingPlatformAnalytics = exports.EditorLinkingPlatformAnalytics = /*
   return (0, _createClass2.default)(EditorLinkingPlatformAnalytics, [{
     key: "render",
     value: function render() {
-      if ((0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) && !this.props.editorView) {
+      if (!this.props.editorView) {
         return null;
       }
       return /*#__PURE__*/_react.default.createElement(_linkProvider.EditorSmartCardProvider, null, /*#__PURE__*/_react.default.createElement(_linkProvider.EditorSmartCardProviderValueGuard, null, /*#__PURE__*/_react.default.createElement(_EditorAnalyticsContext.EditorAnalyticsContext, {

package/dist/cjs/ui/EditorSmartCardEvents.js

@@ -6,13 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.EditorSmartCardEvents = void 0;
 var _react = require("react");
 var _smartCard = require("@atlaskit/smart-card");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _actions = require("../pm-plugins/actions");
 var EditorSmartCardEvents = exports.EditorSmartCardEvents = function EditorSmartCardEvents(_ref) {
   var editorView = _ref.editorView;
   var events = (0, _smartCard.useSmartLinkEvents)();
   (0, _react.useEffect)(function () {
-    if (!events || (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) && !editorView) {
+    if (!events || !editorView) {
       return;
     }
     editorView.dispatch((0, _actions.registerSmartCardEvents)(events)(editorView.state.tr));

package/dist/es2019/cardPlugin.js

@@ -151,6 +151,51 @@ export const cardPlugin = ({
       registerEmbedCardTransformer: transformers => {
         instanceEmbedCardTransformers = transformers;
       },
+      resolveShortLinkUrl: async url => {
+        if (!options.provider) {
+          return undefined;
+        }
+        try {
+          const provider = await options.provider;
+          // EditorCardProvider holds a CardClient instance internally. We access it
+          // directly to call fetchData, which gives us the raw ORS JSON-LD response
+          // including the canonical url field — something provider.resolve() does not
+          // surface. This is intentionally a structural cast rather than a typed
+          // dependency on EditorCardProvider's private API.
+          const clientHolder = provider;
+          const client = clientHolder.cardClient;
+          if (!client) {
+            return undefined;
+          }
+          const response = await client.fetchData(url);
+          // ORS returns a JsonLd.Response whose data union includes BaseData,
+          // BaseCollectionData, and BaseCollectionPage. We only care about the
+          // `url` field which is present on BaseData (Primitives.Object). Cast
+          // to a minimal shape rather than accessing through the full union type.
+          const data = response === null || response === void 0 ? void 0 : response.data;
+          if (!data) {
+            return undefined;
+          }
+          const urlField = data.url;
+          // Property<string | Link> can be a string, a Link object, or an array.
+          // Short-link responses always return a plain string URL.
+          if (typeof urlField === 'string' && urlField !== url) {
+            return urlField;
+          }
+          // Fallback: Link object shape with href or @id
+          if (urlField && typeof urlField === 'object' && !Array.isArray(urlField)) {
+            var _linkObj$Id;
+            const linkObj = urlField;
+            const id = (_linkObj$Id = linkObj['@id']) !== null && _linkObj$Id !== void 0 ? _linkObj$Id : linkObj['href'];
+            if (typeof id === 'string' && id !== url) {
+              return id;
+            }
+          }
+        } catch {
+          // Swallow errors — callers handle undefined
+        }
+        return undefined;
+      },
       getStartingToolbarItems: getStartingToolbarItems(options, api),
       getEndingToolbarItems: getEndingToolbarItems(options, api)
     },

package/dist/es2019/pm-plugins/doc.js

@@ -5,6 +5,7 @@ import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { getActiveLinkMark } from '@atlaskit/editor-common/link';
 import { getAnnotationMarksForPos, getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged, processRawValue } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { closeHistory } from '@atlaskit/prosemirror-history';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { hideDatasourceModal, queueCards, removeDatasourceStash, resolveCard, setDatasourceStash } from './actions';
@@ -69,13 +70,39 @@ export const replaceQueuedUrlWithCard = (url, cardData, analyticsAction, editorA
 
   // If an embed card transformer is provided and the resolved card is an embedCard,
   // attempt to transform it into an alternative node representation first.
-  if (cardData.type === 'embedCard' && embedCardNodeTransformer) {
-    var _embedCardNodeTransfo;
-    cardAdf = (_embedCardNodeTransfo = embedCardNodeTransformer(schema, cardData.attrs)) !== null && _embedCardNodeTransfo !== void 0 ? _embedCardNodeTransfo : null;
+  if (cardData.type === 'embedCard' && embedCardNodeTransformer && fg('platform-native-embeds-short-link-expansion')) {
+    const transformResult = embedCardNodeTransformer(schema, cardData.attrs);
+    // The transformer may return a Promise for async transformations (e.g. short-link expansion).
+    // When async, we snapshot the current requests and positions now (before any dispatch),
+    // then insert the resolved node and clean up the queue in one transaction once the
+    // Promise settles. This avoids the stale-editorState problem: rather than re-running
+    // replaceQueuedUrlWithCard with an outdated state snapshot, we capture what we need
+    // immediately and apply a targeted insert when ready.
+    if (transformResult instanceof Promise) {
+      // Snapshot requests now, while the queue still contains this URL.
+      const pendingRequests = [...requests];
+      transformResult.then(resolvedNode => {
+        var _processRawValue;
+        if (!dispatch) {
+          return;
+        }
+        // Build a fresh transaction (editorState is the snapshot at call-time; positions
+        // are mapped through it). For the async case we fall back to cardData if the
+        // transform returned nothing, mirroring what the sync path would do.
+        const asyncCardAdf = resolvedNode ? resolvedNode : (_processRawValue = processRawValue(schema, cardData)) !== null && _processRawValue !== void 0 ? _processRawValue : null;
+        const asyncTr = editorState.tr;
+        if (asyncCardAdf) {
+          pendingRequests.forEach(request => replaceLinksToCards(asyncTr, asyncCardAdf, schema, request));
+        }
+        dispatch(resolveCard(url)(closeHistory(asyncTr)));
+      });
+      return true;
+    }
+    cardAdf = transformResult !== null && transformResult !== void 0 ? transformResult : null;
   }
   if (!cardAdf) {
-    var _processRawValue;
-    cardAdf = (_processRawValue = processRawValue(schema, cardData)) !== null && _processRawValue !== void 0 ? _processRawValue : null;
+    var _processRawValue2;
+    cardAdf = (_processRawValue2 = processRawValue(schema, cardData)) !== null && _processRawValue2 !== void 0 ? _processRawValue2 : null;
   }
   const tr = editorState.tr;
   if (cardAdf) {

package/dist/es2019/ui/EditorLinkingPlatformAnalytics/index.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { EditorSmartCardProvider, EditorSmartCardProviderValueGuard } from '@atlaskit/link-provider';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { EditorAnalyticsContext } from '../EditorAnalyticsContext';
 import { DatasourceEventsBinding } from './DatasourceEvents';
 import { LinkEventsBinding } from './LinkEvents';
@@ -8,7 +7,7 @@ import { LinkEventsBinding } from './LinkEvents';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class EditorLinkingPlatformAnalytics extends React.PureComponent {
   render() {
-    if (expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) && !this.props.editorView) {
+    if (!this.props.editorView) {
       return null;
     }
     return /*#__PURE__*/React.createElement(EditorSmartCardProvider, null, /*#__PURE__*/React.createElement(EditorSmartCardProviderValueGuard, null, /*#__PURE__*/React.createElement(EditorAnalyticsContext, {

package/dist/es2019/ui/EditorSmartCardEvents.js

@@ -1,13 +1,12 @@
 import { useEffect } from 'react';
 import { useSmartLinkEvents } from '@atlaskit/smart-card';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { registerSmartCardEvents } from '../pm-plugins/actions';
 export const EditorSmartCardEvents = ({
   editorView
 }) => {
   const events = useSmartLinkEvents();
   useEffect(() => {
-    if (!events || expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) && !editorView) {
+    if (!events || !editorView) {
       return;
     }
     editorView.dispatch(registerSmartCardEvents(events)(editorView.state.tr));

package/dist/esm/cardPlugin.js

@@ -1,3 +1,4 @@
+import _typeof from "@babel/runtime/helpers/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -167,6 +168,89 @@ export var cardPlugin = function cardPlugin(_ref) {
       registerEmbedCardTransformer: function registerEmbedCardTransformer(transformers) {
         instanceEmbedCardTransformers = transformers;
       },
+      resolveShortLinkUrl: function () {
+        var _resolveShortLinkUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url) {
+          var provider, clientHolder, client, response, data, urlField, _linkObj$Id, linkObj, id;
+          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                if (options.provider) {
+                  _context2.next = 2;
+                  break;
+                }
+                return _context2.abrupt("return", undefined);
+              case 2:
+                _context2.prev = 2;
+                _context2.next = 5;
+                return options.provider;
+              case 5:
+                provider = _context2.sent;
+                // EditorCardProvider holds a CardClient instance internally. We access it
+                // directly to call fetchData, which gives us the raw ORS JSON-LD response
+                // including the canonical url field — something provider.resolve() does not
+                // surface. This is intentionally a structural cast rather than a typed
+                // dependency on EditorCardProvider's private API.
+                clientHolder = provider;
+                client = clientHolder.cardClient;
+                if (client) {
+                  _context2.next = 10;
+                  break;
+                }
+                return _context2.abrupt("return", undefined);
+              case 10:
+                _context2.next = 12;
+                return client.fetchData(url);
+              case 12:
+                response = _context2.sent;
+                // ORS returns a JsonLd.Response whose data union includes BaseData,
+                // BaseCollectionData, and BaseCollectionPage. We only care about the
+                // `url` field which is present on BaseData (Primitives.Object). Cast
+                // to a minimal shape rather than accessing through the full union type.
+                data = response === null || response === void 0 ? void 0 : response.data;
+                if (data) {
+                  _context2.next = 16;
+                  break;
+                }
+                return _context2.abrupt("return", undefined);
+              case 16:
+                urlField = data.url; // Property<string | Link> can be a string, a Link object, or an array.
+                // Short-link responses always return a plain string URL.
+                if (!(typeof urlField === 'string' && urlField !== url)) {
+                  _context2.next = 19;
+                  break;
+                }
+                return _context2.abrupt("return", urlField);
+              case 19:
+                if (!(urlField && _typeof(urlField) === 'object' && !Array.isArray(urlField))) {
+                  _context2.next = 24;
+                  break;
+                }
+                linkObj = urlField;
+                id = (_linkObj$Id = linkObj['@id']) !== null && _linkObj$Id !== void 0 ? _linkObj$Id : linkObj['href'];
+                if (!(typeof id === 'string' && id !== url)) {
+                  _context2.next = 24;
+                  break;
+                }
+                return _context2.abrupt("return", id);
+              case 24:
+                _context2.next = 28;
+                break;
+              case 26:
+                _context2.prev = 26;
+                _context2.t0 = _context2["catch"](2);
+              case 28:
+                return _context2.abrupt("return", undefined);
+              case 29:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2, null, [[2, 26]]);
+        }));
+        function resolveShortLinkUrl(_x2) {
+          return _resolveShortLinkUrl.apply(this, arguments);
+        }
+        return resolveShortLinkUrl;
+      }(),
       getStartingToolbarItems: getStartingToolbarItems(options, api),
       getEndingToolbarItems: getEndingToolbarItems(options, api)
     },

package/dist/esm/pm-plugins/doc.js

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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 isEqual from 'lodash/isEqual';
@@ -9,6 +10,7 @@ import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { getActiveLinkMark } from '@atlaskit/editor-common/link';
 import { getAnnotationMarksForPos, getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged, processRawValue } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { closeHistory } from '@atlaskit/prosemirror-history';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { hideDatasourceModal, queueCards, removeDatasourceStash, resolveCard, setDatasourceStash } from './actions';
@@ -72,13 +74,41 @@ export var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, car
 
     // If an embed card transformer is provided and the resolved card is an embedCard,
     // attempt to transform it into an alternative node representation first.
-    if (cardData.type === 'embedCard' && embedCardNodeTransformer) {
-      var _embedCardNodeTransfo;
-      cardAdf = (_embedCardNodeTransfo = embedCardNodeTransformer(schema, cardData.attrs)) !== null && _embedCardNodeTransfo !== void 0 ? _embedCardNodeTransfo : null;
+    if (cardData.type === 'embedCard' && embedCardNodeTransformer && fg('platform-native-embeds-short-link-expansion')) {
+      var transformResult = embedCardNodeTransformer(schema, cardData.attrs);
+      // The transformer may return a Promise for async transformations (e.g. short-link expansion).
+      // When async, we snapshot the current requests and positions now (before any dispatch),
+      // then insert the resolved node and clean up the queue in one transaction once the
+      // Promise settles. This avoids the stale-editorState problem: rather than re-running
+      // replaceQueuedUrlWithCard with an outdated state snapshot, we capture what we need
+      // immediately and apply a targeted insert when ready.
+      if (transformResult instanceof Promise) {
+        // Snapshot requests now, while the queue still contains this URL.
+        var pendingRequests = _toConsumableArray(requests);
+        transformResult.then(function (resolvedNode) {
+          var _processRawValue;
+          if (!dispatch) {
+            return;
+          }
+          // Build a fresh transaction (editorState is the snapshot at call-time; positions
+          // are mapped through it). For the async case we fall back to cardData if the
+          // transform returned nothing, mirroring what the sync path would do.
+          var asyncCardAdf = resolvedNode ? resolvedNode : (_processRawValue = processRawValue(schema, cardData)) !== null && _processRawValue !== void 0 ? _processRawValue : null;
+          var asyncTr = editorState.tr;
+          if (asyncCardAdf) {
+            pendingRequests.forEach(function (request) {
+              return replaceLinksToCards(asyncTr, asyncCardAdf, schema, request);
+            });
+          }
+          dispatch(resolveCard(url)(closeHistory(asyncTr)));
+        });
+        return true;
+      }
+      cardAdf = transformResult !== null && transformResult !== void 0 ? transformResult : null;
     }
     if (!cardAdf) {
-      var _processRawValue;
-      cardAdf = (_processRawValue = processRawValue(schema, cardData)) !== null && _processRawValue !== void 0 ? _processRawValue : null;
+      var _processRawValue2;
+      cardAdf = (_processRawValue2 = processRawValue(schema, cardData)) !== null && _processRawValue2 !== void 0 ? _processRawValue2 : null;
     }
     var tr = editorState.tr;
     if (cardAdf) {

package/dist/esm/ui/EditorLinkingPlatformAnalytics/index.js

@@ -7,7 +7,6 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
 import { EditorSmartCardProvider, EditorSmartCardProviderValueGuard } from '@atlaskit/link-provider';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { EditorAnalyticsContext } from '../EditorAnalyticsContext';
 import { DatasourceEventsBinding } from './DatasourceEvents';
 import { LinkEventsBinding } from './LinkEvents';
@@ -22,7 +21,7 @@ export var EditorLinkingPlatformAnalytics = /*#__PURE__*/function (_React$PureCo
   return _createClass(EditorLinkingPlatformAnalytics, [{
     key: "render",
     value: function render() {
-      if (expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) && !this.props.editorView) {
+      if (!this.props.editorView) {
         return null;
       }
       return /*#__PURE__*/React.createElement(EditorSmartCardProvider, null, /*#__PURE__*/React.createElement(EditorSmartCardProviderValueGuard, null, /*#__PURE__*/React.createElement(EditorAnalyticsContext, {

package/dist/esm/ui/EditorSmartCardEvents.js

@@ -1,12 +1,11 @@
 import { useEffect } from 'react';
 import { useSmartLinkEvents } from '@atlaskit/smart-card';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { registerSmartCardEvents } from '../pm-plugins/actions';
 export var EditorSmartCardEvents = function EditorSmartCardEvents(_ref) {
   var editorView = _ref.editorView;
   var events = useSmartLinkEvents();
   useEffect(function () {
-    if (!events || expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) && !editorView) {
+    if (!events || !editorView) {
       return;
     }
     editorView.dispatch(registerSmartCardEvents(events)(editorView.state.tr));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "16.1.0",
+	"version": "16.3.0",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,18 +41,18 @@
 		"@atlaskit/editor-plugin-editor-viewmode": "^12.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^9.0.0",
 		"@atlaskit/editor-plugin-floating-toolbar": "^12.0.0",
-		"@atlaskit/editor-plugin-grid": "^10.0.0",
+		"@atlaskit/editor-plugin-grid": "^10.1.0",
 		"@atlaskit/editor-plugin-toolbar": "^7.0.0",
 		"@atlaskit/editor-plugin-width": "^11.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-smart-link-draggable": "^0.5.0",
 		"@atlaskit/frontend-utilities": "^3.2.0",
-		"@atlaskit/icon": "^34.2.0",
+		"@atlaskit/icon": "^34.3.0",
 		"@atlaskit/link": "^3.4.0",
 		"@atlaskit/link-analytics": "^11.0.0",
 		"@atlaskit/link-client-extension": "^6.0.0",
-		"@atlaskit/link-datasource": "^5.1.0",
+		"@atlaskit/link-datasource": "^5.2.0",
 		"@atlaskit/link-extractors": "^2.4.0",
 		"@atlaskit/linking-common": "^9.11.0",
 		"@atlaskit/linking-types": "^14.2.0",
@@ -62,7 +62,7 @@
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/smart-card": "^44.3.0",
-		"@atlaskit/tmp-editor-statsig": "^64.0.0",
+		"@atlaskit/tmp-editor-statsig": "^66.0.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -72,7 +72,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.6.0",
+		"@atlaskit/editor-common": "^114.7.0",
 		"@atlaskit/link-provider": "^4.3.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -111,6 +111,9 @@
 		}
 	},
 	"platform-feature-flags": {
+		"platform-native-embeds-short-link-expansion": {
+			"type": "boolean"
+		},
 		"cc_drag_and_drop_smart_link_from_content_to_tree": {
 			"type": "boolean"
 		},