@atlaskit/editor-core 188.11.4 → 188.12.1

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

@@ -17,7 +17,8 @@ import { findPanel } from './utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { DEFAULT_BORDER_COLOR } from '@atlaskit/editor-common/ui-color';
 import { PanelType } from '@atlaskit/adf-schema';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID, withAnalytics } from '../analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { messages } from './message';
 export var panelIconMap = (_panelIconMap = {}, _defineProperty(_panelIconMap, PanelType.INFO, {
   shortName: ':info:',
@@ -38,7 +39,7 @@ export var panelIconMap = (_panelIconMap = {}, _defineProperty(_panelIconMap, Pa
   shortName: ':tip:',
   id: 'atlassian-tip'
 }), _panelIconMap);
-export var getToolbarItems = function getToolbarItems(formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, hoverDecoration, activePanelType, activePanelColor, activePanelIcon, state) {
+export var getToolbarItems = function getToolbarItems(formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, hoverDecoration, editorAnalyticsAPI, activePanelType, activePanelColor, activePanelIcon, state) {
   // TODO: ED-14403 investigate why these titles are not getting translated for the tooltips
   var items = [{
     id: 'editor.panel.info',
@@ -111,7 +112,7 @@ export var getToolbarItems = function getToolbarItems(formatMessage, panelNodeTy
           },
           eventType: EVENT_TYPE.TRACK
         };
-        withAnalytics(payload)(changePanelType(PanelType.CUSTOM, _objectSpread({
+        withAnalytics(editorAnalyticsAPI, payload)(changePanelType(PanelType.CUSTOM, _objectSpread({
           color: color
         }, previousEmoji), isCustomPanelEnabled))(state, dispatch);
         return false;
@@ -142,7 +143,7 @@ export var getToolbarItems = function getToolbarItems(formatMessage, panelNodeTy
           },
           eventType: EVENT_TYPE.TRACK
         };
-        withAnalytics(payload)(changePanelType(PanelType.CUSTOM, {
+        withAnalytics(editorAnalyticsAPI, payload)(changePanelType(PanelType.CUSTOM, {
           emoji: emoji.shortName,
           emojiId: emoji.id,
           emojiText: emoji.fallback
@@ -168,7 +169,7 @@ export var getToolbarItems = function getToolbarItems(formatMessage, panelNodeTy
           },
           eventType: EVENT_TYPE.TRACK
         };
-        withAnalytics(payload)(changePanelType(PanelType.CUSTOM, {
+        withAnalytics(editorAnalyticsAPI, payload)(changePanelType(PanelType.CUSTOM, {
           emoji: undefined,
           emojiId: undefined,
           emojiText: undefined
@@ -253,10 +254,11 @@ export var getToolbarItems = function getToolbarItems(formatMessage, panelNodeTy
 export var getToolbarConfig = function getToolbarConfig(state, intl) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var providerFactory = arguments.length > 3 ? arguments[3] : undefined;
-  var hoverDecoration = arguments.length > 4 ? arguments[4] : undefined;
+  var api = arguments.length > 4 ? arguments[4] : undefined;
   var formatMessage = intl.formatMessage;
   var panelObject = findPanel(state);
   if (panelObject) {
+    var _api$analytics;
     var nodeType = state.schema.nodes.panel;
     var _panelObject$node$att = panelObject.node.attrs,
       panelType = _panelObject$node$att.panelType,
@@ -267,7 +269,7 @@ export var getToolbarConfig = function getToolbarConfig(state, intl) {
     };
 
     // force toolbar to be turned on
-    var items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, hoverDecoration, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined, state);
+    var items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, api === null || api === void 0 ? void 0 : api.decorations.actions.hoverDecoration, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined, state);
     var getDomRef = function getDomRef(editorView) {
       var domAtPos = editorView.domAtPos.bind(editorView);
       var element = findDomRefAtPos(panelObject.pos, domAtPos);

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

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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, addAnalytics, PasteTypes, PasteContents, withAnalytics } from '../../analytics';
+import { ACTION, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, PasteTypes, PasteContents } 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';
@@ -212,11 +212,6 @@ export function sendPasteAnalyticsEvent(view, event, slice, pasteContext) {
   var payload = createPasteAnalyticsPayload(view, event, slice, pasteContext);
   view.dispatch(addAnalytics(view.state, view.state.tr, payload));
 }
-export function pasteCommandWithAnalytics(view, event, slice, pasteContext) {
-  return withAnalytics(function () {
-    return createPasteAnalyticsPayload(view, event, slice, pasteContext);
-  });
-}
 export var handlePasteAsPlainTextWithAnalytics = function handlePasteAsPlainTextWithAnalytics(view, event, slice) {
   return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.plain,

package/dist/esm/plugins/rank.js

@@ -13,7 +13,7 @@ export default {
   'mediaKeymap',
   // selection keymap needs to be above gap cursor keymap so it can set node selections from
   // left/right arrows
-  'selectionKeymap', 'gapCursorKeymap', 'gapCursor', 'syncUrlText', 'fakeCursorToolbarPlugin', 'hyperLink', 'table', 'tableDecorations', 'hyperlinkInputRule', 'tablePMColResizing', 'hyperlinkKeymap', 'tableColResizing', 'undoRedoKeyMap', 'blockTypeKeyMap', 'tableEditing', 'filterStepsPlugin', 'pmCollab', 'collab', 'ruleInputRule', 'ruleKeymap', 'panel', 'media', 'mediaSingleKeymap', 'mediaEditor', 'unsupportedContent', 'jiraIssue', 'fakeTextCursor', 'helpDialog', 'helpDialogKeymap', 'macro', 'expand', 'extension', 'layout', 'contextPanel', 'floatingToolbar', 'clearMarksOnChange', 'reactNodeView', 'history', 'undoRedoPlugin', 'codeBlockIndent', 'placeholder', 'width', 'maxContentSize', 'multilineContent', 'grid', 'mobileDimensions', 'scrollGutterPlugin', 'analytics', 'findReplace', 'selection', 'avatarGroup', 'viewUpdateSubscription', 'beforePrimaryToolbar', 'inlineCode'],
+  'selectionKeymap', 'gapCursorKeymap', 'gapCursor', 'syncUrlText', 'fakeCursorToolbarPlugin', 'hyperLink', 'table', 'tableDecorations', 'hyperlinkInputRule', 'tablePMColResizing', 'hyperlinkKeymap', 'tableColResizing', 'undoRedoKeyMap', 'blockTypeKeyMap', 'tableEditing', 'filterStepsPlugin', 'pmCollab', 'collab', 'ruleInputRule', 'ruleKeymap', 'panel', 'media', 'mediaSingleKeymap', 'mediaEditor', 'unsupportedContent', 'jiraIssue', 'fakeTextCursor', 'helpDialog', 'helpDialogKeymap', 'macro', 'expand', 'extension', 'layout', 'contextPanel', 'selectionToolbar', 'floatingToolbar', 'clearMarksOnChange', 'reactNodeView', 'history', 'undoRedoPlugin', 'codeBlockIndent', 'placeholder', 'width', 'maxContentSize', 'multilineContent', 'grid', 'mobileDimensions', 'scrollGutterPlugin', 'analytics', 'findReplace', 'selection', 'avatarGroup', 'viewUpdateSubscription', 'beforePrimaryToolbar', 'inlineCode'],
   nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'rule', 'panel', 'mention', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'unsupportedBlock', 'unsupportedInline', 'confluenceJiraIssue', 'hardBreak', 'emoji', 'placeholder', 'mediaSingle', 'mediaGroup', 'table', 'expand', 'nestedExpand', 'media', 'tableHeader', 'decisionList', 'tableRow', 'decisionItem', 'tableCell', 'taskList', 'taskItem', 'extension', 'bodiedExtension', 'inlineExtension', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard'],
   marks: [
   // Fragment mark is both for inline and block elements

package/dist/esm/plugins/tasks-and-decisions/index.js

@@ -72,7 +72,7 @@ var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
         name: 'tasksAndDecisionsKeyMap',
         plugin: function plugin(_ref5) {
           var schema = _ref5.schema;
-          return keymap(schema, allowNestedTasks, consumeTabs);
+          return keymap(schema, api, allowNestedTasks, consumeTabs);
         }
       } // Needs to be after "save-on-enter"
       ];

package/dist/esm/plugins/tasks-and-decisions/pm-plugins/keymaps.js

@@ -9,7 +9,8 @@ import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { uuid } from '@atlaskit/adf-schema';
 import { filterCommand as filter, isEmptySelectionAtStart, isEmptySelectionAtEnd, deleteEmptyParagraphAndMoveBlockUp } from '@atlaskit/editor-common/utils';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD, withAnalytics } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { insertTaskDecisionWithAnalytics } from '../commands';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
 import { getBlockRange, getCurrentIndentLevel, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideTask, isInsideTaskOrDecisionItem, liftBlock, walkOut, getTaskItemIndex, isInsideDecision, isTable } from './helpers';
@@ -88,16 +89,18 @@ var joinTaskDecisionFollowing = function joinTaskDecisionFollowing(state, dispat
   }
   return false;
 };
-export var getUnindentCommand = function getUnindentCommand() {
-  var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.KEYBOARD;
-  return filter(isInsideTask, function (state, dispatch) {
-    var normalizedSelection = normalizeTaskItemsSelection(state.selection);
-    var curIndentLevel = getCurrentIndentLevel(normalizedSelection);
-    if (!curIndentLevel || curIndentLevel === 1) {
-      return false;
-    }
-    return withAnalytics(indentationAnalytics(curIndentLevel, INDENT_DIRECTION.OUTDENT, inputMethod))(autoJoin(liftSelection, ['taskList']))(state, dispatch);
-  });
+export var getUnindentCommand = function getUnindentCommand(editorAnalyticsAPI) {
+  return function () {
+    var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.KEYBOARD;
+    return filter(isInsideTask, function (state, dispatch) {
+      var normalizedSelection = normalizeTaskItemsSelection(state.selection);
+      var curIndentLevel = getCurrentIndentLevel(normalizedSelection);
+      if (!curIndentLevel || curIndentLevel === 1) {
+        return false;
+      }
+      return withAnalytics(editorAnalyticsAPI, indentationAnalytics(curIndentLevel, INDENT_DIRECTION.OUTDENT, inputMethod))(autoJoin(liftSelection, ['taskList']))(state, dispatch);
+    });
+  };
 };
 
 // if selection is decision item or first action item in table cell
@@ -114,53 +117,59 @@ var shouldLetTabThroughInTable = function shouldLetTabThroughInTable(state) {
   }
   return false;
 };
-export var getIndentCommand = function getIndentCommand() {
-  var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.KEYBOARD;
-  return filter(isInsideTask, function (state, dispatch) {
-    var normalizedSelection = normalizeTaskItemsSelection(state.selection);
-    var curIndentLevel = getCurrentIndentLevel(normalizedSelection);
-    if (!curIndentLevel || curIndentLevel >= 6) {
-      return true;
-    }
-    return withAnalytics(indentationAnalytics(curIndentLevel, INDENT_DIRECTION.INDENT, inputMethod))(autoJoin(wrapSelectionInTaskList, ['taskList']))(state, dispatch);
-  });
+export var getIndentCommand = function getIndentCommand(editorAnalyticsAPI) {
+  return function () {
+    var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.KEYBOARD;
+    return filter(isInsideTask, function (state, dispatch) {
+      var normalizedSelection = normalizeTaskItemsSelection(state.selection);
+      var curIndentLevel = getCurrentIndentLevel(normalizedSelection);
+      if (!curIndentLevel || curIndentLevel >= 6) {
+        return true;
+      }
+      return withAnalytics(editorAnalyticsAPI, indentationAnalytics(curIndentLevel, INDENT_DIRECTION.INDENT, inputMethod))(autoJoin(wrapSelectionInTaskList, ['taskList']))(state, dispatch);
+    });
+  };
 };
-var backspaceFrom = function backspaceFrom($from) {
-  return function (state, dispatch) {
-    // previous was empty, just delete backwards
-    var taskBefore = $from.doc.resolve($from.before());
-    if (taskBefore.nodeBefore && isActionOrDecisionItem(taskBefore.nodeBefore) && taskBefore.nodeBefore.nodeSize === 2) {
-      return false;
-    }
+var backspaceFrom = function backspaceFrom(editorAnalyticsAPI) {
+  return function ($from) {
+    return function (state, dispatch) {
+      // previous was empty, just delete backwards
+      var taskBefore = $from.doc.resolve($from.before());
+      if (taskBefore.nodeBefore && isActionOrDecisionItem(taskBefore.nodeBefore) && taskBefore.nodeBefore.nodeSize === 2) {
+        return false;
+      }
 
-    // if nested, just unindent
-    var _state$schema$nodes3 = state.schema.nodes,
-      taskList = _state$schema$nodes3.taskList,
-      paragraph = _state$schema$nodes3.paragraph;
-    if ($from.node($from.depth - 2).type === taskList) {
-      return getUnindentCommand()(state, dispatch);
-    }
+      // if nested, just unindent
+      var _state$schema$nodes3 = state.schema.nodes,
+        taskList = _state$schema$nodes3.taskList,
+        paragraph = _state$schema$nodes3.paragraph;
+      if ($from.node($from.depth - 2).type === taskList) {
+        return getUnindentCommand(editorAnalyticsAPI)()(state, dispatch);
+      }
 
-    // bottom level, should "unwrap" taskItem contents into paragraph
-    // we achieve this by slicing the content out, and replacing
-    if (actionDecisionFollowsOrNothing($from)) {
-      if (dispatch) {
-        var taskContent = state.doc.slice($from.start(), $from.end()).content;
+      // bottom level, should "unwrap" taskItem contents into paragraph
+      // we achieve this by slicing the content out, and replacing
+      if (actionDecisionFollowsOrNothing($from)) {
+        if (dispatch) {
+          var taskContent = state.doc.slice($from.start(), $from.end()).content;
 
-        // might be end of document after
-        var slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
-        dispatch(splitListItemWith(state.tr, slice, $from, true));
+          // might be end of document after
+          var slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
+          dispatch(splitListItemWith(state.tr, slice, $from, true));
+        }
+        return true;
       }
-      return true;
-    }
-    return false;
+      return false;
+    };
   };
 };
-var backspace = filter(isEmptySelectionAtStart, autoJoin(chainCommands(function (state, dispatch) {
-  return joinAtCut(state.selection.$from)(state, dispatch);
-}, filter(isInsideTaskOrDecisionItem, function (state, dispatch) {
-  return backspaceFrom(state.selection.$from)(state, dispatch);
-})), ['taskList', 'decisionList']));
+var backspace = function backspace(editorAnalyticsAPI) {
+  return filter(isEmptySelectionAtStart, autoJoin(chainCommands(function (state, dispatch) {
+    return joinAtCut(state.selection.$from)(state, dispatch);
+  }, filter(isInsideTaskOrDecisionItem, function (state, dispatch) {
+    return backspaceFrom(editorAnalyticsAPI)(state.selection.$from)(state, dispatch);
+  })), ['taskList', 'decisionList']));
+};
 var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTaskDecisionFollowing(state, dispatch) {
   var $from = state.selection.$from,
     _state$schema$nodes4 = state.schema.nodes,
@@ -270,42 +279,44 @@ var splitListItem = function splitListItem(state, dispatch) {
   }
   return false;
 };
-var enter = filter(isInsideTaskOrDecisionItem, chainCommands(filter(isEmptyTaskDecision, chainCommands(getUnindentCommand(), splitListItem)), function (state, dispatch) {
-  var selection = state.selection,
-    schema = state.schema;
-  var taskItem = schema.nodes.taskItem;
-  var $from = selection.$from,
-    $to = selection.$to;
-  var node = $from.node($from.depth);
-  var nodeType = node && node.type;
-  var listType = nodeType === taskItem ? 'taskList' : 'decisionList';
-  var addItem = function addItem(_ref) {
-    var tr = _ref.tr,
-      itemLocalId = _ref.itemLocalId;
-    // ED-8932: When cursor is at the beginning of a task item, instead of split, we insert above.
-    if ($from.pos === $to.pos && $from.parentOffset === 0) {
-      var newTask = nodeType.createAndFill({
-        localId: itemLocalId
-      });
-      if (newTask) {
-        // Current position will point to text node, but we want to insert above the taskItem node
-        return tr.insert($from.pos - 1, newTask);
+var enter = function enter(editorAnalyticsAPI) {
+  return filter(isInsideTaskOrDecisionItem, chainCommands(filter(isEmptyTaskDecision, chainCommands(getUnindentCommand(editorAnalyticsAPI)(), splitListItem)), function (state, dispatch) {
+    var selection = state.selection,
+      schema = state.schema;
+    var taskItem = schema.nodes.taskItem;
+    var $from = selection.$from,
+      $to = selection.$to;
+    var node = $from.node($from.depth);
+    var nodeType = node && node.type;
+    var listType = nodeType === taskItem ? 'taskList' : 'decisionList';
+    var addItem = function addItem(_ref) {
+      var tr = _ref.tr,
+        itemLocalId = _ref.itemLocalId;
+      // ED-8932: When cursor is at the beginning of a task item, instead of split, we insert above.
+      if ($from.pos === $to.pos && $from.parentOffset === 0) {
+        var newTask = nodeType.createAndFill({
+          localId: itemLocalId
+        });
+        if (newTask) {
+          // Current position will point to text node, but we want to insert above the taskItem node
+          return tr.insert($from.pos - 1, newTask);
+        }
       }
+      return tr.split($from.pos, 1, [{
+        type: nodeType,
+        attrs: {
+          localId: itemLocalId
+        }
+      }]);
+    };
+    var insertTr = insertTaskDecisionWithAnalytics(state, listType, INPUT_METHOD.KEYBOARD, addItem);
+    if (insertTr && dispatch) {
+      insertTr.scrollIntoView();
+      dispatch(insertTr);
     }
-    return tr.split($from.pos, 1, [{
-      type: nodeType,
-      attrs: {
-        localId: itemLocalId
-      }
-    }]);
-  };
-  var insertTr = insertTaskDecisionWithAnalytics(state, listType, INPUT_METHOD.KEYBOARD, addItem);
-  if (insertTr && dispatch) {
-    insertTr.scrollIntoView();
-    dispatch(insertTr);
-  }
-  return true;
-}));
+    return true;
+  }));
+};
 var cmdOptEnter = filter(isInsideTaskOrDecisionItem, function (state, dispatch) {
   var selection = state.selection,
     schema = state.schema;
@@ -326,17 +337,20 @@ var cmdOptEnter = filter(isInsideTaskOrDecisionItem, function (state, dispatch)
   }
   return true;
 });
-export function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
+export function keymapPlugin(schema, api, allowNestedTasks, consumeTabs) {
+  var _api$analytics3, _api$analytics4;
   var indentHandlers = {
     'Shift-Tab': filter([isInsideTaskOrDecisionItem, function (state) {
       return !shouldLetTabThroughInTable(state);
     }], function (state, dispatch) {
-      return getUnindentCommand(INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
+      var _api$analytics;
+      return getUnindentCommand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
     }),
     Tab: filter([isInsideTaskOrDecisionItem, function (state) {
       return !shouldLetTabThroughInTable(state);
     }], function (state, dispatch) {
-      return getIndentCommand(INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
+      var _api$analytics2;
+      return getIndentCommand(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
     })
   };
   var defaultHandlers = consumeTabs ? {
@@ -344,10 +358,10 @@ export function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
     Tab: isInsideTaskOrDecisionItem
   } : {};
   var keymaps = _objectSpread(_defineProperty({
-    Backspace: backspace,
+    Backspace: backspace(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions),
     Delete: deleteForwards,
     'Ctrl-d': deleteForwards,
-    Enter: enter
+    Enter: enter(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)
   }, toggleTaskItemCheckbox.common, cmdOptEnter), allowNestedTasks ? indentHandlers : defaultHandlers);
   return keymap(keymaps);
 }

package/dist/esm/plugins/toolbar-lists-indentation/ui/onItemActivated.js

@@ -24,7 +24,8 @@ export var onItemActivated = function onItemActivated(pluginInjectionApi) {
             pluginInjectionApi === null || pluginInjectionApi === void 0 || pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.commands.indentList(INPUT_METHOD.TOOLBAR));
           }
           if (node === 'taskList') {
-            indentTaskList(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+            var _pluginInjectionApi$a;
+            indentTaskList(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           break;
         }
@@ -39,7 +40,8 @@ export var onItemActivated = function onItemActivated(pluginInjectionApi) {
             pluginInjectionApi === null || pluginInjectionApi === void 0 || pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.commands.outdentList(INPUT_METHOD.TOOLBAR));
           }
           if (_node === 'taskList') {
-            outdentTaskList(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+            var _pluginInjectionApi$a2;
+            outdentTaskList(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions)(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           break;
         }

package/dist/esm/plugins/undo-redo/index.js

@@ -1,9 +1,8 @@
 import React from 'react';
 import { keymapPlugin } from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
-import { historyPluginKey } from '../history';
+// eslint-disable-next-line @atlassian/tangerine/import/entry-points
 import ToolbarUndoRedo from './ui/ToolbarUndoRedo';
-import WithPluginState from '../../ui/WithPluginState';
 var undoRedoPlugin = function undoRedoPlugin(_ref) {
   var api = _ref.api;
   return {
@@ -25,20 +24,11 @@ var undoRedoPlugin = function undoRedoPlugin(_ref) {
       var editorView = _ref2.editorView,
         disabled = _ref2.disabled,
         isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing;
-      return /*#__PURE__*/React.createElement(WithPluginState, {
-        plugins: {
-          historyState: historyPluginKey
-        },
-        render: function render(_ref3) {
-          var historyState = _ref3.historyState;
-          return /*#__PURE__*/React.createElement(ToolbarUndoRedo, {
-            isReducedSpacing: isToolbarReducedSpacing,
-            disabled: disabled,
-            historyState: historyState,
-            editorView: editorView,
-            api: api
-          });
-        }
+      return /*#__PURE__*/React.createElement(ToolbarUndoRedo, {
+        isReducedSpacing: isToolbarReducedSpacing,
+        disabled: disabled,
+        editorView: editorView,
+        api: api
       });
     }
   };

package/dist/esm/plugins/undo-redo/ui/ToolbarUndoRedo/index.js

@@ -1,16 +1,9 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /** @jsx jsx */
-import { PureComponent } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import UndoIcon from '@atlaskit/icon/glyph/undo';
 import RedoIcon from '@atlaskit/icon/glyph/redo';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { undo as undoKeymap, redo as redoKeymap, ToolTipContent, tooltip } from '../../../../keymaps';
 import { separatorStyles, buttonGroupStyle } from '@atlaskit/editor-common/styles';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
@@ -42,70 +35,59 @@ var forceFocus = function forceFocus(editorView, api) {
     }
   };
 };
-export var ToolbarUndoRedo = /*#__PURE__*/function (_PureComponent) {
-  _inherits(ToolbarUndoRedo, _PureComponent);
-  var _super = _createSuper(ToolbarUndoRedo);
-  function ToolbarUndoRedo() {
-    _classCallCheck(this, ToolbarUndoRedo);
-    return _super.apply(this, arguments);
-  }
-  _createClass(ToolbarUndoRedo, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-        disabled = _this$props.disabled,
-        isReducedSpacing = _this$props.isReducedSpacing,
-        historyState = _this$props.historyState,
-        editorView = _this$props.editorView,
-        api = _this$props.api,
-        formatMessage = _this$props.intl.formatMessage;
-      var handleUndo = function handleUndo() {
-        forceFocus(editorView, api)(undoFromToolbar);
-      };
-      var handleRedo = function handleRedo() {
-        forceFocus(editorView, api)(redoFromToolbar);
-      };
-      var labelUndo = formatMessage(undoRedoMessages.undo);
-      var labelRedo = formatMessage(undoRedoMessages.redo);
-      var canUndo = historyState.canUndo,
-        canRedo = historyState.canRedo;
-      return jsx("span", {
-        css: buttonGroupStyle
-      }, jsx(ToolbarButton, {
-        buttonId: TOOLBAR_BUTTON.UNDO,
-        spacing: isReducedSpacing ? 'none' : 'default',
-        onClick: handleUndo,
-        disabled: !canUndo || disabled,
-        "aria-label": tooltip(undoKeymap, labelUndo),
-        "aria-keyshortcuts": getAriaKeyshortcuts(undoKeymap),
-        title: jsx(ToolTipContent, {
-          description: labelUndo,
-          keymap: undoKeymap
-        }),
-        iconBefore: jsx(UndoIcon, {
-          label: ""
-        }),
-        testId: "ak-editor-toolbar-button-undo"
-      }), jsx(ToolbarButton, {
-        spacing: isReducedSpacing ? 'none' : 'default',
-        buttonId: TOOLBAR_BUTTON.REDO,
-        onClick: handleRedo,
-        disabled: !canRedo || disabled,
-        title: jsx(ToolTipContent, {
-          description: labelRedo,
-          keymap: redoKeymap
-        }),
-        iconBefore: jsx(RedoIcon, {
-          label: ""
-        }),
-        testId: "ak-editor-toolbar-button-redo",
-        "aria-label": tooltip(redoKeymap, labelRedo),
-        "aria-keyshortcuts": getAriaKeyshortcuts(redoKeymap)
-      }), jsx("span", {
-        css: separatorStyles
-      }));
-    }
-  }]);
-  return ToolbarUndoRedo;
-}(PureComponent);
+export var ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
+  var disabled = _ref.disabled,
+    isReducedSpacing = _ref.isReducedSpacing,
+    editorView = _ref.editorView,
+    api = _ref.api,
+    formatMessage = _ref.intl.formatMessage;
+  var _useSharedPluginState = useSharedPluginState(api, ['history']),
+    historyState = _useSharedPluginState.historyState;
+  var handleUndo = function handleUndo() {
+    forceFocus(editorView, api)(undoFromToolbar);
+  };
+  var handleRedo = function handleRedo() {
+    forceFocus(editorView, api)(redoFromToolbar);
+  };
+  var labelUndo = formatMessage(undoRedoMessages.undo);
+  var labelRedo = formatMessage(undoRedoMessages.redo);
+  var _ref2 = historyState !== null && historyState !== void 0 ? historyState : {},
+    canUndo = _ref2.canUndo,
+    canRedo = _ref2.canRedo;
+  return jsx("span", {
+    css: buttonGroupStyle
+  }, jsx(ToolbarButton, {
+    buttonId: TOOLBAR_BUTTON.UNDO,
+    spacing: isReducedSpacing ? 'none' : 'default',
+    onClick: handleUndo,
+    disabled: !canUndo || disabled,
+    "aria-label": tooltip(undoKeymap, labelUndo),
+    "aria-keyshortcuts": getAriaKeyshortcuts(undoKeymap),
+    title: jsx(ToolTipContent, {
+      description: labelUndo,
+      keymap: undoKeymap
+    }),
+    iconBefore: jsx(UndoIcon, {
+      label: ""
+    }),
+    testId: "ak-editor-toolbar-button-undo"
+  }), jsx(ToolbarButton, {
+    spacing: isReducedSpacing ? 'none' : 'default',
+    buttonId: TOOLBAR_BUTTON.REDO,
+    onClick: handleRedo,
+    disabled: !canRedo || disabled,
+    title: jsx(ToolTipContent, {
+      description: labelRedo,
+      keymap: redoKeymap
+    }),
+    iconBefore: jsx(RedoIcon, {
+      label: ""
+    }),
+    testId: "ak-editor-toolbar-button-redo",
+    "aria-label": tooltip(redoKeymap, labelRedo),
+    "aria-keyshortcuts": getAriaKeyshortcuts(redoKeymap)
+  }), jsx("span", {
+    css: separatorStyles
+  }));
+};
 export default injectIntl(ToolbarUndoRedo);

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "188.11.4";
+export var version = "188.12.1";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/plugins/annotation/pm-plugins/types.d.ts

@@ -71,4 +71,5 @@ export type InlineCommentPluginState = {
     bookmark?: SelectionBookmark;
     disallowOnWhitespace: boolean;
     isVisible: boolean;
+    skipSelectionHandling: boolean;
 };

package/dist/types/plugins/index.d.ts

@@ -24,7 +24,6 @@ export { default as annotationPlugin } from './annotation';
 export { default as analyticsPlugin } from './analytics';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
-export { default as historyPlugin } from './history';
 export { default as expandPlugin, isExpandInsertionEnabled } from './expand';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';
 export { default as findReplacePlugin } from './find-replace';

package/dist/types/plugins/insert-block/types.d.ts

@@ -10,6 +10,7 @@ import type { QuickInsertPlugin } from '@atlaskit/editor-plugin-quick-insert';
 import type { BlockTypePlugin } from '@atlaskit/editor-plugin-block-type';
 import type codeBlockPlugin from '../code-block';
 import type panelPlugin from '../panel';
+import type { LayoutPlugin } from '../layout';
 import type { RulePlugin } from '@atlaskit/editor-plugin-rule';
 import type { MediaPlugin } from '@atlaskit/editor-plugin-media';
 import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
@@ -31,5 +32,6 @@ export type InsertBlockPluginDependencies = [
     OptionalPlugin<typeof panelPlugin>,
     OptionalPlugin<MediaPlugin>,
     OptionalPlugin<MentionsPlugin>,
-    OptionalPlugin<StatusPlugin>
+    OptionalPlugin<StatusPlugin>,
+    OptionalPlugin<LayoutPlugin>
 ];