@atlaskit/editor-core 188.13.1 → 188.13.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 188.13.3
+
+### Patch Changes
+
+- [#41937](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41937) [`d510a8e569a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d510a8e569a) - Migrate code-block, panel, and layout to new editor analytics API.
+
+## 188.13.2
+
+### Patch Changes
+
+- [#41634](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41634) [`e7cd20932b9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e7cd20932b9) - on windows, toggles mark when the capslock is on
+
 ## 188.13.1
 
 ### Patch Changes

package/dist/cjs/plugins/code-block/actions.js

@@ -14,7 +14,6 @@ var _pluginKey = require("./plugin-key");
 var _codeBlockCopySelectionPlugin = require("./pm-plugins/codeBlockCopySelectionPlugin");
 var _actions = require("./pm-plugins/actions");
 var _clipboard = require("../../utils/clipboard");
-var _utils2 = require("../analytics/utils");
 var _insert = require("@atlaskit/editor-common/insert");
 var _transformToCodeBlock = require("./transform-to-code-block");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
@@ -33,30 +32,33 @@ var removeCodeBlock = exports.removeCodeBlock = function removeCodeBlock(state,
   }
   return true;
 };
-var changeLanguage = exports.changeLanguage = function changeLanguage(language) {
-  return function (state, dispatch) {
-    var _pluginKey$getState;
-    var codeBlock = state.schema.nodes.codeBlock;
-    var pos = (_pluginKey$getState = _pluginKey.pluginKey.getState(state)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.pos;
-    if (typeof pos !== 'number') {
-      return false;
-    }
-    var tr = state.tr.setNodeMarkup(pos, codeBlock, {
-      language: language
-    }).setMeta('scrollIntoView', false);
-    var selection = (0, _utils.isNodeSelection)(state.selection) ? _state.NodeSelection.create(tr.doc, pos) : tr.selection;
-    var result = tr.setSelection(selection);
-    if (dispatch) {
-      dispatch((0, _utils2.addAnalytics)(state, result, {
-        action: _analytics.ACTION.LANGUAGE_SELECTED,
-        actionSubject: _analytics.ACTION_SUBJECT.CODE_BLOCK,
-        attributes: {
-          language: language
-        },
-        eventType: _analytics.EVENT_TYPE.TRACK
-      }));
-    }
-    return true;
+var changeLanguage = exports.changeLanguage = function changeLanguage(editorAnalyticsAPI) {
+  return function (language) {
+    return function (state, dispatch) {
+      var _pluginKey$getState;
+      var codeBlock = state.schema.nodes.codeBlock;
+      var pos = (_pluginKey$getState = _pluginKey.pluginKey.getState(state)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.pos;
+      if (typeof pos !== 'number') {
+        return false;
+      }
+      var tr = state.tr.setNodeMarkup(pos, codeBlock, {
+        language: language
+      }).setMeta('scrollIntoView', false);
+      var selection = (0, _utils.isNodeSelection)(state.selection) ? _state.NodeSelection.create(tr.doc, pos) : tr.selection;
+      var result = tr.setSelection(selection);
+      if (dispatch) {
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+          action: _analytics.ACTION.LANGUAGE_SELECTED,
+          actionSubject: _analytics.ACTION_SUBJECT.CODE_BLOCK,
+          attributes: {
+            language: language
+          },
+          eventType: _analytics.EVENT_TYPE.TRACK
+        })(result);
+        dispatch(result);
+      }
+      return true;
+    };
   };
 };
 var copyContentToClipboard = exports.copyContentToClipboard = function copyContentToClipboard(state, dispatch) {

package/dist/cjs/plugins/code-block/ide-ux/commands.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.indent = indent;
+exports.indent = void 0;
 exports.insertIndent = insertIndent;
 exports.insertNewlineWithIndent = insertNewlineWithIndent;
-exports.outdent = outdent;
+exports.outdent = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _lineHandling = require("./line-handling");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 /**
  * Return the current indentation level
  * @param indentText - Text in the code block that represent an indentation
@@ -21,55 +21,21 @@ function getIndentLevel(indentText, indentSize) {
   }
   return indentText.length / indentSize;
 }
-function indent(state, dispatch) {
-  var _getLinesFromSelectio = (0, _lineHandling.getLinesFromSelection)(state),
-    text = _getLinesFromSelectio.text,
-    start = _getLinesFromSelectio.start;
-  var tr = state.tr,
-    selection = state.selection;
-  (0, _lineHandling.forEachLine)(text, function (line, offset) {
-    var _getLineInfo = (0, _lineHandling.getLineInfo)(line),
-      indentText = _getLineInfo.indentText,
-      indentToken = _getLineInfo.indentToken;
-    var indentLevel = getIndentLevel(indentText, indentToken.size);
-    var indentToAdd = indentToken.token.repeat(indentToken.size - indentText.length % indentToken.size || indentToken.size);
-    tr.insertText(indentToAdd, tr.mapping.map(start + offset, -1));
-    (0, _analytics.addAnalytics)(state, tr, {
-      action: _analytics.ACTION.FORMATTED,
-      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_INDENT,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: {
-        inputMethod: _analytics.INPUT_METHOD.KEYBOARD,
-        previousIndentationLevel: indentLevel,
-        newIndentLevel: indentLevel + 1,
-        direction: _analytics.INDENT_DIRECTION.INDENT,
-        indentType: _analytics.INDENT_TYPE.CODE_BLOCK
-      }
-    });
-    if (!selection.empty) {
-      tr.setSelection(_state.TextSelection.create(tr.doc, tr.mapping.map(selection.from, -1), tr.selection.to));
-    }
-  });
-  if (dispatch) {
-    dispatch(tr);
-  }
-  return true;
-}
-function outdent(state, dispatch) {
-  var _getLinesFromSelectio2 = (0, _lineHandling.getLinesFromSelection)(state),
-    text = _getLinesFromSelectio2.text,
-    start = _getLinesFromSelectio2.start;
-  var tr = state.tr;
-  (0, _lineHandling.forEachLine)(text, function (line, offset) {
-    var _getLineInfo2 = (0, _lineHandling.getLineInfo)(line),
-      indentText = _getLineInfo2.indentText,
-      indentToken = _getLineInfo2.indentToken;
-    if (indentText) {
+var indent = exports.indent = function indent(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var _getLinesFromSelectio = (0, _lineHandling.getLinesFromSelection)(state),
+      text = _getLinesFromSelectio.text,
+      start = _getLinesFromSelectio.start;
+    var tr = state.tr,
+      selection = state.selection;
+    (0, _lineHandling.forEachLine)(text, function (line, offset) {
+      var _getLineInfo = (0, _lineHandling.getLineInfo)(line),
+        indentText = _getLineInfo.indentText,
+        indentToken = _getLineInfo.indentToken;
       var indentLevel = getIndentLevel(indentText, indentToken.size);
-      var unindentLength = indentText.length % indentToken.size || indentToken.size;
-      tr.delete(tr.mapping.map(start + offset), tr.mapping.map(start + offset + unindentLength));
-      (0, _analytics.addAnalytics)(state, tr, {
+      var indentToAdd = indentToken.token.repeat(indentToken.size - indentText.length % indentToken.size || indentToken.size);
+      tr.insertText(indentToAdd, tr.mapping.map(start + offset, -1));
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
         action: _analytics.ACTION.FORMATTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
         actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_INDENT,
@@ -77,18 +43,56 @@ function outdent(state, dispatch) {
         attributes: {
           inputMethod: _analytics.INPUT_METHOD.KEYBOARD,
           previousIndentationLevel: indentLevel,
-          newIndentLevel: indentLevel - 1,
-          direction: _analytics.INDENT_DIRECTION.OUTDENT,
+          newIndentLevel: indentLevel + 1,
+          direction: _analytics.INDENT_DIRECTION.INDENT,
           indentType: _analytics.INDENT_TYPE.CODE_BLOCK
         }
-      });
+      })(tr);
+      if (!selection.empty) {
+        tr.setSelection(_state.TextSelection.create(tr.doc, tr.mapping.map(selection.from, -1), tr.selection.to));
+      }
+    });
+    if (dispatch) {
+      dispatch(tr);
     }
-  });
-  if (dispatch) {
-    dispatch(tr);
-  }
-  return true;
-}
+    return true;
+  };
+};
+var outdent = exports.outdent = function outdent(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var _getLinesFromSelectio2 = (0, _lineHandling.getLinesFromSelection)(state),
+      text = _getLinesFromSelectio2.text,
+      start = _getLinesFromSelectio2.start;
+    var tr = state.tr;
+    (0, _lineHandling.forEachLine)(text, function (line, offset) {
+      var _getLineInfo2 = (0, _lineHandling.getLineInfo)(line),
+        indentText = _getLineInfo2.indentText,
+        indentToken = _getLineInfo2.indentToken;
+      if (indentText) {
+        var indentLevel = getIndentLevel(indentText, indentToken.size);
+        var unindentLength = indentText.length % indentToken.size || indentToken.size;
+        tr.delete(tr.mapping.map(start + offset), tr.mapping.map(start + offset + unindentLength));
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+          action: _analytics.ACTION.FORMATTED,
+          actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_INDENT,
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          attributes: {
+            inputMethod: _analytics.INPUT_METHOD.KEYBOARD,
+            previousIndentationLevel: indentLevel,
+            newIndentLevel: indentLevel - 1,
+            direction: _analytics.INDENT_DIRECTION.OUTDENT,
+            indentType: _analytics.INDENT_TYPE.CODE_BLOCK
+          }
+        })(tr);
+      }
+    });
+    if (dispatch) {
+      dispatch(tr);
+    }
+    return true;
+  };
+};
 function insertIndent(state, dispatch) {
   var _getStartOfCurrentLin = (0, _lineHandling.getStartOfCurrentLine)(state),
     textAtStartOfLine = _getStartOfCurrentLin.text;

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

@@ -113,7 +113,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           }
         }];
       },
-      floatingToolbar: (0, _toolbar.getToolbarConfig)(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api === null || api === void 0 ? void 0 : api.decorations.actions.hoverDecoration)
+      floatingToolbar: (0, _toolbar.getToolbarConfig)(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api)
     }
   };
 };

package/dist/cjs/plugins/code-block/pm-plugins/ide-ux.js

@@ -16,6 +16,8 @@ var _quoteHandling = require("../ide-ux/quote-handling");
 var _lineHandling = require("../ide-ux/line-handling");
 var _commands = require("../ide-ux/commands");
 var ideUX = function ideUX(pluginInjectionApi) {
+  var _pluginInjectionApi$a;
+  var editorAnalyticsAPI = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
   return new _safePlugin.SafePlugin({
     props: {
       handleTextInput: function handleTextInput(view, from, to, text) {
@@ -98,8 +100,8 @@ var ideUX = function ideUX(pluginInjectionApi) {
           return false;
         },
         Enter: (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.insertNewlineWithIndent),
-        'Mod-]': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.indent),
-        'Mod-[': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.outdent),
+        'Mod-]': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, (0, _commands.indent)(editorAnalyticsAPI)),
+        'Mod-[': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, (0, _commands.outdent)(editorAnalyticsAPI)),
         Tab: (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, function (state, dispatch) {
           if (!dispatch) {
             return false;
@@ -107,9 +109,9 @@ var ideUX = function ideUX(pluginInjectionApi) {
           if ((0, _lineHandling.isCursorInsideCodeBlock)(state)) {
             return (0, _commands.insertIndent)(state, dispatch);
           }
-          return (0, _commands.indent)(state, dispatch);
+          return (0, _commands.indent)(editorAnalyticsAPI)(state, dispatch);
         }),
-        'Shift-Tab': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.outdent),
+        'Shift-Tab': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, (0, _commands.outdent)(editorAnalyticsAPI)),
         'Mod-a': function ModA(state, dispatch) {
           if ((0, _lineHandling.isSelectionEntirelyInsideCodeBlock)(state)) {
             var _state$selection = state.selection,

package/dist/cjs/plugins/code-block/toolbar.js

@@ -25,10 +25,13 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
 var languageList = (0, _languageList.createLanguageList)(_languageList.DEFAULT_LANGUAGES);
 var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
   var allowCopyToClipboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  var hoverDecoration = arguments.length > 1 ? arguments[1] : undefined;
+  var api = arguments.length > 1 ? arguments[1] : undefined;
   return function (state, _ref) {
-    var _codeBlockState$pos, _node$attrs;
+    var _api$decorations$acti, _api$analytics, _codeBlockState$pos, _node$attrs;
     var formatMessage = _ref.formatMessage;
+    var _ref2 = (_api$decorations$acti = api === null || api === void 0 ? void 0 : api.decorations.actions) !== null && _api$decorations$acti !== void 0 ? _api$decorations$acti : {},
+      hoverDecoration = _ref2.hoverDecoration;
+    var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
     var codeBlockState = _pluginKey.pluginKey.getState(state);
     var pos = (_codeBlockState$pos = codeBlockState === null || codeBlockState === void 0 ? void 0 : codeBlockState.pos) !== null && _codeBlockState$pos !== void 0 ? _codeBlockState$pos : null;
     if (!codeBlockState || pos === null) {
@@ -59,7 +62,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
       type: 'select',
       selectType: 'list',
       onChange: function onChange(option) {
-        return (0, _actions.changeLanguage)(option.value);
+        return (0, _actions.changeLanguage)(editorAnalyticsAPI)(option.value);
       },
       defaultValue: defaultValue,
       placeholder: formatMessage(messages.selectLanguage),
@@ -117,8 +120,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
  * Filters language list based on both name and alias properties.
  */
 var languageListFilter = exports.languageListFilter = function languageListFilter(option, rawInput) {
-  var _ref2 = option,
-    data = _ref2.data;
+  var _ref3 = option,
+    data = _ref3.data;
   var searchString = rawInput.toLowerCase();
   return data.label.toLowerCase().includes(searchString) || data.alias.some(function (alias) {
     return alias.toLowerCase() === searchString;

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

@@ -14,7 +14,6 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _slice = require("../../utils/slice");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _utils3 = require("../analytics/utils");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _nodeEvents = require("../analytics/types/node-events");
 var _pluginKey = require("./pm-plugins/plugin-key");
@@ -210,36 +209,38 @@ function forceSectionToPresetLayout(state, node, pos, presetLayout) {
   var selectionPos$ = tr.doc.resolve(selection.$from.pos);
   return tr.setSelection(state.selection instanceof _state.NodeSelection ? new _state.NodeSelection(selectionPos$) : new _state.TextSelection(selectionPos$));
 }
-var setPresetLayout = exports.setPresetLayout = function setPresetLayout(layout) {
-  return function (state, dispatch) {
-    var _ref = _pluginKey.pluginKey.getState(state),
-      pos = _ref.pos,
-      selectedLayout = _ref.selectedLayout;
-    if (selectedLayout === layout || pos === null) {
-      return false;
-    }
-    var node = state.doc.nodeAt(pos);
-    if (!node) {
-      return false;
-    }
-    var tr = forceSectionToPresetLayout(state, node, pos, layout);
-    if (tr) {
-      tr = (0, _utils3.addAnalytics)(state, tr, {
-        action: _analytics.ACTION.CHANGED_LAYOUT,
-        actionSubject: _analytics.ACTION_SUBJECT.LAYOUT,
-        attributes: {
-          previousLayout: formatLayoutName(selectedLayout),
-          newLayout: formatLayoutName(layout)
-        },
-        eventType: _analytics.EVENT_TYPE.TRACK
-      });
-      tr.setMeta('scrollIntoView', false);
-      if (dispatch) {
-        dispatch(tr);
+var setPresetLayout = exports.setPresetLayout = function setPresetLayout(editorAnalyticsAPI) {
+  return function (layout) {
+    return function (state, dispatch) {
+      var _ref = _pluginKey.pluginKey.getState(state),
+        pos = _ref.pos,
+        selectedLayout = _ref.selectedLayout;
+      if (selectedLayout === layout || pos === null) {
+        return false;
       }
-      return true;
-    }
-    return false;
+      var node = state.doc.nodeAt(pos);
+      if (!node) {
+        return false;
+      }
+      var tr = forceSectionToPresetLayout(state, node, pos, layout);
+      if (tr) {
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+          action: _analytics.ACTION.CHANGED_LAYOUT,
+          actionSubject: _analytics.ACTION_SUBJECT.LAYOUT,
+          attributes: {
+            previousLayout: formatLayoutName(selectedLayout),
+            newLayout: formatLayoutName(layout)
+          },
+          eventType: _analytics.EVENT_TYPE.TRACK
+        })(tr);
+        tr.setMeta('scrollIntoView', false);
+        if (dispatch) {
+          dispatch(tr);
+        }
+        return true;
+      }
+      return false;
+    };
   };
 };
 function layoutNeedChanges(node) {
@@ -304,27 +305,29 @@ var fixColumnStructure = exports.fixColumnStructure = function fixColumnStructur
   }
   return;
 };
-var deleteActiveLayoutNode = exports.deleteActiveLayoutNode = function deleteActiveLayoutNode(state, dispatch) {
-  var _ref3 = _pluginKey.pluginKey.getState(state),
-    pos = _ref3.pos,
-    selectedLayout = _ref3.selectedLayout;
-  if (pos !== null) {
-    var node = state.doc.nodeAt(pos);
-    if (dispatch) {
-      var tr = state.tr.delete(pos, pos + node.nodeSize);
-      tr = (0, _utils3.addAnalytics)(state, tr, {
-        action: _analytics.ACTION.DELETED,
-        actionSubject: _analytics.ACTION_SUBJECT.LAYOUT,
-        attributes: {
-          layout: formatLayoutName(selectedLayout)
-        },
-        eventType: _analytics.EVENT_TYPE.TRACK
-      });
-      dispatch(tr);
+var deleteActiveLayoutNode = exports.deleteActiveLayoutNode = function deleteActiveLayoutNode(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var _ref3 = _pluginKey.pluginKey.getState(state),
+      pos = _ref3.pos,
+      selectedLayout = _ref3.selectedLayout;
+    if (pos !== null) {
+      var node = state.doc.nodeAt(pos);
+      if (dispatch) {
+        var tr = state.tr.delete(pos, pos + node.nodeSize);
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+          action: _analytics.ACTION.DELETED,
+          actionSubject: _analytics.ACTION_SUBJECT.LAYOUT,
+          attributes: {
+            layout: formatLayoutName(selectedLayout)
+          },
+          eventType: _analytics.EVENT_TYPE.TRACK
+        })(tr);
+        dispatch(tr);
+      }
+      return true;
     }
-    return true;
-  }
-  return false;
+    return false;
+  };
 };
 var formatLayoutName = function formatLayoutName(layout) {
   switch (layout) {

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

@@ -55,8 +55,7 @@ var layoutPlugin = function layoutPlugin(_ref) {
           addSidebarLayouts = _ref2.addSidebarLayouts,
           allowSingleColumnLayout = _ref2.allowSingleColumnLayout;
         if (pos !== null) {
-          var _api$decorations$acti;
-          return (0, _toolbar.buildToolbar)(state, intl, pos, allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api === null || api === void 0 || (_api$decorations$acti = api.decorations.actions) === null || _api$decorations$acti === void 0 ? void 0 : _api$decorations$acti.hoverDecoration);
+          return (0, _toolbar.buildToolbar)(state, intl, pos, allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api);
         }
         return undefined;
       },

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

@@ -50,20 +50,24 @@ var SIDEBAR_LAYOUT_TYPES = [{
   title: _toolbarMessages.toolbarMessages.threeColumnsWithSidebars,
   icon: _layoutThreeWithSidebars.default
 }];
-var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout) {
+var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, editorAnalyticsAPI) {
   return {
     id: item.id,
     type: 'button',
     icon: item.icon,
     testId: item.title.id,
     title: intl.formatMessage(item.title),
-    onClick: (0, _actions.setPresetLayout)(item.type),
+    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)(item.type),
     selected: !!currentLayout && currentLayout === item.type,
     tabIndex: null
   };
 };
 var layoutToolbarTitle = exports.layoutToolbarTitle = 'Layout floating controls';
-var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, hoverDecoration) {
+var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api) {
+  var _api$decorations$acti, _api$decorations, _api$analytics;
+  var _ref = (_api$decorations$acti = api === null || api === void 0 || (_api$decorations = api.decorations) === null || _api$decorations === void 0 ? void 0 : _api$decorations.actions) !== null && _api$decorations$acti !== void 0 ? _api$decorations$acti : {},
+    hoverDecoration = _ref.hoverDecoration;
+  var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   var node = state.doc.nodeAt(pos);
   if (node) {
     var currentLayout = (0, _actions.getPresetLayout)(node);
@@ -79,7 +83,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
       icon: _remove.default,
       testId: _messages.default.remove.id,
       title: intl.formatMessage(_messages.default.remove),
-      onClick: _actions.deleteActiveLayoutNode,
+      onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI),
       onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
       onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
@@ -94,9 +98,9 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
       },
       nodeType: nodeType,
       items: [].concat((0, _toConsumableArray2.default)(layoutTypes.map(function (i) {
-        return buildLayoutButton(intl, i, currentLayout);
+        return buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI);
       })), (0, _toConsumableArray2.default)(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(function (i) {
-        return buildLayoutButton(intl, i, currentLayout);
+        return buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI);
       }) : []), [{
         type: 'copy-button',
         items: [separator, {

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

@@ -11,14 +11,14 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _adfSchema = require("@atlaskit/adf-schema");
-var _analytics = require("../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils2 = require("./utils");
 var _panel = require("@atlaskit/editor-common/panel");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _utils3 = require("@atlaskit/editor-common/utils");
 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) { (0, _defineProperty2.default)(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; }
-var removePanel = exports.removePanel = function removePanel() {
+var removePanel = exports.removePanel = function removePanel(editorAnalyticsAPI) {
   return function (state, dispatch) {
     var nodes = state.schema.nodes,
       tr = state.tr;
@@ -40,65 +40,68 @@ var removePanel = exports.removePanel = function removePanel() {
       return false;
     }
     if (dispatch) {
-      dispatch((0, _analytics.addAnalytics)(state, deleteTr, payload));
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(deleteTr);
+      dispatch(deleteTr);
     }
     return true;
   };
 };
-var changePanelType = exports.changePanelType = function changePanelType(panelType) {
-  var panelOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var allowCustomPanel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  return function (state, dispatch) {
-    var nodes = state.schema.nodes,
-      tr = state.tr;
-    var panelNode = (0, _utils2.findPanel)(state);
-    if (panelNode === undefined) {
-      return false;
-    }
-    var newType = panelType;
-    var previousType = panelNode.node.attrs.panelType;
-    var newTr;
-    if (allowCustomPanel) {
-      var previousColor = panelNode.node.attrs.panelType === 'custom' ? panelNode.node.attrs.panelColor || 'none' : (0, _panel.getPanelTypeBackgroundNoTokens)(previousType);
-      var previousIcon = panelNode.node.attrs.panelIcon;
-      var previousIconId = panelNode.node.attrs.panelIconId;
-      var previousIconText = panelNode.node.attrs.panelIconText;
-      var newPanelOptions = _objectSpread({
-        color: previousColor,
-        emoji: previousIcon,
-        emojiId: previousIconId,
-        emojiText: previousIconText
-      }, panelOptions);
-      newTr = tr.setNodeMarkup(panelNode.pos, nodes.panel, {
-        panelIcon: newPanelOptions.emoji,
-        panelIconId: newPanelOptions.emojiId,
-        panelIconText: newPanelOptions.emojiText,
-        panelColor: newPanelOptions.color,
-        panelType: panelType
-      });
-    } else {
-      newTr = tr.setNodeMarkup(panelNode.pos, nodes.panel, {
-        panelType: panelType
-      });
-    }
-    var payload = {
-      action: _analytics.ACTION.CHANGED_TYPE,
-      actionSubject: _analytics.ACTION_SUBJECT.PANEL,
-      attributes: {
-        newType: newType,
-        previousType: previousType
-      },
-      eventType: _analytics.EVENT_TYPE.TRACK
-    };
+var changePanelType = exports.changePanelType = function changePanelType(editorAnalyticsAPI) {
+  return function (panelType) {
+    var panelOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var allowCustomPanel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    return function (state, dispatch) {
+      var nodes = state.schema.nodes,
+        tr = state.tr;
+      var panelNode = (0, _utils2.findPanel)(state);
+      if (panelNode === undefined) {
+        return false;
+      }
+      var newType = panelType;
+      var previousType = panelNode.node.attrs.panelType;
+      var newTr;
+      if (allowCustomPanel) {
+        var previousColor = panelNode.node.attrs.panelType === 'custom' ? panelNode.node.attrs.panelColor || 'none' : (0, _panel.getPanelTypeBackgroundNoTokens)(previousType);
+        var previousIcon = panelNode.node.attrs.panelIcon;
+        var previousIconId = panelNode.node.attrs.panelIconId;
+        var previousIconText = panelNode.node.attrs.panelIconText;
+        var newPanelOptions = _objectSpread({
+          color: previousColor,
+          emoji: previousIcon,
+          emojiId: previousIconId,
+          emojiText: previousIconText
+        }, panelOptions);
+        newTr = tr.setNodeMarkup(panelNode.pos, nodes.panel, {
+          panelIcon: newPanelOptions.emoji,
+          panelIconId: newPanelOptions.emojiId,
+          panelIconText: newPanelOptions.emojiText,
+          panelColor: newPanelOptions.color,
+          panelType: panelType
+        });
+      } else {
+        newTr = tr.setNodeMarkup(panelNode.pos, nodes.panel, {
+          panelType: panelType
+        });
+      }
+      var payload = {
+        action: _analytics.ACTION.CHANGED_TYPE,
+        actionSubject: _analytics.ACTION_SUBJECT.PANEL,
+        attributes: {
+          newType: newType,
+          previousType: previousType
+        },
+        eventType: _analytics.EVENT_TYPE.TRACK
+      };
 
-    // Select the panel if it was previously selected
-    var newTrWithSelection = state.selection instanceof _state.NodeSelection && state.selection.node.type.name === 'panel' ? newTr.setSelection(new _state.NodeSelection(tr.doc.resolve(panelNode.pos))) : newTr;
-    var changePanelTypeTr = (0, _analytics.addAnalytics)(state, newTrWithSelection, payload);
-    changePanelTypeTr.setMeta('scrollIntoView', false);
-    if (dispatch) {
-      dispatch(changePanelTypeTr);
-    }
-    return true;
+      // Select the panel if it was previously selected
+      var newTrWithSelection = state.selection instanceof _state.NodeSelection && state.selection.node.type.name === 'panel' ? newTr.setSelection(new _state.NodeSelection(tr.doc.resolve(panelNode.pos))) : newTr;
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(newTrWithSelection);
+      newTrWithSelection.setMeta('scrollIntoView', false);
+      if (dispatch) {
+        dispatch(newTrWithSelection);
+      }
+      return true;
+    };
   };
 };
 function insertPanelWithAnalytics(inputMethod, analyticsAPI) {