@atlaskit/editor-core 187.8.3 → 187.8.10

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

@@ -1,10 +1,10 @@
 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/es2019/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/es2019/plugins/list/commands/indent-list.js

@@ -1,11 +1,10 @@
 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 const indentList = editorAnalyticsAPI => (inputMethod = INPUT_METHOD.KEYBOARD) => {
   return function (state, dispatch) {

package/dist/es2019/plugins/list/commands/index.js

@@ -2,22 +2,21 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import * as baseCommand from '@atlaskit/editor-prosemirror/commands';
 import { findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { hasVisibleContent } from '../../../utils/document';
-import { findCutBefore, isEmptySelectionAtStart, isFirstChildOfParent } from '../../../utils/commands';
-import { filterCommands as filter } from '@atlaskit/editor-common/utils';
+import { filterCommand as filter, hasVisibleContent, isEmptySelectionAtStart } from '@atlaskit/editor-common/utils';
+import { isFirstChildOfParent, findCutBefore } from '../../../utils/commands';
 import { sanitiseMarksInSelection } from '../../../utils';
+import { getCommonListAnalyticsAttributes } from '@atlaskit/editor-common/lists';
 import { liftFollowingList, liftTextSelectionList, liftNodeSelectionList } from '../transforms';
 import { GapCursorSelection } from '../../selection/gap-cursor-selection';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { isInsideListItem, canJoinToPreviousListItem, selectionContainsList } from '../utils/selection';
-import { getCommonListAnalyticsAttributes } from '../utils/analytics';
 import { listBackspace } from './listBackspace';
 import { joinListItemForward } from './join-list-item-forward';
 import { convertListType } from '../actions/conversions';
 import { wrapInListAndJoin } from '../actions/wrap-and-join-lists';
 import { outdentList } from './outdent-list';
 import { indentList } from './indent-list';
-import { moveTargetIntoList } from '../utils/replace-content';
+import { moveTargetIntoList } from '@atlaskit/editor-common/lists';
 export { outdentList, indentList };
 export const enterKeyCommand = editorAnalyticsAPI => featureFlags => (state, dispatch) => {
   const {

package/dist/es2019/plugins/list/commands/join-list-item-forward.js

@@ -1,4 +1,4 @@
-import { isEmptySelectionAtEnd, walkNextNode } from '../../../utils/commands';
+import { isEmptySelectionAtEnd, walkNextNode } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, DELETE_DIRECTION } from '@atlaskit/editor-common/analytics';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { calcJoinListScenario } from '../actions/join-list-items-forward';

package/dist/es2019/plugins/list/commands/listBackspace.js

@@ -1,7 +1,6 @@
-import { insertContentDeleteRange, isEmptySelectionAtStart, walkPrevNode } from '../../../utils/commands';
+import { insertContentDeleteRange, isEmptySelectionAtStart, walkPrevNode, isListNode, isParagraphNode } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, DELETE_DIRECTION, LIST_TEXT_SCENARIOS } from '@atlaskit/editor-common/analytics';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { isListNode, isParagraphNode } from '@atlaskit/editor-common/utils';
 import { isPosInsideList, isPosInsideParagraph } from '../utils/selection';
 //Cases below refer to the cases found in this document: https://product-fabric.atlassian.net/wiki/spaces/E/pages/1146954996/List+Backspace+and+Delete+Behaviour
 //Case for two adjacent list items of the same indentation

package/dist/es2019/plugins/list/commands/outdent-list.js

@@ -1,8 +1,9 @@
+import { getCommonListAnalyticsAttributes } from '@atlaskit/editor-common/lists';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';
 import { isInsideListItem, isInsideTableCell } from '../utils/selection';
-import { isBulletList } from '../utils/node';
+import { isBulletList } from '@atlaskit/editor-common/utils';
 import { findFirstParentListNode } from '../utils/find';
-import { getCommonListAnalyticsAttributes, getRestartListsAttributes } from '../utils/analytics';
+import { getRestartListsAttributes } from '../utils/analytics';
 import { outdentListItemsSelected as outdentListAction } from '../actions/outdent-list-items-selected';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 export const outdentList = editorAnalyticsAPI => (inputMethod = INPUT_METHOD.KEYBOARD, featureFlags) => {

package/dist/es2019/plugins/list/pm-plugins/main.js

@@ -3,7 +3,7 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isWrappingPossible } from '../utils/selection';
-import { isListNode } from '../utils/node';
+import { isListNode } from '@atlaskit/editor-common/utils';
 import { pluginFactory } from '../../../utils/plugin-state-factory';
 import { setGapCursorSelection } from '../../../utils';
 import { Side } from '@atlaskit/editor-common/selection';

package/dist/es2019/plugins/list/utils/analytics.js

@@ -1,39 +1,3 @@
-import { isListItemNode, isListNode } from '@atlaskit/editor-common/utils';
-import { getListItemAttributes } from './selection';
-export const getCommonListAnalyticsAttributes = state => {
-  const {
-    selection: {
-      $from,
-      $to
-    }
-  } = state;
-  const fromAttrs = getListItemAttributes($from);
-  const toAttrs = getListItemAttributes($to);
-  return {
-    itemIndexAtSelectionStart: fromAttrs.itemIndex,
-    itemIndexAtSelectionEnd: toAttrs.itemIndex,
-    indentLevelAtSelectionStart: fromAttrs.indentLevel,
-    indentLevelAtSelectionEnd: toAttrs.indentLevel,
-    itemsInSelection: countListItemsInSelection(state)
-  };
-};
-export const countListItemsInSelection = state => {
-  const {
-    from,
-    to
-  } = state.selection;
-  if (from === to) {
-    return 1;
-  }
-  let count = 0;
-  const listSlice = state.doc.cut(from, to);
-  listSlice.content.nodesBetween(0, listSlice.content.size, (node, pos, parent, index) => {
-    if (parent && isListItemNode(parent) && !isListNode(node) && index === 0) {
-      count++;
-    }
-  });
-  return count;
-};
 export const RESTART_LISTS_ANALYTICS_KEY = 'restartListsAnalytics';
 export const getRestartListsAttributes = tr => {
   var _tr$getMeta;

package/dist/es2019/plugins/list/utils/indentation.js

@@ -1,4 +1,3 @@
-import { numberNestedLists } from './selection';
 import { isListItemNode, isListNode } from '@atlaskit/editor-common/utils';
 
 // This will return (depth - 1) for root list parent of a list.
@@ -14,21 +13,4 @@ export const getListLiftTarget = resPos => {
     }
   }
   return target - 1;
-};
-export const hasValidListIndentationLevel = ({
-  tr,
-  maxIndentation
-}) => {
-  const initialIndentationLevel = numberNestedLists(tr.selection.$from);
-  let currentIndentationLevel;
-  let currentPos = tr.selection.$to.pos;
-  do {
-    const resolvedPos = tr.doc.resolve(currentPos);
-    currentIndentationLevel = numberNestedLists(resolvedPos);
-    if (currentIndentationLevel > maxIndentation) {
-      return false;
-    }
-    currentPos++;
-  } while (currentIndentationLevel >= initialIndentationLevel);
-  return true;
 };

package/dist/es2019/plugins/list/utils/node.js

@@ -1,7 +1,6 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-export { isListNode, isListItemNode, isBulletList, isParagraphNode } from '@atlaskit/editor-common/utils';
-import { isListNode, isListItemNode } from '@atlaskit/editor-common/utils';
-function isListNodeValidContent(node) {
+import { isListItemNode } from '@atlaskit/editor-common/utils';
+export function isListNodeValidContent(node) {
   const {
     bulletList
   } = node.type.schema.nodes;
@@ -10,89 +9,4 @@ function isListNodeValidContent(node) {
   }
   const listFragment = Fragment.from(bulletList.createAndFill());
   return !isListItemNode(node) && node.type.validContent(listFragment);
-}
-export let JoinDirection = /*#__PURE__*/function (JoinDirection) {
-  JoinDirection[JoinDirection["LEFT"] = 1] = "LEFT";
-  JoinDirection[JoinDirection["RIGHT"] = -1] = "RIGHT";
-  return JoinDirection;
-}({});
-export const joinSiblingLists = ({
-  tr,
-  direction,
-  forceListType
-}) => {
-  const result = {
-    orderedList: 0,
-    bulletList: 0
-  };
-  const {
-    doc,
-    selection: {
-      $from,
-      $to
-    },
-    selection
-  } = tr;
-  const range = $from.blockRange($to, isListNodeValidContent);
-  if (!range) {
-    return result;
-  }
-  const rootListNode = doc.nodeAt(range.start);
-  const from = isListNode(rootListNode) ? range.start : 0;
-  const to = isListNode(rootListNode) ? range.end : tr.doc.content.size;
-  const joins = [];
-  doc.nodesBetween(from, to, (node, pos, parent) => {
-    const resolvedPos = doc.resolve(pos);
-    const {
-      nodeBefore,
-      nodeAfter
-    } = resolvedPos;
-    if (!nodeBefore || !nodeAfter || !isListNode(nodeBefore) || !isListNode(nodeAfter)) {
-      return;
-    }
-    const isNestedList = isListItemNode(parent);
-    if (!isNestedList && nodeBefore.type !== nodeAfter.type && !forceListType) {
-      return;
-    }
-    const index = resolvedPos.index();
-    const positionPreviousNode = resolvedPos.posAtIndex(index - 1);
-    const positionCurrentNode = resolvedPos.posAtIndex(index);
-
-    // If the previous node is part of the selection, OR
-    // If the previous node is not part of the selection and the previous node has the same list type that we’re converting to
-    const joinBefore = positionPreviousNode >= from || nodeBefore.type === forceListType;
-    if (forceListType) {
-      if (joinBefore) {
-        tr.setNodeMarkup(positionPreviousNode, forceListType);
-      }
-      tr.setNodeMarkup(positionCurrentNode, forceListType);
-    }
-    if (isNestedList && nodeBefore.type !== nodeAfter.type) {
-      const nodeType = direction === JoinDirection.RIGHT ? nodeAfter.type : nodeBefore.type;
-      tr.setNodeMarkup(positionPreviousNode, nodeType);
-    }
-    if (joinBefore) {
-      joins.push(pos);
-    }
-  });
-  if (selection.empty && rootListNode && isListNode(rootListNode)) {
-    const resolvedPos = doc.resolve(range.start + rootListNode.nodeSize);
-    const {
-      nodeBefore,
-      nodeAfter
-    } = resolvedPos;
-    if (nodeBefore && nodeAfter && isListNode(nodeBefore) && isListNode(nodeAfter) && nodeAfter.type === nodeBefore.type) {
-      joins.push(resolvedPos.pos);
-    }
-  }
-  for (let i = joins.length - 1; i >= 0; i--) {
-    const listNode = tr.doc.nodeAt(joins[i]);
-    const listName = listNode === null || listNode === void 0 ? void 0 : listNode.type.name;
-    if (listName && (listName === 'orderedList' || listName === 'bulletList')) {
-      const amount = result[listName] || 0;
-      result[listName] = amount + 1;
-    }
-    tr.join(joins[i]);
-  }
-  return result;
-};
+}

package/dist/es2019/plugins/list/utils/selection.js

@@ -1,6 +1,5 @@
 import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
-import { Selection, TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeClosestToPos, findParentNodeOfType, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { isListItemNode, isListNode, isParagraphNode } from '@atlaskit/editor-common/utils';
 export const isPosInsideParagraph = $pos => {
@@ -82,56 +81,6 @@ export const selectionContainsList = tr => {
   });
   return foundListNode;
 };
-export const numberNestedLists = resolvedPos => {
-  let count = 0;
-  for (let i = resolvedPos.depth - 1; i > 0; i--) {
-    const node = resolvedPos.node(i);
-    if (isListNode(node)) {
-      count += 1;
-    }
-  }
-  return count;
-};
-export const getListItemAttributes = $pos => {
-  const indentLevel = numberNestedLists($pos) - 1;
-  const itemAtPos = findParentNodeClosestToPos($pos, isListItemNode);
-
-  // Get the index of the current item relative to parent (parent is at item depth - 1)
-  const itemIndex = $pos.index(itemAtPos ? itemAtPos.depth - 1 : undefined);
-  return {
-    indentLevel,
-    itemIndex
-  };
-};
-export const normalizeListItemsSelection = ({
-  selection,
-  doc
-}) => {
-  if (selection.empty) {
-    return selection;
-  }
-  const {
-    $from,
-    $to
-  } = selection;
-  if (selection instanceof NodeSelection) {
-    const head = resolvePositionToStartOfListItem($from);
-    return new TextSelection(head, head);
-  }
-  const head = resolvePositionToStartOfListItem($from);
-  const anchor = resolvePositionToEndOfListItem($to);
-  return new TextSelection(anchor, head);
-};
-const resolvePositionToStartOfListItem = $pos => {
-  const fromRange = $pos.blockRange($pos, isListItemNode);
-  const fromPosition = fromRange && $pos.textOffset === 0 && fromRange.end - 1 === $pos.pos ? Selection.near($pos.doc.resolve(fromRange.end + 1), 1).$from : $pos;
-  return fromPosition;
-};
-const resolvePositionToEndOfListItem = $pos => {
-  const toRange = $pos.blockRange($pos, isListItemNode);
-  const toPosition = toRange && $pos.textOffset === 0 && toRange.start + 1 === $pos.pos ? Selection.near($pos.doc.resolve(toRange.start - 1), -1).$to : $pos;
-  return toPosition;
-};
 export const createListNodeRange = ({
   selection
 }) => {

package/dist/es2019/plugins/tasks-and-decisions/commands.js

@@ -6,7 +6,7 @@ import { uuid } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD, USER_CONTEXT } from '../analytics';
 import { GapCursorSelection } from '../selection/gap-cursor-selection';
 import { stateKey as taskDecisionStateKey } from './pm-plugins/plugin-key';
-import { autoJoinTr } from '../../utils/prosemirror/autojoin';
+import { autoJoinTr } from '@atlaskit/editor-common/utils';
 const getContextData = (contextProvider = {}) => {
   const {
     objectId,

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

@@ -4,8 +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 { isEmptySelectionAtStart, deleteEmptyParagraphAndMoveBlockUp, isEmptySelectionAtEnd } from '../../../utils/commands';
-import { filterCommands as filter } from '@atlaskit/editor-common/utils';
+import { filterCommand as filter, isEmptySelectionAtStart, deleteEmptyParagraphAndMoveBlockUp, isEmptySelectionAtEnd } 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/text-color/commands/toggle-color.js

@@ -1,4 +1,4 @@
-import { toggleMark } from '../../../utils/commands';
+import { toggleMark } from '@atlaskit/editor-common/mark';
 import { ACTIONS, pluginKey } from '../pm-plugins/main';
 import { getDisabledState } from '../utils/disabled';
 export const toggleColor = color => (state, dispatch) => {

package/dist/es2019/plugins/text-formatting/commands/text-formatting.js

@@ -1,5 +1,5 @@
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { applyMarkOnRange, toggleMark } from '../../../utils/commands';
+import { applyMarkOnRange, toggleMark } from '@atlaskit/editor-common/mark';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { hasCode, markActive } from '../utils';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';

package/dist/es2019/plugins/text-formatting/commands/transform-to-code.js

@@ -1,4 +1,4 @@
-import { filterChildrenBetween } from '../../../utils';
+import { filterChildrenBetween } from '@atlaskit/editor-common/mark';
 const SMART_TO_ASCII = {
   '…': '...',
   '→': '->',

package/dist/es2019/plugins/text-formatting/pm-plugins/clear-formatting.js

@@ -1,8 +1,8 @@
-import * as safePlugin from '@atlaskit/editor-common/safe-plugin';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { checkFormattingIsPresent } from '../utils';
 export const pluginKey = new PluginKey('clearFormattingPlugin');
-export const plugin = dispatch => new safePlugin.SafePlugin({
+export const plugin = dispatch => new SafePlugin({
   state: {
     init(_config, state) {
       return {

package/dist/es2019/plugins/text-formatting/pm-plugins/input-rule.js

@@ -1,7 +1,7 @@
 import { ruleWithAnalytics } from '../../../utils/input-rules';
 import { createRule, createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { transformSmartCharsMentionsAndEmojis } from '../commands/transform-to-code';
+import { transformSmartCharsMentionsAndEmojis } from '@atlaskit/editor-common/mark';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
   ValidAutoformatChars["STRIKE"] = "~~";

package/dist/es2019/plugins/text-formatting/pm-plugins/main.js

@@ -1,9 +1,10 @@
+// TODO: Ideally this should use the custom toggleMark function from @atlaskit/editor-common so we also disable the options when selecting inline nodes but it disables the marks when the selection is empty at this point in time which is undesirable
+// import { toggleMark } from '@atlaskit/editor-common/mark';
 import { toggleMark } from '@atlaskit/editor-prosemirror/commands';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import * as keymaps from '@atlaskit/editor-common/keymaps';
 import { shallowEqual } from '@atlaskit/editor-common/utils';
 import { createInlineCodeFromTextInputWithAnalytics } from '../commands/text-formatting';
-// eslint-disable-next-line no-duplicate-imports
 import * as commands from '../commands/text-formatting';
 import { anyMarkActive } from '../utils';
 import { pluginKey } from './plugin-key';

package/dist/es2019/plugins/text-formatting/ui/Toolbar/dropdown-menu.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo, useState } 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 { useMenuState } from './hooks/menu-state';
 import { MoreButton } from './more-button';
 export const FormattingTextDropdownMenu = /*#__PURE__*/React.memo(({

package/dist/es2019/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js

@@ -8,9 +8,8 @@ import { toolbarMessages } from '../toolbar-messages';
 import * as commands from '../../../commands/text-formatting';
 import { TOOLBAR_ACTION_SUBJECT_ID, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { pluginKey as textFormattingPluginKey } from '../../../pm-plugins/plugin-key';
-import { toggleCode, toggleStrikethrough, toggleUnderline, tooltip, toggleBold, toggleItalic, toggleSubscript, toggleSuperscript, ToolTipContent } from '../../../../../keymaps';
+import { toggleCode, toggleStrikethrough, toggleUnderline, tooltip, toggleBold, toggleItalic, toggleSubscript, toggleSuperscript, ToolTipContent, getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
 import { IconTypes } from '../types';
-import { getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
 const withToolbarInputMethod = func => func({
   inputMethod: INPUT_METHOD.TOOLBAR
 });

package/dist/es2019/plugins/toolbar-lists-indentation/pm-plugins/indentation-buttons.js

@@ -2,9 +2,10 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { shallowEqual } from '@atlaskit/editor-common/utils';
-import { getListItemAttributes, isInsideListItem } from '../../list/utils/selection';
+import { isInsideListItem } from '../../list/utils/selection';
 import { getCurrentIndentLevel as getTaskListIndentLevel, getTaskItemIndex, isInsideTask } from '../../tasks-and-decisions/pm-plugins/helpers';
 import { isIndentationAllowed, MAX_INDENTATION_LEVEL } from '../../indentation/commands';
+import { getListItemAttributes } from '@atlaskit/editor-common/lists';
 export const pluginKey = new PluginKey('indentationButtonsPlugin');
 function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation) {
   const state = {

package/dist/es2019/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js

@@ -5,7 +5,7 @@ import { useIntl } from 'react-intl-next';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import BulletListIcon from '@atlaskit/icon/glyph/editor/bullet-list';
 import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, indent as toggleIndentKeymap, outdent as toggleOutdentKeymap, tooltip } from '../../../keymaps';
-import DropdownMenu from '../../../ui/DropdownMenu';
+import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import ToolbarButton from '../../../ui/ToolbarButton';
 import { expandIconWrapperStyle, shortcutStyle } from '../../../ui/styles';
 import { wrapperStyle, separatorStyles } from '@atlaskit/editor-common/styles';

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -22,15 +22,15 @@ import { injectIntl } from 'react-intl-next';
 import messages from '../../../messages';
 import { TableControlsPadding, MainToolbar, mainToolbarCustomComponentsSlotStyle } from './Toolbar';
 import { createEditorContentStyle } from '../../ContentStyles';
-import { ToolbarArrowKeyNavigationProvider } from '../../ToolbarArrowKeyNavigationProvider';
+import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 const CommentEditorMargin = 14;
-const CommentEditorSmallerMargin = 8;
 const commentEditorStyle = css`
   display: flex;
   flex-direction: column;
 
   .less-margin .ProseMirror {
-    margin: 12px ${CommentEditorSmallerMargin}px ${CommentEditorSmallerMargin}px;
+    margin: ${"var(--ds-space-150, 12px)"} ${"var(--ds-space-100, 8px)"}
+      ${"var(--ds-space-100, 8px)"};
   }
 
   min-width: 272px;
@@ -55,7 +55,8 @@ const ContentArea = createEditorContentStyle(css`
   /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/
   /** Hack for table controls. Otherwise margin collapse and controls are misplaced. **/
   .ProseMirror {
-    margin: 12px ${CommentEditorMargin}px ${CommentEditorMargin}px;
+    margin: ${"var(--ds-space-150, 12px)"} ${CommentEditorMargin}px
+      ${CommentEditorMargin}px;
   }
 
   .gridParent {
@@ -74,7 +75,7 @@ const secondaryToolbarStyle = css`
   justify-content: flex-end;
   align-items: center;
   display: flex;
-  padding: 12px 1px;
+  padding: ${"var(--ds-space-150, 12px)"} 1px;
 `;
 class Editor extends React.Component {
   constructor(props) {

package/dist/es2019/ui/Appearance/Comment/Toolbar.js

@@ -1,4 +1,5 @@
 /** @jsx jsx */
+
 import React, { useEffect, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
@@ -12,7 +13,7 @@ const mainToolbarWrapperStyle = css`
   height: auto;
   background-color: ${"var(--ds-surface, white)"};
   box-shadow: none;
-  padding-left: ${TableControlsPadding}px;
+  padding-left: ${"var(--ds-space-250, 20px)"};
 
   & > div {
     > :first-child:not(style),
@@ -106,7 +107,7 @@ export const mainToolbarCustomComponentsSlotStyle = css`
   justify-content: flex-end;
   align-items: center;
   flex-grow: 1;
-  padding-right: ${TableControlsPadding}px;
+  padding-right: ${"var(--ds-space-250, 20px)"};
   > div {
     display: flex;
     flex-shrink: 0;

package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js

@@ -1,14 +1,13 @@
 /** @jsx jsx */
 import { jsx, useTheme } from '@emotion/react';
-import { WidthConsumer } from '@atlaskit/editor-common/ui';
-import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
+import { WidthConsumer, ContextPanelConsumer } from '@atlaskit/editor-common/ui';
 import React, { useImperativeHandle, useRef } from 'react';
 import { injectIntl } from 'react-intl-next';
 import { ClickAreaBlock } from '../../Addon';
 import ContextPanel from '../../ContextPanel';
 import PluginSlot from '../../PluginSlot';
 import { contentArea, editorContentAreaStyle, sidebarArea, ScrollContainer, editorContentGutterStyle, positionedOverEditorStyle } from './StyledComponents';
-import messages from './messages';
+import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
 export const CONTENT_AREA_TEST_ID = 'ak-editor-fp-content-area';
 const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
   const theme = useTheme();

package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js

@@ -9,8 +9,8 @@ import { BeforePrimaryToolbarWrapper } from '../../../plugins/before-primaryTool
 import Toolbar from '../../Toolbar';
 import { mainToolbarStyle, mainToolbarIconBeforeStyle, mainToolbarFirstChildStyle, mainToolbarSecondChildStyle, nonCustomToolbarWrapperStyle, customToolbarWrapperStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
-import messages from './messages';
-import { ToolbarArrowKeyNavigationProvider } from '../../ToolbarArrowKeyNavigationProvider';
+import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
+import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 export const EditorToolbar = /*#__PURE__*/React.memo(props => {
   var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _props$featureFlags5, _props$featureFlags6;
   const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);

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

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
-import { Dropdown as DropdownComponent } from '@atlaskit/editor-common/ui-menu';
+import { Dropdown as DropdownComponent, KeyDownHandlerContext } from '@atlaskit/editor-common/ui-menu';
 import React, { useContext } from 'react';
-import { KeyDownHandlerContext } from '../ToolbarArrowKeyNavigationProvider';
 const Dropdown = /*#__PURE__*/React.memo(({
   ...props
 }) => {

package/dist/es2019/ui/ElementBrowser/InsertMenu.js

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
+
 import { useCallback, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 // AFP-2532 TODO: Fix automatic suppressions below

package/dist/es2019/ui/styles.js

@@ -22,9 +22,4 @@ export const buttonContentReducedSpacingStyle = css`
 `;
 export const clickSelectWrapperStyle = css`
   user-select: all;
-`;
-export const centeredToolbarContainer = css`
-  display: flex;
-  width: 100%;
-  align-items: center;
 `;