@atlaskit/editor-core 187.34.2 → 187.35.1

package/dist/esm/plugins/block-type/commands/block-type.js

@@ -1,16 +1,11 @@
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
-import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { PanelType } from '@atlaskit/adf-schema';
 import { CellSelection } from '@atlaskit/editor-tables';
-import { shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { filterChildrenBetween, removeBlockMarks } from '@atlaskit/editor-common/utils';
-import { CODE_BLOCK, BLOCK_QUOTE, PANEL, HEADINGS_BY_NAME, NORMAL_TEXT } from '../types';
-import { transformToCodeBlockAction } from './transform-to-code-block';
+import { filterChildrenBetween, wrapSelectionIn } from '@atlaskit/editor-common/utils';
+import { HEADINGS_BY_NAME, NORMAL_TEXT } from '../types';
 export function setBlockType(name) {
   return function (state, dispatch) {
     var nodes = state.schema.nodes;
@@ -137,25 +132,11 @@ export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeading
     })(setHeading(newHeadingLevel));
   });
 };
-export function insertBlockType(name) {
+function insertBlockQuote() {
   return function (state, dispatch) {
     var nodes = state.schema.nodes;
-    switch (name) {
-      case BLOCK_QUOTE.name:
-        if (nodes.paragraph && nodes.blockquote) {
-          return wrapSelectionIn(nodes.blockquote)(state, dispatch);
-        }
-        break;
-      case CODE_BLOCK.name:
-        if (nodes.codeBlock) {
-          return insertCodeBlock()(state, dispatch);
-        }
-        break;
-      case PANEL.name:
-        if (nodes.panel && nodes.paragraph) {
-          return wrapSelectionIn(nodes.panel)(state, dispatch);
-        }
-        break;
+    if (nodes.paragraph && nodes.blockquote) {
+      return wrapSelectionIn(nodes.blockquote)(state, dispatch);
     }
     return false;
   };
@@ -169,189 +150,20 @@ export function insertBlockType(name) {
  * otherwise Editor becomes very sad and crashes
  * @returns - command that inserts block type
  */
-export var insertBlockTypesWithAnalytics = function insertBlockTypesWithAnalytics(name, inputMethod, editorAnalyticsApi) {
-  switch (name) {
-    case BLOCK_QUOTE.name:
-      return withAnalytics(editorAnalyticsApi, {
-        action: ACTION.FORMATTED,
-        actionSubject: ACTION_SUBJECT.TEXT,
-        eventType: EVENT_TYPE.TRACK,
-        actionSubjectId: ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
-        attributes: {
-          inputMethod: inputMethod
-        }
-      })(insertBlockType(name));
-    case CODE_BLOCK.name:
-      return withAnalytics(editorAnalyticsApi, {
-        action: ACTION.INSERTED,
-        actionSubject: ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,
-        attributes: {
-          inputMethod: inputMethod
-        },
-        eventType: EVENT_TYPE.TRACK
-      })(insertBlockType(name));
-    case PANEL.name:
-      return withAnalytics(editorAnalyticsApi, {
-        action: ACTION.INSERTED,
-        actionSubject: ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: ACTION_SUBJECT_ID.PANEL,
-        attributes: {
-          inputMethod: inputMethod,
-          panelType: PanelType.INFO // only info panels can be inserted from toolbar
-        },
-
-        eventType: EVENT_TYPE.TRACK
-      })(insertBlockType(name));
-    default:
-      return insertBlockType(name);
-  }
-};
-
-/**
- * This function creates a new transaction that wraps the current selection
- * in the specified node type if it results in a valid transaction.
- * If not valid, it performs a safe insert operation.
- *
- * Example of when wrapping might not be valid is when attempting to wrap
- * content that is already inside a panel with another panel
- */
-export function createWrapSelectionTransaction(_ref3) {
-  var state = _ref3.state,
-    type = _ref3.type,
-    nodeAttributes = _ref3.nodeAttributes;
-  var tr = state.tr;
-  var _state$schema$marks = state.schema.marks,
-    alignment = _state$schema$marks.alignment,
-    indentation = _state$schema$marks.indentation;
-
-  /** Alignment or Indentation is not valid inside block types */
-  var removeAlignTr = removeBlockMarks(state, [alignment, indentation]);
-  tr = removeAlignTr || tr;
-
-  /**Get range and wrapping needed for the selection*/
-  var _getWrappingOptions = getWrappingOptions(state, type, nodeAttributes),
-    range = _getWrappingOptions.range,
-    wrapping = _getWrappingOptions.wrapping;
-  if (wrapping) {
-    tr.wrap(range, wrapping).scrollIntoView();
-  } else {
-    /** We always want to append a block type */
-    safeInsert(type.createAndFill(nodeAttributes))(tr).scrollIntoView();
-  }
-  return tr;
-}
-function getWrappingOptions(state, type, nodeAttributes) {
-  var _state$selection = state.selection,
-    $from = _state$selection.$from,
-    $to = _state$selection.$to;
-  var range = $from.blockRange($to);
-  var isAllowedChild = true;
-  /**
-   * Added a check to avoid wrapping codeblock
-   */
-  if (state.selection.empty) {
-    state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-      if (!isAllowedChild) {
-        return false;
-      }
-      return isAllowedChild = node.type !== state.schema.nodes.codeBlock;
-    });
-  }
-  var wrapping = isAllowedChild && range && findWrapping(range, type, nodeAttributes);
-  return {
-    range: range,
-    wrapping: wrapping
-  };
-}
-
-/**
- * Function will add wrapping node.
- * 1. If currently selected blocks can be wrapped in the wrapper type it will wrap them.
- * 2. If current block can not be wrapped inside wrapping block it will create a new block below selection,
- *  and set selection on it.
- */
-function wrapSelectionIn(type) {
-  return function (state, dispatch) {
-    var tr = createWrapSelectionTransaction({
-      state: state,
-      type: type
-    });
-    if (dispatch) {
-      dispatch(tr);
-    }
-    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(_ref4) {
-  var _state$selection$$fro;
-  var state = _ref4.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;
-}
-
-/**
- * Function will insert code block at current selection if block is empty or below current selection and set focus on it.
- */
-function insertCodeBlock() {
-  return function (state, dispatch) {
-    var tr = createInsertCodeBlockTransaction({
-      state: state
-    });
-    if (dispatch) {
-      dispatch(tr);
+export var insertBlockQuoteWithAnalytics = function insertBlockQuoteWithAnalytics(inputMethod, editorAnalyticsApi) {
+  return withAnalytics(editorAnalyticsApi, {
+    action: ACTION.FORMATTED,
+    actionSubject: ACTION_SUBJECT.TEXT,
+    eventType: EVENT_TYPE.TRACK,
+    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
+    attributes: {
+      inputMethod: inputMethod
     }
-    return true;
-  };
-}
-
-/**
- * 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$selection2 = state.selection,
-    $from = _state$selection2.$from,
-    $to = _state$selection2.$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;
-}
+  })(insertBlockQuote());
+};
 export var cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
-  var _ref5 = state.selection,
-    $cursor = _ref5.$cursor;
+  var _ref3 = state.selection,
+    $cursor = _ref3.$cursor;
   if ($cursor && !$cursor.nodeBefore && !$cursor.nodeAfter && $cursor.pos === 1) {
     var tr = state.tr,
       schema = state.schema;

package/dist/esm/plugins/block-type/commands/index.js

@@ -1,5 +1,3 @@
-export { cleanUpAtTheStartOfDocument, insertBlockType, insertBlockTypesWithAnalytics, setBlockType, setBlockTypeWithAnalytics, setHeading, setHeadingWithAnalytics, setNormalText, setNormalTextWithAnalytics } from './block-type';
-export { insertBlock } from './insert-block';
-export { isConvertableToCodeBlock, transformToCodeBlockAction } from './transform-to-code-block';
+export { cleanUpAtTheStartOfDocument, insertBlockQuoteWithAnalytics, setBlockType, setBlockTypeWithAnalytics, setHeading, setHeadingWithAnalytics, setNormalText, setNormalTextWithAnalytics } from './block-type';
 export { deleteAndMoveCursor } from './delete-and-move-cursor';
 export { deleteBlockContent } from './delete-block-content';

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

@@ -12,6 +12,7 @@ import inputRulePlugin from './pm-plugins/input-rule';
 import ToolbarBlockType from './ui/ToolbarBlockType';
 import { setBlockTypeWithAnalytics } from './commands';
 import { messages } from './messages';
+import { insertBlockQuoteWithAnalytics } from './commands/block-type';
 var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editorAnalyticsApi) {
   var formatMessage = _ref.formatMessage;
   if (!isAllowed) {
@@ -137,6 +138,22 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
         }
       }];
     },
+    actions: {
+      insertBlockQuote: function insertBlockQuote(inputMethod) {
+        var _api$analytics4;
+        return insertBlockQuoteWithAnalytics(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
+      },
+      setBlockType: function setBlockType(name, inputMethod) {
+        var _api$analytics5;
+        return setBlockTypeWithAnalytics(name, inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
+      }
+    },
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return;
+      }
+      return pluginKey.getState(editorState);
+    },
     primaryToolbarComponent: function primaryToolbarComponent(_ref7) {
       var editorView = _ref7.editorView,
         popupsMountPoint = _ref7.popupsMountPoint,
@@ -148,8 +165,8 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
         eventDispatcher = _ref7.eventDispatcher;
       var isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < ToolbarSize.XXL : toolbarSize < ToolbarSize.XL;
       var boundSetBlockType = function boundSetBlockType(name) {
-        var _api$analytics4;
-        return setBlockTypeWithAnalytics(name, INPUT_METHOD.TOOLBAR, api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(editorView.state, editorView.dispatch);
+        var _api$analytics6;
+        return setBlockTypeWithAnalytics(name, INPUT_METHOD.TOOLBAR, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)(editorView.state, editorView.dispatch);
       };
       return /*#__PURE__*/React.createElement(WithPluginState, {
         editorView: editorView,
@@ -174,9 +191,9 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
     },
     pluginsOptions: {
       quickInsert: function quickInsert(intl) {
-        var _api$analytics5, _api$analytics6;
+        var _api$analytics7, _api$analytics8;
         var exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-        return [].concat(_toConsumableArray(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions)), _toConsumableArray(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)));
+        return [].concat(_toConsumableArray(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions)), _toConsumableArray(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions)));
       }
     }
   };

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)];
+}