@atlaskit/editor-core 188.13.1 → 188.13.3

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

@@ -10,7 +10,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _main = require("./pm-plugins/main");
 var _toolbar = require("./toolbar");
 var _keymaps = _interopRequireDefault(require("./pm-plugins/keymaps"));
-var _analytics = require("../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _utils = require("@atlaskit/editor-common/utils");
 var _messages = require("@atlaskit/editor-common/messages");
@@ -67,7 +67,8 @@ var panelPlugin = function panelPlugin(_ref) {
               state: state,
               attributes: {
                 panelType: _adfSchema.PanelType.INFO
-              }
+              },
+              api: api
             });
           }
         }, {
@@ -83,7 +84,8 @@ var panelPlugin = function panelPlugin(_ref) {
               state: state,
               attributes: {
                 panelType: _adfSchema.PanelType.NOTE
-              }
+              },
+              api: api
             });
           }
         }, {
@@ -100,7 +102,8 @@ var panelPlugin = function panelPlugin(_ref) {
               state: state,
               attributes: {
                 panelType: _adfSchema.PanelType.SUCCESS
-              }
+              },
+              api: api
             });
           }
         }, {
@@ -116,7 +119,8 @@ var panelPlugin = function panelPlugin(_ref) {
               state: state,
               attributes: {
                 panelType: _adfSchema.PanelType.WARNING
-              }
+              },
+              api: api
             });
           }
         }, {
@@ -132,7 +136,8 @@ var panelPlugin = function panelPlugin(_ref) {
               state: state,
               attributes: {
                 panelType: _adfSchema.PanelType.ERROR
-              }
+              },
+              api: api
             });
           }
         }];
@@ -156,7 +161,8 @@ var panelPlugin = function panelPlugin(_ref) {
                   // TODO: https://product-fabric.atlassian.net/browse/DSP-7268
                   // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
                   panelColor: _colors.T50
-                }
+                },
+                api: api
               });
             }
           });
@@ -184,14 +190,16 @@ var panelPlugin = function panelPlugin(_ref) {
  */
 function createPanelAction(_ref4) {
   var state = _ref4.state,
-    attributes = _ref4.attributes;
+    attributes = _ref4.attributes,
+    api = _ref4.api;
   var tr = (0, _utils.createWrapSelectionTransaction)({
     state: state,
     type: state.schema.nodes.panel,
     nodeAttributes: attributes
   });
   if (tr) {
-    (0, _analytics.addAnalytics)(state, tr, {
+    var _api$analytics2;
+    api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
       action: _analytics.ACTION.INSERTED,
       actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
       actionSubjectId: _analytics.ACTION_SUBJECT_ID.PANEL,
@@ -200,7 +208,7 @@ function createPanelAction(_ref4) {
         panelType: attributes.panelType
       },
       eventType: _analytics.EVENT_TYPE.TRACK
-    });
+    })(tr);
   }
   return tr;
 }

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

@@ -52,7 +52,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
     id: 'editor.panel.info',
     type: 'button',
     icon: _info.default,
-    onClick: (0, _actions.changePanelType)(_adfSchema.PanelType.INFO),
+    onClick: (0, _actions.changePanelType)(editorAnalyticsAPI)(_adfSchema.PanelType.INFO),
     selected: activePanelType === _adfSchema.PanelType.INFO,
     title: formatMessage(_message.messages.info),
     tabIndex: null
@@ -60,7 +60,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
     id: 'editor.panel.note',
     type: 'button',
     icon: _note.default,
-    onClick: (0, _actions.changePanelType)(_adfSchema.PanelType.NOTE),
+    onClick: (0, _actions.changePanelType)(editorAnalyticsAPI)(_adfSchema.PanelType.NOTE),
     selected: activePanelType === _adfSchema.PanelType.NOTE,
     title: formatMessage(_message.messages.note),
     tabIndex: null
@@ -68,7 +68,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
     id: 'editor.panel.success',
     type: 'button',
     icon: _success.default,
-    onClick: (0, _actions.changePanelType)(_adfSchema.PanelType.SUCCESS),
+    onClick: (0, _actions.changePanelType)(editorAnalyticsAPI)(_adfSchema.PanelType.SUCCESS),
     selected: activePanelType === _adfSchema.PanelType.SUCCESS,
     title: formatMessage(_message.messages.success),
     tabIndex: null
@@ -76,7 +76,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
     id: 'editor.panel.warning',
     type: 'button',
     icon: _warning.default,
-    onClick: (0, _actions.changePanelType)(_adfSchema.PanelType.WARNING),
+    onClick: (0, _actions.changePanelType)(editorAnalyticsAPI)(_adfSchema.PanelType.WARNING),
     selected: activePanelType === _adfSchema.PanelType.WARNING,
     title: formatMessage(_message.messages.warning),
     tabIndex: null
@@ -84,7 +84,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
     id: 'editor.panel.error',
     type: 'button',
     icon: _error.default,
-    onClick: (0, _actions.changePanelType)(_adfSchema.PanelType.ERROR),
+    onClick: (0, _actions.changePanelType)(editorAnalyticsAPI)(_adfSchema.PanelType.ERROR),
     selected: activePanelType === _adfSchema.PanelType.ERROR,
     title: formatMessage(_message.messages.error),
     tabIndex: null
@@ -104,7 +104,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
           emojiId: panelEmoji.id
         } : {};
         if (previousColor === color) {
-          (0, _actions.changePanelType)(_adfSchema.PanelType.CUSTOM, _objectSpread({
+          (0, _actions.changePanelType)(editorAnalyticsAPI)(_adfSchema.PanelType.CUSTOM, _objectSpread({
             color: color
           }, previousEmoji), isCustomPanelEnabled)(state, dispatch);
           return false;
@@ -119,7 +119,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
           },
           eventType: _analytics.EVENT_TYPE.TRACK
         };
-        (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, payload)((0, _actions.changePanelType)(_adfSchema.PanelType.CUSTOM, _objectSpread({
+        (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, payload)((0, _actions.changePanelType)(editorAnalyticsAPI)(_adfSchema.PanelType.CUSTOM, _objectSpread({
           color: color
         }, previousEmoji), isCustomPanelEnabled))(state, dispatch);
         return false;
@@ -133,7 +133,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
         }
         var previousIcon = panelNode.node.attrs.panelIcon || '';
         if (previousIcon === emoji.shortName) {
-          (0, _actions.changePanelType)(_adfSchema.PanelType.CUSTOM, {
+          (0, _actions.changePanelType)(editorAnalyticsAPI)(_adfSchema.PanelType.CUSTOM, {
             emoji: emoji.shortName,
             emojiId: emoji.id,
             emojiText: emoji.fallback
@@ -150,7 +150,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
           },
           eventType: _analytics.EVENT_TYPE.TRACK
         };
-        (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, payload)((0, _actions.changePanelType)(_adfSchema.PanelType.CUSTOM, {
+        (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, payload)((0, _actions.changePanelType)(editorAnalyticsAPI)(_adfSchema.PanelType.CUSTOM, {
           emoji: emoji.shortName,
           emojiId: emoji.id,
           emojiText: emoji.fallback
@@ -176,7 +176,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
           },
           eventType: _analytics.EVENT_TYPE.TRACK
         };
-        (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, payload)((0, _actions.changePanelType)(_adfSchema.PanelType.CUSTOM, {
+        (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, payload)((0, _actions.changePanelType)(editorAnalyticsAPI)(_adfSchema.PanelType.CUSTOM, {
           emoji: undefined,
           emojiId: undefined,
           emojiText: undefined
@@ -248,7 +248,7 @@ var getToolbarItems = exports.getToolbarItems = function getToolbarItems(formatM
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: _remove.default,
-    onClick: (0, _actions.removePanel)(),
+    onClick: (0, _actions.removePanel)(editorAnalyticsAPI),
     onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, true),
     onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, false),
     onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, true),

package/dist/cjs/plugins/undo-redo/pm-plugins/keymaps.js

@@ -4,11 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.keymapPlugin = keymapPlugin;
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _commands = require("../commands");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 function keymapPlugin() {
   var list = {};
   (0, _keymaps.bindKeymapWithCommand)((0, _keymaps.findKeyMapForBrowser)(_keymaps.redo), _commands.redoFromKeyboard, list);
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.undo.common, _commands.undoFromKeyboard, list);
-  return (0, _keymaps.keymap)(list);
+  return new _safePlugin.SafePlugin({
+    props: {
+      handleKeyDown: function handleKeyDown(view, event) {
+        var keyboardEvent = (0, _keymaps.isCapsLockOnAndModifyKeyboardEvent)(event);
+        return (0, _keymap.keydownHandler)(list)(view, keyboardEvent);
+      }
+    }
+  });
 }

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "188.13.1";
+var version = exports.version = "188.13.3";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -4,7 +4,6 @@ import { pluginKey } from './plugin-key';
 import { copySelectionPluginKey } from './pm-plugins/codeBlockCopySelectionPlugin';
 import { ACTIONS } from './pm-plugins/actions';
 import { copyToClipboard } from '../../utils/clipboard';
-import { addAnalytics } from '../analytics/utils';
 import { shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
 import { transformToCodeBlockAction } from './transform-to-code-block';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
@@ -27,7 +26,7 @@ export const removeCodeBlock = (state, dispatch) => {
   }
   return true;
 };
-export const changeLanguage = language => (state, dispatch) => {
+export const changeLanguage = editorAnalyticsAPI => language => (state, dispatch) => {
   var _pluginKey$getState;
   const {
     codeBlock
@@ -42,14 +41,15 @@ export const changeLanguage = language => (state, dispatch) => {
   const selection = isNodeSelection(state.selection) ? NodeSelection.create(tr.doc, pos) : tr.selection;
   const result = tr.setSelection(selection);
   if (dispatch) {
-    dispatch(addAnalytics(state, result, {
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.LANGUAGE_SELECTED,
       actionSubject: ACTION_SUBJECT.CODE_BLOCK,
       attributes: {
         language
       },
       eventType: EVENT_TYPE.TRACK
-    }));
+    })(result);
+    dispatch(result);
   }
   return true;
 };

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

@@ -1,6 +1,6 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { getLinesFromSelection, getLineInfo, forEachLine, getStartOfCurrentLine } from './line-handling';
-import { addAnalytics, ACTION, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, INDENT_DIRECTION, INDENT_TYPE, ACTION_SUBJECT } from '../../analytics';
+import { ACTION, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, INDENT_DIRECTION, INDENT_TYPE, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
 /**
  * Return the current indentation level
  * @param indentText - Text in the code block that represent an indentation
@@ -12,7 +12,7 @@ function getIndentLevel(indentText, indentSize) {
   }
   return indentText.length / indentSize;
 }
-export function indent(state, dispatch) {
+export const indent = editorAnalyticsAPI => (state, dispatch) => {
   const {
     text,
     start
@@ -29,7 +29,7 @@ export function indent(state, dispatch) {
     const indentLevel = getIndentLevel(indentText, indentToken.size);
     const indentToAdd = indentToken.token.repeat(indentToken.size - indentText.length % indentToken.size || indentToken.size);
     tr.insertText(indentToAdd, tr.mapping.map(start + offset, -1));
-    addAnalytics(state, tr, {
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.FORMATTED,
       actionSubject: ACTION_SUBJECT.TEXT,
       actionSubjectId: ACTION_SUBJECT_ID.FORMAT_INDENT,
@@ -41,7 +41,7 @@ export function indent(state, dispatch) {
         direction: INDENT_DIRECTION.INDENT,
         indentType: INDENT_TYPE.CODE_BLOCK
       }
-    });
+    })(tr);
     if (!selection.empty) {
       tr.setSelection(TextSelection.create(tr.doc, tr.mapping.map(selection.from, -1), tr.selection.to));
     }
@@ -50,8 +50,8 @@ export function indent(state, dispatch) {
     dispatch(tr);
   }
   return true;
-}
-export function outdent(state, dispatch) {
+};
+export const outdent = editorAnalyticsAPI => (state, dispatch) => {
   const {
     text,
     start
@@ -68,7 +68,7 @@ export function outdent(state, dispatch) {
       const indentLevel = getIndentLevel(indentText, indentToken.size);
       const unindentLength = indentText.length % indentToken.size || indentToken.size;
       tr.delete(tr.mapping.map(start + offset), tr.mapping.map(start + offset + unindentLength));
-      addAnalytics(state, tr, {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
         actionSubjectId: ACTION_SUBJECT_ID.FORMAT_INDENT,
@@ -80,14 +80,14 @@ export function outdent(state, dispatch) {
           direction: INDENT_DIRECTION.OUTDENT,
           indentType: INDENT_TYPE.CODE_BLOCK
         }
-      });
+      })(tr);
     }
   });
   if (dispatch) {
     dispatch(tr);
   }
   return true;
-}
+};
 export function insertIndent(state, dispatch) {
   const {
     text: textAtStartOfLine

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

@@ -98,7 +98,7 @@ const codeBlockPlugin = ({
         return tr;
       }
     }],
-    floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api === null || api === void 0 ? void 0 : api.decorations.actions.hoverDecoration)
+    floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api)
   }
 });
 export default codeBlockPlugin;

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

@@ -10,6 +10,8 @@ import { getAutoClosingQuoteInfo, shouldAutoCloseQuote } from '../ide-ux/quote-h
 import { getEndOfCurrentLine, getStartOfCurrentLine, isCursorInsideCodeBlock, isSelectionEntirelyInsideCodeBlock, getLineInfo } from '../ide-ux/line-handling';
 import { insertIndent, outdent, indent, insertNewlineWithIndent } from '../ide-ux/commands';
 const ideUX = pluginInjectionApi => {
+  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;
   return new SafePlugin({
     props: {
       handleTextInput(view, from, to, text) {
@@ -100,8 +102,8 @@ const ideUX = pluginInjectionApi => {
           return false;
         },
         Enter: filter(isSelectionEntirelyInsideCodeBlock, insertNewlineWithIndent),
-        'Mod-]': filter(isSelectionEntirelyInsideCodeBlock, indent),
-        'Mod-[': filter(isSelectionEntirelyInsideCodeBlock, outdent),
+        'Mod-]': filter(isSelectionEntirelyInsideCodeBlock, indent(editorAnalyticsAPI)),
+        'Mod-[': filter(isSelectionEntirelyInsideCodeBlock, outdent(editorAnalyticsAPI)),
         Tab: filter(isSelectionEntirelyInsideCodeBlock, (state, dispatch) => {
           if (!dispatch) {
             return false;
@@ -109,9 +111,9 @@ const ideUX = pluginInjectionApi => {
           if (isCursorInsideCodeBlock(state)) {
             return insertIndent(state, dispatch);
           }
-          return indent(state, dispatch);
+          return indent(editorAnalyticsAPI)(state, dispatch);
         }),
-        'Shift-Tab': filter(isSelectionEntirelyInsideCodeBlock, outdent),
+        'Shift-Tab': filter(isSelectionEntirelyInsideCodeBlock, outdent(editorAnalyticsAPI)),
         'Mod-a': (state, dispatch) => {
           if (isSelectionEntirelyInsideCodeBlock(state)) {
             const {

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

@@ -16,10 +16,14 @@ export const messages = defineMessages({
   }
 });
 const languageList = createLanguageList(DEFAULT_LANGUAGES);
-export const getToolbarConfig = (allowCopyToClipboard = false, hoverDecoration) => (state, {
+export const getToolbarConfig = (allowCopyToClipboard = false, api) => (state, {
   formatMessage
 }) => {
-  var _codeBlockState$pos, _node$attrs;
+  var _api$decorations$acti, _api$analytics, _codeBlockState$pos, _node$attrs;
+  const {
+    hoverDecoration
+  } = (_api$decorations$acti = api === null || api === void 0 ? void 0 : api.decorations.actions) !== null && _api$decorations$acti !== void 0 ? _api$decorations$acti : {};
+  const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   const codeBlockState = pluginKey.getState(state);
   const pos = (_codeBlockState$pos = codeBlockState === null || codeBlockState === void 0 ? void 0 : codeBlockState.pos) !== null && _codeBlockState$pos !== void 0 ? _codeBlockState$pos : null;
   if (!codeBlockState || pos === null) {
@@ -43,7 +47,7 @@ export const getToolbarConfig = (allowCopyToClipboard = false, hoverDecoration)
     id: 'editor.codeBlock.languageOptions',
     type: 'select',
     selectType: 'list',
-    onChange: option => changeLanguage(option.value),
+    onChange: option => changeLanguage(editorAnalyticsAPI)(option.value),
     defaultValue,
     placeholder: formatMessage(messages.selectLanguage),
     options,

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

@@ -4,7 +4,6 @@ import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state
 import { flatmap, mapChildren } from '../../utils/slice';
 import { getStepRange, isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { addAnalytics } from '../analytics/utils';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { LAYOUT_TYPE } from '../analytics/types/node-events';
 import { pluginKey } from './pm-plugins/plugin-key';
@@ -194,7 +193,7 @@ export function forceSectionToPresetLayout(state, node, pos, presetLayout) {
   const selectionPos$ = tr.doc.resolve(selection.$from.pos);
   return tr.setSelection(state.selection instanceof NodeSelection ? new NodeSelection(selectionPos$) : new TextSelection(selectionPos$));
 }
-export const setPresetLayout = layout => (state, dispatch) => {
+export const setPresetLayout = editorAnalyticsAPI => layout => (state, dispatch) => {
   const {
     pos,
     selectedLayout
@@ -208,7 +207,7 @@ export const setPresetLayout = layout => (state, dispatch) => {
   }
   let tr = forceSectionToPresetLayout(state, node, pos, layout);
   if (tr) {
-    tr = addAnalytics(state, tr, {
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.CHANGED_LAYOUT,
       actionSubject: ACTION_SUBJECT.LAYOUT,
       attributes: {
@@ -216,7 +215,7 @@ export const setPresetLayout = layout => (state, dispatch) => {
         newLayout: formatLayoutName(layout)
       },
       eventType: EVENT_TYPE.TRACK
-    });
+    })(tr);
     tr.setMeta('scrollIntoView', false);
     if (dispatch) {
       dispatch(tr);
@@ -290,7 +289,7 @@ export const fixColumnStructure = state => {
   }
   return;
 };
-export const deleteActiveLayoutNode = (state, dispatch) => {
+export const deleteActiveLayoutNode = editorAnalyticsAPI => (state, dispatch) => {
   const {
     pos,
     selectedLayout
@@ -299,14 +298,14 @@ export const deleteActiveLayoutNode = (state, dispatch) => {
     const node = state.doc.nodeAt(pos);
     if (dispatch) {
       let tr = state.tr.delete(pos, pos + node.nodeSize);
-      tr = addAnalytics(state, tr, {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.DELETED,
         actionSubject: ACTION_SUBJECT.LAYOUT,
         attributes: {
           layout: formatLayoutName(selectedLayout)
         },
         eventType: EVENT_TYPE.TRACK
-      });
+      })(tr);
       dispatch(tr);
     }
     return true;

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

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

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

@@ -42,18 +42,23 @@ const SIDEBAR_LAYOUT_TYPES = [{
   title: toolbarMessages.threeColumnsWithSidebars,
   icon: LayoutThreeWithSidebarsIcon
 }];
-const buildLayoutButton = (intl, item, currentLayout) => ({
+const buildLayoutButton = (intl, item, currentLayout, editorAnalyticsAPI) => ({
   id: item.id,
   type: 'button',
   icon: item.icon,
   testId: item.title.id,
   title: intl.formatMessage(item.title),
-  onClick: setPresetLayout(item.type),
+  onClick: setPresetLayout(editorAnalyticsAPI)(item.type),
   selected: !!currentLayout && currentLayout === item.type,
   tabIndex: null
 });
 export const layoutToolbarTitle = 'Layout floating controls';
-export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, hoverDecoration) => {
+export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api) => {
+  var _api$decorations$acti, _api$decorations, _api$analytics;
+  const {
+    hoverDecoration
+  } = (_api$decorations$acti = api === null || api === void 0 ? 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 : {};
+  const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   const node = state.doc.nodeAt(pos);
   if (node) {
     const currentLayout = getPresetLayout(node);
@@ -69,7 +74,7 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
       icon: RemoveIcon,
       testId: commonMessages.remove.id,
       title: intl.formatMessage(commonMessages.remove),
-      onClick: deleteActiveLayoutNode,
+      onClick: 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),
@@ -81,7 +86,7 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
       title: layoutToolbarTitle,
       getDomRef: view => findDomRefAtPos(pos, view.domAtPos.bind(view)),
       nodeType,
-      items: [...layoutTypes.map(i => buildLayoutButton(intl, i, currentLayout)), ...(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(i => buildLayoutButton(intl, i, currentLayout)) : []), {
+      items: [...layoutTypes.map(i => buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI)), ...(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(i => buildLayoutButton(intl, i, currentLayout, editorAnalyticsAPI)) : []), {
         type: 'copy-button',
         items: [separator, {
           state,

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

@@ -1,12 +1,12 @@
 import { removeParentNodeOfType, findSelectedNodeOfType, removeSelectedNode, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { PanelType } from '@atlaskit/adf-schema';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE, addAnalytics } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { findPanel } from './utils';
 import { getPanelTypeBackgroundNoTokens } from '@atlaskit/editor-common/panel';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { wrapSelectionIn } from '@atlaskit/editor-common/utils';
-export const removePanel = () => (state, dispatch) => {
+export const removePanel = editorAnalyticsAPI => (state, dispatch) => {
   const {
     schema: {
       nodes
@@ -31,11 +31,12 @@ export const removePanel = () => (state, dispatch) => {
     return false;
   }
   if (dispatch) {
-    dispatch(addAnalytics(state, deleteTr, payload));
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(payload)(deleteTr);
+    dispatch(deleteTr);
   }
   return true;
 };
-export const changePanelType = (panelType, panelOptions = {}, allowCustomPanel = false) => (state, dispatch) => {
+export const changePanelType = editorAnalyticsAPI => (panelType, panelOptions = {}, allowCustomPanel = false) => (state, dispatch) => {
   const {
     schema: {
       nodes
@@ -85,10 +86,10 @@ export const changePanelType = (panelType, panelOptions = {}, allowCustomPanel =
 
   // Select the panel if it was previously selected
   const newTrWithSelection = state.selection instanceof NodeSelection && state.selection.node.type.name === 'panel' ? newTr.setSelection(new NodeSelection(tr.doc.resolve(panelNode.pos))) : newTr;
-  const changePanelTypeTr = addAnalytics(state, newTrWithSelection, payload);
-  changePanelTypeTr.setMeta('scrollIntoView', false);
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(payload)(newTrWithSelection);
+  newTrWithSelection.setMeta('scrollIntoView', false);
   if (dispatch) {
-    dispatch(changePanelTypeTr);
+    dispatch(newTrWithSelection);
   }
   return true;
 };

package/dist/es2019/plugins/panel/index.js

@@ -3,7 +3,7 @@ import { panel, PanelType } from '@atlaskit/adf-schema';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
 import keymap from './pm-plugins/keymaps';
-import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { IconPanel, IconPanelNote, IconPanelSuccess, IconPanelWarning, IconPanelError } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
@@ -56,7 +56,8 @@ const panelPlugin = ({
             state,
             attributes: {
               panelType: PanelType.INFO
-            }
+            },
+            api
           });
         }
       }, {
@@ -70,7 +71,8 @@ const panelPlugin = ({
             state,
             attributes: {
               panelType: PanelType.NOTE
-            }
+            },
+            api
           });
         }
       }, {
@@ -85,7 +87,8 @@ const panelPlugin = ({
             state,
             attributes: {
               panelType: PanelType.SUCCESS
-            }
+            },
+            api
           });
         }
       }, {
@@ -99,7 +102,8 @@ const panelPlugin = ({
             state,
             attributes: {
               panelType: PanelType.WARNING
-            }
+            },
+            api
           });
         }
       }, {
@@ -113,7 +117,8 @@ const panelPlugin = ({
             state,
             attributes: {
               panelType: PanelType.ERROR
-            }
+            },
+            api
           });
         }
       }];
@@ -135,7 +140,8 @@ const panelPlugin = ({
                 // TODO: https://product-fabric.atlassian.net/browse/DSP-7268
                 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
                 panelColor: T50
-              }
+              },
+              api
             });
           }
         });
@@ -160,7 +166,8 @@ const panelPlugin = ({
  */
 function createPanelAction({
   state,
-  attributes
+  attributes,
+  api
 }) {
   const tr = createWrapSelectionTransaction({
     state,
@@ -168,7 +175,8 @@ function createPanelAction({
     nodeAttributes: attributes
   });
   if (tr) {
-    addAnalytics(state, tr, {
+    var _api$analytics2;
+    api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
       action: ACTION.INSERTED,
       actionSubject: ACTION_SUBJECT.DOCUMENT,
       actionSubjectId: ACTION_SUBJECT_ID.PANEL,
@@ -177,7 +185,7 @@ function createPanelAction({
         panelType: attributes.panelType
       },
       eventType: EVENT_TYPE.TRACK
-    });
+    })(tr);
   }
   return tr;
 }