@atlaskit/editor-core 187.8.3 → 187.8.10

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

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.selectionContainsList = exports.numberNestedLists = exports.normalizeListItemsSelection = exports.isWrappingPossible = exports.isPosInsideParagraph = exports.isPosInsideList = exports.isInsideTableCell = exports.isInsideListItem = exports.getListItemAttributes = exports.createListNodeRange = exports.canJoinToPreviousListItem = void 0;
+exports.selectionContainsList = exports.isWrappingPossible = exports.isPosInsideParagraph = exports.isPosInsideList = exports.isInsideTableCell = exports.isInsideListItem = exports.createListNodeRange = exports.canJoinToPreviousListItem = void 0;
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _selection = require("@atlaskit/editor-common/selection");
 var _utils2 = require("@atlaskit/editor-common/utils");
@@ -83,58 +82,8 @@ var selectionContainsList = function selectionContainsList(tr) {
   return foundListNode;
 };
 exports.selectionContainsList = selectionContainsList;
-var numberNestedLists = function numberNestedLists(resolvedPos) {
-  var count = 0;
-  for (var i = resolvedPos.depth - 1; i > 0; i--) {
-    var node = resolvedPos.node(i);
-    if ((0, _utils2.isListNode)(node)) {
-      count += 1;
-    }
-  }
-  return count;
-};
-exports.numberNestedLists = numberNestedLists;
-var getListItemAttributes = function getListItemAttributes($pos) {
-  var indentLevel = numberNestedLists($pos) - 1;
-  var itemAtPos = (0, _utils.findParentNodeClosestToPos)($pos, _utils2.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
-  };
-};
-exports.getListItemAttributes = getListItemAttributes;
-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 _state.NodeSelection) {
-    var _head = resolvePositionToStartOfListItem($from);
-    return new _state.TextSelection(_head, _head);
-  }
-  var head = resolvePositionToStartOfListItem($from);
-  var anchor = resolvePositionToEndOfListItem($to);
-  return new _state.TextSelection(anchor, head);
-};
-exports.normalizeListItemsSelection = normalizeListItemsSelection;
-var resolvePositionToStartOfListItem = function resolvePositionToStartOfListItem($pos) {
-  var fromRange = $pos.blockRange($pos, _utils2.isListItemNode);
-  var fromPosition = fromRange && $pos.textOffset === 0 && fromRange.end - 1 === $pos.pos ? _state.Selection.near($pos.doc.resolve(fromRange.end + 1), 1).$from : $pos;
-  return fromPosition;
-};
-var resolvePositionToEndOfListItem = function resolvePositionToEndOfListItem($pos) {
-  var toRange = $pos.blockRange($pos, _utils2.isListItemNode);
-  var toPosition = toRange && $pos.textOffset === 0 && toRange.start + 1 === $pos.pos ? _state.Selection.near($pos.doc.resolve(toRange.start - 1), -1).$to : $pos;
-  return toPosition;
-};
-var createListNodeRange = function createListNodeRange(_ref2) {
-  var selection = _ref2.selection;
+var createListNodeRange = function createListNodeRange(_ref) {
+  var selection = _ref.selection;
   var $from = selection.$from,
     $to = selection.$to;
   var range = $from.blockRange($to, _utils2.isListNode);

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

@@ -12,7 +12,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("../analytics");
 var _gapCursorSelection = require("../selection/gap-cursor-selection");
 var _pluginKey = require("./pm-plugins/plugin-key");
-var _autojoin = require("../../utils/prosemirror/autojoin");
+var _utils2 = require("@atlaskit/editor-common/utils");
 var getContextData = function getContextData() {
   var contextProvider = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var objectId = contextProvider.objectId,
@@ -102,7 +102,7 @@ var insertTaskDecisionAction = function insertTaskDecisionAction(state, listType
   if (!tr) {
     return state.tr;
   }
-  (0, _autojoin.autoJoinTr)(tr, ['taskList', 'decisionList']);
+  (0, _utils2.autoJoinTr)(tr, ['taskList', 'decisionList']);
   return tr;
 };
 exports.insertTaskDecisionAction = insertTaskDecisionAction;

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

@@ -13,11 +13,10 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _adfSchema = require("@atlaskit/adf-schema");
-var _commands2 = require("../../../utils/commands");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _analytics = require("../../analytics");
-var _commands3 = require("../commands");
-var _commands4 = require("./commands");
+var _commands2 = require("../commands");
+var _commands3 = require("./commands");
 var _helpers = require("./helpers");
 var _utils3 = require("../utils");
 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; }
@@ -46,7 +45,7 @@ var actionDecisionFollowsOrNothing = function actionDecisionFollowsOrNothing($po
 };
 var joinTaskDecisionFollowing = function joinTaskDecisionFollowing(state, dispatch) {
   // only run if selection is at end of text, and inside a task or decision item
-  if (!(0, _commands2.isEmptySelectionAtEnd)(state) || !(0, _helpers.isInsideTaskOrDecisionItem)(state) || !dispatch) {
+  if (!(0, _utils2.isEmptySelectionAtEnd)(state) || !(0, _helpers.isInsideTaskOrDecisionItem)(state) || !dispatch) {
     return false;
   }
   // look for the node after this current one
@@ -67,7 +66,7 @@ var joinTaskDecisionFollowing = function joinTaskDecisionFollowing(state, dispat
   if (!parentList) {
     if ($next.parent.type === paragraph) {
       // try to join paragraph and taskList when backspacing
-      return (0, _commands4.joinAtCut)($next.doc.resolve($next.pos))(state, dispatch);
+      return (0, _commands3.joinAtCut)($next.doc.resolve($next.pos))(state, dispatch);
     }
     // If the item we are joining is a list
     if ($next.parent.type === bulletList || $next.parent.type === orderedList) {
@@ -97,13 +96,13 @@ var joinTaskDecisionFollowing = function joinTaskDecisionFollowing(state, dispat
 };
 var getUnindentCommand = function getUnindentCommand() {
   var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.KEYBOARD;
-  return (0, _utils2.filterCommands)(_helpers.isInsideTask, function (state, dispatch) {
+  return (0, _utils2.filterCommand)(_helpers.isInsideTask, function (state, dispatch) {
     var normalizedSelection = (0, _utils3.normalizeTaskItemsSelection)(state.selection);
     var curIndentLevel = (0, _helpers.getCurrentIndentLevel)(normalizedSelection);
     if (!curIndentLevel || curIndentLevel === 1) {
       return false;
     }
-    return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.OUTDENT, inputMethod))((0, _commands.autoJoin)(_commands4.liftSelection, ['taskList']))(state, dispatch);
+    return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.OUTDENT, inputMethod))((0, _commands.autoJoin)(_commands3.liftSelection, ['taskList']))(state, dispatch);
   });
 };
 
@@ -124,13 +123,13 @@ var shouldLetTabThroughInTable = function shouldLetTabThroughInTable(state) {
 };
 var getIndentCommand = function getIndentCommand() {
   var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.KEYBOARD;
-  return (0, _utils2.filterCommands)(_helpers.isInsideTask, function (state, dispatch) {
+  return (0, _utils2.filterCommand)(_helpers.isInsideTask, function (state, dispatch) {
     var normalizedSelection = (0, _utils3.normalizeTaskItemsSelection)(state.selection);
     var curIndentLevel = (0, _helpers.getCurrentIndentLevel)(normalizedSelection);
     if (!curIndentLevel || curIndentLevel >= 6) {
       return true;
     }
-    return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.INDENT, inputMethod))((0, _commands.autoJoin)(_commands4.wrapSelectionInTaskList, ['taskList']))(state, dispatch);
+    return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.INDENT, inputMethod))((0, _commands.autoJoin)(_commands3.wrapSelectionInTaskList, ['taskList']))(state, dispatch);
   });
 };
 exports.getIndentCommand = getIndentCommand;
@@ -165,9 +164,9 @@ var backspaceFrom = function backspaceFrom($from) {
     return false;
   };
 };
-var backspace = (0, _utils2.filterCommands)(_commands2.isEmptySelectionAtStart, (0, _commands.autoJoin)((0, _commands.chainCommands)(function (state, dispatch) {
-  return (0, _commands4.joinAtCut)(state.selection.$from)(state, dispatch);
-}, (0, _utils2.filterCommands)(_helpers.isInsideTaskOrDecisionItem, function (state, dispatch) {
+var backspace = (0, _utils2.filterCommand)(_utils2.isEmptySelectionAtStart, (0, _commands.autoJoin)((0, _commands.chainCommands)(function (state, dispatch) {
+  return (0, _commands3.joinAtCut)(state.selection.$from)(state, dispatch);
+}, (0, _utils2.filterCommand)(_helpers.isInsideTaskOrDecisionItem, function (state, dispatch) {
   return backspaceFrom(state.selection.$from)(state, dispatch);
 })), ['taskList', 'decisionList']));
 var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTaskDecisionFollowing(state, dispatch) {
@@ -179,7 +178,7 @@ var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTas
     tr = state.tr;
 
   // only run if cursor is at the end of the node
-  if (!(0, _commands2.isEmptySelectionAtEnd)(state) || !dispatch) {
+  if (!(0, _utils2.isEmptySelectionAtEnd)(state) || !dispatch) {
     return false;
   }
 
@@ -213,7 +212,7 @@ var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTas
   }
   return false;
 };
-var deleteForwards = (0, _commands.autoJoin)((0, _commands.chainCommands)((0, _commands2.deleteEmptyParagraphAndMoveBlockUp)(_helpers.isActionOrDecisionList), joinTaskDecisionFollowing, unindentTaskOrUnwrapTaskDecisionFollowing), ['taskList', 'decisionList']);
+var deleteForwards = (0, _commands.autoJoin)((0, _commands.chainCommands)((0, _utils2.deleteEmptyParagraphAndMoveBlockUp)(_helpers.isActionOrDecisionList), joinTaskDecisionFollowing, unindentTaskOrUnwrapTaskDecisionFollowing), ['taskList', 'decisionList']);
 var splitListItemWith = function splitListItemWith(tr, content, $from, setSelection) {
   var origDoc = tr.doc;
 
@@ -279,7 +278,7 @@ var splitListItem = function splitListItem(state, dispatch) {
   }
   return false;
 };
-var enter = (0, _utils2.filterCommands)(_helpers.isInsideTaskOrDecisionItem, (0, _commands.chainCommands)((0, _utils2.filterCommands)(_helpers.isEmptyTaskDecision, (0, _commands.chainCommands)(getUnindentCommand(), splitListItem)), function (state, dispatch) {
+var enter = (0, _utils2.filterCommand)(_helpers.isInsideTaskOrDecisionItem, (0, _commands.chainCommands)((0, _utils2.filterCommand)(_helpers.isEmptyTaskDecision, (0, _commands.chainCommands)(getUnindentCommand(), splitListItem)), function (state, dispatch) {
   var selection = state.selection,
     schema = state.schema;
   var taskItem = schema.nodes.taskItem;
@@ -308,7 +307,7 @@ var enter = (0, _utils2.filterCommands)(_helpers.isInsideTaskOrDecisionItem, (0,
       }
     }]);
   };
-  var insertTr = (0, _commands3.insertTaskDecisionWithAnalytics)(state, listType, _analytics.INPUT_METHOD.KEYBOARD, addItem);
+  var insertTr = (0, _commands2.insertTaskDecisionWithAnalytics)(state, listType, _analytics.INPUT_METHOD.KEYBOARD, addItem);
   if (insertTr && dispatch) {
     insertTr.scrollIntoView();
     dispatch(insertTr);
@@ -317,12 +316,12 @@ var enter = (0, _utils2.filterCommands)(_helpers.isInsideTaskOrDecisionItem, (0,
 }));
 function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
   var indentHandlers = {
-    'Shift-Tab': (0, _utils2.filterCommands)([_helpers.isInsideTaskOrDecisionItem, function (state) {
+    'Shift-Tab': (0, _utils2.filterCommand)([_helpers.isInsideTaskOrDecisionItem, function (state) {
       return !shouldLetTabThroughInTable(state);
     }], function (state, dispatch) {
       return getUnindentCommand(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
     }),
-    Tab: (0, _utils2.filterCommands)([_helpers.isInsideTaskOrDecisionItem, function (state) {
+    Tab: (0, _utils2.filterCommand)([_helpers.isInsideTaskOrDecisionItem, function (state) {
       return !shouldLetTabThroughInTable(state);
     }], function (state, dispatch) {
       return getIndentCommand(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;

package/dist/cjs/plugins/text-color/commands/toggle-color.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.toggleColor = void 0;
-var _commands = require("../../../utils/commands");
+var _mark = require("@atlaskit/editor-common/mark");
 var _main = require("../pm-plugins/main");
 var _disabled = require("../utils/disabled");
 var toggleColor = function toggleColor(color) {
@@ -26,7 +26,7 @@ var toggleColor = function toggleColor(color) {
         color: color
       });
       state.tr.scrollIntoView();
-      (0, _commands.toggleMark)(textColor, {
+      (0, _mark.toggleMark)(textColor, {
         color: color
       })(state, dispatch);
     }

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toggleUnderlineWithAnalytics = exports.toggleUnderline = exports.toggleSuperscriptWithAnalytics = exports.toggleSuperscript = exports.toggleSubscriptWithAnalytics = exports.toggleSubscript = exports.toggleStrongWithAnalytics = exports.toggleStrong = exports.toggleStrikeWithAnalytics = exports.toggleStrike = exports.toggleEmWithAnalytics = exports.toggleEm = exports.toggleCodeWithAnalytics = exports.toggleCode = exports.moveRight = exports.moveLeft = exports.createInlineCodeFromTextInputWithAnalytics = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _commands = require("../../../utils/commands");
+var _mark = require("@atlaskit/editor-common/mark");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("../utils");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
@@ -109,7 +109,7 @@ var toggleEm = function toggleEm() {
   return function (state, dispatch) {
     var em = state.schema.marks.em;
     if (em) {
-      return (0, _commands.toggleMark)(em)(state, dispatch);
+      return (0, _mark.toggleMark)(em)(state, dispatch);
     }
     return false;
   };
@@ -134,7 +134,7 @@ var toggleStrike = function toggleStrike() {
   return function (state, dispatch) {
     var strike = state.schema.marks.strike;
     if (strike) {
-      return (0, _commands.toggleMark)(strike)(state, dispatch);
+      return (0, _mark.toggleMark)(strike)(state, dispatch);
     }
     return false;
   };
@@ -159,7 +159,7 @@ var toggleStrong = function toggleStrong() {
   return function (state, dispatch) {
     var strong = state.schema.marks.strong;
     if (strong) {
-      return (0, _commands.toggleMark)(strong)(state, dispatch);
+      return (0, _mark.toggleMark)(strong)(state, dispatch);
     }
     return false;
   };
@@ -184,7 +184,7 @@ var toggleUnderline = function toggleUnderline() {
   return function (state, dispatch) {
     var underline = state.schema.marks.underline;
     if (underline) {
-      return (0, _commands.toggleMark)(underline)(state, dispatch);
+      return (0, _mark.toggleMark)(underline)(state, dispatch);
     }
     return false;
   };
@@ -209,7 +209,7 @@ var toggleSuperscript = function toggleSuperscript() {
   return function (state, dispatch) {
     var subsup = state.schema.marks.subsup;
     if (subsup) {
-      return (0, _commands.toggleMark)(subsup, {
+      return (0, _mark.toggleMark)(subsup, {
         type: 'sup'
       })(state, dispatch);
     }
@@ -236,7 +236,7 @@ var toggleSubscript = function toggleSubscript() {
   return function (state, dispatch) {
     var subsup = state.schema.marks.subsup;
     if (subsup) {
-      return (0, _commands.toggleMark)(subsup, {
+      return (0, _mark.toggleMark)(subsup, {
         type: 'sub'
       })(state, dispatch);
     }
@@ -263,7 +263,7 @@ var toggleCode = function toggleCode() {
   return function (state, dispatch) {
     var code = state.schema.marks.code;
     if (code) {
-      return (0, _commands.toggleMark)(code)(state, dispatch);
+      return (0, _mark.toggleMark)(code)(state, dispatch);
     }
     return false;
   };
@@ -297,7 +297,7 @@ var createInlineCodeFromTextInput = function createInlineCodeFromTextInput(from,
         var tr = state.tr.replaceRangeWith(from - 1, to + 1, state.schema.text(text));
         if (dispatch) {
           var codeMark = state.schema.marks.code.create();
-          tr = (0, _commands.applyMarkOnRange)(tr.mapping.map(from - 1), tr.mapping.map(to + 1), false, codeMark, tr).setStoredMarks([codeMark]);
+          tr = (0, _mark.applyMarkOnRange)(tr.mapping.map(from - 1), tr.mapping.map(to + 1), false, codeMark, tr).setStoredMarks([codeMark]);
           dispatch(tr);
         }
         return true;

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformSmartCharsMentionsAndEmojis = void 0;
-var _utils = require("../../../utils");
+var _mark = require("@atlaskit/editor-common/mark");
 var SMART_TO_ASCII = {
   '…': '...',
   '→': '->',
@@ -52,7 +52,7 @@ var transformSmartCharsMentionsAndEmojis = function transformSmartCharsMentionsA
     text = _schema$nodes2.text,
     emoji = _schema$nodes2.emoji;
   // Traverse through all the nodes within the range and replace them with their plaintext counterpart
-  var children = (0, _utils.filterChildrenBetween)(tr.doc, from, to, isNodeTextBlock(schema));
+  var children = (0, _mark.filterChildrenBetween)(tr.doc, from, to, isNodeTextBlock(schema));
   children.forEach(function (_ref) {
     var node = _ref.node,
       pos = _ref.pos;

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

@@ -1,19 +1,16 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = exports.plugin = void 0;
-var safePlugin = _interopRequireWildcard(require("@atlaskit/editor-common/safe-plugin"));
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("../utils");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var pluginKey = new _state.PluginKey('clearFormattingPlugin');
 exports.pluginKey = pluginKey;
 var plugin = function plugin(dispatch) {
-  return new safePlugin.SafePlugin({
+  return new _safePlugin.SafePlugin({
     state: {
       init: function init(_config, state) {
         return {

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

@@ -19,7 +19,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _inputRules = require("../../../utils/input-rules");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _transformToCode = require("../commands/transform-to-code");
+var _mark = require("@atlaskit/editor-common/mark");
 var _ValidCombinations;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
@@ -95,7 +95,7 @@ function addMark(markType, schema, char) {
       return null;
     }
     if (markType.name === 'code') {
-      (0, _transformToCode.transformSmartCharsMentionsAndEmojis)(tr.mapping.map(start), tr.mapping.map(end), tr);
+      (0, _mark.transformSmartCharsMentionsAndEmojis)(tr.mapping.map(start), tr.mapping.map(end), tr);
     }
     var mappedStart = tr.mapping.map(start);
     var mappedEnd = tr.mapping.map(end);

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

@@ -20,7 +20,8 @@ var _utils2 = require("../utils");
 var _pluginKey = require("./plugin-key");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-// eslint-disable-next-line no-duplicate-imports
+// 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';
 
 var getTextFormattingState = function getTextFormattingState(editorState, editorAnalyticsAPI) {
   var _editorState$schema$m = editorState.schema.marks,

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

@@ -9,7 +9,7 @@ exports.FormattingTextDropdownMenu = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _DropdownMenu = _interopRequireDefault(require("../../../../ui/DropdownMenu"));
+var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _menuState = require("./hooks/menu-state");
 var _moreButton = require("./more-button");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -46,7 +46,7 @@ var FormattingTextDropdownMenu = /*#__PURE__*/_react.default.memo(function (_ref
       closeMenu();
     }
   }, [editorView.state, editorView.dispatch, closeMenu]);
-  return /*#__PURE__*/_react.default.createElement(_DropdownMenu.default, {
+  return /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownMenuWithKeyboardNavigation, {
     mountTo: popupsMountPoint,
     onOpenChange: closeMenu,
     boundariesElement: popupsBoundariesElement,

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

@@ -16,9 +16,8 @@ var _toolbarMessages = require("../toolbar-messages");
 var commands = _interopRequireWildcard(require("../../../commands/text-formatting"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _pluginKey = require("../../../pm-plugins/plugin-key");
-var _keymaps = require("../../../../../keymaps");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _types = require("../types");
-var _keymaps2 = require("@atlaskit/editor-common/keymaps");
 var _IconsMarkSchema;
 /** @jsx jsx */
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -108,7 +107,7 @@ var getIcon = function getIcon(_ref) {
     isActive: isActive,
     isDisabled: isDisabled,
     'aria-label': tooltipKeymap ? (0, _keymaps.tooltip)(tooltipKeymap, String(content)) : String(content),
-    'aria-keyshortcuts': (0, _keymaps2.getAriaKeyshortcuts)(tooltipKeymap)
+    'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(tooltipKeymap)
   };
 };
 var IconsMarkSchema = (_IconsMarkSchema = {}, (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.strong, 'strong'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.em, 'em'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.strike, 'strike'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.code, 'code'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.underline, 'underline'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.superscript, 'subsup'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.subscript, 'subsup'), _IconsMarkSchema);

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

@@ -11,6 +11,7 @@ var _utils2 = require("@atlaskit/editor-common/utils");
 var _selection = require("../../list/utils/selection");
 var _helpers = require("../../tasks-and-decisions/pm-plugins/helpers");
 var _commands = require("../../indentation/commands");
+var _lists = require("@atlaskit/editor-common/lists");
 var pluginKey = new _state.PluginKey('indentationButtonsPlugin');
 exports.pluginKey = pluginKey;
 function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation) {
@@ -27,7 +28,7 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
   // Check for lists before paragraphs and headings in case
   // the selection is in a list nested in a layout column.
   if ((0, _selection.isInsideListItem)(editorState)) {
-    var _getListItemAttribute = (0, _selection.getListItemAttributes)(selection.$head),
+    var _getListItemAttribute = (0, _lists.getListItemAttributes)(selection.$head),
       indentLevel = _getListItemAttribute.indentLevel,
       itemIndex = _getListItemAttribute.itemIndex;
     return {

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

@@ -12,7 +12,7 @@ var _reactIntlNext = require("react-intl-next");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
 var _bulletList = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/bullet-list"));
 var _keymaps = require("../../../keymaps");
-var _DropdownMenu = _interopRequireDefault(require("../../../ui/DropdownMenu"));
+var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _ToolbarButton = _interopRequireDefault(require("../../../ui/ToolbarButton"));
 var _styles = require("../../../ui/styles");
 var _styles2 = require("@atlaskit/editor-common/styles");
@@ -69,7 +69,7 @@ function ToolbarDropdown(props) {
   };
   return (0, _react.jsx)("span", {
     css: _styles2.wrapperStyle
-  }, (0, _react.jsx)(_DropdownMenu.default, {
+  }, (0, _react.jsx)(_uiMenu.DropdownMenuWithKeyboardNavigation, {
     items: items,
     onItemActivated: handleOnItemActivated,
     mountTo: popupsMountPoint,

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

@@ -35,17 +35,16 @@ var _reactIntlNext = require("react-intl-next");
 var _messages = _interopRequireDefault(require("../../../messages"));
 var _Toolbar2 = require("./Toolbar");
 var _ContentStyles = require("../../ContentStyles");
-var _ToolbarArrowKeyNavigationProvider = require("../../ToolbarArrowKeyNavigationProvider");
+var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 /** @jsx jsx */
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
 var CommentEditorMargin = 14;
-var CommentEditorSmallerMargin = 8;
-var commentEditorStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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(_colors.N40, ")"), (0, _constants.borderRadius)());
-var ContentArea = (0, _ContentStyles.createEditorContentStyle)((0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\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 - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, _Toolbar2.TableControlsPadding, _commonStyles.tableCommentEditorStyles));
+var commentEditorStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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(_colors.N40, ")"), (0, _constants.borderRadius)());
+var ContentArea = (0, _ContentStyles.createEditorContentStyle)((0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\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 - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, _Toolbar2.TableControlsPadding, _commonStyles.tableCommentEditorStyles));
 ContentArea.displayName = 'ContentArea';
-var secondaryToolbarStyle = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  box-sizing: border-box;\n  justify-content: flex-end;\n  align-items: center;\n  display: flex;\n  padding: 12px 1px;\n"])));
+var secondaryToolbarStyle = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\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) {
   (0, _inherits2.default)(Editor, _React$Component);
   var _super = _createSuper(Editor);
@@ -116,7 +115,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         ref: _this.wrapperElementRef
       }, (0, _react2.jsx)(_Toolbar2.MainToolbar, {
         useStickyToolbar: useStickyToolbar
-      }, (0, _react2.jsx)(_ToolbarArrowKeyNavigationProvider.ToolbarArrowKeyNavigationProvider, {
+      }, (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
         editorView: editorView,
         childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
         isShortcutToFocusToolbar: isShortcutToFocusToolbar,

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

@@ -19,7 +19,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var TableControlsPadding = 20;
 exports.TableControlsPadding = TableControlsPadding;
-var mainToolbarWrapperStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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 = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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 = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\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)", _editorSharedStyles.akEditorMenuZIndex, _editorSharedStyles.akEditorToolbarKeylineHeight, "var(--ds-border, ".concat(_colors.N30, ")"));
 var StickyToolbar = function StickyToolbar(props) {
   var _useState = (0, _react.useState)(0),
@@ -87,5 +87,5 @@ var MainToolbar = function MainToolbar(_ref) {
   return (0, _react2.jsx)(FixedToolbar, null, children);
 };
 exports.MainToolbar = MainToolbar;
-var mainToolbarCustomComponentsSlotStyle = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\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);
+var mainToolbarCustomComponentsSlotStyle = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\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)");
 exports.mainToolbarCustomComponentsSlotStyle = mainToolbarCustomComponentsSlotStyle;

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

@@ -14,7 +14,7 @@ var _Addon = require("../../Addon");
 var _ContextPanel = _interopRequireDefault(require("../../ContextPanel"));
 var _PluginSlot = _interopRequireDefault(require("../../PluginSlot"));
 var _StyledComponents = require("./StyledComponents");
-var _messages = _interopRequireDefault(require("./messages"));
+var _messages = require("@atlaskit/editor-common/messages");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /** @jsx jsx */
@@ -58,7 +58,7 @@ var Content = /*#__PURE__*/_react2.default.forwardRef(function (props, ref) {
           containerWidth: width
         }),
         role: "region",
-        "aria-label": props.intl.formatMessage(_messages.default.editableContentLabel),
+        "aria-label": props.intl.formatMessage(_messages.fullPageMessages.editableContentLabel),
         ref: contentAreaRef
       }, (0, _react.jsx)("div", {
         css: _StyledComponents.editorContentGutterStyle,

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

@@ -16,8 +16,8 @@ var _BeforePrimaryToolbarWrapper = require("../../../plugins/before-primaryToolb
 var _Toolbar = _interopRequireDefault(require("../../Toolbar"));
 var _MainToolbar = require("./MainToolbar");
 var _ui2 = require("@atlaskit/editor-common/ui");
-var _messages = _interopRequireDefault(require("./messages"));
-var _ToolbarArrowKeyNavigationProvider = require("../../ToolbarArrowKeyNavigationProvider");
+var _messages = require("@atlaskit/editor-common/messages");
+var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /** @jsx jsx */
@@ -97,7 +97,7 @@ var EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
   return (0, _react2.jsx)(_ui2.ContextPanelConsumer, null, function (_ref) {
     var _props$featureFlags8, _props$featureFlags9, _props$featureFlags10;
     var contextPanelWidth = _ref.width;
-    return (0, _react2.jsx)(_ToolbarArrowKeyNavigationProvider.ToolbarArrowKeyNavigationProvider, {
+    return (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
       editorView: props.editorView,
       childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
       isShortcutToFocusToolbar: isShortcutToFocusToolbar,
@@ -109,12 +109,12 @@ var EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
     }, (0, _react2.jsx)("div", {
       css: (0, _MainToolbar.mainToolbarFirstChildStyle)(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)),
       role: "toolbar",
-      "aria-label": props.intl.formatMessage(_messages.default.toolbarLabel)
+      "aria-label": props.intl.formatMessage(_messages.fullPageMessages.toolbarLabel)
     }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), (0, _react2.jsx)("div", {
       css: (0, _MainToolbar.mainToolbarSecondChildStyle)(!!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.twoLineEditorToolbar)),
       "data-testid": 'avatar-group-outside-plugin',
       role: "region",
-      "aria-label": props.intl.formatMessage(_messages.default.pageActionsLabel)
+      "aria-label": props.intl.formatMessage(_messages.fullPageMessages.pageActionsLabel)
     }, shouldSplitToolbar ? nonCustomToolbar : customToolbar)));
   });
 });

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

@@ -11,14 +11,13 @@ var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _react = _interopRequireWildcard(require("react"));
-var _ToolbarArrowKeyNavigationProvider = require("../ToolbarArrowKeyNavigationProvider");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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) { (0, _defineProperty2.default)(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; }
 var Dropdown = /*#__PURE__*/_react.default.memo(function (_ref) {
   var props = (0, _extends2.default)({}, ((0, _objectDestructuringEmpty2.default)(_ref), _ref));
-  var keyDownHandlerContext = (0, _react.useContext)(_ToolbarArrowKeyNavigationProvider.KeyDownHandlerContext);
+  var keyDownHandlerContext = (0, _react.useContext)(_uiMenu.KeyDownHandlerContext);
   return (
     /*#__PURE__*/
     //This context is to handle the tab, Arrow Right/Left key events for dropdown.