@atlaskit/editor-core 187.34.2 → 187.35.0

package/dist/esm/plugins/block-type/pm-plugins/input-rule.js

@@ -1,10 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { createRule, createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { INPUT_METHOD, ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
-import { isConvertableToCodeBlock, transformToCodeBlockAction } from '../commands/transform-to-code-block';
-import { insertBlock } from '../commands/insert-block';
+import { insertBlock } from '@atlaskit/editor-common/commands';
 import { createJoinNodesRule, createWrappingTextBlockRule } from '../utils';
 var MAX_HEADING_LEVEL = 6;
 function getHeadingLevel(match) {
@@ -34,7 +32,7 @@ function getHeadingRules(editorAnalyticsAPI, schema) {
   var hashRule = headingRule(schema.nodes.heading, MAX_HEADING_LEVEL);
   var leftNodeReplacementHashRule = createRule(new RegExp("".concat(leafNodeReplacementCharacter, "(#{1,6})\\s$")), function (state, match, start, end) {
     var level = match[1].length;
-    return insertBlock(state, schema.nodes.heading, "heading".concat(level), start, end, {
+    return insertBlock(state, schema.nodes.heading, start, end, {
       level: level
     });
   });
@@ -65,7 +63,7 @@ function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   // '> ' for blockquote
   var greatherThanRule = blockQuoteRule(schema.nodes.blockquote);
   var leftNodeReplacementGreatherRule = createRule(new RegExp("".concat(leafNodeReplacementCharacter, "\\s*>\\s$")), function (state, _match, start, end) {
-    return insertBlock(state, schema.nodes.blockquote, 'blockquote', start, end);
+    return insertBlock(state, schema.nodes.blockquote, start, end);
   });
 
   // Analytics V3 handler
@@ -80,56 +78,6 @@ function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   }, editorAnalyticsAPI);
   return [ruleWithBlockQuoteAnalytics(greatherThanRule), ruleWithBlockQuoteAnalytics(leftNodeReplacementGreatherRule)];
 }
-
-/**
- * Get all code block input rules
- *
- * @param {Schema} schema
- * @returns {InputRuleWithHandler[]}
- */
-function getCodeBlockRules(editorAnalyticsAPI, schema) {
-  var ruleAnalytics = inputRuleWithAnalytics({
-    action: ACTION.INSERTED,
-    actionSubject: ACTION_SUBJECT.DOCUMENT,
-    actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,
-    attributes: {
-      inputMethod: INPUT_METHOD.FORMATTING
-    },
-    eventType: EVENT_TYPE.TRACK
-  }, editorAnalyticsAPI);
-  var validMatchLength = function validMatchLength(match) {
-    return match.length > 0 && match[0].length === 3;
-  };
-  var threeTildeRule = createRule(/(?!\s)(`{3,})$/, function (state, match, start, end) {
-    if (!validMatchLength(match)) {
-      return null;
-    }
-    var attributes = {};
-    if (match[4]) {
-      attributes.language = match[4];
-    }
-    if (isConvertableToCodeBlock(state)) {
-      return transformToCodeBlockAction(state, start, attributes);
-    }
-    var tr = state.tr;
-    tr.delete(start, end);
-    var codeBlock = tr.doc.type.schema.nodes.codeBlock.createChecked();
-    safeInsert(codeBlock)(tr);
-    return tr;
-  });
-  var leftNodeReplacementThreeTildeRule = createRule(new RegExp("((".concat(leafNodeReplacementCharacter, "`{3,})|^\\s(`{3,}))(\\S*)$")), function (state, match, start, end) {
-    if (!validMatchLength(match)) {
-      return null;
-    }
-    var attributes = {};
-    if (match[4]) {
-      attributes.language = match[4];
-    }
-    var inlineStart = Math.max(match.index + state.selection.$from.start(), 1);
-    return insertBlock(state, schema.nodes.codeBlock, 'codeblock', inlineStart, end, attributes);
-  });
-  return [ruleAnalytics(threeTildeRule), ruleAnalytics(leftNodeReplacementThreeTildeRule)];
-}
 function inputRulePlugin(editorAnalyticsAPI, schema, featureFlags) {
   var rules = [];
   if (schema.nodes.heading) {
@@ -138,9 +86,6 @@ function inputRulePlugin(editorAnalyticsAPI, schema, featureFlags) {
   if (schema.nodes.blockquote) {
     rules.push.apply(rules, _toConsumableArray(getBlockQuoteRules(editorAnalyticsAPI, schema)));
   }
-  if (schema.nodes.codeBlock) {
-    rules.push.apply(rules, _toConsumableArray(getCodeBlockRules(editorAnalyticsAPI, schema)));
-  }
   if (rules.length !== 0) {
     return createPlugin('block-type', rules, {
       isBlockNodeRule: true

package/dist/esm/plugins/block-type/pm-plugins/keymap.js

@@ -4,7 +4,7 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { bindKeymapWithCommand, moveUp, moveDown, findKeyMapForBrowser, undo as undoKeymap, redo as redoKeymap, backspace, deleteKey, forwardDelete, toggleBlockQuote, keymap, insertNewLine, findShortcutByKeymap } from '@atlaskit/editor-common/keymaps';
 import { insertNewLineWithAnalytics, createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphAndMoveBlockUp } from '@atlaskit/editor-common/utils';
 import * as blockTypes from '../types';
-import { cleanUpAtTheStartOfDocument, deleteAndMoveCursor, deleteBlockContent, insertBlockTypesWithAnalytics } from '../commands';
+import { cleanUpAtTheStartOfDocument, deleteAndMoveCursor, deleteBlockContent, insertBlockQuoteWithAnalytics } from '../commands';
 import { isNodeAWrappingBlockNode } from '../utils';
 var backspaceCommand = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 var del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
@@ -19,7 +19,7 @@ export default function keymapPlugin(editorAnalyticsApi, schema, _featureFlags)
   bindKeymapWithCommand(deleteKey.common, del, list);
   bindKeymapWithCommand(forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    bindKeymapWithCommand(findShortcutByKeymap(toggleBlockQuote), insertBlockTypesWithAnalytics(blockTypes.BLOCK_QUOTE.name, INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
+    bindKeymapWithCommand(findShortcutByKeymap(toggleBlockQuote), insertBlockQuoteWithAnalytics(INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
   return keymap(list);
 }

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

@@ -1,11 +1,14 @@
-import { findParentNodeOfType, findSelectedNodeOfType, removeSelectedNode, removeParentNodeOfType, isNodeSelection } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType, findSelectedNodeOfType, removeSelectedNode, removeParentNodeOfType, isNodeSelection, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 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 { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../analytics/types';
+import { shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
+import { transformToCodeBlockAction } from './transform-to-code-block';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 export var removeCodeBlock = function removeCodeBlock(state, dispatch) {
   var nodes = state.schema.nodes,
     tr = state.tr;
@@ -113,4 +116,74 @@ export var resetShouldIgnoreFollowingMutations = function resetShouldIgnoreFollo
     dispatch(ignoreFollowingMutationsTr);
   }
   return true;
-};
+};
+
+/**
+ * This function creates a new transaction that inserts a code block,
+ * if there is text selected it will wrap the current selection if not it will
+ * append the codeblock to the end of the document.
+ */
+export function createInsertCodeBlockTransaction(_ref) {
+  var _state$selection$$fro;
+  var state = _ref.state;
+  var tr = state.tr;
+  var from = state.selection.from;
+  var codeBlock = state.schema.nodes.codeBlock;
+  var grandParentNodeType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
+  var parentNodeType = state.selection.$from.parent.type;
+
+  /** We always want to append a codeBlock unless we're inserting into a paragraph
+   * AND it's a valid child of the grandparent node.
+   * Insert the current selection as codeBlock content unless it contains nodes other
+   * than paragraphs and inline.
+   */
+  var canInsertCodeBlock = shouldSplitSelectedNodeOnNodeInsertion({
+    parentNodeType: parentNodeType,
+    grandParentNodeType: grandParentNodeType,
+    content: codeBlock.createAndFill()
+  }) && contentAllowedInCodeBlock(state);
+  if (canInsertCodeBlock) {
+    tr = transformToCodeBlockAction(state, from);
+  } else {
+    safeInsert(codeBlock.createAndFill())(tr).scrollIntoView();
+  }
+  return tr;
+}
+
+/**
+ * Check if the current selection contains any nodes that are not permitted
+ * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
+ * as we extract their text content.
+ */
+function contentAllowedInCodeBlock(state) {
+  var _state$selection = state.selection,
+    $from = _state$selection.$from,
+    $to = _state$selection.$to;
+  var isAllowedChild = true;
+  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+    if (!isAllowedChild) {
+      return false;
+    }
+    return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.isText;
+  });
+  return isAllowedChild;
+}
+export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
+  return withAnalytics(analyticsAPI, {
+    action: ACTION.INSERTED,
+    actionSubject: ACTION_SUBJECT.DOCUMENT,
+    actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,
+    attributes: {
+      inputMethod: inputMethod
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(function (state, dispatch) {
+    var tr = createInsertCodeBlockTransaction({
+      state: state
+    });
+    if (dispatch) {
+      dispatch(tr);
+    }
+    return true;
+  });
+}

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

@@ -12,10 +12,8 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } f
 import { IconCode } from '@atlaskit/editor-common/quick-insert';
 import { messages } from '../block-type/messages';
 import refreshBrowserSelectionOnChange from './refresh-browser-selection';
-// Theres an existing interelationship between these files, where the imported function is being called for code-block
-// Insertions via the drop down menu
-// tslint-ignore-next-line
-import { createInsertCodeBlockTransaction } from '../block-type/commands/block-type';
+import { createInsertCodeBlockTransaction, insertCodeBlockWithAnalytics } from './actions';
+import { createCodeBlockInputRule } from './pm-plugins/input-rule';
 var codeBlockPlugin = function codeBlockPlugin(_ref) {
   var options = _ref.config,
     api = _ref.api;
@@ -38,6 +36,13 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
             appearance: (_options$appearance = options === null || options === void 0 ? void 0 : options.appearance) !== null && _options$appearance !== void 0 ? _options$appearance : 'comment'
           }));
         }
+      }, {
+        name: 'codeBlockInputRule',
+        plugin: function plugin(_ref3) {
+          var _api$analytics;
+          var schema = _ref3.schema;
+          return createCodeBlockInputRule(schema, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+        }
       }, {
         name: 'codeBlockIDEKeyBindings',
         plugin: function plugin() {
@@ -45,8 +50,8 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
         }
       }, {
         name: 'codeBlockKeyMap',
-        plugin: function plugin(_ref3) {
-          var schema = _ref3.schema;
+        plugin: function plugin(_ref4) {
+          var schema = _ref4.schema;
           return keymap(schema);
         }
       }, {
@@ -61,9 +66,18 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
     onEditorViewStateUpdated: function onEditorViewStateUpdated(props) {
       refreshBrowserSelectionOnChange(props.originalTransaction, props.newEditorState);
     },
+    actions: {
+      /*
+       * Function will insert code block at current selection if block is empty or below current selection and set focus on it.
+       */
+      insertCodeBlock: function insertCodeBlock(inputMethod) {
+        var _api$analytics2;
+        return insertCodeBlockWithAnalytics(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+      }
+    },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref4) {
-        var formatMessage = _ref4.formatMessage;
+      quickInsert: function quickInsert(_ref5) {
+        var formatMessage = _ref5.formatMessage;
         return [{
           id: 'codeblock',
           title: formatMessage(messages.codeblock),
@@ -74,12 +88,12 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           icon: function icon() {
             return /*#__PURE__*/React.createElement(IconCode, null);
           },
-          action: function action(insert, state) {
-            var _api$analytics;
+          action: function action(_insert, state) {
+            var _api$analytics3;
             var tr = createInsertCodeBlockTransaction({
               state: state
             });
-            api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
+            api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.attachAnalyticsEvent({
               action: ACTION.INSERTED,
               actionSubject: ACTION_SUBJECT.DOCUMENT,
               actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,

package/dist/esm/plugins/code-block/pm-plugins/input-rule.js

@@ -0,0 +1,62 @@
+import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { createRule, createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
+import { INPUT_METHOD, ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
+import { isConvertableToCodeBlock, transformToCodeBlockAction } from '../transform-to-code-block';
+import { insertBlock } from '@atlaskit/editor-common/commands';
+export function createCodeBlockInputRule(schema, editorAnalyticsAPI) {
+  var rules = getCodeBlockRules(editorAnalyticsAPI, schema);
+  return createPlugin('code-block-input-rule', rules, {
+    isBlockNodeRule: true
+  });
+}
+
+/**
+ * Get all code block input rules
+ *
+ * @param {Schema} schema
+ * @returns {InputRuleWithHandler[]}
+ */
+function getCodeBlockRules(editorAnalyticsAPI, schema) {
+  var ruleAnalytics = inputRuleWithAnalytics({
+    action: ACTION.INSERTED,
+    actionSubject: ACTION_SUBJECT.DOCUMENT,
+    actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,
+    attributes: {
+      inputMethod: INPUT_METHOD.FORMATTING
+    },
+    eventType: EVENT_TYPE.TRACK
+  }, editorAnalyticsAPI);
+  var validMatchLength = function validMatchLength(match) {
+    return match.length > 0 && match[0].length === 3;
+  };
+  var threeTildeRule = createRule(/(?!\s)(`{3,})$/, function (state, match, start, end) {
+    if (!validMatchLength(match)) {
+      return null;
+    }
+    var attributes = {};
+    if (match[4]) {
+      attributes.language = match[4];
+    }
+    if (isConvertableToCodeBlock(state)) {
+      return transformToCodeBlockAction(state, start, attributes);
+    }
+    var tr = state.tr;
+    tr.delete(start, end);
+    var codeBlock = tr.doc.type.schema.nodes.codeBlock.createChecked();
+    safeInsert(codeBlock)(tr);
+    return tr;
+  });
+  var leftNodeReplacementThreeTildeRule = createRule(new RegExp("((".concat(leafNodeReplacementCharacter, "`{3,})|^\\s(`{3,}))(\\S*)$")), function (state, match, start, end) {
+    if (!validMatchLength(match)) {
+      return null;
+    }
+    var attributes = {};
+    if (match[4]) {
+      attributes.language = match[4];
+    }
+    var inlineStart = Math.max(match.index + state.selection.$from.start(), 1);
+    return insertBlock(state, schema.nodes.codeBlock, inlineStart, end, attributes);
+  });
+  return [ruleAnalytics(threeTildeRule), ruleAnalytics(leftNodeReplacementThreeTildeRule)];
+}

package/dist/esm/plugins/date/ui/DatePicker/index.js

@@ -24,7 +24,7 @@ var PopupWithListeners = withOuterListeners(Popup);
 import { INPUT_METHOD } from '../../../analytics/types/enums';
 import { injectIntl } from 'react-intl-next';
 import DatePickerInput from './date-picker-input';
-var popupContentWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: 2px;\n  border-radius: ", "px;\n  box-shadow: ", ";\n  background-color: ", ";\n"])), borderRadius(), "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(N60A, ", 0 0 1px ").concat(N60A), ")"), "var(--ds-surface-overlay, ".concat(N0, ")"));
+var popupContentWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: ", ";\n  border-radius: ", "px;\n  box-shadow: ", ";\n  background-color: ", ";\n"])), "var(--ds-space-025, 2px)", borderRadius(), "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(N60A, ", 0 0 1px ").concat(N60A), ")"), "var(--ds-surface-overlay, ".concat(N0, ")"));
 var DatePicker = /*#__PURE__*/function (_React$Component) {
   _inherits(DatePicker, _React$Component);
   var _super = _createSuper(DatePicker);
@@ -151,7 +151,8 @@ var DatePicker = /*#__PURE__*/function (_React$Component) {
         year: year,
         selected: selected,
         ref: this.handleRef,
-        weekStartDay: weekStartDay
+        weekStartDay: weekStartDay,
+        testId: 'datepicker'
       })));
     }
   }]);

package/dist/esm/plugins/expand/commands.js

@@ -7,7 +7,7 @@ import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD,
 import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
 import { findExpand } from './utils';
 import { createCommand } from './pm-plugins/plugin-factory';
-import { createWrapSelectionTransaction } from '../block-type/commands/block-type';
+import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 export var setExpandRef = function setExpandRef(ref) {
   return createCommand({

package/dist/esm/plugins/expand/index.js

@@ -8,7 +8,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, IN
 import { getToolbarConfig } from './toolbar';
 import { createExpandNode } from './commands';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
-import { createWrapSelectionTransaction } from '../block-type/commands/block-type';
+import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 var expandPlugin = function expandPlugin(_ref) {
   var _api$featureFlags;
   var _ref$config = _ref.config,

package/dist/esm/plugins/index.js

@@ -1,6 +1,5 @@
 export { basePlugin } from './base';
 export { default as blockTypePlugin } from './block-type';
-export { pluginKey as blockPluginStateKey } from './block-type';
 export { default as betterTypeHistoryPlugin } from './better-type-history';
 export { default as clearMarksOnChangeToEmptyDocumentPlugin } from './clear-marks-on-change-to-empty-document';
 export { default as codeBlockPlugin } from './code-block';

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
-import { pluginKey as blockTypeStateKey } from '../block-type/pm-plugins/main';
 import { stateKey as mediaStateKey } from '../media/pm-plugins/plugin-key';
 import { isTypeAheadAllowed } from '../type-ahead/utils';
 import { pluginKey as layoutStateKey } from '../layout';
@@ -8,7 +7,7 @@ import { insertMacroFromMacroBrowser } from '../macro';
 import WithPluginState from '../../ui/WithPluginState';
 import ToolbarInsertBlock from './ui/ToolbarInsertBlock';
 import { pluginKey as typeAheadPluginKey } from '../type-ahead/pm-plugins/key';
-import { insertBlockTypesWithAnalytics } from '../block-type/commands';
+import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '../block-type/types';
 import { INPUT_METHOD } from '../analytics';
 import { pluginKey as placeholderTextStateKey } from '../placeholder-text/plugin-key';
 import { pluginKey as macroStateKey } from '../macro/plugin-key';
@@ -27,6 +26,26 @@ var toolbarSizeToButtons = function toolbarSizeToButtons(toolbarSize) {
       return 0;
   }
 };
+/**
+ * Wrapper over insertBlockTypeWithAnalytics to autobind toolbar input method
+ * @param name Block name
+ */
+function handleInsertBlockType(insertCodeBlock, insertPanel, insertBlockQuote) {
+  return function (name) {
+    if (name === CODE_BLOCK.name && insertCodeBlock) {
+      return insertCodeBlock(INPUT_METHOD.TOOLBAR);
+    }
+    if (name === PANEL.name && insertPanel) {
+      return insertPanel(INPUT_METHOD.TOOLBAR);
+    }
+    if (name === BLOCK_QUOTE.name && insertBlockQuote) {
+      return insertBlockQuote(INPUT_METHOD.TOOLBAR);
+    }
+    return function () {
+      return false;
+    };
+  };
+}
 var insertBlockPlugin = function insertBlockPlugin(_ref) {
   var _api$featureFlags;
   var _ref$config = _ref.config,
@@ -53,16 +72,13 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
         return /*#__PURE__*/React.createElement(WithPluginState, {
           plugins: {
             typeAheadState: typeAheadPluginKey,
-            // needed to check isTypeAheadAllowed in ToolbarInsertBlock
-            blockTypeState: blockTypeStateKey,
             mediaState: mediaStateKey,
             macroState: macroStateKey,
             placeholderTextState: placeholderTextStateKey,
             layoutState: layoutStateKey
           },
           render: function render(_ref3) {
-            var blockTypeState = _ref3.blockTypeState,
-              mediaState = _ref3.mediaState,
+            var mediaState = _ref3.mediaState,
               _ref3$macroState = _ref3.macroState,
               macroState = _ref3$macroState === void 0 ? {} : _ref3$macroState,
               placeholderTextState = _ref3.placeholderTextState,
@@ -81,7 +97,6 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
               isToolbarReducedSpacing: isToolbarReducedSpacing,
               isLastItem: isLastItem,
               featureFlags: featureFlags,
-              blockTypeState: blockTypeState,
               mediaState: mediaState,
               macroState: macroState,
               placeholderTextState: placeholderTextState,
@@ -101,11 +116,10 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
   };
 };
 function ToolbarInsertBlockWithInjectionApi(_ref4) {
-  var _pluginInjectionApi$a2, _pluginInjectionApi$i;
+  var _pluginInjectionApi$i, _pluginInjectionApi$c, _pluginInjectionApi$p, _pluginInjectionApi$b;
   var editorView = _ref4.editorView,
     editorActions = _ref4.editorActions,
     dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent,
-    providerFactory = _ref4.providerFactory,
     popupsMountPoint = _ref4.popupsMountPoint,
     popupsBoundariesElement = _ref4.popupsBoundariesElement,
     popupsScrollableElement = _ref4.popupsScrollableElement,
@@ -116,28 +130,19 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     providers = _ref4.providers,
     pluginInjectionApi = _ref4.pluginInjectionApi,
     options = _ref4.options,
-    blockTypeState = _ref4.blockTypeState,
     mediaState = _ref4.mediaState,
     macroState = _ref4.macroState,
     placeholderTextState = _ref4.placeholderTextState,
     layoutState = _ref4.layoutState,
     featureFlags = _ref4.featureFlags;
   var buttons = toolbarSizeToButtons(toolbarSize);
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji']),
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType']),
     dateState = _useSharedPluginState.dateState,
     hyperlinkState = _useSharedPluginState.hyperlinkState,
     imageUploadState = _useSharedPluginState.imageUploadState,
     mentionState = _useSharedPluginState.mentionState,
-    emojiState = _useSharedPluginState.emojiState;
-
-  /**
-   * Wrapper over insertBlockTypeWithAnalytics to autobind toolbar input method
-   * @param name Block name
-   */
-  var handleInsertBlockType = React.useCallback(function (name) {
-    var _pluginInjectionApi$a;
-    return insertBlockTypesWithAnalytics(name, INPUT_METHOD.TOOLBAR, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions);
-  }, [pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions]);
+    emojiState = _useSharedPluginState.emojiState,
+    blockTypeState = _useSharedPluginState.blockTypeState;
   return /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
     pluginInjectionApi: pluginInjectionApi,
     buttons: buttons,
@@ -167,7 +172,7 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     emojiProvider: providers.emojiProvider,
     nativeStatusSupported: options.nativeStatusSupported,
     horizontalRuleEnabled: options.horizontalRuleEnabled,
-    onInsertBlockType: handleInsertBlockType,
+    onInsertBlockType: handleInsertBlockType(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.codeBlock) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.insertCodeBlock, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$p = pluginInjectionApi.panel) === null || _pluginInjectionApi$p === void 0 ? void 0 : _pluginInjectionApi$p.actions.insertPanel, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$b = pluginInjectionApi.blockType) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.insertBlockQuote),
     onInsertMacroFromMacroBrowser: insertMacroFromMacroBrowser,
     macroProvider: macroState.macroProvider,
     popupsMountPoint: popupsMountPoint,

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

@@ -3,9 +3,12 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 { removeParentNodeOfType, findSelectedNodeOfType, removeSelectedNode, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, addAnalytics } from '../analytics';
+import { PanelType } from '@atlaskit/adf-schema';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE, addAnalytics } from '../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 var removePanel = function removePanel() {
   return function (state, dispatch) {
     var nodes = state.schema.nodes,
@@ -88,4 +91,23 @@ export var changePanelType = function changePanelType(panelType) {
     }
     return true;
   };
-};
+};
+export function insertPanelWithAnalytics(inputMethod, analyticsAPI) {
+  return withAnalytics(analyticsAPI, {
+    action: ACTION.INSERTED,
+    actionSubject: ACTION_SUBJECT.DOCUMENT,
+    actionSubjectId: ACTION_SUBJECT_ID.PANEL,
+    attributes: {
+      inputMethod: inputMethod,
+      panelType: PanelType.INFO // only info panels can be inserted via this action
+    },
+
+    eventType: EVENT_TYPE.TRACK
+  })(function (state, dispatch) {
+    var nodes = state.schema.nodes;
+    if (nodes.panel && nodes.paragraph) {
+      return wrapSelectionIn(nodes.panel)(state, dispatch);
+    }
+    return false;
+  });
+}

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

@@ -5,13 +5,11 @@ 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 { IconPanel, IconPanelNote, IconPanelSuccess, IconPanelWarning, IconPanelError } from '@atlaskit/editor-common/quick-insert';
+import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { messages } from '../block-type/messages';
 import { IconCustomPanel } from '@atlaskit/editor-common/quick-insert';
 import { T50 } from '@atlaskit/theme/colors';
-// Theres an existing interelationship between these files, where the imported function is being called for panel
-// Insertions via the drop down menu
-// tslint-ignore-next-line
-import { createWrapSelectionTransaction } from '../block-type/commands/block-type';
+import { insertPanelWithAnalytics } from './actions';
 var panelPlugin = function panelPlugin(_ref) {
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
@@ -40,6 +38,12 @@ var panelPlugin = function panelPlugin(_ref) {
         }
       }];
     },
+    actions: {
+      insertPanel: function insertPanel(inputMethod) {
+        var _api$analytics;
+        return insertPanelWithAnalytics(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+      }
+    },
     pluginsOptions: {
       quickInsert: function quickInsert(_ref3) {
         var formatMessage = _ref3.formatMessage;

package/dist/esm/version-wrapper.js

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

package/dist/types/index.d.ts

@@ -24,12 +24,25 @@ export { textColorPluginKey } from './plugins/text-color';
 export type { TextColorPluginState } from './plugins/text-color';
 export { changeColor } from './plugins/text-color/commands/change-color';
 export { insertHorizontalRule } from './plugins/rule/commands';
-export { blockPluginStateKey } from './plugins';
-export type { BlockTypeState } from './plugins';
+export type { BlockTypeState } from './plugins/block-type/pm-plugins/main';
+/**
+ * @private
+ * @deprecated DO NOT USE, temporary solution while decoupling plugins from editor-core
+ */
+export type { BlockTypePlugin } from './plugins/block-type';
+/**
+ * @private
+ * @deprecated DO NOT USE, temporary solution while decoupling plugins from editor-core
+ */
+export type { CodeBlockPlugin } from './plugins/code-block';
+/**
+ * @private
+ * @deprecated DO NOT USE, temporary solution while decoupling plugins from editor-core
+ */
+export type { PanelPlugin } from './plugins/panel';
 export { subscribeToToolbarAndPickerUpdates } from './plugins/view-update-subscription/subscribe/toolbarAndPickerUpdates';
 export { subscribeTypeAheadUpdates } from './plugins/view-update-subscription/subscribe/type-ahead-updates';
 export type { InputMethodToolbar as TextFormattingInputMethodToolbar, InputMethodBasic as TextFormattingInputMethodBasic, } from '@atlaskit/editor-common/types';
-export { insertBlockType, insertBlockTypesWithAnalytics, setBlockType, setBlockTypeWithAnalytics, } from './plugins/block-type/commands';
 export type { InputMethod as BlockTypeInputMethod } from './plugins/block-type/commands';
 export { createTable } from '@atlaskit/editor-plugin-table/commands';
 export { insertTaskDecisionCommand } from './plugins/tasks-and-decisions/commands';

package/dist/types/labs/next/presets/default.d.ts

@@ -56,6 +56,9 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
         }, import("@atlaskit/editor-common/types").FeatureFlags>];
         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
+    actions: {
+        insertCodeBlock: (inputMethod: import("@atlaskit/editor-common/analytics").INPUT_METHOD) => import("@atlaskit/editor-common/types").Command;
+    };
 }, CodeBlockOptions>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
     pluginConfiguration: SelectionPluginOptions | undefined;
 }, SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"floatingToolbar", {
@@ -181,6 +184,9 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
         }, import("@atlaskit/editor-common/types").FeatureFlags>];
         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
+    actions: {
+        insertCodeBlock: (inputMethod: import("@atlaskit/editor-common/analytics").INPUT_METHOD) => import("@atlaskit/editor-common/types").Command;
+    };
 }, CodeBlockOptions>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
     pluginConfiguration: SelectionPluginOptions | undefined;
 }, SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"floatingToolbar", {