@atlaskit/editor-core 185.6.5 → 185.8.0

package/dist/esm/plugins/card/utils.js

@@ -1,7 +1,5 @@
 import { NodeSelection } from 'prosemirror-state';
-import { Slice, Fragment } from 'prosemirror-model';
 import { pluginKey } from './pm-plugins/plugin-key';
-import { isSupportedInParent, mapChildren } from '@atlaskit/editor-common/utils';
 export var appearanceForNodeType = function appearanceForNodeType(spec) {
   if (spec.name === 'inlineCard') {
     return 'inline';
@@ -44,29 +42,4 @@ export var findCardInfo = function findCardInfo(state) {
   return pluginState.cards.find(function (cardInfo) {
     return cardInfo.pos === state.selection.from;
   });
-};
-export var transformUnsupportedBlockCardToInline = function transformUnsupportedBlockCardToInline(slice, state, cardOptions) {
-  var _state$schema$nodes = state.schema.nodes,
-    blockCard = _state$schema$nodes.blockCard,
-    inlineCard = _state$schema$nodes.inlineCard;
-  var children = [];
-  mapChildren(slice.content, function (node, i, frag) {
-    var _cardOptions$allowBlo;
-    if (node.type === blockCard && !isBlockCardSupported(state, frag, (_cardOptions$allowBlo = cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards) !== null && _cardOptions$allowBlo !== void 0 ? _cardOptions$allowBlo : false)) {
-      children.push(inlineCard.createChecked(node.attrs, node.content, node.marks));
-    } else {
-      children.push(node);
-    }
-  });
-  return new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd);
-};
-/**
- * Function to determine if a block card is supported by the editor
- * @param state
- * @param frag
- * @param allowBlockCards
- * @returns
- */
-var isBlockCardSupported = function isBlockCardSupported(state, frag, allowBlockCards) {
-  return allowBlockCards && isSupportedInParent(state, frag);
 };

package/dist/esm/plugins/hyperlink/Toolbar.js

@@ -14,27 +14,29 @@ import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import { linkToolbarMessages as linkToolbarCommonMessages, linkMessages } from '../../messages';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
-import { HyperlinkToolbarAppearance } from './HyperlinkToolbarAppearance';
 import { ACTION_SUBJECT_ID, ACTION, INPUT_METHOD, buildVisitedLinkPayload, buildOpenedSettingsPayload } from '@atlaskit/editor-common/analytics';
-import { addAnalytics } from '../analytics';
+import { toolbarKey } from './pm-plugins/toolbar-buttons';
+
 /* type guard for edit links */
 function isEditLink(linkMark) {
   return linkMark.pos !== undefined;
 }
-var dispatchAnalytics = function dispatchAnalytics(dispatch, state, analyticsBuilder) {
+var dispatchAnalytics = function dispatchAnalytics(dispatch, state, analyticsBuilder, editorAnalyticsApi) {
   if (dispatch) {
-    dispatch(addAnalytics(state, state.tr, analyticsBuilder(ACTION_SUBJECT_ID.HYPERLINK)));
+    var tr = state.tr;
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(analyticsBuilder(ACTION_SUBJECT_ID.HYPERLINK))(tr);
+    dispatch(tr);
   }
 };
-var visitHyperlink = function visitHyperlink() {
+var visitHyperlink = function visitHyperlink(editorAnalyticsApi) {
   return function (state, dispatch) {
-    dispatchAnalytics(dispatch, state, buildVisitedLinkPayload);
+    dispatchAnalytics(dispatch, state, buildVisitedLinkPayload, editorAnalyticsApi);
     return true;
   };
 };
-var openLinkSettings = function openLinkSettings() {
+var openLinkSettings = function openLinkSettings(editorAnalyticsApi) {
   return function (state, dispatch) {
-    dispatchAnalytics(dispatch, state, buildOpenedSettingsPayload);
+    dispatchAnalytics(dispatch, state, buildOpenedSettingsPayload, editorAnalyticsApi);
     return true;
   };
 };
@@ -52,7 +54,7 @@ function getLinkText(activeLinkMark, state) {
   }
   return activeLinkMark.node.text;
 }
-var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl, featureFlags) {
+var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl, featureFlags, editorAnalyticsApi) {
   var floatingToolbarLinkSettingsButton = featureFlags.floatingToolbarLinkSettingsButton;
   return floatingToolbarLinkSettingsButton === 'true' ? [{
     type: 'separator'
@@ -61,15 +63,17 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl, featur
     type: 'button',
     icon: CogIcon,
     title: intl.formatMessage(linkToolbarCommonMessages.settingsLink),
-    onClick: openLinkSettings(),
+    onClick: openLinkSettings(editorAnalyticsApi),
     href: 'https://id.atlassian.com/manage-profile/link-preferences',
     target: '_blank'
   }] : [];
 };
-export var getToolbarConfig = function getToolbarConfig(options, featureFlags, editorAnalyticsApi) {
+export var getToolbarConfig = function getToolbarConfig(options, featureFlags, pluginInjectionApi) {
   return function (state, intl, providerFactory) {
+    var _pluginInjectionApi$d;
     var formatMessage = intl.formatMessage;
     var linkState = stateKey.getState(state);
+    var editorAnalyticsApi = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions;
 
     /**
      * Enable focus trap only if feature flag is enabled AND for the new version of the picker
@@ -92,6 +96,7 @@ export var getToolbarConfig = function getToolbarConfig(options, featureFlags, e
       switch (activeLinkMark.type) {
         case 'EDIT':
           {
+            var _toolbarKey$getState$, _toolbarKey$getState;
             var pos = activeLinkMark.pos,
               node = activeLinkMark.node;
             var linkMark = node.marks.filter(function (mark) {
@@ -113,23 +118,7 @@ export var getToolbarConfig = function getToolbarConfig(options, featureFlags, e
             return _objectSpread(_objectSpread({}, hyperLinkToolbar), {}, {
               height: 32,
               width: 250,
-              items: [{
-                type: 'custom',
-                fallback: [],
-                render: function render(editorView) {
-                  return /*#__PURE__*/React.createElement(HyperlinkToolbarAppearance, {
-                    key: "link-appearance",
-                    url: link,
-                    intl: intl,
-                    editorView: editorView,
-                    editorState: state,
-                    cardOptions: options === null || options === void 0 ? void 0 : options.cardOptions,
-                    providerFactory: providerFactory,
-                    platform: options === null || options === void 0 ? void 0 : options.platform,
-                    editorAnalyticsApi: editorAnalyticsApi
-                  });
-                }
-              }, {
+              items: [].concat(_toConsumableArray((_toolbarKey$getState$ = (_toolbarKey$getState = toolbarKey.getState(state)) === null || _toolbarKey$getState === void 0 ? void 0 : _toolbarKey$getState.items(state, intl, providerFactory, link)) !== null && _toolbarKey$getState$ !== void 0 ? _toolbarKey$getState$ : []), [{
                 id: 'editor.link.edit',
                 type: 'button',
                 onClick: editInsertedLink(),
@@ -145,7 +134,7 @@ export var getToolbarConfig = function getToolbarConfig(options, featureFlags, e
                 disabled: !isValidUrl,
                 target: '_blank',
                 href: isValidUrl ? link : undefined,
-                onClick: visitHyperlink(),
+                onClick: visitHyperlink(editorAnalyticsApi),
                 selected: false,
                 title: labelOpenLink,
                 icon: OpenIcon,
@@ -173,7 +162,7 @@ export var getToolbarConfig = function getToolbarConfig(options, featureFlags, e
                   formatMessage: formatMessage,
                   markType: state.schema.marks.link
                 }]
-              }].concat(_toConsumableArray(getSettingsButtonGroup(state, intl, featureFlags))),
+              }], _toConsumableArray(getSettingsButtonGroup(state, intl, featureFlags, editorAnalyticsApi))),
               scrollable: true
             });
           }

package/dist/esm/plugins/hyperlink/commands.js

@@ -191,10 +191,13 @@ export function showLinkToolbar() {
 export function hideLinkToolbar() {
   return function (state, dispatch) {
     if (dispatch) {
-      dispatch(state.tr.setMeta(stateKey, {
-        type: LinkAction.HIDE_TOOLBAR
-      }));
+      dispatch(hideLinkToolbarSetMeta(state.tr));
     }
     return true;
   };
+}
+export function hideLinkToolbarSetMeta(tr) {
+  return tr.setMeta(stateKey, {
+    type: LinkAction.HIDE_TOOLBAR
+  });
 }

package/dist/esm/plugins/hyperlink/index.js

@@ -4,13 +4,14 @@ import { createInputRulePlugin } from './pm-plugins/input-rule';
 import { createKeymapPlugin } from './pm-plugins/keymap';
 import { plugin as _plugin, stateKey, LinkAction } from './pm-plugins/main';
 import fakeCursorToolbarPlugin from './pm-plugins/fake-cursor-for-toolbar';
+import { toolbarButtonsPlugin, prependToolbarButtons } from './pm-plugins/toolbar-buttons';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getToolbarConfig } from './Toolbar';
 import { tooltip, addLink } from '../../keymaps';
 import { IconLink } from '../quick-insert/assets';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 var hyperlinkPlugin = function hyperlinkPlugin() {
-  var _api$dependencies, _api$dependencies$fea, _api$dependencies$ana;
+  var _api$dependencies, _api$dependencies$fea;
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var api = arguments.length > 1 ? arguments[1] : undefined;
   var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
@@ -22,6 +23,9 @@ var hyperlinkPlugin = function hyperlinkPlugin() {
         mark: link
       }];
     },
+    actions: {
+      prependToolbarButtons: prependToolbarButtons
+    },
     pmPlugins: function pmPlugins() {
       var _options$cardOptions;
       // Skip analytics if card provider is available, as they will be
@@ -50,6 +54,9 @@ var hyperlinkPlugin = function hyperlinkPlugin() {
         plugin: function plugin() {
           return createKeymapPlugin(skipAnalytics);
         }
+      }, {
+        name: 'hyperlinkToolbarButtons',
+        plugin: toolbarButtonsPlugin
       }];
     },
     pluginsOptions: {
@@ -85,7 +92,7 @@ var hyperlinkPlugin = function hyperlinkPlugin() {
           }
         }];
       },
-      floatingToolbar: getToolbarConfig(options, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions)
+      floatingToolbar: getToolbarConfig(options, featureFlags, api)
     }
   };
 };

package/dist/esm/plugins/hyperlink/pm-plugins/toolbar-buttons.js

@@ -0,0 +1,32 @@
+import { PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+export var toolbarKey = new PluginKey('hyperlinkToolbarItems');
+export var prependToolbarButtons = function prependToolbarButtons(_ref) {
+  var items = _ref.items,
+    onEscapeCallback = _ref.onEscapeCallback,
+    view = _ref.view;
+  var tr = view.state.tr,
+    dispatch = view.dispatch;
+  tr.setMeta(toolbarKey, {
+    items: items,
+    onEscapeCallback: onEscapeCallback
+  });
+  dispatch(tr);
+};
+export var toolbarButtonsPlugin = function toolbarButtonsPlugin() {
+  return new SafePlugin({
+    key: toolbarKey,
+    state: {
+      init: function init(_, state) {
+        return undefined;
+      },
+      apply: function apply(tr, pluginState) {
+        var metaState = tr.getMeta(toolbarKey);
+        if (metaState) {
+          return metaState;
+        }
+        return pluginState;
+      }
+    }
+  });
+};

package/dist/esm/plugins/hyperlink/ui/EditorLinkPicker/index.js

@@ -3,8 +3,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["view", "onCancel", "invokeMethod", "editorAppearance", "onClose"];
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { LinkPicker } from '@atlaskit/link-picker';
-import { hideLinkToolbar as cardHideLinkToolbar } from '../../../card/pm-plugins/actions';
-import { hideLinkToolbar } from '../../commands';
+import { hideLinkToolbarSetMeta, hideLinkToolbar } from '../../commands';
+import { toolbarKey } from '../../pm-plugins/toolbar-buttons';
 import { useEscapeClickaway } from './useEscapeClickaway';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { getAnalyticsEditorAppearance } from '@atlaskit/editor-common/utils';
@@ -43,8 +43,11 @@ export var EditorLinkPicker = function EditorLinkPicker(_ref) {
     };
   }, []);
   var onEscape = useCallback(function () {
-    hideLinkToolbar()(view.state, view.dispatch);
-    view.dispatch(cardHideLinkToolbar(view.state.tr));
+    var _toolbarKey$getState, _toolbarKey$getState$;
+    var tr = view.state.tr;
+    hideLinkToolbarSetMeta(tr);
+    (_toolbarKey$getState = toolbarKey.getState(view.state)) === null || _toolbarKey$getState === void 0 ? void 0 : (_toolbarKey$getState$ = _toolbarKey$getState.onEscapeCallback) === null || _toolbarKey$getState$ === void 0 ? void 0 : _toolbarKey$getState$.call(_toolbarKey$getState, tr);
+    view.dispatch(tr);
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   }, [view, onCancel]);
   var onClickAway = useCallback(function () {

package/dist/esm/plugins/hyperlink/ui/HyperlinkAddToolbar/HyperlinkAddToolbar.js

@@ -26,7 +26,7 @@ import Tooltip from '@atlaskit/tooltip';
 import { PureComponent } from 'react';
 import { defineMessages, injectIntl } from 'react-intl-next';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
-import { linkToolbarMessages as linkToolbarCommonMessages } from '../../../../messages';
+import { linkToolbarMessages as linkToolbarCommonMessages } from '@atlaskit/editor-common/messages';
 import PanelTextInput from '../../../../ui/PanelTextInput';
 import LinkSearchList from '../../../../ui/LinkSearch/LinkSearchList';
 import { container, containerWithProvider, inputWrapper } from '../../../../ui/LinkSearch/ToolbarComponents';
@@ -35,12 +35,12 @@ import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import { filterUniqueItems } from '../../../../utils/array';
 import debounce from 'lodash/debounce';
 import { mapContentTypeToIcon, sha1, wordCount } from './utils';
-import { hideLinkToolbar } from '../../commands';
-import { hideLinkToolbar as cardHideLinkToolbar } from '../../../card/pm-plugins/actions';
+import { hideLinkToolbar, hideLinkToolbarSetMeta } from '../../commands';
 import { visuallyHiddenStyles } from '../../styles';
 import { browser } from '@atlaskit/editor-common/utils';
 import { transformTimeStamp } from '../../../../ui/LinkSearch/transformTimeStamp';
 import Announcer from '../../../../utils/announcer/announcer';
+import { toolbarKey } from '../../pm-plugins/toolbar-buttons';
 export var RECENT_SEARCH_LIST_SIZE = 5;
 var clearText = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  cursor: pointer;\n  padding: 0;\n  margin-right: 8px;\n  color: ", ";\n  background: transparent;\n  border: none;\n"])), "var(--ds-icon-subtle, ".concat(N90, ")"));
 var textInputWrapper = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", ";\n  border-top: 1px solid ", ";\n  border-bottom: 1px solid ", ";\n"])), inputWrapper, "var(--ds-border, ".concat(N30, ")"), "var(--ds-border, ".concat(N30, ")"));
@@ -499,10 +499,14 @@ export var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
       var KEY_CODE_ARROW_DOWN = 40;
       var KEY_CODE_ARROW_UP = 38;
       if (keyCode === KEY_CODE_ESCAPE) {
+        var _toolbarKey$getState, _toolbarKey$getState$;
         // escape
         event.preventDefault();
-        hideLinkToolbar()(view.state, view.dispatch);
-        view.dispatch(cardHideLinkToolbar(view.state.tr));
+        var tr = view.state.tr,
+          dispatch = view.dispatch;
+        hideLinkToolbarSetMeta(tr);
+        (_toolbarKey$getState = toolbarKey.getState(view.state)) === null || _toolbarKey$getState === void 0 ? void 0 : (_toolbarKey$getState$ = _toolbarKey$getState.onEscapeCallback) === null || _toolbarKey$getState$ === void 0 ? void 0 : _toolbarKey$getState$.call(_toolbarKey$getState, tr);
+        dispatch(tr);
         return;
       }
       if (!items || !items.length) {

package/dist/esm/plugins/media/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { PluginKey, NodeSelection } from 'prosemirror-state';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline } from '@atlaskit/adf-schema';
+import { media, mediaGroup, mediaInline, mediaSingleSpec } from '@atlaskit/adf-schema';
 import { stateKey as pluginKey, createPlugin } from './pm-plugins/main';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { createPlugin as createMediaAltTextPlugin } from './pm-plugins/alt-text';
@@ -22,6 +22,7 @@ import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { ReactMediaNode } from './nodeviews/mediaNodeView';
 import { ReactMediaInlineNode } from './nodeviews/mediaInline';
 import { stateKey } from './pm-plugins/plugin-key';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export { insertMediaSingleNode } from './utils/media-single';
 var mediaPlugin = function mediaPlugin() {
   var _api$dependencies, _api$dependencies$fea;
@@ -45,7 +46,14 @@ var mediaPlugin = function mediaPlugin() {
         mediaFeatureFlags = _ref.featureFlags;
       var captions = getMediaFeatureFlag('captions', mediaFeatureFlags);
       var allowMediaInline = getMediaFeatureFlag('mediaInline', mediaFeatureFlags);
-      var mediaSingleNode = captions ? mediaSingleWithCaption : mediaSingle;
+      var mediaSingleOption = getBooleanFF('platform.editor.media.extended-resize-experience') ? {
+        withCaption: captions,
+        withExtendedWidthTypes: true
+      } : {
+        withCaption: captions,
+        withExtendedWidthTypes: false
+      };
+      var mediaSingleNode = mediaSingleSpec(mediaSingleOption);
       return [{
         name: 'mediaGroup',
         node: mediaGroup

package/dist/esm/plugins/media/toolbar/index.js

@@ -19,7 +19,7 @@ import { showLinkingToolbar } from '../commands/linking';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { messages } from '@atlaskit/media-ui';
-import { messages as cardMessages } from '../../card/messages';
+import { cardMessages } from '@atlaskit/editor-common/messages';
 import { FilePreviewItem } from './filePreviewItem';
 import { downloadMedia, removeMediaGroupNode } from './utils';
 import { changeInlineToMediaCard, changeMediaCardToInline, removeInlineCard, setBorderMark, toggleBorderMark } from './commands';

package/dist/esm/plugins/media/utils/media-common.js

@@ -7,7 +7,7 @@ import { mapSlice } from '../../../utils/slice';
 import { walkUpTreeUntil, removeNestedEmptyEls, unwrap } from '../../../utils/dom';
 import { isImage } from './is-image';
 import { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, endPositionOfParent, startPositionOfParent } from '../../../utils/prosemirror/position';
-import { GapCursorSelection } from '../../selection/gap-cursor/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { isMediaBlobUrl } from '@atlaskit/media-client';
 export var isMediaBlobUrlFromAttrs = function isMediaBlobUrlFromAttrs(attrs) {
   return !!(attrs && attrs.type === 'external' && isMediaBlobUrl(attrs.url));

package/dist/esm/plugins/paste/handlers.js

@@ -15,7 +15,6 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { compose, insideTable, isParagraph, isText, isLinkMark, insideTableCell, isInListItem } from '../../utils';
 import { mapSlice } from '../../utils/slice';
 import { INPUT_METHOD } from '../analytics';
-import { queueCardsFromChangedTr } from '../card/pm-plugins/doc';
 import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
 import { linkifyContent } from '@atlaskit/editor-common/utils';
 import { runMacroAutoConvert } from '../macro';
@@ -28,7 +27,6 @@ import { insertSliceForLists } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { doesSelectionWhichStartsOrEndsInListContainEntireList } from '../../utils/lists';
-
 // remove text attribute from mention for copy/paste (GDPR)
 export function handleMention(slice, schema) {
   return mapSlice(slice, function (node) {
@@ -42,7 +40,7 @@ export function handleMention(slice, schema) {
     return node;
   });
 }
-export function handlePasteIntoTaskOrDecisionOrPanel(slice) {
+export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
     var _slice$content$firstC, _transformedSlice$con;
     var schema = state.schema,
@@ -107,7 +105,7 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice) {
       // This maintains both the selection (destination) and the slice (paste content).
       safeInsert(transformedSlice.content)(tr).scrollIntoView();
     }
-    queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
+    queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
     if (dispatch) {
       dispatch(tr);
     }
@@ -329,7 +327,7 @@ export function handlePasteAsPlainText(slice, _event) {
     return false;
   };
 }
-export function handlePastePreservingMarks(slice) {
+export function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
     var schema = state.schema,
       selection = state.tr.selection;
@@ -365,7 +363,7 @@ export function handlePastePreservingMarks(slice) {
     // special case for plainTextSlice & linkMark: merge into existing link
     if (isPlainTextSlice && linkMark.isInSet(selectionMarks) && selectionMarks.length === 1) {
       var tr = closeHistory(state.tr).replaceSelectionWith(slice.content.firstChild.firstChild, true).setStoredMarks(selectionMarks).scrollIntoView();
-      queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
+      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
       if (dispatch) {
         dispatch(tr);
       }
@@ -377,7 +375,7 @@ export function handlePastePreservingMarks(slice) {
     if (hasOnlyNodesOfType(bulletList, hardBreak, heading, listItem, paragraph, text, emoji, mention, orderedList)(slice)) {
       var transformedSlice = applyTextMarksToSlice(schema, selectionMarks)(slice);
       var _tr2 = closeHistory(state.tr).replaceSelection(transformedSlice).setStoredMarks(selectionMarks).scrollIntoView();
-      queueCardsFromChangedTr(state, _tr2, INPUT_METHOD.CLIPBOARD);
+      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, _tr2, INPUT_METHOD.CLIPBOARD);
       if (dispatch) {
         dispatch(_tr2);
       }
@@ -439,7 +437,7 @@ function insertAutoMacro(slice, macro, view, from, to) {
   }
   return false;
 }
-export function handleMacroAutoConvert(text, slice, cardsOptions, extensionAutoConverter) {
+export function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, cardsOptions, extensionAutoConverter) {
   return function (state, dispatch, view) {
     var macro = null;
 
@@ -477,7 +475,7 @@ export function handleMacroAutoConvert(text, slice, cardsOptions, extensionAutoC
           var _getPastePluginState = getPastePluginState(view.state),
             pastedMacroPositions = _getPastePluginState.pastedMacroPositions;
           if (dispatch) {
-            handleMarkdown(slice, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo])(view.state, dispatch);
+            handleMarkdown(slice, queueCardsFromChangedTr, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo])(view.state, dispatch);
           }
         }).catch(function () {
           var _getPastePluginState2 = getPastePluginState(view.state),
@@ -583,7 +581,7 @@ export function handleExpandPasteInTable(slice) {
     return false;
   };
 }
-export function handleMarkdown(markdownSlice, from, to) {
+export function handleMarkdown(markdownSlice, queueCardsFromChangedTr, from, to) {
   return function (state, dispatch) {
     var tr = closeHistory(state.tr);
     var pastesFrom = typeof from === 'number' ? from : tr.selection.from;
@@ -593,7 +591,7 @@ export function handleMarkdown(markdownSlice, from, to) {
       tr.replaceSelection(markdownSlice);
     }
     tr.setSelection(TextSelection.near(tr.doc.resolve(pastesFrom + markdownSlice.size), -1));
-    queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
+    queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
     if (dispatch) {
       dispatch(tr.scrollIntoView());
     }
@@ -745,7 +743,7 @@ export function flattenNestedListInSlice(slice) {
   var contentWithFlattenedList = slice.content.replaceChild(0, listToFlatten.type.createChecked(listToFlatten.attrs, leafListItems));
   return new Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
-export function handleRichText(slice) {
+export function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
     var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     var _state$schema$nodes3 = state.schema.nodes,
@@ -819,8 +817,9 @@ export function handleRichText(slice) {
     tr.scrollIntoView();
 
     // queue link cards, ignoring any errors
+    queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
     if (dispatch) {
-      dispatch(queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD));
+      dispatch(tr);
     }
     return true;
   };

package/dist/esm/plugins/paste/index.js

@@ -14,7 +14,7 @@ var pastePlugin = function pastePlugin(_ref, api) {
             providerFactory = _ref2.providerFactory,
             dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
             dispatch = _ref2.dispatch;
-          return createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, cardOptions, sanitizePrivateContent, providerFactory);
+          return createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, api, cardOptions, sanitizePrivateContent, providerFactory);
         }
       }];
     }

package/dist/esm/plugins/paste/pm-plugins/analytics.js

@@ -223,10 +223,11 @@ export var handlePasteAsPlainTextWithAnalytics = function handlePasteAsPlainText
     asPlain: true
   }))(handlePasteAsPlainText(slice, event));
 };
-export var handlePasteIntoTaskAndDecisionWithAnalytics = function handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, type) {
+export var handlePasteIntoTaskAndDecisionWithAnalytics = function handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, type, pluginInjectionApi) {
+  var _pluginInjectionApi$d, _pluginInjectionApi$d2;
   return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: type
-  }))(handlePasteIntoTaskOrDecisionOrPanel(slice));
+  }))(handlePasteIntoTaskOrDecisionOrPanel(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.actions) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.queueCardsFromChangedTr));
 };
 export var handlePasteIntoCaptionWithAnalytics = function handlePasteIntoCaptionWithAnalytics(view, event, slice, type) {
   return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
@@ -243,20 +244,23 @@ export var handleMediaSingleWithAnalytics = function handleMediaSingleWithAnalyt
     type: type
   }))(handleMediaSingle(INPUT_METHOD.CLIPBOARD)(slice));
 };
-export var handlePastePreservingMarksWithAnalytics = function handlePastePreservingMarksWithAnalytics(view, event, slice, type) {
+export var handlePastePreservingMarksWithAnalytics = function handlePastePreservingMarksWithAnalytics(view, event, slice, type, pluginInjectionApi) {
+  var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
   return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: type
-  }))(handlePastePreservingMarks(slice));
+  }))(handlePastePreservingMarks(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.actions) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.queueCardsFromChangedTr));
 };
-export var handleMarkdownWithAnalytics = function handleMarkdownWithAnalytics(view, event, slice) {
+export var handleMarkdownWithAnalytics = function handleMarkdownWithAnalytics(view, event, slice, pluginInjectionApi) {
+  var _pluginInjectionApi$d5, _pluginInjectionApi$d6;
   return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.markdown
-  }))(handleMarkdown(slice));
+  }))(handleMarkdown(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d5 = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : (_pluginInjectionApi$d6 = _pluginInjectionApi$d5.actions) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.queueCardsFromChangedTr));
 };
-export var handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice) {
+export var handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi) {
+  var _pluginInjectionApi$d7, _pluginInjectionApi$d8;
   return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
-  }))(handleRichText(slice));
+  }))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d7 = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d7 === void 0 ? void 0 : (_pluginInjectionApi$d8 = _pluginInjectionApi$d7.actions) === null || _pluginInjectionApi$d8 === void 0 ? void 0 : _pluginInjectionApi$d8.queueCardsFromChangedTr));
 };
 function injectAnalyticsPayloadBeforeCommand(createPayloadByTransaction) {
   return function (mainCommand) {

package/dist/esm/plugins/paste/pm-plugins/main.js

@@ -9,7 +9,7 @@ import { mapChildren } from '../../../utils/slice';
 import { getExtensionAutoConvertersFromProvider } from '@atlaskit/editor-common/extensions';
 import * as clipboard from '../../../utils/clipboard';
 import { transformSliceForMedia } from '../../media/utils/media-single';
-import { escapeLinks, htmlContainsSingleFile, isPastedFromWord, isPastedFromExcel, htmlHasInvalidLinkTags, removeDuplicateInvalidLinks } from '../util';
+import { escapeLinks, htmlContainsSingleFile, isPastedFromWord, isPastedFromExcel, htmlHasInvalidLinkTags, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from '../util';
 import { linkifyContent } from '@atlaskit/editor-common/utils';
 import { transformSliceNestedExpandToExpand } from '../../expand/utils';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks } from '../handlers';
@@ -21,7 +21,6 @@ import { measureRender } from '@atlaskit/editor-common/utils';
 import { transformSliceToCorrectMediaWrapper, unwrapNestedMediaElements } from '../../media/utils/media-common';
 import { upgradeTextToLists, splitParagraphs } from '../../list/transforms';
 import { md } from '@atlaskit/editor-common/paste';
-import { transformUnsupportedBlockCardToInline } from '../../card/utils';
 import { transformSliceToDecisionList } from '../../tasks-and-decisions/utils';
 import { containsAnyAnnotations, stripNonExistingAnnotations } from '../../annotation/utils';
 import { pluginKey as betterTypePluginKey } from '../../base/pm-plugins/better-type-history';
@@ -32,7 +31,7 @@ import { extractSliceFromStep } from '../../../utils/step';
 import { pluginKey as stateKey, createPluginState } from './plugin-factory';
 export { pluginKey as stateKey } from './plugin-factory';
 import { hasParentNodeOfType } from 'prosemirror-utils';
-export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, cardOptions, sanitizePrivateContent, providerFactory) {
+export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pluginInjectionApi, cardOptions, sanitizePrivateContent, providerFactory) {
   var atlassianMarkDownParser = new MarkdownTransformer(schema, md);
   function getMarkdownSlice(text, openStart, openEnd) {
     var textInput = text;
@@ -228,13 +227,14 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // force a "paste as plain text" action by clearing the markdownSlice.
           markdownSlice = !((_markdownSlice = markdownSlice) !== null && _markdownSlice !== void 0 && _markdownSlice.size) ? undefined : markdownSlice;
           if (markdownSlice) {
+            var _pluginInjectionApi$d, _pluginInjectionApi$d2;
             // linkify text prior to converting to macro
             if (handlePasteLinkOnSelectedTextWithAnalytics(view, event, markdownSlice, PasteTypes.markdown)(state, dispatch)) {
               return true;
             }
 
             // run macro autoconvert prior to other conversions
-            if (handleMacroAutoConvert(text, markdownSlice, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
+            if (handleMacroAutoConvert(text, markdownSlice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.actions) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.queueCardsFromChangedTr, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
               // TODO: handleMacroAutoConvert dispatch twice, so we can't use the helper
               sendPasteAnalyticsEvent(view, event, markdownSlice, {
                 type: PasteTypes.markdown
@@ -257,7 +257,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (slice.openStart === 0 && selectionParentNode && edgeCaseNodeTypes.includes(selectionParentType)) {
           slice.openStart = 1;
         }
-        if (handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, isPlainText ? PasteTypes.plain : PasteTypes.richText)(state, dispatch)) {
+        if (handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, isPlainText ? PasteTypes.plain : PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
           return true;
         }
 
@@ -274,10 +274,10 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // If the clipboard only contains plain text, attempt to parse it as Markdown
         if (isPlainText && markdownSlice) {
-          if (handlePastePreservingMarksWithAnalytics(view, event, markdownSlice, PasteTypes.markdown)(state, dispatch)) {
+          if (handlePastePreservingMarksWithAnalytics(view, event, markdownSlice, PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
             return true;
           }
-          return handleMarkdownWithAnalytics(view, event, markdownSlice)(state, dispatch);
+          return handleMarkdownWithAnalytics(view, event, markdownSlice, pluginInjectionApi)(state, dispatch);
         }
         if (isRichText && isInsideBlockQuote(state)) {
           //If pasting inside blockquote
@@ -298,6 +298,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText) {
+          var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -305,7 +306,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           }
 
           // run macro autoconvert prior to other conversions
-          if (handleMacroAutoConvert(text, slice, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
+          if (handleMacroAutoConvert(text, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.actions) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.queueCardsFromChangedTr, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
             // TODO: handleMacroAutoConvert dispatch twice, so we can't use the helper
             sendPasteAnalyticsEvent(view, event, slice, {
               type: PasteTypes.richText
@@ -329,7 +330,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           }
 
           // ED-4732
-          if (handlePastePreservingMarksWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
+          if (handlePastePreservingMarksWithAnalytics(view, event, slice, PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
             return true;
           }
 
@@ -367,7 +368,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists && handlePasteNonNestableBlockNodesIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
             return true;
           }
-          return handleRichTextWithAnalytics(view, event, slice)(state, dispatch);
+          return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi)(state, dispatch);
         }
         return false;
       },