@atlaskit/editor-core 187.34.1 → 187.35.0

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

@@ -1,13 +1,8 @@
-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 (state, dispatch) => {
     const {
@@ -132,27 +127,13 @@ export const setHeadingWithAnalytics = (newHeadingLevel, inputMethod, editorAnal
     }
   })(setHeading(newHeadingLevel)));
 };
-export function insertBlockType(name) {
+function insertBlockQuote() {
   return function (state, dispatch) {
     const {
       nodes
     } = state.schema;
-    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;
   };
@@ -166,200 +147,17 @@ export function insertBlockType(name) {
  * otherwise Editor becomes very sad and crashes
  * @returns - command that inserts block type
  */
-export const 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
-        }
-      })(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({
-  state,
-  type,
-  nodeAttributes
-}) {
-  let {
-    tr
-  } = state;
-  const {
-    alignment,
-    indentation
-  } = state.schema.marks;
-
-  /** Alignment or Indentation is not valid inside block types */
-  const removeAlignTr = removeBlockMarks(state, [alignment, indentation]);
-  tr = removeAlignTr || tr;
-
-  /**Get range and wrapping needed for the selection*/
-  const {
-    range,
-    wrapping
-  } = getWrappingOptions(state, type, nodeAttributes);
-  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) {
-  const {
-    $from,
-    $to
-  } = state.selection;
-  const range = $from.blockRange($to);
-  let isAllowedChild = true;
-  /**
-   * Added a check to avoid wrapping codeblock
-   */
-  if (state.selection.empty) {
-    state.doc.nodesBetween($from.pos, $to.pos, node => {
-      if (!isAllowedChild) {
-        return false;
-      }
-      return isAllowedChild = node.type !== state.schema.nodes.codeBlock;
-    });
-  }
-  const wrapping = isAllowedChild && range && findWrapping(range, type, nodeAttributes);
-  return {
-    range,
-    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) {
-    let tr = createWrapSelectionTransaction({
-      state,
-      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({
-  state
-}) {
-  var _state$selection$$fro;
-  let {
-    tr
-  } = state;
-  const {
-    from
-  } = state.selection;
-  const {
-    codeBlock
-  } = state.schema.nodes;
-  const grandParentNodeType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
-  const 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.
-   */
-  const canInsertCodeBlock = shouldSplitSelectedNodeOnNodeInsertion({
-    parentNodeType,
-    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) {
-    let tr = createInsertCodeBlockTransaction({
-      state
-    });
-    if (dispatch) {
-      dispatch(tr);
-    }
-    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) {
-  const {
-    $from,
-    $to
-  } = state.selection;
-  let isAllowedChild = true;
-  state.doc.nodesBetween($from.pos, $to.pos, node => {
-    if (!isAllowedChild) {
-      return false;
+export const 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 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 const cleanUpAtTheStartOfDocument = (state, dispatch) => {
   const {
     $cursor

package/dist/es2019/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/es2019/plugins/block-type/index.js

@@ -11,6 +11,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';
 const headingPluginOptions = ({
   formatMessage
 }, isAllowed, editorAnalyticsApi) => {
@@ -135,6 +136,22 @@ const blockTypePlugin = ({
       }
     }];
   },
+  actions: {
+    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(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(editorState) {
+    if (!editorState) {
+      return;
+    }
+    return pluginKey.getState(editorState);
+  },
   primaryToolbarComponent({
     editorView,
     popupsMountPoint,
@@ -147,8 +164,8 @@ const blockTypePlugin = ({
   }) {
     const isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < ToolbarSize.XXL : toolbarSize < ToolbarSize.XL;
     const 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 @@ const blockTypePlugin = ({
   },
   pluginsOptions: {
     quickInsert: intl => {
-      var _api$analytics5, _api$analytics6;
+      var _api$analytics7, _api$analytics8;
       const exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-      return [...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), ...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 [...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), ...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/es2019/plugins/block-type/pm-plugins/input-rule.js

@@ -1,9 +1,7 @@
-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';
 const MAX_HEADING_LEVEL = 6;
 function getHeadingLevel(match) {
@@ -33,7 +31,7 @@ function getHeadingRules(editorAnalyticsAPI, schema) {
   const hashRule = headingRule(schema.nodes.heading, MAX_HEADING_LEVEL);
   const leftNodeReplacementHashRule = createRule(new RegExp(`${leafNodeReplacementCharacter}(#{1,6})\\s$`), (state, match, start, end) => {
     const level = match[1].length;
-    return insertBlock(state, schema.nodes.heading, `heading${level}`, start, end, {
+    return insertBlock(state, schema.nodes.heading, start, end, {
       level
     });
   });
@@ -62,7 +60,7 @@ function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   // '> ' for blockquote
   const greatherThanRule = blockQuoteRule(schema.nodes.blockquote);
   const leftNodeReplacementGreatherRule = createRule(new RegExp(`${leafNodeReplacementCharacter}\\s*>\\s$`), (state, _match, start, end) => {
-    return insertBlock(state, schema.nodes.blockquote, 'blockquote', start, end);
+    return insertBlock(state, schema.nodes.blockquote, start, end);
   });
 
   // Analytics V3 handler
@@ -77,54 +75,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) {
-  const 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);
-  const validMatchLength = match => match.length > 0 && match[0].length === 3;
-  const threeTildeRule = createRule(/(?!\s)(`{3,})$/, (state, match, start, end) => {
-    if (!validMatchLength(match)) {
-      return null;
-    }
-    const attributes = {};
-    if (match[4]) {
-      attributes.language = match[4];
-    }
-    if (isConvertableToCodeBlock(state)) {
-      return transformToCodeBlockAction(state, start, attributes);
-    }
-    const tr = state.tr;
-    tr.delete(start, end);
-    const codeBlock = tr.doc.type.schema.nodes.codeBlock.createChecked();
-    safeInsert(codeBlock)(tr);
-    return tr;
-  });
-  const leftNodeReplacementThreeTildeRule = createRule(new RegExp(`((${leafNodeReplacementCharacter}\`{3,})|^\\s(\`{3,}))(\\S*)$`), (state, match, start, end) => {
-    if (!validMatchLength(match)) {
-      return null;
-    }
-    const attributes = {};
-    if (match[4]) {
-      attributes.language = match[4];
-    }
-    const 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) {
   const rules = [];
   if (schema.nodes.heading) {
@@ -133,9 +83,6 @@ function inputRulePlugin(editorAnalyticsAPI, schema, featureFlags) {
   if (schema.nodes.blockquote) {
     rules.push(...getBlockQuoteRules(editorAnalyticsAPI, schema));
   }
-  if (schema.nodes.codeBlock) {
-    rules.push(...getCodeBlockRules(editorAnalyticsAPI, schema));
-  }
   if (rules.length !== 0) {
     return createPlugin('block-type', rules, {
       isBlockNodeRule: true

package/dist/es2019/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';
 const backspaceCommand = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 const 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/es2019/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 const removeCodeBlock = (state, dispatch) => {
   const {
     schema: {
@@ -127,4 +130,82 @@ export const resetShouldIgnoreFollowingMutations = (state, dispatch) => {
     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({
+  state
+}) {
+  var _state$selection$$fro;
+  let {
+    tr
+  } = state;
+  const {
+    from
+  } = state.selection;
+  const {
+    codeBlock
+  } = state.schema.nodes;
+  const grandParentNodeType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
+  const 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.
+   */
+  const canInsertCodeBlock = shouldSplitSelectedNodeOnNodeInsertion({
+    parentNodeType,
+    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) {
+  const {
+    $from,
+    $to
+  } = state.selection;
+  let isAllowedChild = true;
+  state.doc.nodesBetween($from.pos, $to.pos, 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) {
+    let tr = createInsertCodeBlockTransaction({
+      state
+    });
+    if (dispatch) {
+      dispatch(tr);
+    }
+    return true;
+  });
+}

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

@@ -9,10 +9,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';
 const codeBlockPlugin = ({
   config: options,
   api
@@ -37,6 +35,14 @@ const codeBlockPlugin = ({
           appearance: (_options$appearance = options === null || options === void 0 ? void 0 : options.appearance) !== null && _options$appearance !== void 0 ? _options$appearance : 'comment'
         });
       }
+    }, {
+      name: 'codeBlockInputRule',
+      plugin: ({
+        schema
+      }) => {
+        var _api$analytics;
+        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: () => ideUX(api)
@@ -55,6 +61,15 @@ const codeBlockPlugin = ({
   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: 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: ({
       formatMessage
@@ -66,12 +81,12 @@ const codeBlockPlugin = ({
       priority: 700,
       keyshortcut: '```',
       icon: () => /*#__PURE__*/React.createElement(IconCode, null),
-      action(insert, state) {
-        var _api$analytics;
+      action(_insert, state) {
+        var _api$analytics3;
         const tr = createInsertCodeBlockTransaction({
           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/es2019/plugins/code-block/pm-plugins/input-rule.js

@@ -0,0 +1,60 @@
+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) {
+  const 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) {
+  const 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);
+  const validMatchLength = match => match.length > 0 && match[0].length === 3;
+  const threeTildeRule = createRule(/(?!\s)(`{3,})$/, (state, match, start, end) => {
+    if (!validMatchLength(match)) {
+      return null;
+    }
+    const attributes = {};
+    if (match[4]) {
+      attributes.language = match[4];
+    }
+    if (isConvertableToCodeBlock(state)) {
+      return transformToCodeBlockAction(state, start, attributes);
+    }
+    const tr = state.tr;
+    tr.delete(start, end);
+    const codeBlock = tr.doc.type.schema.nodes.codeBlock.createChecked();
+    safeInsert(codeBlock)(tr);
+    return tr;
+  });
+  const leftNodeReplacementThreeTildeRule = createRule(new RegExp(`((${leafNodeReplacementCharacter}\`{3,})|^\\s(\`{3,}))(\\S*)$`), (state, match, start, end) => {
+    if (!validMatchLength(match)) {
+      return null;
+    }
+    const attributes = {};
+    if (match[4]) {
+      attributes.language = match[4];
+    }
+    const 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/es2019/plugins/copy-button/commands.js

@@ -123,7 +123,8 @@ export const createToolbarCopyCommandForNode = nodeType => (state, dispatch) =>
         div.firstChild.setAttribute('data-pm-slice', '0 0 []');
       }
       // ED-17083 safari seems have bugs for extension copy because exntension do not have a child text(innerText) and it will not recognized as html in clipboard, this could be merge into one if this extension fixed children issue or safari fix the copy bug
-      if (browser.safari && state.selection instanceof NodeSelection && state.selection.node.type === state.schema.nodes.extension) {
+      // MEX-2528 safari has a bug related to the mediaSingle node with border or link. The image tag within the clipboard is not recognized as HTML when using the ClipboardItem API. To address this, we have to switch to ClipboardPolyfill
+      if (browser.safari && state.selection instanceof NodeSelection && (state.selection.node.type === state.schema.nodes.extension || state.selection.node.type === state.schema.nodes.mediaSingle)) {
         copyHTMLToClipboardPolyfill(div);
       } else {
         copyHTMLToClipboard(div);