@atlaskit/editor-core 187.8.3 → 187.8.10

package/dist/es2019/utils/commands.js

@@ -1,22 +1,5 @@
-import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { transformSmartCharsMentionsAndEmojis } from '../plugins/text-formatting/commands/transform-to-code';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
-import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
-const isEmptySelectionAtStart = state => {
-  const {
-    empty,
-    $from
-  } = state.selection;
-  return empty && ($from.parentOffset === 0 || state.selection instanceof GapCursorSelection);
-};
-const isEmptySelectionAtEnd = state => {
-  const {
-    empty,
-    $from
-  } = state.selection;
-  return empty && ($from.end() === $from.pos || state.selection instanceof GapCursorSelection);
-};
 const isFirstChildOfParent = state => {
   const {
     $from
@@ -65,160 +48,12 @@ function findCutBefore($pos) {
   }
   return null;
 }
-const applyMarkOnRange = (from, to, removeMark, mark, tr) => {
-  const {
-    schema
-  } = tr.doc.type;
-  const {
-    code
-  } = schema.marks;
-  if (mark.type === code) {
-    transformSmartCharsMentionsAndEmojis(from, to, tr);
-  }
-  tr.doc.nodesBetween(tr.mapping.map(from), tr.mapping.map(to), (node, pos) => {
-    if (!node.isText) {
-      return true;
-    }
-
-    // This is an issue when the user selects some text.
-    // We need to check if the current node position is less than the range selection from.
-    // If it’s true, that means we should apply the mark using the range selection,
-    // not the current node position.
-    const nodeBetweenFrom = Math.max(pos, tr.mapping.map(from));
-    const nodeBetweenTo = Math.min(pos + node.nodeSize, tr.mapping.map(to));
-    if (removeMark) {
-      tr.removeMark(nodeBetweenFrom, nodeBetweenTo, mark);
-    } else {
-      tr.addMark(nodeBetweenFrom, nodeBetweenTo, mark);
-    }
-    return true;
-  });
-  return tr;
-};
-const entireSelectionContainsMark = (mark, doc, fromPos, toPos) => {
-  let onlyContainsMark = true;
-  doc.nodesBetween(fromPos, toPos, node => {
-    // Skip recursion once we've found text which doesn't include the mark
-    if (!onlyContainsMark) {
-      return false;
-    }
-    if (node.isText) {
-      onlyContainsMark && (onlyContainsMark = mark.isInSet(node.marks));
-    }
-  });
-  return onlyContainsMark;
-};
-const toggleMarkInRange = mark => (state, dispatch) => {
-  const tr = state.tr;
-  if (state.selection instanceof CellSelection) {
-    let removeMark = true;
-    const cells = [];
-    state.selection.forEachCell((cell, cellPos) => {
-      cells.push({
-        node: cell,
-        pos: cellPos
-      });
-      const from = cellPos;
-      const to = cellPos + cell.nodeSize;
-      removeMark && (removeMark = entireSelectionContainsMark(mark, state.doc, from, to));
-    });
-    for (let i = cells.length - 1; i >= 0; i--) {
-      const cell = cells[i];
-      const from = cell.pos;
-      const to = from + cell.node.nodeSize;
-      applyMarkOnRange(from, to, removeMark, mark, tr);
-    }
-  } else {
-    const {
-      $from,
-      $to
-    } = state.selection;
-    // We decide to remove the mark only if the entire selection contains the mark
-    // Examples with *bold* text
-    // Scenario 1: Selection contains both bold and non-bold text -> bold entire selection
-    // Scenario 2: Selection contains only bold text -> un-bold entire selection
-    // Scenario 3: Selection contains no bold text -> bold entire selection
-    const removeMark = entireSelectionContainsMark(mark, state.doc, $from.pos, $to.pos);
-    applyMarkOnRange($from.pos, $to.pos, removeMark, mark, tr);
-  }
-  if (tr.docChanged) {
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  }
-  return false;
-};
-
-/**
- * A wrapper over the default toggleMark, except when we have a selection
- * we only toggle marks on text nodes rather than inline nodes.
- * @param markType
- * @param attrs
- */
-const toggleMark = (markType, attrs) => (state, dispatch) => {
-  const mark = markType.create(attrs);
-
-  // For cursor selections we can use the default behaviour.
-  if (state.selection instanceof TextSelection && state.selection.$cursor) {
-    const tr = state.tr;
-    if (mark.isInSet(state.storedMarks || state.selection.$cursor.marks())) {
-      tr.removeStoredMark(mark);
-    } else {
-      tr.addStoredMark(mark);
-    }
-    if (dispatch) {
-      dispatch(tr);
-      return true;
-    }
-    return false;
-  }
-  return toggleMarkInRange(mark)(state, dispatch);
-};
 const withScrollIntoView = command => (state, dispatch, view) => command(state, tr => {
   tr.scrollIntoView();
   if (dispatch) {
     dispatch(tr);
   }
 }, view);
-/**
- * Walk forwards from a position until we encounter the (inside) start of
- * the next node, or reach the end of the document.
- *
- * @param $startPos Position to start walking from.
- */
-const walkNextNode = $startPos => {
-  let $pos = $startPos;
-
-  // invariant 1: don't walk past the end of the document
-  // invariant 2: we are at the beginning or
-  //              we haven't walked to the start of *any* node
-  //              parentOffset includes textOffset.
-  while ($pos.pos < $pos.doc.nodeSize - 2 && ($pos.pos === $startPos.pos || $pos.parentOffset > 0)) {
-    $pos = $pos.doc.resolve($pos.pos + 1);
-  }
-  return {
-    $pos: $pos,
-    foundNode: $pos.pos < $pos.doc.nodeSize - 2
-  };
-};
-
-/**
- * Walk backwards from a position until we encounter the (inside) end of
- * the previous node, or reach the start of the document.
- *
- * @param $startPos Position to start walking from.
- */
-const walkPrevNode = $startPos => {
-  let $pos = $startPos;
-  while ($pos.pos > 0 && ($pos.pos === $startPos.pos || $pos.parentOffset < $pos.parent.nodeSize - 2)) {
-    $pos = $pos.doc.resolve($pos.pos - 1);
-  }
-  return {
-    $pos: $pos,
-    foundNode: $pos.pos > 0
-  };
-};
 
 /**
  * Insert content, delete a range and create a new selection
@@ -230,57 +65,10 @@ const walkPrevNode = $startPos => {
  * @param deletions the ranges to delete
  */
 
-const insertContentDeleteRange = (tr, getSelectionResolvedPos, insertions, deletions) => {
-  insertions.forEach(contentInsert => {
-    let [content, pos] = contentInsert;
-    tr.insert(tr.mapping.map(pos), content);
-  });
-  deletions.forEach(deleteRange => {
-    let [firstPos, lastPos] = deleteRange;
-    tr.delete(tr.mapping.map(firstPos), tr.mapping.map(lastPos));
-  });
-  tr.setSelection(new TextSelection(getSelectionResolvedPos(tr)));
-};
 const selectNode = pos => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setSelection(new NodeSelection(state.doc.resolve(pos))));
   }
   return true;
 };
-
-/**
- * If the selection is empty, is inside a paragraph node and `canNextNodeMoveUp` is true then delete current paragraph
- * and move the node below it up. The selection will be retained, to be placed in the moved node.
- *
- * @param canNextNodeMoveUp check if node directly after the selection is able to be brought up to selection
- * @returns PM Command
- */
-const deleteEmptyParagraphAndMoveBlockUp = canNextNodeMoveUp => {
-  return (state, dispatch, view) => {
-    const {
-      selection: {
-        $from: {
-          pos,
-          parent
-        },
-        $head,
-        empty
-      },
-      tr,
-      doc
-    } = state;
-    const {
-      $pos
-    } = walkNextNode($head);
-    const nextPMNode = doc.nodeAt($pos.pos - 1);
-    if (empty && nextPMNode && canNextNodeMoveUp(nextPMNode) && isEmptyParagraph(parent) && view !== null && view !== void 0 && view.endOfTextblock('right')) {
-      tr.deleteRange(pos - 1, pos + 1);
-      if (dispatch) {
-        dispatch(tr);
-      }
-      return true;
-    }
-    return false;
-  };
-};
-export { isEmptySelectionAtStart, isEmptySelectionAtEnd, isFirstChildOfParent, isNthParentOfType, findCutBefore, toggleMark, applyMarkOnRange, withScrollIntoView, walkNextNode, walkPrevNode, insertContentDeleteRange, selectNode, deleteEmptyParagraphAndMoveBlockUp };
+export { isFirstChildOfParent, isNthParentOfType, findCutBefore, withScrollIntoView, selectNode };

package/dist/es2019/utils/document.js

@@ -1,31 +1,6 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { getBreakoutMode } from './node-width';
-import { processRawValue, hasDocAsParent, getStepRange } from '@atlaskit/editor-common/utils';
-
-/**
- * Returns false if node contains only empty inline nodes and hardBreaks.
- */
-export function hasVisibleContent(node) {
-  const isInlineNodeHasVisibleContent = inlineNode => {
-    return inlineNode.isText ? !!inlineNode.textContent.trim() : inlineNode.type.name !== 'hardBreak';
-  };
-  if (node.isInline) {
-    return isInlineNodeHasVisibleContent(node);
-  } else if (node.isBlock && (node.isLeaf || node.isAtom)) {
-    return true;
-  } else if (!node.childCount) {
-    return false;
-  }
-  for (let index = 0; index < node.childCount; index++) {
-    const child = node.child(index);
-    const invisibleNodeTypes = ['paragraph', 'text', 'hardBreak'];
-    if (!invisibleNodeTypes.includes(child.type.name) || hasVisibleContent(child)) {
-      return true;
-    }
-  }
-  return false;
-}
+import { processRawValue, hasDocAsParent, getStepRange, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 
 /**
  * Checks if a node has any content. Ignores node that only contain empty block nodes.

package/dist/es2019/utils/index.js

@@ -7,7 +7,7 @@ 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 { hasVisibleContent, isNodeEmpty, findFarthestParentNode, isSelectionEndOfParagraph, nodesBetweenChanged, getNodesCount } from './document';
+export { isNodeEmpty, findFarthestParentNode, isSelectionEndOfParagraph, nodesBetweenChanged, getNodesCount } from './document';
 export { sanitiseMarksInSelection } from './mark';
 export { isParagraph, isText, isLinkMark } from './nodes';
 export { setNodeSelection, setGapCursorSelection, setTextSelection } from './selection';
@@ -294,18 +294,6 @@ export const isInsideBlockQuote = state => {
   } = state.schema.nodes;
   return hasParentNodeOfType(blockquote)(state.selection);
 };
-export function filterChildrenBetween(doc, from, to, predicate) {
-  const results = [];
-  doc.nodesBetween(from, to, (node, pos, parent) => {
-    if (predicate(node, pos, parent)) {
-      results.push({
-        node,
-        pos
-      });
-    }
-  });
-  return results;
-}
 export function dedupe(list = [], iteratee = p => p) {
   /**
               .,

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.8.3";
+export const version = "187.8.10";
 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.8.3",
+	"version": "187.8.10",
 	"sideEffects": false
 }

package/dist/esm/create-editor/ReactEditorViewInternal.js

@@ -15,10 +15,9 @@ import PropTypes from 'prop-types';
 import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { editorMessages } from './messages';
-import { browser, getAnalyticsEventSeverity, getResponseEndTime, measureRender, startMeasure, stopMeasure, shouldForceTracking } from '@atlaskit/editor-common/utils';
+import { browser, getAnalyticsEventSeverity, getResponseEndTime, measureRender, startMeasure, stopMeasure, shouldForceTracking, processRawValue, analyticsEventKey } from '@atlaskit/editor-common/utils';
 import { ExperienceStore, EditorExperience, RELIABILITY_INTERVAL } from '@atlaskit/editor-common/ufo';
 import { createDispatch, EventDispatcher } from '../event-dispatcher';
-import { processRawValue } from '@atlaskit/editor-common/utils';
 import { freezeUnsafeTransactionProperties } from '../utils/performance/safer-transactions';
 import { RenderTracking } from '../utils/performance/components/RenderTracking';
 import { findChangedNodesFromTransaction, validateNodes, validNode } from '../utils/nodes';
@@ -30,17 +29,16 @@ import { getDocStructure } from '../utils/document-logger';
 import { isFullPage } from '../utils/is-full-page';
 import measurements from '../utils/performance/measure-enum';
 import { getNodesCount } from '../utils/document';
-import { analyticsEventKey } from '@atlaskit/editor-common/utils';
 import { createSchema } from './create-schema';
 import { PluginPerformanceObserver } from '../utils/performance/plugin-performance-observer';
 import { getParticipantsCount } from '../plugins/collab-edit/get-participants-count';
+import { EVENT_NAME_DISPATCH_TRANSACTION, EVENT_NAME_STATE_APPLY, EVENT_NAME_UPDATE_STATE, EVENT_NAME_VIEW_STATE_UPDATED, EVENT_NAME_ON_CHANGE, TransactionTracker } from '../utils/performance/track-transactions';
 import { countNodes as _countNodes } from '../utils/count-nodes';
-import { TransactionTracker } from '../utils/performance/track-transactions';
-import { EVENT_NAME_DISPATCH_TRANSACTION, EVENT_NAME_STATE_APPLY, EVENT_NAME_UPDATE_STATE, EVENT_NAME_VIEW_STATE_UPDATED, EVENT_NAME_ON_CHANGE } from '../utils/performance/track-transactions';
 import { PROSEMIRROR_RENDERED_NORMAL_SEVERITY_THRESHOLD, PROSEMIRROR_RENDERED_DEGRADED_SEVERITY_THRESHOLD, DEFAULT_SAMPLING_RATE_VALID_TRANSACTIONS } from './consts';
 import { getContextIdentifier } from '../plugins/base/pm-plugins/context-identifier';
 import ReactEditorViewContext from './ReactEditorViewContext';
 import { EditorPluginInjectionAPI } from '@atlaskit/editor-common/preset';
+import { EDIT_AREA_ID } from '@atlaskit/editor-common/ui';
 function handleEditorFocus(view) {
   if (view.hasFocus()) {
     return;
@@ -78,7 +76,6 @@ function handleEditorFocus(view) {
     view.focus();
   }, 0);
 }
-export var EDIT_AREA_ID = 'ak-editor-textarea';
 export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
   _inherits(ReactEditorView, _React$Component);
   var _super = _createSuper(ReactEditorView);

package/dist/esm/index.js

@@ -42,7 +42,7 @@ export { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } f
 export { setKeyboardHeight, setMobilePaddingTop, setIsExpanded } from './plugins/mobile-dimensions/commands';
 
 // Used in editor-test-helpers and mobile bridge
-export { setTextSelection, dedupe, getNodesCount, measurements, hasVisibleContent } from './utils';
+export { setTextSelection, dedupe, getNodesCount, measurements } from './utils';
 export { getListCommands } from './utils/list-commands';
 export { ReactEditorView, BaseReactEditorView } from './create-editor';
 export { getDefaultPresetOptionsFromEditorProps } from './create-editor';

package/dist/esm/plugins/annotation/commands/transform.js

@@ -3,7 +3,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addAnalytics } from '../../analytics/utils';
 import { getSelectionPositions, getPluginState, getDraftCommandAnalyticsPayload } from '../utils';
-import { applyMarkOnRange } from '../../../utils/commands';
+import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 var addAnnotationMark = function addAnnotationMark(id) {
   return function (transaction, state) {
     var inlineCommentState = getPluginState(state);

package/dist/esm/plugins/base/pm-plugins/newline-preserve-marks.js

@@ -1,7 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
-import { filterCommands as filter } from '@atlaskit/editor-common/utils';
+import { filterCommand as filter } from '@atlaskit/editor-common/utils';
 import { isSelectionEndOfParagraph } from '../../../utils';
 export var newlinePreserveMarksKey = new PluginKey('newlinePreserveMarksPlugin');
 var isSelectionAligned = function isSelectionAligned(state) {

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

@@ -9,7 +9,7 @@ import { shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/
 import { withAnalytics as withAnalyticsDeprecated } from '../../analytics';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { filterChildrenBetween } from '../../../utils';
+import { filterChildrenBetween } from '@atlaskit/editor-common/mark';
 import { PanelType } from '@atlaskit/adf-schema';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { transformToCodeBlockAction } from './transform-to-code-block';

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

@@ -5,7 +5,7 @@ import * as commands from '../../../commands';
 import * as blockTypes from '../types';
 import { keymap } from '../../../utils/keymap';
 import { cleanUpAtTheStartOfDocument, deleteAndMoveCursor, deleteBlockContent, insertBlockTypesWithAnalytics } from '../commands';
-import { deleteEmptyParagraphAndMoveBlockUp } from '../../../utils/commands';
+import { deleteEmptyParagraphAndMoveBlockUp } from '@atlaskit/editor-common/utils';
 import { INPUT_METHOD } from '../../analytics';
 import { isNodeAWrappingBlockNode } from '../utils';
 var backspace = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);

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

@@ -14,7 +14,7 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
-import DropdownMenu from '../../../../ui/DropdownMenu';
+import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import { separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
 import { blockTypeMenuItemStyle, keyboardShortcut, keyboardShortcutSelect } from './styled';
 import { tooltip, findKeymapByDescription } from '../../../../keymaps';

package/dist/esm/plugins/code-block/pm-plugins/ide-ux.js

@@ -3,7 +3,7 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
 import { setTextSelection } from '@atlaskit/editor-prosemirror/utils';
 import { getCursor } from '../../../utils';
-import { filterCommands as filter } from '@atlaskit/editor-common/utils';
+import { filterCommand as filter } from '@atlaskit/editor-common/utils';
 import { isCursorBeforeClosingCharacter, isClosingCharacter } from '../ide-ux/paired-character-handling';
 import { getAutoClosingBracketInfo, shouldAutoCloseBracket } from '../ide-ux/bracket-handling';
 import { getAutoClosingQuoteInfo, shouldAutoCloseQuote } from '../ide-ux/quote-handling';

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

@@ -11,9 +11,8 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _temp
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /** @jsx jsx */
-import React from 'react';
+import React, { Component } from 'react';
 import { css, jsx } from '@emotion/react';
-import { Component } from 'react';
 import ButtonGroup from '@atlaskit/button/button-group';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { themed } from '@atlaskit/theme/components';
@@ -21,7 +20,7 @@ import { borderRadius } from '@atlaskit/theme/constants';
 import { DN70 } from '@atlaskit/theme/colors';
 import { compareArrays, shallowEqual } from '../utils';
 import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
-import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
+import { FloatingToolbarButton as Button, Announcer } from '@atlaskit/editor-common/ui';
 import Dropdown from './Dropdown';
 import Select from './Select';
 import Separator from './Separator';
@@ -30,12 +29,11 @@ import { ExtensionsPlaceholder } from './ExtensionsPlaceholder';
 import ColorPickerButton from '../../../ui/ColorPickerButton';
 import { backgroundPaletteTooltipMessages } from '../../../ui/ColorPalette';
 import { EmojiPickerButton } from './EmojiPickerButton';
-import { Announcer } from '@atlaskit/editor-common/ui';
 import { injectIntl } from 'react-intl-next';
 import messages from './messages';
 import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';
 import ScrollButtons from './ScrollButtons';
-import { ToolbarArrowKeyNavigationProvider } from '../../../ui/ToolbarArrowKeyNavigationProvider';
+import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';
 var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
   var items = _ref.items,

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu-legacy.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
-import DropdownMenu from '../../../../ui/DropdownMenu';
+import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import { DropDownButton } from './dropdown-button';
 export var BlockInsertMenuLegacy = function BlockInsertMenuLegacy(props) {
   var items = props.items;

package/dist/esm/plugins/layout/pm-plugins/main.js

@@ -6,7 +6,7 @@ import { TextSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { filterCommands as filter } from '@atlaskit/editor-common/utils';
+import { filterCommand as filter } from '@atlaskit/editor-common/utils';
 import { createSelectionClickHandler } from '../../selection/utils';
 import { fixColumnSizes, fixColumnStructure, getSelectedLayout } from '../actions';
 import { pluginKey } from './plugin-key';

package/dist/esm/plugins/list/actions/conversions.js

@@ -2,8 +2,8 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { NodeRange } from '@atlaskit/editor-prosemirror/model';
 import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
-import { isListNode, joinSiblingLists } from '../utils/node';
-import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
+import { isEmptyParagraph, isListNode } from '@atlaskit/editor-common/utils';
+import { joinSiblingLists } from '@atlaskit/editor-common/lists';
 import { findFirstParentListNode } from '../utils/find';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 export function convertListType(_ref) {

package/dist/esm/plugins/list/actions/indent-list-items-selected.js

@@ -1,9 +1,9 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { Selection, TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { isListItemNode, isListNode } from '../utils/node';
+import { normalizeListItemsSelection } from '@atlaskit/editor-common/lists';
 import { findFirstParentListItemNode } from '../utils/find';
-import { normalizeListItemsSelection } from '../utils/selection';
+import { isListItemNode, isListNode } from '@atlaskit/editor-common/utils';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 export var indentListItemsSelected = function indentListItemsSelected(tr) {
   var originalSelection = tr.selection;

package/dist/esm/plugins/list/actions/join-list-items-forward.js

@@ -1,5 +1,5 @@
 import { LIST_TEXT_SCENARIOS } from '../../analytics';
-import { isParagraphNode, isListNode, isListItemNode } from '../utils/node';
+import { isParagraphNode, isListNode, isListItemNode } from '@atlaskit/editor-common/utils';
 import { isPosInsideList, isPosInsideParagraph } from '../utils/selection';
 import { joinParagrapWithList, joinSiblingListItems, joinNestedListWithParentListItem, joinListItemWithParentNestedList, joinListItemWithParagraph } from './join-list-items-scenarios';
 export var calcJoinListScenario = function calcJoinListScenario(walkNode, $head) {

package/dist/esm/plugins/list/actions/join-list-items-scenarios/join-list-item-with-paragraph.js

@@ -1,6 +1,5 @@
-import { insertContentDeleteRange } from '../../../../utils/commands';
+import { insertContentDeleteRange, isListNode } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { isListNode } from '../../utils/node';
 // Case for when a users selection is at the end of a paragraph, the paragraph
 // is followed by a list, and they delete forward
 export var joinListItemWithParagraph = function joinListItemWithParagraph(_ref) {

package/dist/esm/plugins/list/actions/join-list-items-scenarios/join-list-item-with-parent-nested-list.js

@@ -1,5 +1,5 @@
-import { insertContentDeleteRange } from '../../../../utils/commands';
-import { isListNode } from '../../utils/node';
+import { insertContentDeleteRange } from '@atlaskit/editor-common/utils';
+import { isListNode } from '@atlaskit/editor-common/utils';
 //Case for two adjacent list items with the first being of greater indentation
 export var joinListItemWithParentNestedList = function joinListItemWithParentNestedList(_ref) {
   var tr = _ref.tr,

package/dist/esm/plugins/list/actions/join-list-items-scenarios/join-nested-list-with-parent-list-item.js

@@ -1,5 +1,5 @@
-import { insertContentDeleteRange } from '../../../../utils/commands';
-import { isListNode } from '../../utils/node';
+import { insertContentDeleteRange } from '@atlaskit/editor-common/utils';
+import { isListNode } from '@atlaskit/editor-common/utils';
 //Case for two adjacent list items with the first being of lower indentation
 export var joinNestedListWithParentListItem = function joinNestedListWithParentListItem(_ref) {
   var tr = _ref.tr,

package/dist/esm/plugins/list/actions/join-list-items-scenarios/join-paragraph-with-list.js

@@ -1,4 +1,4 @@
-import { insertContentDeleteRange } from '../../../../utils/commands';
+import { insertContentDeleteRange } from '@atlaskit/editor-common/utils';
 //Case for two adjacent nodes with the first being a list item and the last being a paragraph
 export var joinParagrapWithList = function joinParagrapWithList(_ref) {
   var tr = _ref.tr,

package/dist/esm/plugins/list/actions/join-list-items-scenarios/join-sibling-list-items.js

@@ -1,4 +1,4 @@
-import { insertContentDeleteRange } from '../../../../utils/commands';
+import { insertContentDeleteRange } from '@atlaskit/editor-common/utils';
 //Case for two adjacent list items of the same indentation
 export var joinSiblingListItems = function joinSiblingListItems(_ref) {
   var tr = _ref.tr,

package/dist/esm/plugins/list/actions/merge-lists.js

@@ -1,4 +1,4 @@
-import { isListNode } from '../utils/node';
+import { isListNode } from '@atlaskit/editor-common/utils';
 export function mergeNextListAtPosition(_ref) {
   var tr = _ref.tr,
     listPosition = _ref.listPosition;

package/dist/esm/plugins/list/actions/outdent-list-items-selected.js

@@ -4,10 +4,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { Selection, TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { NodeRange, Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { liftTarget, ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
-import { getOrderFromOrderedListNode } from '@atlaskit/editor-common/utils';
-import { isListNode, isListItemNode, joinSiblingLists, JoinDirection } from '../utils/node';
+import { getOrderFromOrderedListNode, isListNode, isListItemNode } from '@atlaskit/editor-common/utils';
+import { joinSiblingLists, JoinDirection, normalizeListItemsSelection } from '@atlaskit/editor-common/lists';
 import { findFirstParentListItemNode, findRootParentListNode } from '../utils/find';
-import { normalizeListItemsSelection, createListNodeRange } from '../utils/selection';
+import { createListNodeRange } from '../utils/selection';
 import { GapCursorSelection } from '../../selection/gap-cursor-selection';
 import { storeRestartListsAttributes, getRestartListsAttributes } from '../utils/analytics';
 import { OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';

package/dist/esm/plugins/list/actions/wrap-and-join-lists.js

@@ -1,6 +1,6 @@
 import { Fragment, Slice, NodeRange } from '@atlaskit/editor-prosemirror/model';
 import { ReplaceAroundStep, findWrapping, canSplit } from '@atlaskit/editor-prosemirror/transform';
-import { autoJoinTr } from '../../../utils/prosemirror/autojoin';
+import { autoJoinTr } from '@atlaskit/editor-common/utils';
 import { GapCursorSelection } from '../../selection/gap-cursor-selection';
 import { isWrappingPossible } from '../utils/selection';
 

package/dist/esm/plugins/list/commands/indent-list.js

@@ -2,13 +2,12 @@ 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { hasValidListIndentationLevel } from '../utils/indentation';
+import { hasValidListIndentationLevel, getListItemAttributes, getCommonListAnalyticsAttributes } from '@atlaskit/editor-common/lists';
 import { indentListItemsSelected as indentListAction } from '../actions/indent-list-items-selected';
-import { isBulletList } from '../utils/node';
+import { isBulletList } from '@atlaskit/editor-common/utils';
 import { findFirstParentListNode } from '../utils/find';
 import { MAX_NESTED_LIST_INDENTATION } from '../types';
-import { isInsideListItem, isInsideTableCell, getListItemAttributes } from '../utils/selection';
-import { getCommonListAnalyticsAttributes } from '../utils/analytics';
+import { isInsideListItem, isInsideTableCell } from '../utils/selection';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 export var indentList = function indentList(editorAnalyticsAPI) {
   return function () {