@atlaskit/editor-plugin-card 35.0.1 → 35.1.1

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atlaskit/editor-plugin-card
 
+## 35.1.1
+
+### Patch Changes
+
+- [`deffb3655ce41`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/deffb3655ce41) -
+  Add platform_native_embeds_rollout_all_products alongside the existing non-MAUI rollout gate so
+  native embeds can roll out independently across host products.
+- Updated dependencies
+
+## 35.1.0
+
+### Minor Changes
+
+- [`f268dee2526f7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f268dee2526f7) -
+  Migrate Smart Card registration and removal from transactions to editor actions behind
+  `platform_editor_reduce_forced_layout_2`. Remove unused card overlay registration behind
+  `platform_editor_reduce_forced_layout_2`.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 35.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 35.0.1
 
 ### Patch Changes

package/dist/cjs/actions/cardRegistry.js

@@ -0,0 +1,65 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createCardRegistry = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (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; }
+/**
+ * Creates a registry of resolved cards, for use with editor actions.
+ * Registration changes (insertion, deletion, and id/title/url updates) notify subscribers; live position changes do not.
+ *
+ * @returns A registry object with the following methods:
+ * - `getCardRegistrations`: Returns the current registrations, keyed by card ID.
+ * - `registerCard`: Adds or updates a card.
+ * - `removeCard`: Removes a card by ID.
+ * - `subscribe`: Registers a change listener and returns an unsubscribe function.
+ */
+var createCardRegistry = exports.createCardRegistry = function createCardRegistry() {
+  // Replace registrations on each change to notify subscribers and trigger React updates.
+  var registrations = {};
+  var listeners = new Set();
+  var getCardRegistrations = function getCardRegistrations() {
+    return registrations;
+  };
+  var notify = function notify() {
+    Array.from(listeners).forEach(function (listener) {
+      return listener();
+    });
+  };
+  var registerCard = function registerCard(info) {
+    if (info.getPos() === undefined) {
+      return;
+    }
+    var previous = registrations[info.id];
+    if (previous && previous.getPos === info.getPos && previous.title === info.title && previous.url === info.url) {
+      return; // Don't mutate registrations if no change
+    }
+    registrations = _objectSpread(_objectSpread({}, registrations), {}, (0, _defineProperty2.default)({}, info.id, _objectSpread({}, info)));
+    notify();
+  };
+  var removeCard = function removeCard(id) {
+    if (!registrations[id]) {
+      return;
+    }
+    var next = _objectSpread({}, registrations);
+    delete next[id];
+    registrations = next;
+    notify();
+  };
+  var subscribe = function subscribe(listener) {
+    listeners.add(listener);
+    return function () {
+      listeners.delete(listener);
+    };
+  };
+  return {
+    registerCard: registerCard,
+    removeCard: removeCard,
+    subscribe: subscribe,
+    getCardRegistrations: getCardRegistrations
+  };
+};

package/dist/cjs/actions/useCardRegistry.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useCardRegistry = void 0;
+var _react = require("react");
+var emptySnapshot = function emptySnapshot() {
+  return undefined;
+};
+var emptySubscription = function emptySubscription() {
+  return function () {};
+};
+
+/** Subscribe to resolved card metadata without observing every editor transaction. */
+var useCardRegistry = exports.useCardRegistry = function useCardRegistry(actions) {
+  var _actions$subscribeToC, _actions$getCardRegis;
+  return (0, _react.useSyncExternalStore)((_actions$subscribeToC = actions === null || actions === void 0 ? void 0 : actions.subscribeToCardRegistry) !== null && _actions$subscribeToC !== void 0 ? _actions$subscribeToC : emptySubscription, (_actions$getCardRegis = actions === null || actions === void 0 ? void 0 : actions.getCardRegistrations) !== null && _actions$getCardRegis !== void 0 ? _actions$getCardRegis : emptySnapshot, emptySnapshot);
+};

package/dist/cjs/cardPlugin.js

@@ -20,6 +20,7 @@ var _context3 = require("@atlaskit/link-provider/context");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
+var _cardRegistry = require("./actions/cardRegistry");
 var _blockCard = require("./nodeviews/toDOM-fixes/blockCard");
 var _embedCard = require("./nodeviews/toDOM-fixes/embedCard");
 var _inlineCard = require("./nodeviews/toDOM-fixes/inlineCard");
@@ -57,6 +58,7 @@ var cardPlugin = exports.cardPlugin = function cardPlugin(_ref2) {
   var _ref2$config = _ref2.config,
     options = _ref2$config === void 0 ? {} : _ref2$config,
     api = _ref2.api;
+  var cardRegistry = (0, _cardRegistry.createCardRegistry)();
   var previousCardProvider;
   var cardPluginEvents = (0, _createEventsQueue.createEventsQueue)();
   var isRegisteredSlashCommandEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_command');
@@ -215,6 +217,10 @@ var cardPlugin = exports.cardPlugin = function cardPlugin(_ref2) {
       }
     },
     actions: {
+      registerCard: cardRegistry.registerCard,
+      removeRegisteredCard: cardRegistry.removeCard,
+      getCardRegistrations: cardRegistry.getCardRegistrations,
+      subscribeToCardRegistry: cardRegistry.subscribe,
       setProvider: function () {
         var _setProvider2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(providerPromise) {
           var _api$core$actions$exe;

package/dist/cjs/nodeviews/blockCard.js

@@ -52,16 +52,32 @@ var BlockCardComponent = exports.BlockCardComponent = /*#__PURE__*/function (_Re
       // don't dispatch immediately since we might be in the middle of
       // rendering a nodeview
       var scheduleRegisterCard = (0, _rafSchd.default)(function () {
-        var pos = getPos();
-        if (typeof pos !== 'number') {
-          return;
+        if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2')) {
+          var _pluginInjectionApi$c;
+          if (_this.removeCardDispatched || getPos() === undefined) {
+            return;
+          }
+          var _this$props2 = _this.props,
+            pluginInjectionApi = _this$props2.pluginInjectionApi,
+            id = _this$props2.id;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.card.actions) === null || _pluginInjectionApi$c === void 0 || _pluginInjectionApi$c.registerCard({
+            id: id,
+            title: title,
+            url: url,
+            getPos: getPos
+          });
+        } else {
+          var pos = getPos();
+          if (typeof pos !== 'number') {
+            return;
+          }
+          view.dispatch((0, _actions.registerCard)({
+            title: title,
+            url: url,
+            pos: pos,
+            id: _this.props.id
+          })(view.state.tr));
         }
-        view.dispatch((0, _actions.registerCard)({
-          title: title,
-          url: url,
-          pos: pos,
-          id: _this.props.id
-        })(view.state.tr));
       });
       if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_memory_leaks')) {
         _this.pendingRegisterCard = scheduleRegisterCard;
@@ -112,22 +128,30 @@ var BlockCardComponent = exports.BlockCardComponent = /*#__PURE__*/function (_Re
         return;
       }
       this.removeCardDispatched = true;
-      var tr = this.props.view.state.tr;
-      (0, _actions.removeCard)({
-        id: this.props.id
-      })(tr);
-      this.props.view.dispatch(tr);
+      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2')) {
+        var _pluginInjectionApi$c2;
+        var _this$props3 = this.props,
+          pluginInjectionApi = _this$props3.pluginInjectionApi,
+          id = _this$props3.id;
+        pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.card.actions) === null || _pluginInjectionApi$c2 === void 0 || _pluginInjectionApi$c2.removeRegisteredCard(id);
+      } else {
+        var tr = this.props.view.state.tr;
+        (0, _actions.removeCard)({
+          id: this.props.id
+        })(tr);
+        this.props.view.dispatch(tr);
+      }
     }
   }, {
     key: "render",
     value: function render() {
-      var _this$props2 = this.props,
-        node = _this$props2.node,
-        cardContext = _this$props2.cardContext,
-        actionOptions = _this$props2.actionOptions,
-        onClick = _this$props2.onClick,
-        CompetitorPrompt = _this$props2.CompetitorPrompt,
-        isPageSSRed = _this$props2.isPageSSRed;
+      var _this$props4 = this.props,
+        node = _this$props4.node,
+        cardContext = _this$props4.cardContext,
+        actionOptions = _this$props4.actionOptions,
+        onClick = _this$props4.onClick,
+        CompetitorPrompt = _this$props4.CompetitorPrompt,
+        isPageSSRed = _this$props4.isPageSSRed;
       var _node$attrs = node.attrs,
         url = _node$attrs.url,
         data = _node$attrs.data;

package/dist/cjs/nodeviews/embedCard.js

@@ -187,16 +187,32 @@ var EmbedCardComponent = exports.EmbedCardComponent = /*#__PURE__*/function (_Re
       // don't dispatch immediately since we might be in the middle of
       // rendering a nodeview
       (0, _rafSchd.default)(function () {
-        var pos = _this.getPosSafely();
-        if (pos === undefined) {
-          return;
+        if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2')) {
+          var _pluginInjectionApi$c;
+          if (_this.removeCardDispatched || _this.getPosSafely() === undefined) {
+            return;
+          }
+          var _this$props = _this.props,
+            pluginInjectionApi = _this$props.pluginInjectionApi,
+            id = _this$props.id;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.card.actions) === null || _pluginInjectionApi$c === void 0 || _pluginInjectionApi$c.registerCard({
+            id: id,
+            title: title,
+            url: url,
+            getPos: _this.getPosSafely
+          });
+        } else {
+          var pos = _this.getPosSafely();
+          if (pos === undefined) {
+            return;
+          }
+          return view.dispatch((0, _actions.registerCard)({
+            title: title,
+            url: url,
+            pos: pos,
+            id: _this.props.id
+          })(view.state.tr));
         }
-        return view.dispatch((0, _actions.registerCard)({
-          title: title,
-          url: url,
-          pos: pos,
-          id: _this.props.id
-        })(view.state.tr));
       })();
       try {
         var _this$props$cardConte, _this$props$cardConte2;
@@ -331,27 +347,35 @@ var EmbedCardComponent = exports.EmbedCardComponent = /*#__PURE__*/function (_Re
         return;
       }
       this.removeCardDispatched = true;
-      var tr = this.props.view.state.tr;
-      (0, _actions.removeCard)({
-        id: this.props.id
-      })(tr);
-      this.props.view.dispatch(tr);
+      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2')) {
+        var _pluginInjectionApi$c2;
+        var _this$props2 = this.props,
+          pluginInjectionApi = _this$props2.pluginInjectionApi,
+          id = _this$props2.id;
+        pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.card.actions) === null || _pluginInjectionApi$c2 === void 0 || _pluginInjectionApi$c2.removeRegisteredCard(id);
+      } else {
+        var tr = this.props.view.state.tr;
+        (0, _actions.removeCard)({
+          id: this.props.id
+        })(tr);
+        this.props.view.dispatch(tr);
+      }
     }
   }, {
     key: "render",
     value: function render() {
-      var _this$props = this.props,
-        node = _this$props.node,
-        allowResizing = _this$props.allowResizing,
-        fullWidthMode = _this$props.fullWidthMode,
-        view = _this$props.view,
-        dispatchAnalyticsEvent = _this$props.dispatchAnalyticsEvent,
-        getPos = _this$props.getPos,
-        pluginInjectionApi = _this$props.pluginInjectionApi,
-        actionOptions = _this$props.actionOptions,
-        onClick = _this$props.onClick,
-        CompetitorPrompt = _this$props.CompetitorPrompt,
-        isPageSSRed = _this$props.isPageSSRed;
+      var _this$props3 = this.props,
+        node = _this$props3.node,
+        allowResizing = _this$props3.allowResizing,
+        fullWidthMode = _this$props3.fullWidthMode,
+        view = _this$props3.view,
+        dispatchAnalyticsEvent = _this$props3.dispatchAnalyticsEvent,
+        getPos = _this$props3.getPos,
+        pluginInjectionApi = _this$props3.pluginInjectionApi,
+        actionOptions = _this$props3.actionOptions,
+        onClick = _this$props3.onClick,
+        CompetitorPrompt = _this$props3.CompetitorPrompt,
+        isPageSSRed = _this$props3.isPageSSRed;
       var _node$attrs = node.attrs,
         url = _node$attrs.url,
         pctWidth = _node$attrs.width,

package/dist/cjs/nodeviews/inlineCardBase.js

@@ -53,6 +53,9 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
       }
     };
   }, []);
+  var cardActions = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions;
+  var registerResolvedCard = cardActions === null || cardActions === void 0 ? void 0 : cardActions.registerCard;
+  var removeRegisteredCard = cardActions === null || cardActions === void 0 ? void 0 : cardActions.removeRegisteredCard;
   var _ref2 = (cardContext === null || cardContext === void 0 || (_cardContext$value = cardContext.value) === null || _cardContext$value === void 0 ? void 0 : _cardContext$value.store) || {},
     getSmartlinkState = _ref2.getState;
   var cardState = getSmartlinkState === null || getSmartlinkState === void 0 ? void 0 : getSmartlinkState()[url || ''];
@@ -64,13 +67,17 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
         return;
       }
       removeCardDispatched.current = true;
-      var tr = view.state.tr;
-      (0, _actions.removeCard)({
-        id: id
-      })(tr);
-      view.dispatch(tr);
+      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2')) {
+        removeRegisteredCard === null || removeRegisteredCard === void 0 || removeRegisteredCard(id);
+      } else {
+        var tr = view.state.tr;
+        (0, _actions.removeCard)({
+          id: id
+        })(tr);
+        view.dispatch(tr);
+      }
     };
-  }, [getPos, view]);
+  }, [getPos, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') ? undefined : view, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') ? removeRegisteredCard : undefined]);
   var scrollContainer = (0, _react.useMemo)(function () {
     return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') && (0, _isIntersectionObserverSupported.isIntersectionObserverSupported)() ? undefined :
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
@@ -85,26 +92,40 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
     // don't dispatch immediately since we might be in the middle of
     // rendering a nodeview
     var scheduleRegisterCard = (0, _rafSchd.default)(function () {
-      // prosemirror-bump-fix
-      var pos = getPos();
-      if (typeof pos !== 'number') {
-        return;
+      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2')) {
+        if (removeCardDispatched.current || getPos() === undefined) {
+          return;
+        }
+        var id = refId.current;
+        registerResolvedCard === null || registerResolvedCard === void 0 || registerResolvedCard({
+          id: id,
+          title: title,
+          url: url,
+          getPos: getPos
+        });
+        onRes === null || onRes === void 0 || onRes(undefined, title);
+      } else {
+        // prosemirror-bump-fix
+        var pos = getPos();
+        if (typeof pos !== 'number') {
+          return;
+        }
+        var tr = view.state.tr;
+        (0, _actions.registerCard)({
+          title: title,
+          url: url,
+          pos: pos,
+          id: refId.current
+        })(tr);
+        onRes === null || onRes === void 0 || onRes(tr, title);
+        view.dispatch(tr);
       }
-      var tr = view.state.tr;
-      (0, _actions.registerCard)({
-        title: title,
-        url: url,
-        pos: pos,
-        id: refId.current
-      })(tr);
-      onRes === null || onRes === void 0 || onRes(tr, title);
-      view.dispatch(tr);
     });
     if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_memory_leaks')) {
       pendingRegisterCard.current = scheduleRegisterCard;
     }
     scheduleRegisterCard();
-  }, [getPos, view, onRes]);
+  }, [getPos, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') ? undefined : view, onRes, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') ? registerResolvedCard : undefined]);
   var onError = (0, _react.useCallback)(function (data) {
     var url = data.url,
       err = data.err;

package/dist/cjs/nodeviews/inlineCardWithAwareness.js

@@ -77,25 +77,29 @@ var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0,
     setIsResolvedViewRendered = _useState6[1];
   var editorAppearance = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.card.sharedState.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.editorAppearance;
   var destinationUrl = (0, _useSmartLinkDestinationUrl.useSmartLinkDestinationUrl)(node.attrs.url);
+
+  // Remove tr: Transaction | undefined parameter with platform_editor_reduce_forced_layout_2 cleanup.
   var onResolve = (0, _react.useCallback)(function (tr, title) {
-    var metadata = tr.getMeta(_pluginKey.pluginKey);
-    var removeOverlay = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_memory_leaks') ? createRemoveOverlay(setIsInsertedRef) : function () {
-      return setIsInserted(false);
-    };
-    if (metadata && metadata.type === 'REGISTER') {
-      (0, _actions.registerRemoveOverlay)(removeOverlay, metadata.info)(tr);
-    } else {
-      (0, _actions.registerRemoveOverlay)(removeOverlay)(tr);
+    if (tr) {
+      var metadata = tr.getMeta(_pluginKey.pluginKey);
+      var removeOverlay = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_memory_leaks') ? createRemoveOverlay(setIsInsertedRef) : function () {
+        return setIsInserted(false);
+      };
+      if (metadata && metadata.type === 'REGISTER') {
+        (0, _actions.registerRemoveOverlay)(removeOverlay, metadata.info)(tr);
+      } else {
+        (0, _actions.registerRemoveOverlay)(removeOverlay)(tr);
+      }
     }
     if (title) {
       setIsResolvedViewRendered(true);
     }
   }, []);
   var markMostRecentlyInsertedLink = (0, _react.useCallback)(function (isLinkMostRecentlyInserted) {
-    if (isOverlayEnabled) {
+    if (isOverlayEnabled && !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2')) {
       setIsInserted(isLinkMostRecentlyInserted);
     }
-  }, [isOverlayEnabled]);
+  }, [(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') ? undefined : isOverlayEnabled]);
   var setOverlayHoveredStyles = (0, _react.useCallback)(function (isHovered) {
     if (isOverlayEnabled) {
       setIsHovered(isHovered);

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

@@ -85,7 +85,7 @@ 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 && (0, _fg.fg)('platform_native_embeds_rollout_non_maui_experience')) {
+    if (cardData.type === 'embedCard' && embedCardNodeTransformer && ((0, _fg.fg)('platform_native_embeds_rollout_non_maui_experience') || (0, _fg.fg)('platform_native_embeds_rollout_all_products'))) {
       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),

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

@@ -35,14 +35,16 @@ var LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK = 'smart-link-upgrade-pulse';
 // Only the first resolved inline smart link is needed for PO spotlight targeting
 var MAX_RESOLVED_INLINE_SMART_LINKS = 1;
 var handleAwarenessOverlay = function handleAwarenessOverlay(view) {
-  var currentState = (0, _state2.getPluginState)(view.state);
-  var overlayCandidatePos = currentState === null || currentState === void 0 ? void 0 : currentState.overlayCandidatePosition;
-  if (overlayCandidatePos) {
-    var _currentState$removeO;
-    (_currentState$removeO = currentState.removeOverlay) === null || _currentState$removeO === void 0 || _currentState$removeO.call(currentState);
-    var tr = view.state.tr;
-    (0, _actions.clearOverlayCandidate)(tr);
-    view.dispatch(tr);
+  if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2')) {
+    var currentState = (0, _state2.getPluginState)(view.state);
+    var overlayCandidatePos = currentState === null || currentState === void 0 ? void 0 : currentState.overlayCandidatePosition;
+    if (overlayCandidatePos) {
+      var _currentState$removeO;
+      (_currentState$removeO = currentState.removeOverlay) === null || _currentState$removeO === void 0 || _currentState$removeO.call(currentState);
+      var tr = view.state.tr;
+      (0, _actions.clearOverlayCandidate)(tr);
+      view.dispatch(tr);
+    }
   }
 };
 var createPlugin = exports.createPlugin = function createPlugin(options, pluginInjectionApi) {
@@ -158,7 +160,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
           var linkPosition = pluginState.requests[0].pos;
           var canBeUpgradedToBlock = allowBlockCards && (0, _utils3.isBlockSupportedAtPosition)(linkPosition, prevEditorState, 'inline');
           var canBeUpgradedToEmbed = allowEmbeds && (0, _utils3.isEmbedSupportedAtPosition)(linkPosition, prevEditorState, 'inline');
-          if (canBeUpgradedToBlock || canBeUpgradedToEmbed) {
+          if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') && (canBeUpgradedToBlock || canBeUpgradedToEmbed)) {
             newState.overlayCandidatePosition = linkPosition;
           }
           if (!isSmartLinkPulseDiscovered && canBeUpgradedToEmbed) {

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

@@ -12,6 +12,7 @@ var _getResolvedAttributes = require("@atlaskit/link-analytics/get-resolved-attr
 var _assetsModal = require("@atlaskit/link-datasource/assets-modal");
 var _confluenceSearchModal = require("@atlaskit/link-datasource/confluence-search-modal");
 var _jiraIssuesModal = require("@atlaskit/link-datasource/jira-issues-modal");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _pluginKey = require("./plugin-key");
 var appearanceForNodeType = exports.appearanceForNodeType = function appearanceForNodeType(spec) {
   if (spec.name === 'inlineCard') {
@@ -50,14 +51,25 @@ var mergeCardInfo = exports.mergeCardInfo = function mergeCardInfo(titleUrlPair,
 var displayInfoForCard = exports.displayInfoForCard = function displayInfoForCard(node, info) {
   return mergeCardInfo(titleUrlPairFromNode(node), info);
 };
-var findCardInfo = exports.findCardInfo = function findCardInfo(state) {
-  var pluginState = _pluginKey.pluginKey.getState(state);
-  if (!pluginState) {
-    return undefined;
+var findCardInfo = exports.findCardInfo = function findCardInfo(state, cardActions) {
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2')) {
+    var _cardActions$getCardR, _cardActions$getCardR2;
+    var registrations = (_cardActions$getCardR = cardActions === null || cardActions === void 0 || (_cardActions$getCardR2 = cardActions.getCardRegistrations) === null || _cardActions$getCardR2 === void 0 ? void 0 : _cardActions$getCardR2.call(cardActions)) !== null && _cardActions$getCardR !== void 0 ? _cardActions$getCardR : {};
+    var card = Object.values(registrations).find(function (registration) {
+      return registration.getPos() === state.selection.from;
+    });
+    return card ? {
+      id: card.id,
+      title: card.title,
+      url: card.url,
+      pos: state.selection.from
+    } : undefined;
+  } else {
+    var pluginState = _pluginKey.pluginKey.getState(state);
+    return pluginState === null || pluginState === void 0 ? void 0 : pluginState.cards.find(function (cardInfo) {
+      return cardInfo.pos === state.selection.from;
+    });
   }
-  return pluginState.cards.find(function (cardInfo) {
-    return cardInfo.pos === state.selection.from;
-  });
 };
 var isAppearanceSupportedInParent = function isAppearanceSupportedInParent(currentNodePosition, editorState, fragment, currentAppearance) {
   var resolvedPosition = editorState.doc.resolve(currentNodePosition);

package/dist/cjs/ui/EditLinkToolbar.js

@@ -20,6 +20,7 @@ var _linkSearchConstants = require("@atlaskit/editor-common/link-search-constant
 var _HyperlinkAddToolbar = require("@atlaskit/editor-common/link/HyperlinkAddToolbar");
 var _linkToolbar = require("@atlaskit/editor-common/messages/link-toolbar");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _actions = require("../pm-plugins/actions");
 var _doc = require("../pm-plugins/doc");
 var _utils2 = require("../pm-plugins/utils");
@@ -170,7 +171,7 @@ var buildEditLinkToolbar = exports.buildEditLinkToolbar = function buildEditLink
       if (!view || !providerFactory) {
         return null;
       }
-      var displayInfo = (0, _utils2.displayInfoForCard)(node, (0, _utils2.findCardInfo)(view.state));
+      var displayInfo = (0, _utils2.displayInfoForCard)(node, (0, _utils2.findCardInfo)(view.state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions));
       return /*#__PURE__*/_react.default.createElement(EditLinkToolbar, {
         key: idx,
         view: view,
@@ -184,8 +185,9 @@ var buildEditLinkToolbar = exports.buildEditLinkToolbar = function buildEditLink
         // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
         ,
         onSubmit: function onSubmit(newHref, newText, inputMethod, analytic) {
-          var urlChanged = newHref !== displayInfo.url;
-          var titleChanged = newText !== displayInfo.title;
+          var currentDisplayInfo = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') ? (0, _utils2.displayInfoForCard)(node, (0, _utils2.findCardInfo)(view.state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions)) : displayInfo;
+          var urlChanged = newHref !== currentDisplayInfo.url;
+          var titleChanged = newText !== currentDisplayInfo.title;
 
           // If the title is changed in a smartlink, convert to standard blue hyperlink
           // (even if the url was also changed) - we don't want to lose the custom title.

package/dist/cjs/ui/PasteDisplayAsMenu.js

@@ -30,10 +30,13 @@ var _smartLinkCard = _interopRequireDefault(require("@atlaskit/icon/core/smart-l
 var _smartLinkEmbed = _interopRequireDefault(require("@atlaskit/icon/core/smart-link-embed"));
 var _smartLinkInline = _interopRequireDefault(require("@atlaskit/icon/core/smart-link-inline"));
 var _useSmartCardContext = require("@atlaskit/link-provider/use-smart-card-context");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _conditionalHooksFactory = require("@atlaskit/platform-feature-flags-react/conditional-hooks-factory/conditional-hooks-factory");
 var _box = require("@atlaskit/primitives/compiled/box");
 var _flex = require("@atlaskit/primitives/compiled/flex");
 var _pressable = require("@atlaskit/primitives/compiled/pressable");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
+var _useCardRegistry = require("../actions/useCardRegistry");
 var _doc = require("../pm-plugins/doc");
 var _currentPastedSmartLink = require("./currentPastedSmartLink");
 var _nativeEmbedNode = require("./nativeEmbedNode");
@@ -204,6 +207,17 @@ var normalizeSelectionToLinkRangeForUrlAppearance = exports.normalizeSelectionTo
   var linkRangeSelectionTr = editorView.state.tr.setSelection(_state.TextSelection.create(editorView.state.doc, firstLinkRange.from, firstLinkRange.to));
   editorView.dispatch(linkRangeSelectionTr);
 };
+// Remove with platform_editor_reduce_forced_layout_2 cleanup; call useCardRegistry(api?.card?.actions) directly.
+var useCardState = (0, _conditionalHooksFactory.conditionalHooksFactory)(function () {
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2');
+}, function useRegisteredCardState(api) {
+  var _api$card;
+  return (0, _useCardRegistry.useCardRegistry)(api === null || api === void 0 || (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions);
+}, function useLegacyCardState(api) {
+  return (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['card'], function (states) {
+    return states.cardState;
+  });
+});
 var PasteDisplayAsMenuHorizontalView = function PasteDisplayAsMenuHorizontalView(_ref8) {
   var _smartCardContext$val, _cardAtPasteRange$app, _smartCardContext$val2;
   var api = _ref8.api,
@@ -224,10 +238,7 @@ var PasteDisplayAsMenuHorizontalView = function PasteDisplayAsMenuHorizontalView
       pasteStartPos: pluginState.pasteStartPos
     } : undefined;
   });
-  // Subscribe to card state so the menu re-renders when resolved card metadata updates.
-  (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['card'], function (states) {
-    return states.cardState;
-  });
+  useCardState(api);
   var pastedLinkUrlFromSlice = (0, _currentPastedSmartLink.getSingleSmartLinkUrlFromSlice)(getCurrentPastedSlice(api));
   var pastedLinkUrlFromCard = editorView && pasteRange ? getCardUrlAtPasteRange({
     editorView: editorView,