@atlaskit/editor-core 189.3.10 → 189.3.11

package/dist/cjs/plugins/extension/actions.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "transformSliceToRemoveOpenBodiedExtension", {
     return _transforms.transformSliceToRemoveOpenBodiedExtension;
   }
 });
-exports.updateExtensionParams = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -19,7 +18,6 @@ var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _analytics2 = require("../analytics");
 var _extensionEvents = require("../analytics/types/extension-events");
 var _utils2 = require("./utils");
 var _main = require("./pm-plugins/main");
@@ -36,140 +34,149 @@ var buildExtensionNode = exports.buildExtensionNode = function buildExtensionNod
       return schema.nodes.bodiedExtension.create(attrs, content, marks);
   }
 };
-var performNodeUpdate = exports.performNodeUpdate = function performNodeUpdate(type, newAttrs, content, marks, shouldScrollIntoView) {
-  return function (_state, _dispatch, view) {
-    if (!view) {
-      throw Error('EditorView is required to perform node update!');
-    }
-    // NOTE: `state` and `dispatch` are stale at this point so we need to grab
-    // the latest one from `view` @see HOT-93986
-    var state = view.state,
-      dispatch = view.dispatch;
-    var newNode = buildExtensionNode(type, state.schema, newAttrs, content, marks);
-    if (!newNode) {
-      return false;
-    }
-    var selection = state.selection,
-      schema = state.schema;
-    var _schema$nodes = schema.nodes,
-      extension = _schema$nodes.extension,
-      inlineExtension = _schema$nodes.inlineExtension,
-      bodiedExtension = _schema$nodes.bodiedExtension;
-    var isBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([bodiedExtension])(selection);
-    var extensionState = (0, _main.getPluginState)(state);
-    var targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
-    var action = _analytics.ACTION.UPDATED;
-    var tr = state.tr;
-
-    // When it's a bodiedExtension but not selected
-    if (newNode.type === bodiedExtension && !isBodiedExtensionSelected) {
-      // Bodied extensions can trigger an update when the cursor is inside which means that there is no node selected.
-      // To work around that we replace the parent and create a text selection instead of new node selection
-      tr = (0, _utils.replaceParentNodeOfType)(state.schema.nodes.bodiedExtension, newNode)(tr);
-      // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-      tr.setSelection(_state2.TextSelection.create(tr.doc, state.selection.anchor));
-    }
-    // If any extension is currently selected
-    else if ((0, _utils.findSelectedNodeOfType)([extension, bodiedExtension, inlineExtension])(selection)) {
-      tr = (0, _utils.replaceSelectedNode)(newNode)(tr);
-      // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-      tr.setSelection(_state2.NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
-    }
-    // When we loose the selection. This usually happens when Synchrony resets or changes
-    // the selection when user is in the middle of updating an extension.
-    else if (extensionState.element) {
-      var pos = view.posAtDOM(extensionState.element, -1);
-      if (pos > -1) {
-        tr = tr.replaceWith(pos, pos + (content.size || 0) + 1, newNode);
-        tr.setSelection(_state2.Selection.near(tr.doc.resolve(pos)));
-        targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
-      } else {
-        action = _analytics.ACTION.ERRORED;
+var performNodeUpdate = exports.performNodeUpdate = function performNodeUpdate(editorAnalyticsAPI) {
+  return function (type, newAttrs, content, marks, shouldScrollIntoView) {
+    return function (_state, _dispatch, view) {
+      if (!view) {
+        throw Error('EditorView is required to perform node update!');
       }
-    }
+      // NOTE: `state` and `dispatch` are stale at this point so we need to grab
+      // the latest one from `view` @see HOT-93986
+      var state = view.state,
+        dispatch = view.dispatch;
+      var newNode = buildExtensionNode(type, state.schema, newAttrs, content, marks);
+      if (!newNode) {
+        return false;
+      }
+      var selection = state.selection,
+        schema = state.schema;
+      var _schema$nodes = schema.nodes,
+        extension = _schema$nodes.extension,
+        inlineExtension = _schema$nodes.inlineExtension,
+        bodiedExtension = _schema$nodes.bodiedExtension;
+      var isBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([bodiedExtension])(selection);
+      var extensionState = (0, _main.getPluginState)(state);
+      var targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
+      var action = _analytics.ACTION.UPDATED;
+      var tr = state.tr;
 
-    // Only scroll if we have anything to update, best to avoid surprise scroll
-    if (dispatch && tr.docChanged) {
-      var _newNode$attrs = newNode.attrs,
-        extensionType = _newNode$attrs.extensionType,
-        extensionKey = _newNode$attrs.extensionKey,
-        layout = _newNode$attrs.layout,
-        localId = _newNode$attrs.localId;
-      (0, _analytics2.addAnalytics)(state, tr, {
-        action: action,
-        actionSubject: _analytics.ACTION_SUBJECT.EXTENSION,
-        actionSubjectId: newNode.type.name,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        attributes: {
-          inputMethod: _analytics.INPUT_METHOD.CONFIG_PANEL,
-          extensionType: extensionType,
-          extensionKey: extensionKey,
-          layout: layout,
-          localId: localId,
-          selection: tr.selection.toJSON(),
-          targetSelectionSource: targetSelectionSource
+      // When it's a bodiedExtension but not selected
+      if (newNode.type === bodiedExtension && !isBodiedExtensionSelected) {
+        // Bodied extensions can trigger an update when the cursor is inside which means that there is no node selected.
+        // To work around that we replace the parent and create a text selection instead of new node selection
+        tr = (0, _utils.replaceParentNodeOfType)(state.schema.nodes.bodiedExtension, newNode)(tr);
+        // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+        tr.setSelection(_state2.TextSelection.create(tr.doc, state.selection.anchor));
+      }
+      // If any extension is currently selected
+      else if ((0, _utils.findSelectedNodeOfType)([extension, bodiedExtension, inlineExtension])(selection)) {
+        tr = (0, _utils.replaceSelectedNode)(newNode)(tr);
+        // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+        tr.setSelection(_state2.NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
+      }
+      // When we loose the selection. This usually happens when Synchrony resets or changes
+      // the selection when user is in the middle of updating an extension.
+      else if (extensionState.element) {
+        var pos = view.posAtDOM(extensionState.element, -1);
+        if (pos > -1) {
+          tr = tr.replaceWith(pos, pos + (content.size || 0) + 1, newNode);
+          tr.setSelection(_state2.Selection.near(tr.doc.resolve(pos)));
+          targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
+        } else {
+          action = _analytics.ACTION.ERRORED;
         }
-      });
-      dispatch(shouldScrollIntoView ? tr.scrollIntoView() : tr);
-    }
-    return true;
+      }
+
+      // Only scroll if we have anything to update, best to avoid surprise scroll
+      if (dispatch && tr.docChanged) {
+        var _newNode$attrs = newNode.attrs,
+          extensionType = _newNode$attrs.extensionType,
+          extensionKey = _newNode$attrs.extensionKey,
+          layout = _newNode$attrs.layout,
+          localId = _newNode$attrs.localId;
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+          action: action,
+          actionSubject: _analytics.ACTION_SUBJECT.EXTENSION,
+          actionSubjectId: newNode.type.name,
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          attributes: {
+            inputMethod: _analytics.INPUT_METHOD.CONFIG_PANEL,
+            extensionType: extensionType,
+            extensionKey: extensionKey,
+            layout: layout,
+            localId: localId,
+            selection: tr.selection.toJSON(),
+            targetSelectionSource: targetSelectionSource
+          }
+        })(tr);
+        dispatch(shouldScrollIntoView ? tr.scrollIntoView() : tr);
+      }
+      return true;
+    };
   };
 };
-var updateExtensionParams = exports.updateExtensionParams = function updateExtensionParams(updateExtension, node, actions) {
-  return /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(state, dispatch, view) {
-      var _node$node, attrs, type, content, marks, parameters, newParameters, newAttrs;
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _node$node = node.node, attrs = _node$node.attrs, type = _node$node.type, content = _node$node.content, marks = _node$node.marks;
-            if (state.schema.nodes[type.name]) {
-              _context.next = 3;
-              break;
-            }
-            return _context.abrupt("return", false);
-          case 3:
-            parameters = attrs.parameters;
-            _context.prev = 4;
-            _context.next = 7;
-            return updateExtension(parameters, actions);
-          case 7:
-            newParameters = _context.sent;
-            if (!newParameters) {
-              _context.next = 11;
+var updateExtensionParams = function updateExtensionParams(editorAnalyticsAPI) {
+  return function (updateExtension, node, actions) {
+    return /*#__PURE__*/function () {
+      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(state, dispatch, view) {
+        var _node$node, attrs, type, content, marks, parameters, newParameters, newAttrs;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _node$node = node.node, attrs = _node$node.attrs, type = _node$node.type, content = _node$node.content, marks = _node$node.marks;
+              if (state.schema.nodes[type.name]) {
+                _context.next = 3;
+                break;
+              }
+              return _context.abrupt("return", false);
+            case 3:
+              parameters = attrs.parameters;
+              _context.prev = 4;
+              _context.next = 7;
+              return updateExtension(parameters, actions);
+            case 7:
+              newParameters = _context.sent;
+              if (!newParameters) {
+                _context.next = 11;
+                break;
+              }
+              newAttrs = _objectSpread(_objectSpread({}, attrs), {}, {
+                parameters: _objectSpread(_objectSpread({}, parameters), newParameters)
+              });
+              return _context.abrupt("return", performNodeUpdate(editorAnalyticsAPI)(type.name, newAttrs, content, marks, true)(state, dispatch, view));
+            case 11:
+              _context.next = 15;
               break;
-            }
-            newAttrs = _objectSpread(_objectSpread({}, attrs), {}, {
-              parameters: _objectSpread(_objectSpread({}, parameters), newParameters)
-            });
-            return _context.abrupt("return", performNodeUpdate(type.name, newAttrs, content, marks, true)(state, dispatch, view));
-          case 11:
-            _context.next = 15;
-            break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](4);
-          case 15:
-            return _context.abrupt("return", true);
-          case 16:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[4, 13]]);
-    }));
-    return function (_x, _x2, _x3) {
-      return _ref.apply(this, arguments);
-    };
-  }();
+            case 13:
+              _context.prev = 13;
+              _context.t0 = _context["catch"](4);
+            case 15:
+              return _context.abrupt("return", true);
+            case 16:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, null, [[4, 13]]);
+      }));
+      return function (_x, _x2, _x3) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+  };
 };
 var editSelectedExtension = exports.editSelectedExtension = function editSelectedExtension(editorActions) {
   var editorView = editorActions._privateGetEditorView();
   var _getPluginState = (0, _main.getPluginState)(editorView.state),
     updateExtension = _getPluginState.updateExtension,
     applyChangeToContextPanel = _getPluginState.applyChangeToContextPanel;
-  return editExtension(null, applyChangeToContextPanel, updateExtension)(editorView.state, editorView.dispatch, editorView);
+  // The analytics API cannot be accessed in this case because
+  // we do not have access to the plugin injection API. Rather
+  // than change the way this works - we just won't use analytics
+  // here for now.
+  var editorAnalyticsAPI = undefined;
+  return editExtension(null, applyChangeToContextPanel, editorAnalyticsAPI, updateExtension)(editorView.state, editorView.dispatch, editorView);
 };
-var editExtension = exports.editExtension = function editExtension(macroProvider, applyChangeToContextPanel, updateExtension) {
+var editExtension = exports.editExtension = function editExtension(macroProvider, applyChangeToContextPanel, editorAnalyticsAPI, updateExtension) {
   return function (state, dispatch, view) {
     if (!view) {
       return false;
@@ -182,7 +189,8 @@ var editExtension = exports.editExtension = function editExtension(macroProvider
     }
     var editInLegacyMacroBrowser = (0, _extensionApi.getEditInLegacyMacroBrowser)({
       view: view,
-      macroProvider: macroProvider || undefined
+      macroProvider: macroProvider || undefined,
+      editorAnalyticsAPI: editorAnalyticsAPI
     });
     if (updateExtension) {
       updateExtension.then(function (updateMethod) {
@@ -190,9 +198,10 @@ var editExtension = exports.editExtension = function editExtension(macroProvider
           var actions = (0, _extensionApi.createExtensionAPI)({
             editorView: view,
             editInLegacyMacroBrowser: editInLegacyMacroBrowser,
-            applyChange: applyChangeToContextPanel
+            applyChange: applyChangeToContextPanel,
+            editorAnalyticsAPI: editorAnalyticsAPI
           });
-          updateExtensionParams(updateMethod, nodeWithPos, actions)(state, dispatch, view);
+          updateExtensionParams(editorAnalyticsAPI)(updateMethod, nodeWithPos, actions)(state, dispatch, view);
           return;
         }
         if (!updateMethod && macroProvider) {

package/dist/cjs/plugins/extension/extension-api.js

@@ -16,11 +16,11 @@ var _utils = require("../../utils");
 var _commands = require("./commands");
 var _utils2 = require("./utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _analytics2 = require("../analytics");
 var _utils3 = require("@atlaskit/editor-prosemirror/utils");
 var getEditInLegacyMacroBrowser = exports.getEditInLegacyMacroBrowser = function getEditInLegacyMacroBrowser(_ref) {
   var view = _ref.view,
-    macroProvider = _ref.macroProvider;
+    macroProvider = _ref.macroProvider,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI;
   return function () {
     if (!view) {
       throw new Error("Missing view. Can't update without EditorView");
@@ -32,7 +32,7 @@ var getEditInLegacyMacroBrowser = exports.getEditInLegacyMacroBrowser = function
     if (!nodeWithPos) {
       throw new Error("Missing nodeWithPos. Can't determine position of node");
     }
-    (0, _macro.insertMacroFromMacroBrowser)(macroProvider, nodeWithPos.node, true)(view);
+    (0, _macro.insertMacroFromMacroBrowser)(editorAnalyticsAPI)(macroProvider, nodeWithPos.node, true)(view);
   };
 };
 var extensionAPICallPayload = function extensionAPICallPayload(functionName) {
@@ -47,7 +47,8 @@ var extensionAPICallPayload = function extensionAPICallPayload(functionName) {
   };
 };
 var createExtensionAPI = exports.createExtensionAPI = function createExtensionAPI(options) {
-  var schema = options.editorView.state.schema;
+  var schema = options.editorView.state.schema,
+    editorAnalyticsAPI = options.editorAnalyticsAPI;
   var nodes = Object.keys(schema.nodes);
   var marks = Object.keys(schema.marks);
   var validate = (0, _validator.validator)(nodes, marks, {
@@ -115,7 +116,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
 
       // Analytics - tracking the api call
       var apiCallPayload = extensionAPICallPayload('insertAfter');
-      (0, _analytics2.addAnalytics)(state, tr, apiCallPayload);
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(apiCallPayload)(tr);
 
       // Analytics - tracking node types added
       var nodesAdded = [newNode];
@@ -149,7 +150,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
           },
           eventType: _analytics.EVENT_TYPE.TRACK
         };
-        (0, _analytics2.addAnalytics)(state, tr, payload);
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
       });
       if (opt && opt.allowSelectionToNewNode) {
         tr.setSelection(new _state.NodeSelection(tr.doc.resolve(insertPosition)));
@@ -167,7 +168,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
         dispatch = _options$editorView.dispatch,
         state = _options$editorView.state;
       var tr = state.tr;
-      tr = (0, _analytics2.addAnalytics)(state, tr, apiCallPayload);
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(apiCallPayload)(tr);
       tr = (0, _utils3.setTextSelection)(nodePos.pos)(tr);
       tr = tr.scrollIntoView();
       dispatch(tr);
@@ -238,7 +239,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
 
       // Analytics - tracking the api call
       var apiCallPayload = extensionAPICallPayload('update');
-      (0, _analytics2.addAnalytics)(state, tr, apiCallPayload);
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(apiCallPayload)(tr);
       dispatch(tr);
     }
   };
@@ -254,7 +255,8 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
         var macroState = _pluginKey.pluginKey.getState(editorView.state);
         editInLegacy = getEditInLegacyMacroBrowser({
           view: options.editorView,
-          macroProvider: (macroState === null || macroState === void 0 ? void 0 : macroState.macroProvider) || undefined
+          macroProvider: (macroState === null || macroState === void 0 ? void 0 : macroState.macroProvider) || undefined,
+          editorAnalyticsAPI: editorAnalyticsAPI
         });
       }
       editInLegacy();

package/dist/cjs/plugins/extension/index.js

@@ -14,7 +14,7 @@ var _toolbar = require("./toolbar");
 var _contextPanel = require("./context-panel");
 var _extensionApi = require("./extension-api");
 var extensionPlugin = function extensionPlugin(_ref) {
-  var _api$featureFlags, _api$contextPanel3, _api$contextPanel4;
+  var _api$featureFlags, _api$contextPanel3, _api$analytics2, _api$contextPanel4;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     _api = _ref.api;
@@ -80,10 +80,11 @@ var extensionPlugin = function extensionPlugin(_ref) {
     },
     actions: {
       api: function api() {
-        var _api$contextPanel2;
+        var _api$contextPanel2, _api$analytics;
         return (0, _extensionApi.createExtensionAPI)({
           editorView: editorViewRef.current,
-          applyChange: _api === null || _api === void 0 || (_api$contextPanel2 = _api.contextPanel) === null || _api$contextPanel2 === void 0 ? void 0 : _api$contextPanel2.actions.applyChange
+          applyChange: _api === null || _api === void 0 || (_api$contextPanel2 = _api.contextPanel) === null || _api$contextPanel2 === void 0 ? void 0 : _api$contextPanel2.actions.applyChange,
+          editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics = _api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
         });
       }
     },
@@ -91,7 +92,8 @@ var extensionPlugin = function extensionPlugin(_ref) {
       floatingToolbar: (0, _toolbar.getToolbarConfig)({
         breakoutEnabled: options.breakoutEnabled,
         hoverDecoration: _api === null || _api === void 0 ? void 0 : _api.decorations.actions.hoverDecoration,
-        applyChangeToContextPanel: _api === null || _api === void 0 || (_api$contextPanel3 = _api.contextPanel) === null || _api$contextPanel3 === void 0 ? void 0 : _api$contextPanel3.actions.applyChange
+        applyChangeToContextPanel: _api === null || _api === void 0 || (_api$contextPanel3 = _api.contextPanel) === null || _api$contextPanel3 === void 0 ? void 0 : _api$contextPanel3.actions.applyChange,
+        editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics2 = _api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions
       }),
       contextPanel: (0, _contextPanel.getContextPanel)(options.allowAutoSave, featureFlags, _api === null || _api === void 0 || (_api$contextPanel4 = _api.contextPanel) === null || _api$contextPanel4 === void 0 ? void 0 : _api$contextPanel4.actions.applyChange)
     }

package/dist/cjs/plugins/extension/toolbar.js

@@ -96,7 +96,7 @@ var breakoutOptions = function breakoutOptions(state, formatMessage, extensionSt
   }
   return [];
 };
-var editButton = function editButton(formatMessage, extensionState, applyChangeToContextPanel) {
+var editButton = function editButton(formatMessage, extensionState, applyChangeToContextPanel, editorAnalyticsAPI) {
   if (!extensionState.showEditButton) {
     return [];
   }
@@ -110,7 +110,7 @@ var editButton = function editButton(formatMessage, extensionState, applyChangeT
       var macroState = _pluginKey.pluginKey.getState(state);
       var _getPluginState = (0, _main.getPluginState)(state),
         updateExtension = _getPluginState.updateExtension;
-      (0, _actions.editExtension)(macroState && macroState.macroProvider, applyChangeToContextPanel, updateExtension)(state, dispatch, view);
+      (0, _actions.editExtension)(macroState && macroState.macroProvider, applyChangeToContextPanel, editorAnalyticsAPI, updateExtension)(state, dispatch, view);
       return true;
     },
     title: formatMessage(messages.edit),
@@ -122,13 +122,14 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
   var _ref$breakoutEnabled = _ref.breakoutEnabled,
     breakoutEnabled = _ref$breakoutEnabled === void 0 ? true : _ref$breakoutEnabled,
     hoverDecoration = _ref.hoverDecoration,
-    applyChangeToContextPanel = _ref.applyChangeToContextPanel;
+    applyChangeToContextPanel = _ref.applyChangeToContextPanel,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI;
   return function (state, intl) {
     var formatMessage = intl.formatMessage;
     var extensionState = (0, _main.getPluginState)(state);
     if (extensionState && !extensionState.showContextPanel && extensionState.element) {
       var nodeType = [state.schema.nodes.extension, state.schema.nodes.inlineExtension, state.schema.nodes.bodiedExtension];
-      var editButtonArray = editButton(formatMessage, extensionState, applyChangeToContextPanel);
+      var editButtonArray = editButton(formatMessage, extensionState, applyChangeToContextPanel, editorAnalyticsAPI);
       var breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled);
       var extensionObj = (0, _utils2.getSelectedExtension)(state, true);
 

package/dist/cjs/plugins/insert-block/index.js

@@ -108,7 +108,7 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
   };
 };
 function ToolbarInsertBlockWithInjectionApi(_ref4) {
-  var _ref5, _ref6, _pluginInjectionApi$i, _pluginInjectionApi$c, _pluginInjectionApi$p, _pluginInjectionApi$b;
+  var _ref5, _ref6, _pluginInjectionApi$i, _pluginInjectionApi$c, _pluginInjectionApi$p, _pluginInjectionApi$b, _pluginInjectionApi$a;
   var editorView = _ref4.editorView,
     editorActions = _ref4.editorActions,
     dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent,
@@ -165,7 +165,7 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     nativeStatusSupported: options.nativeStatusSupported,
     horizontalRuleEnabled: options.horizontalRuleEnabled,
     onInsertBlockType: handleInsertBlockType(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.codeBlock) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.insertCodeBlock, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$p = pluginInjectionApi.panel) === null || _pluginInjectionApi$p === void 0 ? void 0 : _pluginInjectionApi$p.actions.insertPanel, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$b = pluginInjectionApi.blockType) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.insertBlockQuote),
-    onInsertMacroFromMacroBrowser: _macro.insertMacroFromMacroBrowser,
+    onInsertMacroFromMacroBrowser: (0, _macro.insertMacroFromMacroBrowser)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions),
     macroProvider: macroState.macroProvider,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,