@atlaskit/editor-core 187.8.3 → 187.8.10

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

@@ -5,22 +5,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 var enterKeyCommand = function enterKeyCommand(editorAnalyticsAPI) {
   return function (featureFlags) {

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

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-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/esm/plugins/list/commands/listBackspace.js

@@ -1,9 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _BACKSPACE_COMMANDS;
-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/esm/plugins/list/commands/outdent-list.js

@@ -1,11 +1,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 { 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 var outdentList = function outdentList(editorAnalyticsAPI) {

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

@@ -6,7 +6,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/esm/plugins/list/utils/analytics.js

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

package/dist/esm/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,20 +13,4 @@ export var getListLiftTarget = function getListLiftTarget(resPos) {
     }
   }
   return target - 1;
-};
-export var hasValidListIndentationLevel = function hasValidListIndentationLevel(_ref) {
-  var tr = _ref.tr,
-    maxIndentation = _ref.maxIndentation;
-  var initialIndentationLevel = numberNestedLists(tr.selection.$from);
-  var currentIndentationLevel;
-  var currentPos = tr.selection.$to.pos;
-  do {
-    var resolvedPos = tr.doc.resolve(currentPos);
-    currentIndentationLevel = numberNestedLists(resolvedPos);
-    if (currentIndentationLevel > maxIndentation) {
-      return false;
-    }
-    currentPos++;
-  } while (currentIndentationLevel >= initialIndentationLevel);
-  return true;
 };

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

@@ -1,88 +1,10 @@
 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) {
   var bulletList = node.type.schema.nodes.bulletList;
   if (!bulletList) {
     return false;
   }
   var listFragment = Fragment.from(bulletList.createAndFill());
   return !isListItemNode(node) && node.type.validContent(listFragment);
-}
-export var JoinDirection = /*#__PURE__*/function (JoinDirection) {
-  JoinDirection[JoinDirection["LEFT"] = 1] = "LEFT";
-  JoinDirection[JoinDirection["RIGHT"] = -1] = "RIGHT";
-  return JoinDirection;
-}({});
-export var joinSiblingLists = function joinSiblingLists(_ref) {
-  var tr = _ref.tr,
-    direction = _ref.direction,
-    forceListType = _ref.forceListType;
-  var result = {
-    orderedList: 0,
-    bulletList: 0
-  };
-  var doc = tr.doc,
-    _tr$selection = tr.selection,
-    $from = _tr$selection.$from,
-    $to = _tr$selection.$to,
-    selection = tr.selection;
-  var range = $from.blockRange($to, isListNodeValidContent);
-  if (!range) {
-    return result;
-  }
-  var rootListNode = doc.nodeAt(range.start);
-  var from = isListNode(rootListNode) ? range.start : 0;
-  var to = isListNode(rootListNode) ? range.end : tr.doc.content.size;
-  var joins = [];
-  doc.nodesBetween(from, to, function (node, pos, parent) {
-    var resolvedPos = doc.resolve(pos);
-    var nodeBefore = resolvedPos.nodeBefore,
-      nodeAfter = resolvedPos.nodeAfter;
-    if (!nodeBefore || !nodeAfter || !isListNode(nodeBefore) || !isListNode(nodeAfter)) {
-      return;
-    }
-    var isNestedList = isListItemNode(parent);
-    if (!isNestedList && nodeBefore.type !== nodeAfter.type && !forceListType) {
-      return;
-    }
-    var index = resolvedPos.index();
-    var positionPreviousNode = resolvedPos.posAtIndex(index - 1);
-    var 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
-    var joinBefore = positionPreviousNode >= from || nodeBefore.type === forceListType;
-    if (forceListType) {
-      if (joinBefore) {
-        tr.setNodeMarkup(positionPreviousNode, forceListType);
-      }
-      tr.setNodeMarkup(positionCurrentNode, forceListType);
-    }
-    if (isNestedList && nodeBefore.type !== nodeAfter.type) {
-      var nodeType = direction === JoinDirection.RIGHT ? nodeAfter.type : nodeBefore.type;
-      tr.setNodeMarkup(positionPreviousNode, nodeType);
-    }
-    if (joinBefore) {
-      joins.push(pos);
-    }
-  });
-  if (selection.empty && rootListNode && isListNode(rootListNode)) {
-    var resolvedPos = doc.resolve(range.start + rootListNode.nodeSize);
-    var nodeBefore = resolvedPos.nodeBefore,
-      nodeAfter = resolvedPos.nodeAfter;
-    if (nodeBefore && nodeAfter && isListNode(nodeBefore) && isListNode(nodeAfter) && nodeAfter.type === nodeBefore.type) {
-      joins.push(resolvedPos.pos);
-    }
-  }
-  for (var i = joins.length - 1; i >= 0; i--) {
-    var listNode = tr.doc.nodeAt(joins[i]);
-    var listName = listNode === null || listNode === void 0 ? void 0 : listNode.type.name;
-    if (listName && (listName === 'orderedList' || listName === 'bulletList')) {
-      var amount = result[listName] || 0;
-      result[listName] = amount + 1;
-    }
-    tr.join(joins[i]);
-  }
-  return result;
-};
+}

package/dist/esm/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 var isPosInsideParagraph = function isPosInsideParagraph($pos) {
@@ -70,55 +69,8 @@ export var selectionContainsList = function selectionContainsList(tr) {
   });
   return foundListNode;
 };
-export var numberNestedLists = function numberNestedLists(resolvedPos) {
-  var count = 0;
-  for (var i = resolvedPos.depth - 1; i > 0; i--) {
-    var node = resolvedPos.node(i);
-    if (isListNode(node)) {
-      count += 1;
-    }
-  }
-  return count;
-};
-export var getListItemAttributes = function getListItemAttributes($pos) {
-  var indentLevel = numberNestedLists($pos) - 1;
-  var itemAtPos = findParentNodeClosestToPos($pos, isListItemNode);
-
-  // Get the index of the current item relative to parent (parent is at item depth - 1)
-  var itemIndex = $pos.index(itemAtPos ? itemAtPos.depth - 1 : undefined);
-  return {
-    indentLevel: indentLevel,
-    itemIndex: itemIndex
-  };
-};
-export var normalizeListItemsSelection = function normalizeListItemsSelection(_ref) {
-  var selection = _ref.selection,
-    doc = _ref.doc;
-  if (selection.empty) {
-    return selection;
-  }
-  var $from = selection.$from,
-    $to = selection.$to;
-  if (selection instanceof NodeSelection) {
-    var _head = resolvePositionToStartOfListItem($from);
-    return new TextSelection(_head, _head);
-  }
-  var head = resolvePositionToStartOfListItem($from);
-  var anchor = resolvePositionToEndOfListItem($to);
-  return new TextSelection(anchor, head);
-};
-var resolvePositionToStartOfListItem = function resolvePositionToStartOfListItem($pos) {
-  var fromRange = $pos.blockRange($pos, isListItemNode);
-  var fromPosition = fromRange && $pos.textOffset === 0 && fromRange.end - 1 === $pos.pos ? Selection.near($pos.doc.resolve(fromRange.end + 1), 1).$from : $pos;
-  return fromPosition;
-};
-var resolvePositionToEndOfListItem = function resolvePositionToEndOfListItem($pos) {
-  var toRange = $pos.blockRange($pos, isListItemNode);
-  var toPosition = toRange && $pos.textOffset === 0 && toRange.start + 1 === $pos.pos ? Selection.near($pos.doc.resolve(toRange.start - 1), -1).$to : $pos;
-  return toPosition;
-};
-export var createListNodeRange = function createListNodeRange(_ref2) {
-  var selection = _ref2.selection;
+export var createListNodeRange = function createListNodeRange(_ref) {
+  var selection = _ref.selection;
   var $from = selection.$from,
     $to = selection.$to;
   var range = $from.blockRange($to, isListNode);

package/dist/esm/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';
 var getContextData = function getContextData() {
   var contextProvider = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var objectId = contextProvider.objectId,

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

@@ -7,8 +7,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/esm/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 var toggleColor = function toggleColor(color) {

package/dist/esm/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/esm/plugins/text-formatting/commands/transform-to-code.js

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

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

@@ -1,9 +1,9 @@
-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 var pluginKey = new PluginKey('clearFormattingPlugin');
 export var plugin = function plugin(dispatch) {
-  return new safePlugin.SafePlugin({
+  return new SafePlugin({
     state: {
       init: function init(_config, state) {
         return {

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

@@ -13,7 +13,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 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/esm/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/esm/plugins/text-formatting/ui/Toolbar/dropdown-menu.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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 var FormattingTextDropdownMenu = /*#__PURE__*/React.memo(function (_ref) {

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

@@ -10,9 +10,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';
 var withToolbarInputMethod = function withToolbarInputMethod(func) {
   return func({
     inputMethod: INPUT_METHOD.TOOLBAR

package/dist/esm/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 var pluginKey = new PluginKey('indentationButtonsPlugin');
 function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation) {
   var state = {

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

@@ -6,7 +6,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/esm/ui/Appearance/Comment/Comment.js

@@ -32,13 +32,12 @@ 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';
 var CommentEditorMargin = 14;
-var CommentEditorSmallerMargin = 8;
-var commentEditorStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n\n  .less-margin .ProseMirror {\n    margin: 12px ", "px ", "px;\n  }\n\n  min-width: 272px;\n  /* Border + Toolbar + Footer + (Paragraph + ((Paragraph + Margin) * (DefaultLines - 1)) */\n  /* calc(2px + 40px + 24px + ( 20px + (32px * 2))) */\n\n  height: auto;\n  background-color: ", ";\n  border: 1px solid ", ";\n  box-sizing: border-box;\n  border-radius: ", "px;\n\n  max-width: inherit;\n  word-wrap: break-word;\n"])), CommentEditorSmallerMargin, CommentEditorSmallerMargin, "var(--ds-background-input, white)", "var(--ds-border, ".concat(N40, ")"), borderRadius());
-var ContentArea = createEditorContentStyle(css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  flex-grow: 1;\n  overflow-x: hidden;\n  overflow-y: auto;\n  line-height: 24px;\n\n  /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/\n  /** Hack for table controls. Otherwise margin collapse and controls are misplaced. **/\n  .ProseMirror {\n    margin: 12px ", "px ", "px;\n  }\n\n  .gridParent {\n    margin-left: ", "px;\n    margin-right: ", "px;\n    width: calc(100% + ", "px);\n  }\n\n  padding: ", "px;\n\n  ", ";\n"])), CommentEditorMargin, CommentEditorMargin, CommentEditorMargin - GRID_GUTTER, CommentEditorMargin - GRID_GUTTER, CommentEditorMargin - GRID_GUTTER, TableControlsPadding, tableCommentEditorStyles));
+var commentEditorStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n\n  .less-margin .ProseMirror {\n    margin: ", " ", "\n      ", ";\n  }\n\n  min-width: 272px;\n  /* Border + Toolbar + Footer + (Paragraph + ((Paragraph + Margin) * (DefaultLines - 1)) */\n  /* calc(2px + 40px + 24px + ( 20px + (32px * 2))) */\n\n  height: auto;\n  background-color: ", ";\n  border: 1px solid ", ";\n  box-sizing: border-box;\n  border-radius: ", "px;\n\n  max-width: inherit;\n  word-wrap: break-word;\n"])), "var(--ds-space-150, 12px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-background-input, white)", "var(--ds-border, ".concat(N40, ")"), borderRadius());
+var ContentArea = createEditorContentStyle(css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  flex-grow: 1;\n  overflow-x: hidden;\n  overflow-y: auto;\n  line-height: 24px;\n\n  /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/\n  /** Hack for table controls. Otherwise margin collapse and controls are misplaced. **/\n  .ProseMirror {\n    margin: ", " ", "px\n      ", "px;\n  }\n\n  .gridParent {\n    margin-left: ", "px;\n    margin-right: ", "px;\n    width: calc(100% + ", "px);\n  }\n\n  padding: ", "px;\n\n  ", ";\n"])), "var(--ds-space-150, 12px)", CommentEditorMargin, CommentEditorMargin, CommentEditorMargin - GRID_GUTTER, CommentEditorMargin - GRID_GUTTER, CommentEditorMargin - GRID_GUTTER, TableControlsPadding, tableCommentEditorStyles));
 ContentArea.displayName = 'ContentArea';
-var secondaryToolbarStyle = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  box-sizing: border-box;\n  justify-content: flex-end;\n  align-items: center;\n  display: flex;\n  padding: 12px 1px;\n"])));
+var secondaryToolbarStyle = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  box-sizing: border-box;\n  justify-content: flex-end;\n  align-items: center;\n  display: flex;\n  padding: ", " 1px;\n"])), "var(--ds-space-150, 12px)");
 var Editor = /*#__PURE__*/function (_React$Component) {
   _inherits(Editor, _React$Component);
   var _super = _createSuper(Editor);

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

@@ -3,12 +3,13 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 /** @jsx jsx */
+
 import React, { useEffect, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
 import { akEditorToolbarKeylineHeight, akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 export var TableControlsPadding = 20;
-var mainToolbarWrapperStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  align-items: center;\n  padding: ", " ", " 0;\n  display: flex;\n  height: auto;\n  background-color: ", ";\n  box-shadow: none;\n  padding-left: ", "px;\n\n  & > div {\n    > :first-child:not(style),\n    > style:first-child + * {\n      margin-left: 0;\n    }\n  }\n\n  .block-type-btn {\n    padding-left: 0;\n  }\n"])), "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-surface, white)", TableControlsPadding);
+var mainToolbarWrapperStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  align-items: center;\n  padding: ", " ", " 0;\n  display: flex;\n  height: auto;\n  background-color: ", ";\n  box-shadow: none;\n  padding-left: ", ";\n\n  & > div {\n    > :first-child:not(style),\n    > style:first-child + * {\n      margin-left: 0;\n    }\n  }\n\n  .block-type-btn {\n    padding-left: 0;\n  }\n"])), "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-surface, white)", "var(--ds-space-250, 20px)");
 var stickyToolbarWrapperStyle = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  /* stylelint-disable declaration-block-no-duplicate-properties */\n  position: relative;\n  position: sticky;\n  /* stylelint-enable declaration-block-no-duplicate-properties */\n  padding-bottom: ", ";\n  z-index: ", ";\n  transition: box-shadow ease-in-out 0.2s;\n  &.show-keyline {\n    box-shadow: 0 ", "px 0 0\n      ", ";\n  }\n"])), "var(--ds-space-100, 8px)", akEditorMenuZIndex, akEditorToolbarKeylineHeight, "var(--ds-border, ".concat(N30, ")"));
 var StickyToolbar = function StickyToolbar(props) {
   var _useState = useState(0),
@@ -75,4 +76,4 @@ export var MainToolbar = function MainToolbar(_ref) {
   }
   return jsx(FixedToolbar, null, children);
 };
-export var mainToolbarCustomComponentsSlotStyle = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  flex-grow: 1;\n  padding-right: ", "px;\n  > div {\n    display: flex;\n    flex-shrink: 0;\n  }\n"])), TableControlsPadding);
+export var mainToolbarCustomComponentsSlotStyle = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  flex-grow: 1;\n  padding-right: ", ";\n  > div {\n    display: flex;\n    flex-shrink: 0;\n  }\n"])), "var(--ds-space-250, 20px)");

package/dist/esm/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 var CONTENT_AREA_TEST_ID = 'ak-editor-fp-content-area';
 var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var theme = useTheme();

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

@@ -10,8 +10,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 var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
   var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _props$featureFlags5, _props$featureFlags6;
   var _useState = useState(false),

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

@@ -3,9 +3,8 @@ import _objectDestructuringEmpty from "@babel/runtime/helpers/objectDestructurin
 import _extends from "@babel/runtime/helpers/extends";
 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 { 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';
 var Dropdown = /*#__PURE__*/React.memo(function (_ref) {
   var props = _extends({}, (_objectDestructuringEmpty(_ref), _ref));
   var keyDownHandlerContext = useContext(KeyDownHandlerContext);

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

@@ -5,6 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var _excluded = ["children"];
 var _templateObject, _templateObject2;
 /** @jsx jsx */
+
 import { useCallback, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 // AFP-2532 TODO: Fix automatic suppressions below

package/dist/esm/ui/styles.js

@@ -1,5 +1,5 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 import { css } from '@emotion/react';
 export { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
@@ -7,5 +7,4 @@ export var wrapperSmallStyle = css(_templateObject || (_templateObject = _tagged
 export var expandIconWrapperStyle = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n"])));
 export var buttonContentStyle = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  min-width: 80px;\n  align-items: center;\n  overflow: hidden;\n  justify-content: center;\n  flex-direction: column;\n  padding: ", ";\n"])), "var(--ds-space-075, 6px)");
 export var buttonContentReducedSpacingStyle = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  padding: ", ";\n"])), "var(--ds-space-100, 8px)");
-export var clickSelectWrapperStyle = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  user-select: all;\n"])));
-export var centeredToolbarContainer = css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  align-items: center;\n"])));
+export var clickSelectWrapperStyle = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  user-select: all;\n"])));