@atlaskit/editor-plugin-card 35.0.1 → 35.1.1

package/dist/es2019/ui/PasteDisplayAsMenu.js

@@ -20,10 +20,13 @@ import SmartLinkCardIcon from '@atlaskit/icon/core/smart-link-card';
 import SmartLinkEmbedIcon from '@atlaskit/icon/core/smart-link-embed';
 import SmartLinkInlineIcon from '@atlaskit/icon/core/smart-link-inline';
 import { useSmartCardContext } from '@atlaskit/link-provider/use-smart-card-context';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react/conditional-hooks-factory/conditional-hooks-factory';
 import { Box } from '@atlaskit/primitives/compiled/box';
 import { Flex } from '@atlaskit/primitives/compiled/flex';
 import { Pressable } from '@atlaskit/primitives/compiled/pressable';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { useCardRegistry } from '../actions/useCardRegistry';
 import { changeSelectedCardToLink, setSelectedCardAppearance } from '../pm-plugins/doc';
 import { getSingleSmartLinkUrlFromSlice } from './currentPastedSmartLink';
 import { changeNativeEmbedAppearance, getNativeEmbedUrl, isNativeEmbedAppearanceSupported } from './nativeEmbedNode';
@@ -198,6 +201,13 @@ export const normalizeSelectionToLinkRangeForUrlAppearance = ({
   const linkRangeSelectionTr = editorView.state.tr.setSelection(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.
+const useCardState = conditionalHooksFactory(() => isExperimentEnabled('platform_editor_reduce_forced_layout_2'), function useRegisteredCardState(api) {
+  var _api$card;
+  return useCardRegistry(api === null || api === void 0 ? void 0 : (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions);
+}, function useLegacyCardState(api) {
+  return useSharedPluginStateWithSelector(api, ['card'], states => states.cardState);
+});
 const PasteDisplayAsMenuHorizontalView = ({
   api,
   allowBlockCards,
@@ -220,10 +230,7 @@ const PasteDisplayAsMenuHorizontalView = ({
       pasteStartPos: pluginState.pasteStartPos
     } : undefined;
   });
-  // Subscribe to card state so the menu re-renders when resolved card metadata updates.
-  useSharedPluginStateWithSelector(api, ['card'], states => {
-    return states.cardState;
-  });
+  useCardState(api);
   const pastedLinkUrlFromSlice = getSingleSmartLinkUrlFromSlice(getCurrentPastedSlice(api));
   const pastedLinkUrlFromCard = editorView && pasteRange ? getCardUrlAtPasteRange({
     editorView,

package/dist/es2019/ui/toolbar.js

@@ -25,6 +25,7 @@ import EditIcon from '@atlaskit/icon/core/edit';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import CogIcon from '@atlaskit/icon/core/settings';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { changeSelectedCardToText } from '../pm-plugins/doc';
 import { pluginKey } from '../pm-plugins/plugin-key';
@@ -121,6 +122,7 @@ export const openLinkSettings = editorAnalyticsApi => (state, dispatch) => {
 };
 export const floatingToolbar = (cardOptions, lpLinkPicker, linkPickerOptions, pluginInjectionApi, disableFloatingToolbar) => {
   return (state, intl, providerFactory) => {
+    var _pluginInjectionApi$c;
     if (disableFloatingToolbar) {
       return;
     }
@@ -150,6 +152,10 @@ export const floatingToolbar = (cardOptions, lpLinkPicker, linkPickerOptions, pl
     const isLinkPickerEnabled = !!lpLinkPicker;
     return {
       title: intl.formatMessage(messages.card),
+      externalStore: isExperimentEnabled('platform_editor_reduce_forced_layout_2') ? (pluginInjectionApi === null || pluginInjectionApi === void 0 ? 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,
       nodeType,
       preventPopupOverflow: isLinkPickerEnabled,
@@ -182,15 +188,25 @@ export const floatingToolbar = (cardOptions, lpLinkPicker, linkPickerOptions, pl
     };
   };
 };
-const unlinkCard = (node, state, editorAnalyticsApi) => {
-  const displayInfo = displayInfoForCard(node, findCardInfo(state));
-  const text = displayInfo.title || displayInfo.url;
-  if (text) {
-    return commandWithMetadata(changeSelectedCardToText(text, editorAnalyticsApi), {
-      action: ACTION.UNLINK
-    });
+const unlinkCard = (node, state, editorAnalyticsApi, pluginInjectionApi) => {
+  if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+    return (currentState, dispatch, view) => {
+      const displayInfo = displayInfoForCard(node, findCardInfo(currentState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions));
+      const text = displayInfo.title || displayInfo.url;
+      return text ? commandWithMetadata(changeSelectedCardToText(text, editorAnalyticsApi), {
+        action: ACTION.UNLINK
+      })(currentState, dispatch, view) : false;
+    };
+  } else {
+    const displayInfo = displayInfoForCard(node, findCardInfo(state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions));
+    const text = displayInfo.title || displayInfo.url;
+    if (text) {
+      return commandWithMetadata(changeSelectedCardToText(text, editorAnalyticsApi), {
+        action: ACTION.UNLINK
+      });
+    }
+    return () => false;
   }
-  return () => false;
 };
 const buildAlignmentOptions = (state, intl, widthPluginDependencyApi, analyticsApi, cardOptions, areAnyNewToolbarFlagsEnabled) => {
   if (areAnyNewToolbarFlagsEnabled) {
@@ -230,7 +246,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
   } else {
     const {
       title
-    } = displayInfoForCard(node, findCardInfo(state));
+    } = displayInfoForCard(node, findCardInfo(state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.card.actions));
     metadata = {
       url: url,
       title: title
@@ -280,7 +296,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
   } else if (shouldRenderDatasourceToolbar) {
     return getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, node.attrs.datasource.id, state, cardOptions, currentAppearance, pluginInjectionApi);
   } else {
-    var _pluginInjectionApi$c, _pluginInjectionApi$c2, _pluginInjectionApi$c3, _pluginState$resolved;
+    var _pluginInjectionApi$c2, _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginState$resolved;
     const {
       inlineCard
     } = state.schema.nodes;
@@ -318,7 +334,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       title: intl.formatMessage(annotationMessages.createComment),
       showTitle: editorExperiment('platform_editor_controls', 'control') ? undefined : true,
       onClick: onCommentButtonClick,
-      disabled: isOfflineMode(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c === void 0 ? void 0 : (_pluginInjectionApi$c2 = _pluginInjectionApi$c.sharedState) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : (_pluginInjectionApi$c3 = _pluginInjectionApi$c2.currentState()) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : _pluginInjectionApi$c3.mode)
+      disabled: isOfflineMode(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c2 = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : (_pluginInjectionApi$c3 = _pluginInjectionApi$c2.sharedState) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : (_pluginInjectionApi$c4 = _pluginInjectionApi$c3.currentState()) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.mode)
     }, {
       type: 'separator'
     }] : [];
@@ -382,7 +398,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
     };
     const toolbarItems = areAllNewToolbarFlagsDisabled ? [...editItems, ...commentItems, ...openPreviewPanelItems, openLinkToolbarItem, {
       type: 'separator'
-    }, ...getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled), {
+    }, ...getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled, pluginInjectionApi), {
       type: 'copy-button',
       items: [{
         state,
@@ -406,7 +422,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
       title: intl.formatMessage(commonMessages.remove),
       onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
-    }] : [...editButtonItems, ...[...getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled), {
+    }] : [...editButtonItems, ...[...getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi, !areAllNewToolbarFlagsDisabled, pluginInjectionApi), {
       type: 'separator',
       fullHeight: true
     }], ...openPreviewPanelItems, openLinkToolbarItem, ...(commentItems.length > 1 ? [{
@@ -497,8 +513,8 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
         options: [{
           title: intl.formatMessage(commonMessages.copyToClipboard),
           onClick: () => {
-            var _pluginInjectionApi$c4, _pluginInjectionApi$f;
-            pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c4 = pluginInjectionApi.core) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.commands.copyNode(node.type, INPUT_METHOD.FLOATING_TB));
+            var _pluginInjectionApi$c5, _pluginInjectionApi$f;
+            pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c5 = pluginInjectionApi.core) === null || _pluginInjectionApi$c5 === void 0 ? void 0 : _pluginInjectionApi$c5.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.commands.copyNode(node.type, INPUT_METHOD.FLOATING_TB));
             return true;
           },
           icon: /*#__PURE__*/React.createElement(CopyIcon, {
@@ -519,7 +535,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
     return toolbarItems;
   }
 };
-const getUnlinkButtonGroup = (state, intl, node, inlineCard, editorAnalyticsApi, areAnyNewToolbarFlagsEnabled) => {
+const getUnlinkButtonGroup = (state, intl, node, inlineCard, editorAnalyticsApi, areAnyNewToolbarFlagsEnabled, pluginInjectionApi) => {
   return node.type === inlineCard ? [{
     id: 'editor.link.unlink',
     focusEditoronEnter: true,
@@ -527,7 +543,7 @@ const getUnlinkButtonGroup = (state, intl, node, inlineCard, editorAnalyticsApi,
     title: intl.formatMessage(linkToolbarMessages.unlink),
     icon: LinkBrokenIcon,
     iconFallback: LinkBrokenIcon,
-    onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi))
+    onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi, pluginInjectionApi))
   }, ...(areAnyNewToolbarFlagsEnabled ? [] : [{
     type: 'separator'
   }])] : [];
@@ -727,8 +743,8 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       options: [{
         title: intl.formatMessage(commonMessages.copyToClipboard),
         onClick: () => {
-          var _pluginInjectionApi$c5, _pluginInjectionApi$f2;
-          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c5 = pluginInjectionApi.core) === null || _pluginInjectionApi$c5 === void 0 ? void 0 : _pluginInjectionApi$c5.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.commands.copyNode(node.type, INPUT_METHOD.FLOATING_TB));
+          var _pluginInjectionApi$c6, _pluginInjectionApi$f2;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c6 = pluginInjectionApi.core) === null || _pluginInjectionApi$c6 === void 0 ? void 0 : _pluginInjectionApi$c6.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.commands.copyNode(node.type, INPUT_METHOD.FLOATING_TB));
           return true;
         },
         onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, true, akEditorSelectedNodeClassName),

package/dist/esm/actions/cardRegistry.js

@@ -0,0 +1,58 @@
+import _defineProperty from "@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) { _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; }
+/**
+ * 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 var 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), {}, _defineProperty({}, 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/esm/actions/useCardRegistry.js

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

@@ -14,6 +14,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';
@@ -49,6 +50,7 @@ export var cardPlugin = function cardPlugin(_ref2) {
   var _ref2$config = _ref2.config,
     options = _ref2$config === void 0 ? {} : _ref2$config,
     api = _ref2.api;
+  var cardRegistry = createCardRegistry();
   var previousCardProvider;
   var cardPluginEvents = createEventsQueue();
   var isRegisteredSlashCommandEnabled = isExperimentEnabled('platform_editor_slash_command');
@@ -207,6 +209,10 @@ export var cardPlugin = function cardPlugin(_ref2) {
       }
     },
     actions: {
+      registerCard: cardRegistry.registerCard,
+      removeRegisteredCard: cardRegistry.removeCard,
+      getCardRegistrations: cardRegistry.getCardRegistrations,
+      subscribeToCardRegistry: cardRegistry.subscribe,
       setProvider: function () {
         var _setProvider2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(providerPromise) {
           var _api$core$actions$exe;

package/dist/esm/nodeviews/blockCard.js

@@ -47,16 +47,32 @@ export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
       // don't dispatch immediately since we might be in the middle of
       // rendering a nodeview
       var scheduleRegisterCard = rafSchedule(function () {
-        var pos = getPos();
-        if (typeof pos !== 'number') {
-          return;
+        if (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(registerCard({
+            title: title,
+            url: url,
+            pos: pos,
+            id: _this.props.id
+          })(view.state.tr));
         }
-        view.dispatch(registerCard({
-          title: title,
-          url: url,
-          pos: pos,
-          id: _this.props.id
-        })(view.state.tr));
       });
       if (isExperimentEnabled('platform_editor_reduce_memory_leaks')) {
         _this.pendingRegisterCard = scheduleRegisterCard;
@@ -107,22 +123,30 @@ export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         return;
       }
       this.removeCardDispatched = true;
-      var tr = this.props.view.state.tr;
-      _removeCard({
-        id: this.props.id
-      })(tr);
-      this.props.view.dispatch(tr);
+      if (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;
+        _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/esm/nodeviews/embedCard.js

@@ -182,16 +182,32 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
       // don't dispatch immediately since we might be in the middle of
       // rendering a nodeview
       rafSchedule(function () {
-        var 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;
+          }
+          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(registerCard({
+            title: title,
+            url: url,
+            pos: pos,
+            id: _this.props.id
+          })(view.state.tr));
         }
-        return view.dispatch(registerCard({
-          title: title,
-          url: url,
-          pos: pos,
-          id: _this.props.id
-        })(view.state.tr));
       })();
       try {
         var _this$props$cardConte, _this$props$cardConte2;
@@ -326,27 +342,35 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         return;
       }
       this.removeCardDispatched = true;
-      var tr = this.props.view.state.tr;
-      _removeCard({
-        id: this.props.id
-      })(tr);
-      this.props.view.dispatch(tr);
+      if (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;
+        _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/esm/nodeviews/inlineCardBase.js

@@ -43,6 +43,9 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
       }
     };
   }, []);
+  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 || ''];
@@ -54,13 +57,17 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
         return;
       }
       removeCardDispatched.current = true;
-      var tr = view.state.tr;
-      removeCard({
-        id: id
-      })(tr);
-      view.dispatch(tr);
+      if (isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+        removeRegisteredCard === null || removeRegisteredCard === void 0 || removeRegisteredCard(id);
+      } else {
+        var tr = view.state.tr;
+        removeCard({
+          id: 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]);
   var scrollContainer = useMemo(function () {
     return isExperimentEnabled('platform_editor_reduce_forced_layout_2') && isIntersectionObserverSupported() ? undefined :
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
@@ -75,26 +82,40 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
     // don't dispatch immediately since we might be in the middle of
     // rendering a nodeview
     var scheduleRegisterCard = rafSchedule(function () {
-      // prosemirror-bump-fix
-      var pos = getPos();
-      if (typeof pos !== 'number') {
-        return;
+      if (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;
+        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;
-      registerCard({
-        title: title,
-        url: url,
-        pos: pos,
-        id: refId.current
-      })(tr);
-      onRes === null || onRes === 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]);
   var onError = useCallback(function (data) {
     var url = data.url,
       err = data.err;

package/dist/esm/nodeviews/inlineCardWithAwareness.js

@@ -68,25 +68,29 @@ export var InlineCardWithAwareness = /*#__PURE__*/memo(function (_ref) {
     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 = useSmartLinkDestinationUrl(node.attrs.url);
+
+  // Remove tr: Transaction | undefined parameter with platform_editor_reduce_forced_layout_2 cleanup.
   var onResolve = useCallback(function (tr, title) {
-    var metadata = tr.getMeta(pluginKey);
-    var removeOverlay = isExperimentEnabled('platform_editor_reduce_memory_leaks') ? createRemoveOverlay(setIsInsertedRef) : function () {
-      return setIsInserted(false);
-    };
-    if (metadata && metadata.type === 'REGISTER') {
-      registerRemoveOverlay(removeOverlay, metadata.info)(tr);
-    } else {
-      registerRemoveOverlay(removeOverlay)(tr);
+    if (tr) {
+      var metadata = tr.getMeta(pluginKey);
+      var removeOverlay = isExperimentEnabled('platform_editor_reduce_memory_leaks') ? createRemoveOverlay(setIsInsertedRef) : function () {
+        return setIsInserted(false);
+      };
+      if (metadata && metadata.type === 'REGISTER') {
+        registerRemoveOverlay(removeOverlay, metadata.info)(tr);
+      } else {
+        registerRemoveOverlay(removeOverlay)(tr);
+      }
     }
     if (title) {
       setIsResolvedViewRendered(true);
     }
   }, []);
   var markMostRecentlyInsertedLink = useCallback(function (isLinkMostRecentlyInserted) {
-    if (isOverlayEnabled) {
+    if (isOverlayEnabled && !isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
       setIsInserted(isLinkMostRecentlyInserted);
     }
-  }, [isOverlayEnabled]);
+  }, [isExperimentEnabled('platform_editor_reduce_forced_layout_2') ? undefined : isOverlayEnabled]);
   var setOverlayHoveredStyles = useCallback(function (isHovered) {
     if (isOverlayEnabled) {
       setIsHovered(isHovered);

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

@@ -79,7 +79,7 @@ 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 && 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'))) {
       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/esm/pm-plugins/main.js

@@ -28,14 +28,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 = 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;
-    clearOverlayCandidate(tr);
-    view.dispatch(tr);
+  if (!isExperimentEnabled('platform_editor_reduce_forced_layout_2')) {
+    var currentState = 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;
+      clearOverlayCandidate(tr);
+      view.dispatch(tr);
+    }
   }
 };
 export var createPlugin = function createPlugin(options, pluginInjectionApi) {
@@ -151,7 +153,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
           var linkPosition = pluginState.requests[0].pos;
           var canBeUpgradedToBlock = allowBlockCards && isBlockSupportedAtPosition(linkPosition, prevEditorState, 'inline');
           var 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) {