@atlaskit/editor-core 187.9.2 → 187.10.1

package/dist/es2019/plugins/floating-toolbar/pm-plugins/force-focus/index.js

@@ -26,13 +26,11 @@ export default (() => new SafePlugin({
 /**
  * The provided selector should be the floating toolbar button that needs focus.
  */
-export function forceFocusSelector(selector, view) {
-  if (view) {
-    return view.dispatch(view.state.tr.setMeta(forceFocusStateKey, {
-      selector
-    }));
-  }
-}
+export const forceFocusSelector = selector => tr => {
+  return tr.setMeta(forceFocusStateKey, {
+    selector
+  });
+};
 
 /**
  * If a selector is set and the element exists, focus it.
@@ -52,7 +50,13 @@ export function checkShouldForceFocusAndApply(view) {
           inline: 'nearest'
         });
         focusableElement.focus();
-        forceFocusSelector(null, view);
+        const {
+          state: {
+            tr
+          },
+          dispatch
+        } = view;
+        dispatch(forceFocusSelector(null)(tr));
       }
     }
   }

package/dist/es2019/plugins/floating-toolbar/ui/ExtensionsPlaceholder.js

@@ -60,11 +60,12 @@ export const ExtensionsPlaceholder = props => {
   } = props;
   const [extensions, setExtensions] = useState([]);
   useEffect(() => {
-    if (extensionProvider) {
-      getExtensions();
-    }
+    getExtensions();
     async function getExtensions() {
-      setExtensions(await extensionProvider.getExtensions());
+      const provider = await extensionProvider;
+      if (provider) {
+        setExtensions(await provider.getExtensions());
+      }
     }
     // leaving dependencies array empty so that this effect runs just once on component mount
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/es2019/plugins/floating-toolbar/ui/Toolbar.js

@@ -405,7 +405,18 @@ class Toolbar extends Component {
     }
   }
   componentWillUnmount() {
-    forceFocusSelector(null, this.props.editorView);
+    const {
+      editorView
+    } = this.props;
+    if (editorView) {
+      const {
+        state: {
+          tr
+        },
+        dispatch
+      } = editorView;
+      dispatch(forceFocusSelector(null)(tr));
+    }
     this.resetStyling({
       table: this.props.node.type.name === 'table'
     });

package/dist/es2019/plugins/index.js

@@ -37,7 +37,6 @@ export { default as statusPlugin } from './status';
 export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
-export { default as editorDisabledPlugin } from './editor-disabled';
 export { default as fragmentMarkPlugin } from './fragment';
 export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';

package/dist/es2019/plugins/media/pm-plugins/alt-text/ui/AltTextEdit.js

@@ -75,13 +75,15 @@ export class AltTextEditComponent extends React.Component {
     });
     _defineProperty(this, "dispatchCancelEvent", event => {
       const {
-        view
+        view,
+        onEscape
       } = this.props;
 
       // We need to pass down the ESCAPE keymap
       // because when we focus on the Toolbar, Prosemirror blur,
       // making all keyboard shortcuts not working
       view.someProp('handleKeyDown', fn => fn(view, event));
+      onEscape === null || onEscape === void 0 ? void 0 : onEscape();
     });
     _defineProperty(this, "updateAltText", newAltText => {
       const {

package/dist/es2019/plugins/media/toolbar/alt-text.js

@@ -6,7 +6,6 @@ import AltTextEdit from '../pm-plugins/alt-text/ui/AltTextEdit';
 import { CONTAINER_WIDTH_IN_PX } from '../pm-plugins/alt-text/ui/AltTextEdit';
 import { getMediaNodeFromSelection } from '../utils/media-common';
 import { ClassNames } from '../pm-plugins/alt-text/style';
-import { withOuterListeners } from '@atlaskit/editor-common/ui';
 import { forceFocusSelector } from '../../floating-toolbar/pm-plugins/force-focus';
 const testId = 'alt-text-edit-button';
 export const altTextButton = (intl, state) => {
@@ -26,7 +25,6 @@ export const altTextButton = (intl, state) => {
     })
   };
 };
-const AltTextEditWithListeners = withOuterListeners(AltTextEdit);
 export const altTextEditComponent = options => {
   return {
     type: 'custom',
@@ -43,15 +41,21 @@ export const altTextEditComponent = options => {
       /** Focus should move to the 'Alt text' button when the toolbar closes
        * and not close the floating toolbar.
        */
-      const handleEsc = e => {
-        forceFocusSelector(`[data-testid="${testId}"]`, view);
+      const handleEsc = () => {
+        const {
+          state: {
+            tr
+          },
+          dispatch
+        } = view;
+        dispatch(forceFocusSelector(`[data-testid="${testId}"]`)(tr));
       };
-      return /*#__PURE__*/React.createElement(AltTextEditWithListeners, {
+      return /*#__PURE__*/React.createElement(AltTextEdit, {
         view: view,
         key: idx,
         value: mediaNode.attrs.alt,
         altTextValidator: options && options.altTextValidator,
-        handleEscapeKeydown: handleEsc
+        onEscape: handleEsc
       });
     }
   };

package/dist/es2019/plugins/media/toolbar/linking.js

@@ -68,7 +68,14 @@ export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, i
                 /** Focus should move to the 'Add link' button when the toolbar closes
                  * and not close the floating toolbar.
                  */
-                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.forceFocusSelector(FORCE_FOCUS_SELECTOR, view);
+                const {
+                  state: {
+                    tr
+                  },
+                  dispatch
+                } = view;
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.forceFocusSelector(FORCE_FOCUS_SELECTOR)(tr);
+                dispatch(tr);
               },
               onSubmit: (href, meta) => {
                 setUrlToMedia(href, meta.inputMethod)(view.state, view.dispatch, view);

package/dist/es2019/plugins/media/ui/MediaLinkingToolbar.js

@@ -18,15 +18,17 @@ import { INPUT_METHOD } from '../../analytics/types/enums';
 import { mediaLinkToolbarMessages } from './media-linking-toolbar-messages';
 const validationWrapper = css`
   line-height: 0;
-  padding: 12px 24px 12px 0;
-  margin: 0 4px 0 32px;
+  padding: ${"var(--ds-space-150, 12px)"} ${"var(--ds-space-300, 24px)"}
+    ${"var(--ds-space-150, 12px)"} 0;
+  margin: 0 ${"var(--ds-space-050, 4px)"} 0 ${"var(--ds-space-400, 32px)"};
   border-top: 1px solid ${`var(--ds-border-danger, ${R400})`};
   align-items: start;
   display: flex;
   flex-direction: column;
 `;
 const buttonWrapper = css`
-  padding: 4px 8px 4px 0px;
+  padding: ${"var(--ds-space-050, 4px)"} ${"var(--ds-space-100, 8px)"}
+    ${"var(--ds-space-050, 4px)"} 0px;
 `;
 export class LinkAddToolbar extends React.PureComponent {
   constructor(...args) {

package/dist/es2019/plugins/media/utils/media-common.js

@@ -1,7 +1,7 @@
 import { deleteSelection, splitBlock } from '@atlaskit/editor-prosemirror/commands';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
-import { createParagraphNear, createNewParagraphBelow } from '../../../commands';
+import { createParagraphNear, createNewParagraphBelow } from '@atlaskit/editor-common/utils';
 import { isTemporary } from '../../../utils';
 import { mapSlice } from '../../../utils/slice';
 import { walkUpTreeUntil, removeNestedEmptyEls, unwrap } from '../../../utils/dom';

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

@@ -4,7 +4,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { uuid } from '@atlaskit/adf-schema';
-import { filterCommand as filter, isEmptySelectionAtStart, deleteEmptyParagraphAndMoveBlockUp, isEmptySelectionAtEnd } from '@atlaskit/editor-common/utils';
+import { filterCommand as filter, isEmptySelectionAtStart, isEmptySelectionAtEnd, deleteEmptyParagraphAndMoveBlockUp } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD, withAnalytics } from '../../analytics';
 import { insertTaskDecisionWithAnalytics } from '../commands';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';

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

@@ -1,5 +1,5 @@
 import * as keymaps from '../../../keymaps';
-import { keymap } from '../../../utils/keymap';
+import { keymap } from '@atlaskit/editor-common/keymaps';
 import { redoFromKeyboard, undoFromKeyboard } from '../commands';
 export function keymapPlugin() {
   const list = {};

package/dist/es2019/ui/ColorPickerButton/index.js

@@ -38,6 +38,7 @@ const colorPickerWrapper = theme => css`
 `;
 /* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
 
+const ColorPaletteWithListeners = withOuterListeners(ColorPalette);
 const ColorPickerButton = props => {
   const buttonRef = React.useRef(null);
   const [isPopupOpen, setIsPopupOpen] = React.useState(false);
@@ -70,7 +71,6 @@ const ColorPickerButton = props => {
     setIsPopupPositioned(true);
     return position;
   }, []);
-  const ColorPaletteWithListeners = withOuterListeners(ColorPalette);
   const {
     onChange,
     createAnalyticsEvent,
@@ -174,7 +174,7 @@ const ColorPickerButton = props => {
       width: ${((_props$size2 = props.size) === null || _props$size2 === void 0 ? void 0 : _props$size2.width) || '14px'};
       height: ${((_props$size3 = props.size) === null || _props$size3 === void 0 ? void 0 : _props$size3.height) || '14px'};
       padding: 0;
-      margin: 0px 2px;
+      margin: 0px ${"var(--ds-space-025, 2px)"};
     }
     &:hover {
       background: ${themed({

package/dist/es2019/ui/styles.js

@@ -1,25 +1,9 @@
 import { css } from '@emotion/react';
 export { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
-export const wrapperSmallStyle = css`
-  margin-left: ${"var(--ds-space-050, 4px)"};
-  min-width: 40px;
-`;
 export const expandIconWrapperStyle = css`
   margin-left: -8px;
 `;
-export const buttonContentStyle = css`
-  display: flex;
-  min-width: 80px;
-  align-items: center;
-  overflow: hidden;
-  justify-content: center;
-  flex-direction: column;
-  padding: ${"var(--ds-space-075, 6px)"};
-`;
-export const buttonContentReducedSpacingStyle = css`
-  padding: ${"var(--ds-space-100, 8px)"};
-`;
 export const clickSelectWrapperStyle = css`
   user-select: all;
 `;

package/dist/es2019/utils/index.js

@@ -1,11 +1,8 @@
 import { toggleMark } from '@atlaskit/editor-prosemirror/commands';
-import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { FakeTextCursorSelection } from '../plugins/fake-text-cursor/cursor';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isNodeEmpty } from './document';
-import { atTheBeginningOfDoc, atTheEndOfDoc } from './prosemirror/position';
-import { isMediaNode } from '@atlaskit/editor-common/utils';
 export { insideTable } from '@atlaskit/editor-common/core-utils';
 export { isNodeEmpty, findFarthestParentNode, isSelectionEndOfParagraph, nodesBetweenChanged, getNodesCount } from './document';
 export { sanitiseMarksInSelection } from './mark';
@@ -18,41 +15,6 @@ function isMarkTypeCompatibleWithMark(markType, mark) {
 function isMarkTypeAllowedInNode(markType, state) {
   return toggleMark(markType)(state);
 }
-export function canMoveUp(state) {
-  const {
-    selection
-  } = state;
-  /**
-   * If there's a media element on the selection it will use a gap cursor to move
-   */
-  if (selection instanceof NodeSelection && isMediaNode(selection.node)) {
-    return true;
-  }
-  if (selection instanceof TextSelection) {
-    if (!selection.empty) {
-      return true;
-    }
-  }
-  return !atTheBeginningOfDoc(state);
-}
-export function canMoveDown(state) {
-  const {
-    selection
-  } = state;
-
-  /**
-   * If there's a media element on the selection it will use a gap cursor to move
-   */
-  if (selection instanceof NodeSelection && isMediaNode(selection.node)) {
-    return true;
-  }
-  if (selection instanceof TextSelection) {
-    if (!selection.empty) {
-      return true;
-    }
-  }
-  return !atTheEndOfDoc(state);
-}
 export function isSelectionInsideLastNodeInDocument(selection) {
   const docNode = selection.$anchor.node(0);
   const rootNode = selection.$anchor.node(1);
@@ -177,48 +139,6 @@ export function whichTransitionEvent() {
   }
   return;
 }
-
-/**
- * Function will create a list of wrapper blocks present in a selection.
- */
-function getSelectedWrapperNodes(state) {
-  const nodes = [];
-  if (state.selection) {
-    const {
-      $from,
-      $to
-    } = state.selection;
-    const {
-      blockquote,
-      panel,
-      orderedList,
-      bulletList,
-      listItem,
-      codeBlock,
-      decisionItem,
-      decisionList,
-      taskItem,
-      taskList
-    } = state.schema.nodes;
-    state.doc.nodesBetween($from.pos, $to.pos, node => {
-      if (node.isBlock && [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList].indexOf(node.type) >= 0) {
-        nodes.push(node.type);
-      }
-    });
-  }
-  return nodes;
-}
-
-/**
- * Function will check if changing block types: Paragraph, Heading is enabled.
- */
-export function areBlockTypesDisabled(state) {
-  const nodesTypes = getSelectedWrapperNodes(state);
-  const {
-    panel
-  } = state.schema.nodes;
-  return nodesTypes.filter(type => type !== panel).length > 0;
-}
 export const isTemporary = id => {
   return id.indexOf('temporary:') === 0;
 };

package/dist/es2019/utils/input-rules.js

@@ -1,7 +1,8 @@
-import { canJoin, findWrapping } from '@atlaskit/editor-prosemirror/transform';
-import { createRule } from '@atlaskit/prosemirror-input-rules';
 import { addAnalytics } from '../plugins/analytics';
-import { JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST } from '@atlaskit/editor-common/analytics';
+/**
+ * @private
+ * @deprecated Use import {inputRuleWithAnalytics} from "@atlaskit/editor-common/utils"; instead
+ */
 export const ruleWithAnalytics = getPayload => {
   return originalRule => {
     const onHandlerApply = (state, tr, matchResult) => {
@@ -16,62 +17,4 @@ export const ruleWithAnalytics = getPayload => {
       onHandlerApply
     };
   };
-};
-export const createWrappingTextBlockRule = ({
-  match,
-  nodeType,
-  getAttrs
-}) => {
-  const handler = (state, match, start, end) => {
-    const fixedStart = Math.max(start, 1);
-    const $start = state.doc.resolve(fixedStart);
-    const attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs;
-    const nodeBefore = $start.node(-1);
-    if (nodeBefore && !nodeBefore.canReplaceWith($start.index(-1), $start.indexAfter(-1), nodeType)) {
-      return null;
-    }
-    return state.tr.delete(fixedStart, end).setBlockType(fixedStart, fixedStart, nodeType, attrs);
-  };
-  return createRule(match, handler);
-};
-export const createWrappingJoinRule = ({
-  match,
-  nodeType,
-  getAttrs,
-  joinPredicate
-}) => {
-  const handler = (state, match, start, end) => {
-    const attrs = (getAttrs instanceof Function ? getAttrs(match) : getAttrs) || {};
-    const tr = state.tr;
-    const fixedStart = Math.max(start, 1);
-    tr.delete(fixedStart, end);
-    const $start = tr.doc.resolve(fixedStart);
-    const range = $start.blockRange();
-    const wrapping = range && findWrapping(range, nodeType, attrs);
-    if (!wrapping || !range) {
-      return null;
-    }
-    const parentNodePosMapped = tr.mapping.map(range.start);
-    const parentNode = tr.doc.nodeAt(parentNodePosMapped);
-    const lastWrap = wrapping[wrapping.length - 1];
-    if (parentNode && lastWrap) {
-      const allowedMarks = lastWrap.type.allowedMarks(parentNode.marks) || [];
-      tr.setNodeMarkup(parentNodePosMapped, parentNode.type, parentNode.attrs, allowedMarks);
-    }
-    tr.wrap(range, wrapping);
-    const before = tr.doc.resolve(fixedStart - 1).nodeBefore;
-    if (before && before.type === nodeType && canJoin(tr.doc, fixedStart - 1) && (!joinPredicate || joinPredicate(match, before, JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_ABOVE))) {
-      tr.join(fixedStart - 1);
-    }
-    return tr;
-  };
-  return createRule(match, handler);
-};
-export const createJoinNodesRule = (match, nodeType) => {
-  return createWrappingJoinRule({
-    nodeType,
-    match,
-    getAttrs: {},
-    joinPredicate: (_, node) => node.type === nodeType
-  });
 };

package/dist/es2019/utils/mark.js

@@ -24,39 +24,6 @@ export const isMarkExcluded = (type, marks) => {
   }
   return false;
 };
-const not = fn => arg => !fn(arg);
-export const removeBlockMarks = (state, marks) => {
-  const {
-    selection,
-    schema
-  } = state;
-  let {
-    tr
-  } = state;
-
-  // Marks might not exist in Schema
-  const marksToRemove = marks.filter(Boolean);
-  if (marksToRemove.length === 0) {
-    return undefined;
-  }
-
-  /** Saves an extra dispatch */
-  let blockMarksExists = false;
-  const hasMark = mark => marksToRemove.indexOf(mark.type) > -1;
-  /**
-   * When you need to toggle the selection
-   * when another type which does not allow alignment is applied
-   */
-  state.doc.nodesBetween(selection.from, selection.to, (node, pos) => {
-    if (node.type === schema.nodes.paragraph && node.marks.some(hasMark)) {
-      blockMarksExists = true;
-      const resolvedPos = state.doc.resolve(pos);
-      const withoutBlockMarks = node.marks.filter(not(hasMark));
-      tr = tr.setNodeMarkup(resolvedPos.pos, undefined, node.attrs, withoutBlockMarks);
-    }
-  });
-  return blockMarksExists ? tr : undefined;
-};
 
 /**
  * Removes marks from nodes in the current selection that are not supported

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.9.2";
+export const version = "187.10.1";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.9.2",
+	"version": "187.10.1",
 	"sideEffects": false
 }

package/dist/esm/commands/index.js

@@ -1,126 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, withAnalytics } from '../plugins/analytics';
-import { canMoveDown, canMoveUp } from '../utils';
-export function preventDefault() {
-  return function () {
-    return true;
-  };
-}
-export function insertNewLine() {
-  return function (state, dispatch) {
-    var $from = state.selection.$from;
-    var parent = $from.parent;
-    var hardBreak = state.schema.nodes.hardBreak;
-    if (hardBreak) {
-      var hardBreakNode = hardBreak.createChecked();
-      if (parent && parent.type.validContent(Fragment.from(hardBreakNode))) {
-        if (dispatch) {
-          dispatch(state.tr.replaceSelectionWith(hardBreakNode, false));
-        }
-        return true;
-      }
-    }
-    if (state.selection instanceof TextSelection) {
-      if (dispatch) {
-        dispatch(state.tr.insertText('\n'));
-      }
-      return true;
-    }
-    return false;
-  };
-}
-export var insertNewLineWithAnalytics = withAnalytics({
-  action: ACTION.INSERTED,
-  actionSubject: ACTION_SUBJECT.TEXT,
-  actionSubjectId: ACTION_SUBJECT_ID.LINE_BREAK,
-  eventType: EVENT_TYPE.TRACK
-})(insertNewLine());
-export var createNewParagraphAbove = function createNewParagraphAbove(state, dispatch) {
-  var append = false;
-  if (!canMoveUp(state) && canCreateParagraphNear(state)) {
-    createParagraphNear(append)(state, dispatch);
-    return true;
-  }
-  return false;
-};
-export var createNewParagraphBelow = function createNewParagraphBelow(state, dispatch) {
-  var append = true;
-  if (!canMoveDown(state) && canCreateParagraphNear(state)) {
-    createParagraphNear(append)(state, dispatch);
-    return true;
-  }
-  return false;
-};
-function canCreateParagraphNear(state) {
-  var $from = state.selection.$from;
-  var node = $from.node($from.depth);
-  var insideCodeBlock = !!node && node.type === state.schema.nodes.codeBlock;
-  var isNodeSelection = state.selection instanceof NodeSelection;
-  return $from.depth > 1 || isNodeSelection || insideCodeBlock;
-}
-export function createParagraphNear() {
-  var append = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-  return function (state, dispatch) {
-    var paragraph = state.schema.nodes.paragraph;
-    if (!paragraph) {
-      return false;
-    }
-    var insertPos;
-    if (state.selection instanceof TextSelection) {
-      if (topLevelNodeIsEmptyTextBlock(state)) {
-        return false;
-      }
-      insertPos = getInsertPosFromTextBlock(state, append);
-    } else {
-      insertPos = getInsertPosFromNonTextBlock(state, append);
-    }
-    var tr = state.tr.insert(insertPos, paragraph.createAndFill());
-    tr.setSelection(TextSelection.create(tr.doc, insertPos + 1));
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  };
-}
-function getInsertPosFromTextBlock(state, append) {
-  var _state$selection = state.selection,
-    $from = _state$selection.$from,
-    $to = _state$selection.$to;
-  var pos;
-  if (!append) {
-    pos = $from.start(0);
-  } else {
-    pos = $to.end(0);
-  }
-  return pos;
-}
-function getInsertPosFromNonTextBlock(state, append) {
-  var _state$selection2 = state.selection,
-    $from = _state$selection2.$from,
-    $to = _state$selection2.$to;
-  var nodeAtSelection = state.selection instanceof NodeSelection && state.doc.nodeAt(state.selection.$anchor.pos);
-  var isMediaSelection = nodeAtSelection && nodeAtSelection.type.name === 'mediaGroup';
-  var pos;
-  if (!append) {
-    // The start position is different with text block because it starts from 0
-    pos = $from.start($from.depth);
-    // The depth is different with text block because it starts from 0
-    pos = $from.depth > 0 && !isMediaSelection ? pos - 1 : pos;
-  } else {
-    pos = $to.end($to.depth);
-    pos = $to.depth > 0 && !isMediaSelection ? pos + 1 : pos;
-  }
-  return pos;
-}
-function topLevelNodeIsEmptyTextBlock(state) {
-  var topLevelNode = state.selection.$from.node(1);
-  return topLevelNode.isTextblock && topLevelNode.type !== state.schema.nodes.codeBlock && topLevelNode.nodeSize === 2;
-}
 export function addParagraphAtEnd(tr) {
   var paragraph = tr.doc.type.schema.nodes.paragraph,
     doc = tr.doc;
@@ -144,9 +26,9 @@ export function createParagraphAtEnd() {
 }
 export var changeImageAlignment = function changeImageAlignment(align) {
   return function (state, dispatch) {
-    var _state$selection3 = state.selection,
-      from = _state$selection3.from,
-      to = _state$selection3.to;
+    var _state$selection = state.selection,
+      from = _state$selection.from,
+      to = _state$selection.to;
     var tr = state.tr;
     state.doc.nodesBetween(from, to, function (node, pos) {
       if (node.type === state.schema.nodes.mediaSingle) {
@@ -205,9 +87,9 @@ export var toggleBlockMark = function toggleBlockMark(markType, getAttrs, allowe
         markApplied = toggleBlockMarkOnRange(pos, pos + cell.nodeSize, tr, state);
       });
     } else {
-      var _state$selection4 = state.selection,
-        from = _state$selection4.from,
-        to = _state$selection4.to;
+      var _state$selection2 = state.selection,
+        from = _state$selection2.from,
+        to = _state$selection2.to;
       markApplied = toggleBlockMarkOnRange(from, to, tr, state);
     }
     if (markApplied && tr.docChanged) {

package/dist/esm/labs/next/presets/default.js

@@ -8,7 +8,7 @@ import textFormattingPlugin from '../../../plugins/text-formatting';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import unsupportedContentPlugin from '../../../plugins/unsupported-content';
 import basePlugin from '../../../plugins/base';
-import editorDisabledPlugin from '../../../plugins/editor-disabled';
+import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import typeAheadPlugin from '../../../plugins/type-ahead';
 import submitEditorPlugin from '../../../plugins/submit-editor';
 import fakeTextCursorPlugin from '../../../plugins/fake-text-cursor';

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

@@ -14,7 +14,7 @@ import newlinePreserveMarksPlugin from './pm-plugins/newline-preserve-marks';
 import inlineCursorTargetPlugin from './pm-plugins/inline-cursor-target';
 import betterTypeHistoryPlugin from './pm-plugins/better-type-history';
 import scrollGutter from './pm-plugins/scroll-gutter';
-import { keymap } from '../../utils/keymap';
+import { keymap } from '@atlaskit/editor-common/keymaps';
 import frozenEditor from './pm-plugins/frozen-editor';
 import compositionPlugin from './pm-plugins/composition';
 // Chrome >= 88