@atlaskit/editor-plugin-card 35.0.1 → 35.1.1

package/dist/cjs/ui/toolbar.js

@@ -35,6 +35,7 @@ var _edit = _interopRequireDefault(require("@atlaskit/icon/core/edit"));
 var _linkBroken = _interopRequireDefault(require("@atlaskit/icon/core/link-broken"));
 var _linkExternal = _interopRequireDefault(require("@atlaskit/icon/core/link-external"));
 var _settings = _interopRequireDefault(require("@atlaskit/icon/core/settings"));
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _doc = require("../pm-plugins/doc");
 var _pluginKey = require("../pm-plugins/plugin-key");
@@ -131,6 +132,7 @@ var openLinkSettings = exports.openLinkSettings = function openLinkSettings(edit
 };
 var floatingToolbar = exports.floatingToolbar = function floatingToolbar(cardOptions, lpLinkPicker, linkPickerOptions, pluginInjectionApi, disableFloatingToolbar) {
   return function (state, intl, providerFactory) {
+    var _pluginInjectionApi$c;
     if (disableFloatingToolbar) {
       return;
     }
@@ -159,6 +161,10 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(cardOpt
     var isLinkPickerEnabled = !!lpLinkPicker;
     return _objectSpread(_objectSpread({
       title: intl.formatMessage(_card.messages.card),
+      externalStore: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') ? (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions) && {
+        getSnapshot: pluginInjectionApi.card.actions.getCardRegistrations,
+        subscribe: pluginInjectionApi.card.actions.subscribeToCardRegistry
+      } : undefined,
       className: className,
       nodeType: nodeType,
       preventPopupOverflow: isLinkPickerEnabled
@@ -190,17 +196,27 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(cardOpt
     }, (0, _EditLinkToolbar.editLinkToolbarConfig)(Boolean(pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLinkingToolbar), isLinkPickerEnabled, linkPickerOptions));
   };
 };
-var unlinkCard = function unlinkCard(node, state, editorAnalyticsApi) {
-  var displayInfo = (0, _utils4.displayInfoForCard)(node, (0, _utils4.findCardInfo)(state));
-  var text = displayInfo.title || displayInfo.url;
-  if (text) {
-    return (0, _utils.commandWithMetadata)((0, _doc.changeSelectedCardToText)(text, editorAnalyticsApi), {
-      action: _enums.ACTION.UNLINK
-    });
+var unlinkCard = function unlinkCard(node, state, editorAnalyticsApi, pluginInjectionApi) {
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2')) {
+    return function (currentState, dispatch, view) {
+      var displayInfo = (0, _utils4.displayInfoForCard)(node, (0, _utils4.findCardInfo)(currentState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions));
+      var text = displayInfo.title || displayInfo.url;
+      return text ? (0, _utils.commandWithMetadata)((0, _doc.changeSelectedCardToText)(text, editorAnalyticsApi), {
+        action: _enums.ACTION.UNLINK
+      })(currentState, dispatch, view) : false;
+    };
+  } else {
+    var displayInfo = (0, _utils4.displayInfoForCard)(node, (0, _utils4.findCardInfo)(state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions));
+    var text = displayInfo.title || displayInfo.url;
+    if (text) {
+      return (0, _utils.commandWithMetadata)((0, _doc.changeSelectedCardToText)(text, editorAnalyticsApi), {
+        action: _enums.ACTION.UNLINK
+      });
+    }
+    return function () {
+      return false;
+    };
   }
-  return function () {
-    return false;
-  };
 };
 var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPluginDependencyApi, analyticsApi, cardOptions, areAnyNewToolbarFlagsEnabled) {
   if (areAnyNewToolbarFlagsEnabled) {
@@ -241,7 +257,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     if (url && !(0, _isSafeUrl.isSafeUrl)(url)) {
       return [];
     } else {
-      var _displayInfoForCard = (0, _utils4.displayInfoForCard)(node, (0, _utils4.findCardInfo)(state)),
+      var _displayInfoForCard = (0, _utils4.displayInfoForCard)(node, (0, _utils4.findCardInfo)(state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions)),
         title = _displayInfoForCard.title;
       metadata = {
         url: url,
@@ -291,7 +307,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     } else if (shouldRenderDatasourceToolbar) {
       return getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, node.attrs.datasource.id, state, cardOptions, currentAppearance, pluginInjectionApi);
     } else {
-      var _pluginInjectionApi$c, _pluginState$resolved;
+      var _pluginInjectionApi$c2, _pluginState$resolved;
       var inlineCard = state.schema.nodes.inlineCard;
       var editItems = cardOptions.allowDatasource ? [{
         type: 'custom',
@@ -329,7 +345,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         title: intl.formatMessage(_annotation.annotationMessages.createComment),
         showTitle: (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'control') ? undefined : true,
         onClick: onCommentButtonClick,
-        disabled: (0, _isOfflineMode.isOfflineMode)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.sharedState) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.mode)
+        disabled: (0, _isOfflineMode.isOfflineMode)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c2 === void 0 || (_pluginInjectionApi$c2 = _pluginInjectionApi$c2.sharedState) === null || _pluginInjectionApi$c2 === void 0 || (_pluginInjectionApi$c2 = _pluginInjectionApi$c2.currentState()) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.mode)
       }, {
         type: 'separator'
       }] : [];
@@ -399,7 +415,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       };
       var toolbarItems = areAllNewToolbarFlagsDisabled ? [].concat(editItems, commentItems, openPreviewPanelItems, [openLinkToolbarItem, {
         type: 'separator'
-      }], (0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled)), [{
+      }], (0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled, pluginInjectionApi)), [{
         type: 'copy-button',
         items: [{
           state: state,
@@ -423,7 +439,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
         title: intl.formatMessage(_messages.default.remove),
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
-      }]) : [].concat(editButtonItems, (0, _toConsumableArray2.default)([].concat((0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled)), [{
+      }]) : [].concat(editButtonItems, (0, _toConsumableArray2.default)([].concat((0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled, pluginInjectionApi)), [{
         type: 'separator',
         fullHeight: true
       }])), openPreviewPanelItems, [openLinkToolbarItem], (0, _toConsumableArray2.default)(commentItems.length > 1 ? [{
@@ -518,8 +534,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
           options: [_objectSpread({
             title: intl.formatMessage(_messages.default.copyToClipboard),
             onClick: function onClick() {
-              var _pluginInjectionApi$c2, _pluginInjectionApi$f;
-              pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.core) === null || _pluginInjectionApi$c2 === void 0 || _pluginInjectionApi$c2.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.commands.copyNode(node.type, _enums.INPUT_METHOD.FLOATING_TB));
+              var _pluginInjectionApi$c3, _pluginInjectionApi$f;
+              pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.core) === null || _pluginInjectionApi$c3 === void 0 || _pluginInjectionApi$c3.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.commands.copyNode(node.type, _enums.INPUT_METHOD.FLOATING_TB));
               return true;
             },
             icon: /*#__PURE__*/_react.default.createElement(_copy.default, {
@@ -539,7 +555,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     }
   };
 };
-var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, areAnyNewToolbarFlagsEnabled) {
+var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, areAnyNewToolbarFlagsEnabled, pluginInjectionApi) {
   return node.type === inlineCard ? [{
     id: 'editor.link.unlink',
     focusEditoronEnter: true,
@@ -547,7 +563,7 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     title: intl.formatMessage(_linkToolbar.linkToolbarMessages.unlink),
     icon: _linkBroken.default,
     iconFallback: _linkBroken.default,
-    onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi))
+    onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi, pluginInjectionApi))
   }].concat((0, _toConsumableArray2.default)(areAnyNewToolbarFlagsEnabled ? [] : [{
     type: 'separator'
   }])) : [];
@@ -747,8 +763,8 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       options: [{
         title: intl.formatMessage(_messages.default.copyToClipboard),
         onClick: function onClick() {
-          var _pluginInjectionApi$c3, _pluginInjectionApi$f2;
-          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.core) === null || _pluginInjectionApi$c3 === void 0 || _pluginInjectionApi$c3.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.commands.copyNode(node.type, _enums.INPUT_METHOD.FLOATING_TB));
+          var _pluginInjectionApi$c4, _pluginInjectionApi$f2;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.core) === null || _pluginInjectionApi$c4 === void 0 || _pluginInjectionApi$c4.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.commands.copyNode(node.type, _enums.INPUT_METHOD.FLOATING_TB));
           return true;
         },
         onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, true, _constants.akEditorSelectedNodeClassName),

package/dist/es2019/actions/cardRegistry.js

@@ -0,0 +1,58 @@
+/**
+ * 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.
+ */
+export const createCardRegistry = () => {
+  // Replace registrations on each change to notify subscribers and trigger React updates.
+  let registrations = {};
+  const listeners = new Set();
+  const getCardRegistrations = () => registrations;
+  const notify = () => {
+    Array.from(listeners).forEach(listener => listener());
+  };
+  const registerCard = info => {
+    if (info.getPos() === undefined) {
+      return;
+    }
+    const 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 = {
+      ...registrations,
+      [info.id]: {
+        ...info
+      }
+    };
+    notify();
+  };
+  const removeCard = id => {
+    if (!registrations[id]) {
+      return;
+    }
+    const next = {
+      ...registrations
+    };
+    delete next[id];
+    registrations = next;
+    notify();
+  };
+  const subscribe = listener => {
+    listeners.add(listener);
+    return () => {
+      listeners.delete(listener);
+    };
+  };
+  return {
+    registerCard,
+    removeCard,
+    subscribe,
+    getCardRegistrations
+  };
+};

package/dist/es2019/actions/useCardRegistry.js

@@ -0,0 +1,9 @@
+import { useSyncExternalStore } from 'react';
+const emptySnapshot = () => undefined;
+const emptySubscription = () => () => {};
+
+/** Subscribe to resolved card metadata without observing every editor transaction. */
+export const useCardRegistry = actions => {
+  var _actions$subscribeToC, _actions$getCardRegis;
+  return 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/es2019/cardPlugin.js

@@ -8,6 +8,7 @@ import { SmartCardContext } from '@atlaskit/link-provider/context';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
+import { createCardRegistry } from './actions/cardRegistry';
 import { blockCardSpecWithFixedToDOM } from './nodeviews/toDOM-fixes/blockCard';
 import { embedCardSpecWithFixedToDOM } from './nodeviews/toDOM-fixes/embedCard';
 import { inlineCardSpecWithFixedToDOM } from './nodeviews/toDOM-fixes/inlineCard';
@@ -44,6 +45,7 @@ export const cardPlugin = ({
   api
 }) => {
   var _api$base, _options$lpLinkPicker;
+  const cardRegistry = createCardRegistry();
   let previousCardProvider;
   const cardPluginEvents = createEventsQueue();
   const isRegisteredSlashCommandEnabled = isExperimentEnabled('platform_editor_slash_command');
@@ -207,6 +209,10 @@ export const cardPlugin = ({
       }, tr, from, to, source, analyticsAction, normalizeLinkText, sourceEvent, appearance)
     },
     actions: {
+      registerCard: cardRegistry.registerCard,
+      removeRegisteredCard: cardRegistry.removeCard,
+      getCardRegistrations: cardRegistry.getCardRegistrations,
+      subscribeToCardRegistry: cardRegistry.subscribe,
       setProvider: async providerPromise => {
         var _api$core$actions$exe;
         const provider = await providerPromise;

package/dist/es2019/nodeviews/blockCard.js

@@ -39,16 +39,33 @@ export class BlockCardComponent extends React.PureComponent {
       // don't dispatch immediately since we might be in the middle of
       // rendering a nodeview
       const scheduleRegisterCard = rafSchedule(() => {
-        const pos = getPos();
-        if (typeof pos !== 'number') {
-          return;
+        if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+          var _pluginInjectionApi$c;
+          if (this.removeCardDispatched || getPos() === undefined) {
+            return;
+          }
+          const {
+            pluginInjectionApi,
+            id
+          } = this.props;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.card.actions) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.registerCard({
+            id,
+            title,
+            url,
+            getPos
+          });
+        } else {
+          const pos = getPos();
+          if (typeof pos !== 'number') {
+            return;
+          }
+          view.dispatch(registerCard({
+            title,
+            url,
+            pos,
+            id: this.props.id
+          })(view.state.tr));
         }
-        view.dispatch(registerCard({
-          title,
-          url,
-          pos,
-          id: this.props.id
-        })(view.state.tr));
       });
       if (isExperimentEnabled('platform_editor_reduce_memory_leaks')) {
         this.pendingRegisterCard = scheduleRegisterCard;
@@ -94,13 +111,22 @@ export class BlockCardComponent extends React.PureComponent {
       return;
     }
     this.removeCardDispatched = true;
-    const {
-      tr
-    } = this.props.view.state;
-    removeCard({
-      id: this.props.id
-    })(tr);
-    this.props.view.dispatch(tr);
+    if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+      var _pluginInjectionApi$c2;
+      const {
+        pluginInjectionApi,
+        id
+      } = this.props;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c2 = pluginInjectionApi.card.actions) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.removeRegisteredCard(id);
+    } else {
+      const {
+        tr
+      } = this.props.view.state;
+      removeCard({
+        id: this.props.id
+      })(tr);
+      this.props.view.dispatch(tr);
+    }
   }
   render() {
     const {

package/dist/es2019/nodeviews/embedCard.js

@@ -178,16 +178,33 @@ export class EmbedCardComponent extends React.PureComponent {
       // don't dispatch immediately since we might be in the middle of
       // rendering a nodeview
       rafSchedule(() => {
-        const pos = this.getPosSafely();
-        if (pos === undefined) {
-          return;
+        if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+          var _pluginInjectionApi$c;
+          if (this.removeCardDispatched || this.getPosSafely() === undefined) {
+            return;
+          }
+          const {
+            pluginInjectionApi,
+            id
+          } = this.props;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.card.actions) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.registerCard({
+            id,
+            title,
+            url,
+            getPos: this.getPosSafely
+          });
+        } else {
+          const pos = this.getPosSafely();
+          if (pos === undefined) {
+            return;
+          }
+          return view.dispatch(registerCard({
+            title,
+            url,
+            pos,
+            id: this.props.id
+          })(view.state.tr));
         }
-        return view.dispatch(registerCard({
-          title,
-          url,
-          pos,
-          id: this.props.id
-        })(view.state.tr));
       })();
       try {
         var _this$props$cardConte, _this$props$cardConte2;
@@ -321,13 +338,22 @@ export class EmbedCardComponent extends React.PureComponent {
       return;
     }
     this.removeCardDispatched = true;
-    const {
-      tr
-    } = this.props.view.state;
-    removeCard({
-      id: this.props.id
-    })(tr);
-    this.props.view.dispatch(tr);
+    if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+      var _pluginInjectionApi$c2;
+      const {
+        pluginInjectionApi,
+        id
+      } = this.props;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c2 = pluginInjectionApi.card.actions) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.removeRegisteredCard(id);
+    } else {
+      const {
+        tr
+      } = this.props.view.state;
+      removeCard({
+        id: this.props.id
+      })(tr);
+      this.props.view.dispatch(tr);
+    }
   }
   render() {
     const {

package/dist/es2019/nodeviews/inlineCardBase.js

@@ -45,6 +45,9 @@ export const InlineCard = /*#__PURE__*/memo(({
       }
     };
   }, []);
+  const cardActions = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions;
+  const registerResolvedCard = cardActions === null || cardActions === void 0 ? void 0 : cardActions.registerCard;
+  const removeRegisteredCard = cardActions === null || cardActions === void 0 ? void 0 : cardActions.removeRegisteredCard;
   const {
     getState: getSmartlinkState
   } = (cardContext === null || cardContext === void 0 ? void 0 : (_cardContext$value = cardContext.value) === null || _cardContext$value === void 0 ? void 0 : _cardContext$value.store) || {};
@@ -57,15 +60,19 @@ export const InlineCard = /*#__PURE__*/memo(({
         return;
       }
       removeCardDispatched.current = true;
-      const {
-        tr
-      } = view.state;
-      removeCard({
-        id
-      })(tr);
-      view.dispatch(tr);
+      if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+        removeRegisteredCard === null || removeRegisteredCard === void 0 ? void 0 : removeRegisteredCard(id);
+      } else {
+        const {
+          tr
+        } = view.state;
+        removeCard({
+          id
+        })(tr);
+        view.dispatch(tr);
+      }
     };
-  }, [getPos, view]);
+  }, [getPos, isExperimentEnabled('platform_editor_reduce_forced_layout_2') ? undefined : view, isExperimentEnabled('platform_editor_reduce_forced_layout_2') ? removeRegisteredCard : undefined]);
   const scrollContainer = useMemo(() => isExperimentEnabled('platform_editor_reduce_forced_layout_2') && isIntersectionObserverSupported() ? undefined :
   // eslint-disable-next-line @atlaskit/editor/no-as-casting
   findOverflowScrollParent(view.dom) || undefined, [view.dom]);
@@ -80,26 +87,40 @@ export const InlineCard = /*#__PURE__*/memo(({
     // don't dispatch immediately since we might be in the middle of
     // rendering a nodeview
     const scheduleRegisterCard = rafSchedule(() => {
-      // prosemirror-bump-fix
-      const pos = getPos();
-      if (typeof pos !== 'number') {
-        return;
+      if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+        if (removeCardDispatched.current || getPos() === undefined) {
+          return;
+        }
+        const id = refId.current;
+        registerResolvedCard === null || registerResolvedCard === void 0 ? void 0 : registerResolvedCard({
+          id,
+          title,
+          url,
+          getPos
+        });
+        onRes === null || onRes === void 0 ? void 0 : onRes(undefined, title);
+      } else {
+        // prosemirror-bump-fix
+        const pos = getPos();
+        if (typeof pos !== 'number') {
+          return;
+        }
+        const tr = view.state.tr;
+        registerCard({
+          title,
+          url,
+          pos,
+          id: refId.current
+        })(tr);
+        onRes === null || onRes === void 0 ? void 0 : onRes(tr, title);
+        view.dispatch(tr);
       }
-      const tr = view.state.tr;
-      registerCard({
-        title,
-        url,
-        pos,
-        id: refId.current
-      })(tr);
-      onRes === null || onRes === void 0 ? void 0 : onRes(tr, title);
-      view.dispatch(tr);
     });
     if (isExperimentEnabled('platform_editor_reduce_memory_leaks')) {
       pendingRegisterCard.current = scheduleRegisterCard;
     }
     scheduleRegisterCard();
-  }, [getPos, view, onRes]);
+  }, [getPos, isExperimentEnabled('platform_editor_reduce_forced_layout_2') ? undefined : view, onRes, isExperimentEnabled('platform_editor_reduce_forced_layout_2') ? registerResolvedCard : undefined]);
   const onError = useCallback(data => {
     const {
       url,

package/dist/es2019/nodeviews/inlineCardWithAwareness.js

@@ -57,23 +57,27 @@ export const InlineCardWithAwareness = /*#__PURE__*/memo(({
   const [isResolvedViewRendered, setIsResolvedViewRendered] = useState(false);
   const editorAppearance = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.card.sharedState.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.editorAppearance;
   const destinationUrl = useSmartLinkDestinationUrl(node.attrs.url);
+
+  // Remove tr: Transaction | undefined parameter with platform_editor_reduce_forced_layout_2 cleanup.
   const onResolve = useCallback((tr, title) => {
-    const metadata = tr.getMeta(pluginKey);
-    const removeOverlay = isExperimentEnabled('platform_editor_reduce_memory_leaks') ? createRemoveOverlay(setIsInsertedRef) : () => setIsInserted(false);
-    if (metadata && metadata.type === 'REGISTER') {
-      registerRemoveOverlay(removeOverlay, metadata.info)(tr);
-    } else {
-      registerRemoveOverlay(removeOverlay)(tr);
+    if (tr) {
+      const metadata = tr.getMeta(pluginKey);
+      const removeOverlay = isExperimentEnabled('platform_editor_reduce_memory_leaks') ? createRemoveOverlay(setIsInsertedRef) : () => setIsInserted(false);
+      if (metadata && metadata.type === 'REGISTER') {
+        registerRemoveOverlay(removeOverlay, metadata.info)(tr);
+      } else {
+        registerRemoveOverlay(removeOverlay)(tr);
+      }
     }
     if (title) {
       setIsResolvedViewRendered(true);
     }
   }, []);
   const markMostRecentlyInsertedLink = useCallback(isLinkMostRecentlyInserted => {
-    if (isOverlayEnabled) {
+    if (isOverlayEnabled && !isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
       setIsInserted(isLinkMostRecentlyInserted);
     }
-  }, [isOverlayEnabled]);
+  }, [isExperimentEnabled('platform_editor_reduce_forced_layout_2') ? undefined : isOverlayEnabled]);
   const setOverlayHoveredStyles = useCallback(isHovered => {
     if (isOverlayEnabled) {
       setIsHovered(isHovered);

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

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

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

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

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

@@ -4,6 +4,7 @@ import { getResolvedAttributes } from '@atlaskit/link-analytics/get-resolved-att
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource/assets-modal';
 import { CONFLUENCE_SEARCH_DATASOURCE_ID } from '@atlaskit/link-datasource/confluence-search-modal';
 import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource/jira-issues-modal';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { pluginKey } from './plugin-key';
 export const appearanceForNodeType = spec => {
   if (spec.name === 'inlineCard') {
@@ -42,12 +43,21 @@ export const mergeCardInfo = (titleUrlPair, info) => {
   };
 };
 export const displayInfoForCard = (node, info) => mergeCardInfo(titleUrlPairFromNode(node), info);
-export const findCardInfo = state => {
-  const pluginState = pluginKey.getState(state);
-  if (!pluginState) {
-    return undefined;
+export const findCardInfo = (state, cardActions) => {
+  if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+    var _cardActions$getCardR, _cardActions$getCardR2;
+    const registrations = (_cardActions$getCardR = cardActions === null || cardActions === void 0 ? void 0 : (_cardActions$getCardR2 = cardActions.getCardRegistrations) === null || _cardActions$getCardR2 === void 0 ? void 0 : _cardActions$getCardR2.call(cardActions)) !== null && _cardActions$getCardR !== void 0 ? _cardActions$getCardR : {};
+    const card = Object.values(registrations).find(registration => registration.getPos() === state.selection.from);
+    return card ? {
+      id: card.id,
+      title: card.title,
+      url: card.url,
+      pos: state.selection.from
+    } : undefined;
+  } else {
+    const pluginState = pluginKey.getState(state);
+    return pluginState === null || pluginState === void 0 ? void 0 : pluginState.cards.find(cardInfo => cardInfo.pos === state.selection.from);
   }
-  return pluginState.cards.find(cardInfo => cardInfo.pos === state.selection.from);
 };
 const isAppearanceSupportedInParent = (currentNodePosition, editorState, fragment, currentAppearance) => {
   const resolvedPosition = editorState.doc.resolve(currentNodePosition);

package/dist/es2019/ui/EditLinkToolbar.js

@@ -6,6 +6,7 @@ import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDT
 import { HyperlinkAddToolbar as HyperlinkToolbar } from '@atlaskit/editor-common/link/HyperlinkAddToolbar';
 import { linkToolbarMessages } from '@atlaskit/editor-common/messages/link-toolbar';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { hideLinkToolbar, showLinkToolbar } from '../pm-plugins/actions';
 import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { displayInfoForCard, findCardInfo } from '../pm-plugins/utils';
@@ -147,7 +148,7 @@ export const buildEditLinkToolbar = ({
       if (!view || !providerFactory) {
         return null;
       }
-      const displayInfo = displayInfoForCard(node, findCardInfo(view.state));
+      const displayInfo = displayInfoForCard(node, findCardInfo(view.state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions));
       return /*#__PURE__*/React.createElement(EditLinkToolbar, {
         key: idx,
         view: view,
@@ -161,8 +162,9 @@ export const buildEditLinkToolbar = ({
         // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
         ,
         onSubmit: (newHref, newText, inputMethod, analytic) => {
-          const urlChanged = newHref !== displayInfo.url;
-          const titleChanged = newText !== displayInfo.title;
+          const currentDisplayInfo = isExperimentEnabled('platform_editor_reduce_forced_layout_2') ? displayInfoForCard(node, findCardInfo(view.state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions)) : displayInfo;
+          const urlChanged = newHref !== currentDisplayInfo.url;
+          const 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.