@atlaskit/editor-core 189.0.4 → 189.0.6

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

@@ -1,5 +1,4 @@
 import { ACTION, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT, ACTION_SUBJECT_ID, PasteTypes, PasteContents } from '@atlaskit/editor-common/analytics';
-import { addAnalytics } from '../../analytics';
 import { getPasteSource } from '../util';
 import { handlePasteAsPlainText, handlePasteIntoTaskOrDecisionOrPanel, handleCodeBlock, handleMediaSingle, handlePastePreservingMarks, handleMarkdown, handleRichText, handleExpandPasteInTable, handleSelectedTable, handlePasteLinkOnSelectedText, handlePasteIntoCaption, handlePastePanelOrDecisionContentIntoList, handlePasteNonNestableBlockNodesIntoList } from '../handlers';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
@@ -215,48 +214,50 @@ export function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
 // TODO: ED-6612 We should not dispatch only analytics, it's preferred to wrap each command with his own analytics.
 // However, handlers like handleMacroAutoConvert dispatch multiple time,
 // so pasteCommandWithAnalytics is useless in this case.
-export function sendPasteAnalyticsEvent(view, event, slice, pasteContext) {
+export const sendPasteAnalyticsEvent = editorAnalyticsAPI => (view, event, slice, pasteContext) => {
+  const tr = view.state.tr;
   const payload = createPasteAnalyticsPayload(view, event, slice, pasteContext);
-  view.dispatch(addAnalytics(view.state, view.state.tr, payload));
-}
-export const handlePasteAsPlainTextWithAnalytics = (view, event, slice) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+  view.dispatch(tr);
+};
+export const handlePasteAsPlainTextWithAnalytics = editorAnalyticsAPI => (view, event, slice) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.plain,
   asPlain: true
-}))(handlePasteAsPlainText(slice, event));
+}))(handlePasteAsPlainText(slice, event, editorAnalyticsAPI));
 export const handlePasteIntoTaskAndDecisionWithAnalytics = (view, event, slice, type, pluginInjectionApi) => {
-  var _pluginInjectionApi$c, _pluginInjectionApi$c2;
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+  var _pluginInjectionApi$a, _pluginInjectionApi$c, _pluginInjectionApi$c2;
+  return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type
   }))(handlePasteIntoTaskOrDecisionOrPanel(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 ? void 0 : (_pluginInjectionApi$c2 = _pluginInjectionApi$c.actions) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.queueCardsFromChangedTr));
 };
-export const handlePasteIntoCaptionWithAnalytics = (view, event, slice, type) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+export const handlePasteIntoCaptionWithAnalytics = editorAnalyticsAPI => (view, event, slice, type) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type
 }))(handlePasteIntoCaption(slice));
-export const handleCodeBlockWithAnalytics = (view, event, slice, text) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+export const handleCodeBlockWithAnalytics = editorAnalyticsAPI => (view, event, slice, text) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.plain
 }))(handleCodeBlock(text));
-export const handleMediaSingleWithAnalytics = (view, event, slice, type, insertMediaAsMediaSingle) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+export const handleMediaSingleWithAnalytics = editorAnalyticsAPI => (view, event, slice, type, insertMediaAsMediaSingle) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type
 }))(handleMediaSingle(INPUT_METHOD.CLIPBOARD, insertMediaAsMediaSingle)(slice));
 export const handlePastePreservingMarksWithAnalytics = (view, event, slice, type, pluginInjectionApi) => {
-  var _pluginInjectionApi$c3, _pluginInjectionApi$c4;
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+  var _pluginInjectionApi$a2, _pluginInjectionApi$c3, _pluginInjectionApi$c4;
+  return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type
   }))(handlePastePreservingMarks(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c3 = pluginInjectionApi.card) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : (_pluginInjectionApi$c4 = _pluginInjectionApi$c3.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr));
 };
 export const handleMarkdownWithAnalytics = (view, event, slice, pluginInjectionApi) => {
-  var _pluginInjectionApi$c5, _pluginInjectionApi$c6;
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+  var _pluginInjectionApi$a3, _pluginInjectionApi$c5, _pluginInjectionApi$c6;
+  return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.markdown
   }))(handleMarkdown(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c5 = pluginInjectionApi.card) === null || _pluginInjectionApi$c5 === void 0 ? void 0 : (_pluginInjectionApi$c6 = _pluginInjectionApi$c5.actions) === null || _pluginInjectionApi$c6 === void 0 ? void 0 : _pluginInjectionApi$c6.queueCardsFromChangedTr));
 };
 export const handleRichTextWithAnalytics = (view, event, slice, pluginInjectionApi) => {
-  var _pluginInjectionApi$c7, _pluginInjectionApi$c8;
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+  var _pluginInjectionApi$a4, _pluginInjectionApi$c7, _pluginInjectionApi$c8;
+  return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
   }))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c7 = pluginInjectionApi.card) === null || _pluginInjectionApi$c7 === void 0 ? void 0 : (_pluginInjectionApi$c8 = _pluginInjectionApi$c7.actions) === null || _pluginInjectionApi$c8 === void 0 ? void 0 : _pluginInjectionApi$c8.queueCardsFromChangedTr));
 };
-function injectAnalyticsPayloadBeforeCommand(createPayloadByTransaction) {
+const injectAnalyticsPayloadBeforeCommand = editorAnalyticsAPI => createPayloadByTransaction => {
   return mainCommand => {
     return (state, dispatch, view) => {
       let originalTransaction = state.tr;
@@ -270,28 +271,28 @@ function injectAnalyticsPayloadBeforeCommand(createPayloadByTransaction) {
       if (dispatch && originalTransaction.docChanged) {
         // it needs to know the selection before the changes
         const payload = createPayloadByTransaction(state.selection);
-        addAnalytics(state, originalTransaction, payload);
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(payload)(originalTransaction);
         dispatch(originalTransaction);
       }
       return true;
     };
   };
-}
-export const handlePastePanelOrDecisionIntoListWithAnalytics = (view, event, slice, findRootParentListNode) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+};
+export const handlePastePanelOrDecisionIntoListWithAnalytics = editorAnalyticsAPI => (view, event, slice, findRootParentListNode) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.richText
 }))(handlePastePanelOrDecisionContentIntoList(slice, findRootParentListNode));
-export const handlePasteNonNestableBlockNodesIntoListWithAnalytics = (view, event, slice) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+export const handlePasteNonNestableBlockNodesIntoListWithAnalytics = editorAnalyticsAPI => (view, event, slice) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.richText,
   pasteSplitList: true
 }))(handlePasteNonNestableBlockNodesIntoList(slice));
-export const handleExpandWithAnalytics = (view, event, slice) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+export const handleExpandWithAnalytics = editorAnalyticsAPI => (view, event, slice) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.richText,
   pasteSplitList: true
 }))(handleExpandPasteInTable(slice));
-export const handleSelectedTableWithAnalytics = (view, event, slice) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+export const handleSelectedTableWithAnalytics = editorAnalyticsAPI => (view, event, slice) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.richText
-}))(handleSelectedTable(slice));
-export const handlePasteLinkOnSelectedTextWithAnalytics = (view, event, slice, type) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+}))(handleSelectedTable(editorAnalyticsAPI)(slice));
+export const handlePasteLinkOnSelectedTextWithAnalytics = editorAnalyticsAPI => (view, event, slice, type) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type,
   hyperlinkPasteOnText: true
 }))(handlePasteLinkOnSelectedText(slice));

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

@@ -26,6 +26,8 @@ export { pluginKey as stateKey } from './plugin-factory';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { PastePluginActionTypes } from '../actions';
 export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pluginInjectionApi, cardOptions, sanitizePrivateContent, providerFactory) {
+  var _pluginInjectionApi$a;
+  const editorAnalyticsAPI = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
   const atlassianMarkDownParser = new MarkdownTransformer(schema, md);
   function getMarkdownSlice(text, openStart, openEnd) {
     let textInput = text;
@@ -203,7 +205,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         };
         slice = handleParagraphBlockMarks(state, slice);
         const plainTextPasteSlice = linkifyContent(state.schema)(slice);
-        if (handlePasteAsPlainTextWithAnalytics(view, event, plainTextPasteSlice)(state, dispatch, view)) {
+        if (handlePasteAsPlainTextWithAnalytics(editorAnalyticsAPI)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
         }
 
@@ -223,14 +225,14 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (markdownSlice) {
             var _pluginInjectionApi$c, _pluginInjectionApi$c2;
             // linkify text prior to converting to macro
-            if (handlePasteLinkOnSelectedTextWithAnalytics(view, event, markdownSlice, PasteTypes.markdown)(state, dispatch)) {
+            if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, markdownSlice, PasteTypes.markdown)(state, dispatch)) {
               return true;
             }
 
             // run macro autoconvert prior to other conversions
             if (handleMacroAutoConvert(text, markdownSlice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 ? void 0 : (_pluginInjectionApi$c2 = _pluginInjectionApi$c.actions) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.queueCardsFromChangedTr, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
               // TODO: handleMacroAutoConvert dispatch twice, so we can't use the helper
-              sendPasteAnalyticsEvent(view, event, markdownSlice, {
+              sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, markdownSlice, {
                 type: PasteTypes.markdown
               });
               return true;
@@ -257,13 +259,13 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
 
         // If we're in a code block, append the text contents of clipboard inside it
-        if (handleCodeBlockWithAnalytics(view, event, slice, text)(state, dispatch)) {
+        if (handleCodeBlockWithAnalytics(editorAnalyticsAPI)(view, event, slice, text)(state, dispatch)) {
           return true;
         }
-        if (handleMediaSingleWithAnalytics(view, event, slice, isPastedFile ? PasteTypes.binary : PasteTypes.richText, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$m = pluginInjectionApi.media) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.actions.insertMediaAsMediaSingle)(state, dispatch, view)) {
+        if (handleMediaSingleWithAnalytics(editorAnalyticsAPI)(view, event, slice, isPastedFile ? PasteTypes.binary : PasteTypes.richText, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$m = pluginInjectionApi.media) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.actions.insertMediaAsMediaSingle)(state, dispatch, view)) {
           return true;
         }
-        if (handleSelectedTableWithAnalytics(view, event, slice)(state, dispatch)) {
+        if (handleSelectedTableWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
           return true;
         }
 
@@ -298,14 +300,14 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           var _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
-          if (handlePasteLinkOnSelectedTextWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
+          if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
             return true;
           }
 
           // run macro autoconvert prior to other conversions
           if (handleMacroAutoConvert(text, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c3 = pluginInjectionApi.card) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : (_pluginInjectionApi$c4 = _pluginInjectionApi$c3.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
             // TODO: handleMacroAutoConvert dispatch twice, so we can't use the helper
-            sendPasteAnalyticsEvent(view, event, slice, {
+            sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, slice, {
               type: PasteTypes.richText
             });
             return true;
@@ -314,7 +316,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // get editor-tables to handle pasting tables if it can
           // otherwise, just the replace the selection with the content
           if (handlePasteTable(view, null, slice)) {
-            sendPasteAnalyticsEvent(view, event, slice, {
+            sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, slice, {
               type: PasteTypes.richText
             });
             return true;
@@ -345,7 +347,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             });
             slice = sliceCopy;
           }
-          if (handleExpandWithAnalytics(view, event, slice)(state, dispatch)) {
+          if (handleExpandWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
             return true;
           }
           if (!insideTable(state)) {
@@ -355,13 +357,13 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // Create a custom handler to avoid handling with handleRichText method
           // As SafeInsert is used inside handleRichText which caused some bad UX like this:
           // https://product-fabric.atlassian.net/browse/MEX-1520
-          if (handlePasteIntoCaptionWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
+          if (handlePasteIntoCaptionWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
             return true;
           }
-          if (handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$l = pluginInjectionApi.list) === null || _pluginInjectionApi$l === void 0 ? void 0 : _pluginInjectionApi$l.actions.findRootParentListNode)(state, dispatch)) {
+          if (handlePastePanelOrDecisionIntoListWithAnalytics(editorAnalyticsAPI)(view, event, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$l = pluginInjectionApi.list) === null || _pluginInjectionApi$l === void 0 ? void 0 : _pluginInjectionApi$l.actions.findRootParentListNode)(state, dispatch)) {
             return true;
           }
-          if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists && handlePasteNonNestableBlockNodesIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
+          if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists && handlePasteNonNestableBlockNodesIntoListWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
             return true;
           }
           return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi)(state, dispatch);

package/dist/es2019/plugins/paste/util/index.js

@@ -1,6 +1,6 @@
 import { Slice, Mark, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isMediaBlobUrl } from '@atlaskit/media-client';
-import { ACTION_SUBJECT, addAnalytics, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION } from '../../analytics';
+import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
 import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getSelectedTableInfo, isTableSelected } from '@atlaskit/editor-tables/utils';
@@ -161,13 +161,13 @@ export const removeDuplicateInvalidLinks = html => {
   }
   return html;
 };
-export const addReplaceSelectedTableAnalytics = (state, tr) => {
+export const addReplaceSelectedTableAnalytics = (state, tr, editorAnalyticsAPI) => {
   if (isTableSelected(state.selection)) {
     const {
       totalRowCount,
       totalColumnCount
     } = getSelectedTableInfo(state.selection);
-    addAnalytics(state, tr, {
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: TABLE_ACTION.REPLACED,
       actionSubject: ACTION_SUBJECT.TABLE,
       attributes: {
@@ -176,7 +176,7 @@ export const addReplaceSelectedTableAnalytics = (state, tr) => {
         inputMethod: INPUT_METHOD.CLIPBOARD
       },
       eventType: EVENT_TYPE.TRACK
-    });
+    })(tr);
     return tr;
   }
   return state.tr;

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.0.4";
+export const version = "189.0.6";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/plugins/extension/ui/Extension/Extension/index.js

@@ -15,6 +15,7 @@ import { overlay } from '../styles';
 import ExtensionLozenge from '../Lozenge';
 import classnames from 'classnames';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 function ExtensionWithPluginState(props) {
   var node = props.node,
     handleContentDOMRef = props.handleContentDOMRef,
@@ -27,7 +28,13 @@ function ExtensionWithPluginState(props) {
     shadowClassNames = props.shadowClassNames,
     hideFrame = props.hideFrame,
     editorAppearance = props.editorAppearance;
-  var hasBody = node.type.name === 'bodiedExtension';
+  var isMultiBodiedExtension = false;
+  if (getBooleanFF('platform.editor.multi-bodied-extension_0rygg')) {
+    isMultiBodiedExtension = true;
+  }
+
+  //TODO: clean-up after removing multi-bodied-extension FF
+  var hasBody = node.type.name === 'bodiedExtension' || isMultiBodiedExtension && node.type.name === 'multiBodiedExtension';
   var isMobile = editorAppearance === 'mobile';
   var hasChildren = !!children;
   var removeBorder = hideFrame && !isMobile && !hasBody || false;

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

@@ -331,7 +331,7 @@ export function handlePasteLinkOnSelectedText(slice) {
     return false;
   };
 }
-export function handlePasteAsPlainText(slice, _event) {
+export function handlePasteAsPlainText(slice, _event, editorAnalyticsAPI) {
   return function (state, dispatch, view) {
     var _input;
     if (!view) {
@@ -359,7 +359,7 @@ export function handlePasteAsPlainText(slice, _event) {
       tr = replaceSelectedTable(state, slice);
 
       // add analytics after replacing selected table
-      tr = addReplaceSelectedTableAnalytics(state, tr);
+      tr = addReplaceSelectedTableAnalytics(state, tr, editorAnalyticsAPI);
 
       // otherwise just replace the selection
       if (!tr.docChanged) {
@@ -897,18 +897,20 @@ export function handlePasteIntoCaption(slice) {
     return false;
   };
 }
-export var handleSelectedTable = function handleSelectedTable(slice) {
-  return function (state, dispatch) {
-    var tr = replaceSelectedTable(state, slice);
+export var handleSelectedTable = function handleSelectedTable(editorAnalyticsAPI) {
+  return function (slice) {
+    return function (state, dispatch) {
+      var tr = replaceSelectedTable(state, slice);
 
-    // add analytics after replacing selected table
-    tr = addReplaceSelectedTableAnalytics(state, tr);
-    if (tr.docChanged) {
-      if (dispatch) {
-        dispatch(tr);
+      // add analytics after replacing selected table
+      tr = addReplaceSelectedTableAnalytics(state, tr, editorAnalyticsAPI);
+      if (tr.docChanged) {
+        if (dispatch) {
+          dispatch(tr);
+        }
+        return true;
       }
-      return true;
-    }
-    return false;
+      return false;
+    };
   };
 };

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

@@ -3,7 +3,6 @@ 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; }
 import { ACTION, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT, ACTION_SUBJECT_ID, PasteTypes, PasteContents } from '@atlaskit/editor-common/analytics';
-import { addAnalytics } from '../../analytics';
 import { getPasteSource } from '../util';
 import { handlePasteAsPlainText, handlePasteIntoTaskOrDecisionOrPanel, handleCodeBlock, handleMediaSingle, handlePastePreservingMarks, handleMarkdown, handleRichText, handleExpandPasteInTable, handleSelectedTable, handlePasteLinkOnSelectedText, handlePasteIntoCaption, handlePastePanelOrDecisionContentIntoList, handlePasteNonNestableBlockNodesIntoList } from '../handlers';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
@@ -208,103 +207,127 @@ export function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
 // TODO: ED-6612 We should not dispatch only analytics, it's preferred to wrap each command with his own analytics.
 // However, handlers like handleMacroAutoConvert dispatch multiple time,
 // so pasteCommandWithAnalytics is useless in this case.
-export function sendPasteAnalyticsEvent(view, event, slice, pasteContext) {
-  var payload = createPasteAnalyticsPayload(view, event, slice, pasteContext);
-  view.dispatch(addAnalytics(view.state, view.state.tr, payload));
-}
-export var handlePasteAsPlainTextWithAnalytics = function handlePasteAsPlainTextWithAnalytics(view, event, slice) {
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-    type: PasteTypes.plain,
-    asPlain: true
-  }))(handlePasteAsPlainText(slice, event));
+export var sendPasteAnalyticsEvent = function sendPasteAnalyticsEvent(editorAnalyticsAPI) {
+  return function (view, event, slice, pasteContext) {
+    var tr = view.state.tr;
+    var payload = createPasteAnalyticsPayload(view, event, slice, pasteContext);
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+    view.dispatch(tr);
+  };
+};
+export var handlePasteAsPlainTextWithAnalytics = function handlePasteAsPlainTextWithAnalytics(editorAnalyticsAPI) {
+  return function (view, event, slice) {
+    return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
+      type: PasteTypes.plain,
+      asPlain: true
+    }))(handlePasteAsPlainText(slice, event, editorAnalyticsAPI));
+  };
 };
 export var handlePasteIntoTaskAndDecisionWithAnalytics = function handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, type, pluginInjectionApi) {
-  var _pluginInjectionApi$c;
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+  var _pluginInjectionApi$a, _pluginInjectionApi$c;
+  return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: type
   }))(handlePasteIntoTaskOrDecisionOrPanel(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.actions) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.queueCardsFromChangedTr));
 };
-export var handlePasteIntoCaptionWithAnalytics = function handlePasteIntoCaptionWithAnalytics(view, event, slice, type) {
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-    type: type
-  }))(handlePasteIntoCaption(slice));
+export var handlePasteIntoCaptionWithAnalytics = function handlePasteIntoCaptionWithAnalytics(editorAnalyticsAPI) {
+  return function (view, event, slice, type) {
+    return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
+      type: type
+    }))(handlePasteIntoCaption(slice));
+  };
 };
-export var handleCodeBlockWithAnalytics = function handleCodeBlockWithAnalytics(view, event, slice, text) {
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-    type: PasteTypes.plain
-  }))(handleCodeBlock(text));
+export var handleCodeBlockWithAnalytics = function handleCodeBlockWithAnalytics(editorAnalyticsAPI) {
+  return function (view, event, slice, text) {
+    return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
+      type: PasteTypes.plain
+    }))(handleCodeBlock(text));
+  };
 };
-export var handleMediaSingleWithAnalytics = function handleMediaSingleWithAnalytics(view, event, slice, type, insertMediaAsMediaSingle) {
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-    type: type
-  }))(handleMediaSingle(INPUT_METHOD.CLIPBOARD, insertMediaAsMediaSingle)(slice));
+export var handleMediaSingleWithAnalytics = function handleMediaSingleWithAnalytics(editorAnalyticsAPI) {
+  return function (view, event, slice, type, insertMediaAsMediaSingle) {
+    return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
+      type: type
+    }))(handleMediaSingle(INPUT_METHOD.CLIPBOARD, insertMediaAsMediaSingle)(slice));
+  };
 };
 export var handlePastePreservingMarksWithAnalytics = function handlePastePreservingMarksWithAnalytics(view, event, slice, type, pluginInjectionApi) {
-  var _pluginInjectionApi$c2;
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+  var _pluginInjectionApi$a2, _pluginInjectionApi$c2;
+  return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: type
   }))(handlePastePreservingMarks(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.card) === null || _pluginInjectionApi$c2 === void 0 || (_pluginInjectionApi$c2 = _pluginInjectionApi$c2.actions) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.queueCardsFromChangedTr));
 };
 export var handleMarkdownWithAnalytics = function handleMarkdownWithAnalytics(view, event, slice, pluginInjectionApi) {
-  var _pluginInjectionApi$c3;
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+  var _pluginInjectionApi$a3, _pluginInjectionApi$c3;
+  return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.markdown
   }))(handleMarkdown(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.card) === null || _pluginInjectionApi$c3 === void 0 || (_pluginInjectionApi$c3 = _pluginInjectionApi$c3.actions) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : _pluginInjectionApi$c3.queueCardsFromChangedTr));
 };
 export var handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi) {
-  var _pluginInjectionApi$c4;
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+  var _pluginInjectionApi$a4, _pluginInjectionApi$c4;
+  return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
   }))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.card) === null || _pluginInjectionApi$c4 === void 0 || (_pluginInjectionApi$c4 = _pluginInjectionApi$c4.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr));
 };
-function injectAnalyticsPayloadBeforeCommand(createPayloadByTransaction) {
-  return function (mainCommand) {
-    return function (state, dispatch, view) {
-      var originalTransaction = state.tr;
-      var fakeDispatch = function fakeDispatch(tr) {
-        originalTransaction = tr;
+var injectAnalyticsPayloadBeforeCommand = function injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI) {
+  return function (createPayloadByTransaction) {
+    return function (mainCommand) {
+      return function (state, dispatch, view) {
+        var originalTransaction = state.tr;
+        var fakeDispatch = function fakeDispatch(tr) {
+          originalTransaction = tr;
+        };
+        var result = mainCommand(state, fakeDispatch, view);
+        if (!result) {
+          return false;
+        }
+        if (dispatch && originalTransaction.docChanged) {
+          // it needs to know the selection before the changes
+          var payload = createPayloadByTransaction(state.selection);
+          editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(originalTransaction);
+          dispatch(originalTransaction);
+        }
+        return true;
       };
-      var result = mainCommand(state, fakeDispatch, view);
-      if (!result) {
-        return false;
-      }
-      if (dispatch && originalTransaction.docChanged) {
-        // it needs to know the selection before the changes
-        var payload = createPayloadByTransaction(state.selection);
-        addAnalytics(state, originalTransaction, payload);
-        dispatch(originalTransaction);
-      }
-      return true;
     };
   };
-}
-export var handlePastePanelOrDecisionIntoListWithAnalytics = function handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice, findRootParentListNode) {
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-    type: PasteTypes.richText
-  }))(handlePastePanelOrDecisionContentIntoList(slice, findRootParentListNode));
 };
-export var handlePasteNonNestableBlockNodesIntoListWithAnalytics = function handlePasteNonNestableBlockNodesIntoListWithAnalytics(view, event, slice) {
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-    type: PasteTypes.richText,
-    pasteSplitList: true
-  }))(handlePasteNonNestableBlockNodesIntoList(slice));
+export var handlePastePanelOrDecisionIntoListWithAnalytics = function handlePastePanelOrDecisionIntoListWithAnalytics(editorAnalyticsAPI) {
+  return function (view, event, slice, findRootParentListNode) {
+    return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
+      type: PasteTypes.richText
+    }))(handlePastePanelOrDecisionContentIntoList(slice, findRootParentListNode));
+  };
 };
-export var handleExpandWithAnalytics = function handleExpandWithAnalytics(view, event, slice) {
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-    type: PasteTypes.richText,
-    pasteSplitList: true
-  }))(handleExpandPasteInTable(slice));
+export var handlePasteNonNestableBlockNodesIntoListWithAnalytics = function handlePasteNonNestableBlockNodesIntoListWithAnalytics(editorAnalyticsAPI) {
+  return function (view, event, slice) {
+    return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
+      type: PasteTypes.richText,
+      pasteSplitList: true
+    }))(handlePasteNonNestableBlockNodesIntoList(slice));
+  };
 };
-export var handleSelectedTableWithAnalytics = function handleSelectedTableWithAnalytics(view, event, slice) {
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-    type: PasteTypes.richText
-  }))(handleSelectedTable(slice));
+export var handleExpandWithAnalytics = function handleExpandWithAnalytics(editorAnalyticsAPI) {
+  return function (view, event, slice) {
+    return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
+      type: PasteTypes.richText,
+      pasteSplitList: true
+    }))(handleExpandPasteInTable(slice));
+  };
 };
-export var handlePasteLinkOnSelectedTextWithAnalytics = function handlePasteLinkOnSelectedTextWithAnalytics(view, event, slice, type) {
-  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-    type: type,
-    hyperlinkPasteOnText: true
-  }))(handlePasteLinkOnSelectedText(slice));
+export var handleSelectedTableWithAnalytics = function handleSelectedTableWithAnalytics(editorAnalyticsAPI) {
+  return function (view, event, slice) {
+    return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
+      type: PasteTypes.richText
+    }))(handleSelectedTable(editorAnalyticsAPI)(slice));
+  };
+};
+export var handlePasteLinkOnSelectedTextWithAnalytics = function handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI) {
+  return function (view, event, slice, type) {
+    return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
+      type: type,
+      hyperlinkPasteOnText: true
+    }))(handlePasteLinkOnSelectedText(slice));
+  };
 };
 export var createPasteMeasurePayload = function createPasteMeasurePayload(_ref3) {
   var view = _ref3.view,