@atlaskit/editor-core 187.47.6 → 187.48.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-core
 
+## 187.48.0
+
+### Minor Changes
+
+- [`f8e7203eec6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f8e7203eec6) - ED-19618 Extract base plugin from editor-core
+
+### Patch Changes
+
+- [`4e0f5ccf818`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4e0f5ccf818) - ADFEXP-526: fix loading-adf test
+- Updated dependencies
+
+## 187.47.9
+
+### Patch Changes
+
+- [`36b7e4fd8d5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/36b7e4fd8d5) - ED-20017 Clean up unused functions in Dropdown
+
 ## 187.47.6
 
 ### Patch Changes

package/dist/cjs/editor-next/index.js

@@ -14,7 +14,7 @@ var _analyticsNamespacedContext = require("@atlaskit/analytics-namespaced-contex
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _ufo = require("@atlaskit/editor-common/ufo");
 var _utils = require("@atlaskit/editor-common/utils");
-var _plugins = require("../plugins");
+var _editorPluginBase = require("@atlaskit/editor-plugin-base");
 var _actions = _interopRequireDefault(require("../actions"));
 var _featureFlagsFromProps = require("../create-editor/feature-flags-from-props");
 var _versionWrapper = require("../version-wrapper");
@@ -113,7 +113,7 @@ EditorNext.propTypes = {
   },
   preset: function preset(_ref2) {
     var _preset = _ref2.preset;
-    if (!_preset.has(_plugins.basePlugin)) {
+    if (!_preset.has(_editorPluginBase.basePlugin)) {
       return new Error('Presets must contain the base plugin');
     }
     return null;

package/dist/cjs/index.js

@@ -278,7 +278,7 @@ Object.defineProperty(exports, "insertDate", {
 Object.defineProperty(exports, "insertExpand", {
   enumerable: true,
   get: function get() {
-    return _commands6.insertExpand;
+    return _commands5.insertExpand;
   }
 });
 Object.defineProperty(exports, "insertMediaSingleNode", {
@@ -350,19 +350,19 @@ Object.defineProperty(exports, "selectionPluginKey", {
 Object.defineProperty(exports, "setIsExpanded", {
   enumerable: true,
   get: function get() {
-    return _commands5.setIsExpanded;
+    return _commands4.setIsExpanded;
   }
 });
 Object.defineProperty(exports, "setKeyboardHeight", {
   enumerable: true,
   get: function get() {
-    return _commands4.setKeyboardHeight;
+    return _editorPluginBase.setKeyboardHeight;
   }
 });
 Object.defineProperty(exports, "setMobilePaddingTop", {
   enumerable: true,
   get: function get() {
-    return _commands5.setMobilePaddingTop;
+    return _commands4.setMobilePaddingTop;
   }
 });
 Object.defineProperty(exports, "setStatusPickerAt", {
@@ -462,8 +462,8 @@ var _actions2 = require("./plugins/status/actions");
 var _typeAhead = require("./plugins/type-ahead");
 var _history = require("./plugins/history");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _commands4 = require("./plugins/base/commands");
-var _commands5 = require("./plugins/mobile-dimensions/commands");
+var _editorPluginBase = require("@atlaskit/editor-plugin-base");
+var _commands4 = require("./plugins/mobile-dimensions/commands");
 var _utils = require("./utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _createEditor = require("./create-editor");
@@ -471,7 +471,7 @@ var _actions3 = _interopRequireDefault(require("./actions"));
 var _portalProvider = require("@atlaskit/editor-common/portal-provider");
 var _selection = require("@atlaskit/editor-common/selection");
 var _mobileSelection = require("./plugins/mobile-selection");
-var _commands6 = require("./plugins/expand/commands");
+var _commands5 = require("./plugins/expand/commands");
 var _WithPluginState = _interopRequireDefault(require("./ui/WithPluginState"));
 var _statusColorPalette = require("./ui/ColorPalette/Palettes/statusColorPalette");
 var _common = require("./ui/ColorPalette/Palettes/common");

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

@@ -13,7 +13,7 @@ var _editorPluginHyperlink = require("@atlaskit/editor-plugin-hyperlink");
 var _editorPluginTextFormatting = require("@atlaskit/editor-plugin-text-formatting");
 var _editorPluginWidth = require("@atlaskit/editor-plugin-width");
 var _editorPluginUnsupportedContent = require("@atlaskit/editor-plugin-unsupported-content");
-var _base = require("../../../plugins/base");
+var _editorPluginBase = require("@atlaskit/editor-plugin-base");
 var _editorPluginFocus = require("@atlaskit/editor-plugin-focus");
 var _editorPluginEditorDisabled = require("@atlaskit/editor-plugin-editor-disabled");
 var _typeAhead = _interopRequireDefault(require("../../../plugins/type-ahead"));
@@ -63,7 +63,7 @@ function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).add([_paste.default, options.paste]).add(_clipboard.default).add(_editorPluginFocus.focusPlugin).add(_editorPluginComposition.compositionPlugin).add([_base.basePlugin, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
+  }).add([_paste.default, options.paste]).add(_clipboard.default).add(_editorPluginFocus.focusPlugin).add(_editorPluginComposition.compositionPlugin).add([_editorPluginBase.basePlugin, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin
     if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {

package/dist/cjs/plugins/alignment/ui/ToolbarAlignment/index.js

@@ -23,8 +23,6 @@ var _styles = require("./styles");
 var _styles2 = require("@atlaskit/editor-common/styles");
 var _iconMap = require("./icon-map");
 var _messages = require("./messages");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; } } /** @jsx jsx */
 var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
@@ -39,8 +37,7 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "toolbarItemRef", /*#__PURE__*/_react.default.createRef());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
-      isOpen: false,
-      isOpenedByKeyboard: false
+      isOpen: false
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "changeAlignment", function (align, togglePopup) {
       if (togglePopup) {
@@ -50,16 +47,14 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "toggleOpen", function () {
       _this.setState({
-        isOpen: !_this.state.isOpen,
-        isOpenedByKeyboard: false
+        isOpen: !_this.state.isOpen
       });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "toggleOpenByKeyboard", function (event) {
       if (event.key === 'Enter' || event.key === ' ') {
         event.preventDefault();
         _this.setState({
-          isOpen: !_this.state.isOpen,
-          isOpenedByKeyboard: true
+          isOpen: !_this.state.isOpen
         });
       }
     });
@@ -85,9 +80,7 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$state = this.state,
-        isOpen = _this$state.isOpen,
-        isOpenedByKeyboard = _this$state.isOpenedByKeyboard;
+      var isOpen = this.state.isOpen;
       var _this$props = this.props,
         popupsMountPoint = _this$props.popupsMountPoint,
         popupsBoundariesElement = _this$props.popupsBoundariesElement,
@@ -104,14 +97,6 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,
         isOpen: isOpen,
-        shouldFocusFirstItem: function shouldFocusFirstItem() {
-          if (isOpenedByKeyboard) {
-            _this2.setState(_objectSpread(_objectSpread({}, _this2.state), {}, {
-              isOpenedByKeyboard: false
-            }));
-          }
-          return isOpenedByKeyboard;
-        },
         onOpenChange: function onOpenChange(_ref) {
           var isOpen = _ref.isOpen;
           _this2.setState({
@@ -127,6 +112,9 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
           }
         },
         handleEscapeKeydown: this.hideOnEscape,
+        arrowKeyNavigationProviderOptions: {
+          type: _uiMenu.ArrowKeyNavigationType.MENU
+        },
         fitWidth: 112,
         fitHeight: 80,
         closeOnTab: true,
@@ -165,7 +153,7 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       var _this3 = this;
-      if (this.state.isOpen && this.state.isOpenedByKeyboard) {
+      if (this.state.isOpen) {
         // by triggering the keyboard event with a setTimeout, we ensure that the tooltip
         // associated with the alignment button doesn't render until the next render cycle
         // where the popup will be correctly positioned and the relative position of the tooltip

package/dist/cjs/plugins/floating-toolbar/ui/Dropdown.js

@@ -120,7 +120,6 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         tooltip = _this$props2.tooltip,
         buttonTestId = _this$props2.buttonTestId,
         dropdownWidth = _this$props2.dropdownWidth,
-        editorView = _this$props2.editorView,
         dropdownListId = _this$props2.dropdownListId,
         alignDropdownWithToolbar = _this$props2.alignDropdownWithToolbar;
       var trigger;
@@ -164,7 +163,6 @@ var Dropdown = /*#__PURE__*/function (_Component) {
       var fitWidth = Array.isArray(options) ? dropdownWidth || _DropdownMenu.menuItemDimensions.width : options.width;
       var fitHeight = Array.isArray(options) ? options.length * _DropdownMenu.menuItemDimensions.height + _DropdownMenu.itemSpacing * 2 : options.height;
       return (0, _react2.jsx)(_uiMenu.DropdownContainer, {
-        ref: this.triggerRef,
         mountTo: mountPoint,
         boundariesElement: boundariesElement,
         scrollableElement: scrollableElement,
@@ -175,9 +173,11 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         fitWidth: fitWidth + fitTolerance,
         fitHeight: fitHeight + fitTolerance,
         trigger: trigger,
-        editorView: editorView,
         dropdownListId: dropdownListId,
-        alignDropdownWithParentElement: alignDropdownWithToolbar
+        alignDropdownWithParentElement: alignDropdownWithToolbar,
+        arrowKeyNavigationProviderOptions: {
+          type: _uiMenu.ArrowKeyNavigationType.MENU
+        }
       }, Array.isArray(options) ? this.renderArrayOptions(options) : options.render({
         hide: this.hide,
         dispatchCommand: dispatchCommand

package/dist/cjs/plugins/index.js

@@ -29,12 +29,6 @@ Object.defineProperty(exports, "avatarGroupPlugin", {
     return _avatarGroup.default;
   }
 });
-Object.defineProperty(exports, "basePlugin", {
-  enumerable: true,
-  get: function get() {
-    return _base.basePlugin;
-  }
-});
 Object.defineProperty(exports, "beforePrimaryToolbarPlugin", {
   enumerable: true,
   get: function get() {
@@ -317,7 +311,6 @@ Object.defineProperty(exports, "viewUpdateSubscriptionPlugin", {
     return _viewUpdateSubscription.default;
   }
 });
-var _base = require("./base");
 var _betterTypeHistory = _interopRequireDefault(require("./better-type-history"));
 var _clearMarksOnChangeToEmptyDocument = _interopRequireDefault(require("./clear-marks-on-change-to-empty-document"));
 var _codeBlock = _interopRequireDefault(require("./code-block"));

package/dist/cjs/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -22,7 +22,6 @@ var _editorPalette = require("@atlaskit/editor-palette");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
 var _ColorPalette = _interopRequireWildcard(require("../../../../ui/ColorPalette"));
-var _Dropdown = _interopRequireDefault(require("../../../../ui/Dropdown"));
 var _styles = require("../../../../ui/styles");
 var _styles2 = require("@atlaskit/editor-common/styles");
 var _ToolbarButton = _interopRequireWildcard(require("../../../../ui/ToolbarButton"));
@@ -185,7 +184,7 @@ var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
         selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
       return (0, _react2.jsx)("span", {
         css: _styles2.wrapperStyle
-      }, (0, _react2.jsx)(_Dropdown.default, {
+      }, (0, _react2.jsx)(_uiMenu.DropdownContainer, {
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,

package/dist/cjs/test-utils.js

@@ -39,7 +39,7 @@ var _preset = require("@atlaskit/editor-common/preset");
 var _createSchema = require("./create-editor/create-schema");
 var _sortByOrder = require("./create-editor/sort-by-order");
 var _pluginKey = require("./plugins/analytics/plugin-key");
-var _base = require("./plugins/base");
+var _editorPluginBase = require("@atlaskit/editor-plugin-base");
 var _api = require("./plugins/type-ahead/api");
 var _eventDispatcher = require("./event-dispatcher");
 var _selection = require("@atlaskit/editor-common/selection");
@@ -104,7 +104,7 @@ var createPMSchemaAndPlugins = function createPMSchemaAndPlugins() {
   var inputPreset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new _preset.EditorPresetBuilder();
   return function (pluginFactoryParams) {
     var editorPlugins = [];
-    var preset = inputPreset.has(_base.basePlugin) ? inputPreset : inputPreset.add(_base.basePlugin);
+    var preset = inputPreset.has(_editorPluginBase.basePlugin) ? inputPreset : inputPreset.add(_editorPluginBase.basePlugin);
     editorPlugins = preset.build({
       pluginInjectionAPI: pluginFactoryParams.pluginInjectionAPI
     });

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.47.6";
+var version = "187.48.0";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/es2019/editor-next/index.js

@@ -6,7 +6,7 @@ import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-con
 import { ACTION, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { getAnalyticsAppearance, startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
-import { basePlugin } from '../plugins';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 import EditorActions from '../actions';
 import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
 import { name, version } from '../version-wrapper';

package/dist/es2019/index.js

@@ -41,7 +41,7 @@ export { commitStatusPicker, setStatusPickerAt, updateStatus, updateStatusWithAn
 export { typeAheadPluginKey } from './plugins/type-ahead';
 export { historyPluginKey } from './plugins/history';
 export { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-export { setKeyboardHeight } from './plugins/base/commands';
+export { setKeyboardHeight } from '@atlaskit/editor-plugin-base';
 export { setMobilePaddingTop, setIsExpanded } from './plugins/mobile-dimensions/commands';
 
 // Used in editor-test-helpers and mobile bridge

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

@@ -7,7 +7,7 @@ import { hyperlinkPlugin } from '@atlaskit/editor-plugin-hyperlink';
 import { textFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import { unsupportedContentPlugin } from '@atlaskit/editor-plugin-unsupported-content';
-import { basePlugin } from '../../../plugins/base';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 import { focusPlugin } from '@atlaskit/editor-plugin-focus';
 import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import typeAheadPlugin from '../../../plugins/type-ahead';

package/dist/es2019/plugins/alignment/ui/ToolbarAlignment/index.js

@@ -5,7 +5,7 @@ import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ToolbarButton from '../../../../ui/ToolbarButton';
-import { DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
+import { ArrowKeyNavigationType, DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
 import Alignment from '../../../../ui/Alignment';
 import { expandIconWrapper, triggerWrapper, wrapper } from './styles';
 import { separatorStyles } from '@atlaskit/editor-common/styles';
@@ -16,8 +16,7 @@ export class AlignmentToolbar extends React.Component {
     super(...args);
     _defineProperty(this, "toolbarItemRef", /*#__PURE__*/React.createRef());
     _defineProperty(this, "state", {
-      isOpen: false,
-      isOpenedByKeyboard: false
+      isOpen: false
     });
     _defineProperty(this, "changeAlignment", (align, togglePopup) => {
       if (togglePopup) {
@@ -27,16 +26,14 @@ export class AlignmentToolbar extends React.Component {
     });
     _defineProperty(this, "toggleOpen", () => {
       this.setState({
-        isOpen: !this.state.isOpen,
-        isOpenedByKeyboard: false
+        isOpen: !this.state.isOpen
       });
     });
     _defineProperty(this, "toggleOpenByKeyboard", event => {
       if (event.key === 'Enter' || event.key === ' ') {
         event.preventDefault();
         this.setState({
-          isOpen: !this.state.isOpen,
-          isOpenedByKeyboard: true
+          isOpen: !this.state.isOpen
         });
       }
     });
@@ -59,8 +56,7 @@ export class AlignmentToolbar extends React.Component {
   }
   render() {
     const {
-      isOpen,
-      isOpenedByKeyboard
+      isOpen
     } = this.state;
     const {
       popupsMountPoint,
@@ -79,15 +75,6 @@ export class AlignmentToolbar extends React.Component {
       boundariesElement: popupsBoundariesElement,
       scrollableElement: popupsScrollableElement,
       isOpen: isOpen,
-      shouldFocusFirstItem: () => {
-        if (isOpenedByKeyboard) {
-          this.setState({
-            ...this.state,
-            isOpenedByKeyboard: false
-          });
-        }
-        return isOpenedByKeyboard;
-      },
       onOpenChange: ({
         isOpen
       }) => {
@@ -104,6 +91,9 @@ export class AlignmentToolbar extends React.Component {
         }
       },
       handleEscapeKeydown: this.hideOnEscape,
+      arrowKeyNavigationProviderOptions: {
+        type: ArrowKeyNavigationType.MENU
+      },
       fitWidth: 112,
       fitHeight: 80,
       closeOnTab: true,
@@ -137,7 +127,7 @@ export class AlignmentToolbar extends React.Component {
     }));
   }
   componentDidUpdate(prevProps) {
-    if (this.state.isOpen && this.state.isOpenedByKeyboard) {
+    if (this.state.isOpen) {
       // by triggering the keyboard event with a setTimeout, we ensure that the tooltip
       // associated with the alignment button doesn't render until the next render cycle
       // where the popup will be correctly positioned and the relative position of the tooltip

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

@@ -4,7 +4,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { Component } from 'react';
 import { css, jsx } from '@emotion/react';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
-import { DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
+import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import DropdownMenu, { itemSpacing, menuItemDimensions } from './DropdownMenu';
 const dropdownExpandContainer = css`
@@ -96,7 +96,6 @@ export default class Dropdown extends Component {
       tooltip,
       buttonTestId,
       dropdownWidth,
-      editorView,
       dropdownListId,
       alignDropdownWithToolbar
     } = this.props;
@@ -141,7 +140,6 @@ export default class Dropdown extends Component {
     const fitWidth = Array.isArray(options) ? dropdownWidth || menuItemDimensions.width : options.width;
     const fitHeight = Array.isArray(options) ? options.length * menuItemDimensions.height + itemSpacing * 2 : options.height;
     return jsx(UiDropdown, {
-      ref: this.triggerRef,
       mountTo: mountPoint,
       boundariesElement: boundariesElement,
       scrollableElement: scrollableElement,
@@ -152,9 +150,11 @@ export default class Dropdown extends Component {
       fitWidth: fitWidth + fitTolerance,
       fitHeight: fitHeight + fitTolerance,
       trigger: trigger,
-      editorView: editorView,
       dropdownListId: dropdownListId,
-      alignDropdownWithParentElement: alignDropdownWithToolbar
+      alignDropdownWithParentElement: alignDropdownWithToolbar,
+      arrowKeyNavigationProviderOptions: {
+        type: ArrowKeyNavigationType.MENU
+      }
     }, Array.isArray(options) ? this.renderArrayOptions(options) : options.render({
       hide: this.hide,
       dispatchCommand

package/dist/es2019/plugins/index.js

@@ -1,4 +1,3 @@
-export { basePlugin } from './base';
 export { default as betterTypeHistoryPlugin } from './better-type-history';
 export { default as clearMarksOnChangeToEmptyDocumentPlugin } from './clear-marks-on-change-to-empty-document';
 export { default as codeBlockPlugin } from './code-block';

package/dist/es2019/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -9,7 +9,7 @@ import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ColorPalette, { textPaletteTooltipMessages } from '../../../../ui/ColorPalette';
-import Dropdown from '../../../../ui/Dropdown';
+import { DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
 import { expandIconWrapperStyle } from '../../../../ui/styles';
 import { wrapperStyle, separatorStyles, triggerWrapperStyles } from '@atlaskit/editor-common/styles';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';

package/dist/es2019/test-utils.js

@@ -3,7 +3,7 @@ import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import { createSchema } from './create-editor/create-schema';
 import { sortByOrder } from './create-editor/sort-by-order';
 import { analyticsPluginKey } from './plugins/analytics/plugin-key';
-import { basePlugin } from './plugins/base';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 export { createTypeAheadTools } from './plugins/type-ahead/api';
 export function getFireAnalytics(editorView) {
   var _analyticsPluginKey$g;

package/dist/es2019/version-wrapper.js

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

package/dist/esm/editor-next/index.js

@@ -9,7 +9,7 @@ import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-con
 import { ACTION, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { getAnalyticsAppearance, startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
-import { basePlugin } from '../plugins';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 import EditorActions from '../actions';
 import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
 import { name, version } from '../version-wrapper';

package/dist/esm/index.js

@@ -41,7 +41,7 @@ export { commitStatusPicker, setStatusPickerAt, updateStatus, updateStatusWithAn
 export { typeAheadPluginKey } from './plugins/type-ahead';
 export { historyPluginKey } from './plugins/history';
 export { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-export { setKeyboardHeight } from './plugins/base/commands';
+export { setKeyboardHeight } from '@atlaskit/editor-plugin-base';
 export { setMobilePaddingTop, setIsExpanded } from './plugins/mobile-dimensions/commands';
 
 // Used in editor-test-helpers and mobile bridge

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

@@ -7,7 +7,7 @@ import { hyperlinkPlugin } from '@atlaskit/editor-plugin-hyperlink';
 import { textFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import { unsupportedContentPlugin } from '@atlaskit/editor-plugin-unsupported-content';
-import { basePlugin } from '../../../plugins/base';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 import { focusPlugin } from '@atlaskit/editor-plugin-focus';
 import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import typeAheadPlugin from '../../../plugins/type-ahead';

package/dist/esm/plugins/alignment/ui/ToolbarAlignment/index.js

@@ -5,8 +5,6 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /** @jsx jsx */
@@ -15,7 +13,7 @@ import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ToolbarButton from '../../../../ui/ToolbarButton';
-import { DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
+import { ArrowKeyNavigationType, DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
 import Alignment from '../../../../ui/Alignment';
 import { expandIconWrapper, triggerWrapper, wrapper } from './styles';
 import { separatorStyles } from '@atlaskit/editor-common/styles';
@@ -33,8 +31,7 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "toolbarItemRef", /*#__PURE__*/React.createRef());
     _defineProperty(_assertThisInitialized(_this), "state", {
-      isOpen: false,
-      isOpenedByKeyboard: false
+      isOpen: false
     });
     _defineProperty(_assertThisInitialized(_this), "changeAlignment", function (align, togglePopup) {
       if (togglePopup) {
@@ -44,16 +41,14 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_assertThisInitialized(_this), "toggleOpen", function () {
       _this.setState({
-        isOpen: !_this.state.isOpen,
-        isOpenedByKeyboard: false
+        isOpen: !_this.state.isOpen
       });
     });
     _defineProperty(_assertThisInitialized(_this), "toggleOpenByKeyboard", function (event) {
       if (event.key === 'Enter' || event.key === ' ') {
         event.preventDefault();
         _this.setState({
-          isOpen: !_this.state.isOpen,
-          isOpenedByKeyboard: true
+          isOpen: !_this.state.isOpen
         });
       }
     });
@@ -79,9 +74,7 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$state = this.state,
-        isOpen = _this$state.isOpen,
-        isOpenedByKeyboard = _this$state.isOpenedByKeyboard;
+      var isOpen = this.state.isOpen;
       var _this$props = this.props,
         popupsMountPoint = _this$props.popupsMountPoint,
         popupsBoundariesElement = _this$props.popupsBoundariesElement,
@@ -98,14 +91,6 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,
         isOpen: isOpen,
-        shouldFocusFirstItem: function shouldFocusFirstItem() {
-          if (isOpenedByKeyboard) {
-            _this2.setState(_objectSpread(_objectSpread({}, _this2.state), {}, {
-              isOpenedByKeyboard: false
-            }));
-          }
-          return isOpenedByKeyboard;
-        },
         onOpenChange: function onOpenChange(_ref) {
           var isOpen = _ref.isOpen;
           _this2.setState({
@@ -121,6 +106,9 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
           }
         },
         handleEscapeKeydown: this.hideOnEscape,
+        arrowKeyNavigationProviderOptions: {
+          type: ArrowKeyNavigationType.MENU
+        },
         fitWidth: 112,
         fitHeight: 80,
         closeOnTab: true,
@@ -159,7 +147,7 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       var _this3 = this;
-      if (this.state.isOpen && this.state.isOpenedByKeyboard) {
+      if (this.state.isOpen) {
         // by triggering the keyboard event with a setTimeout, we ensure that the tooltip
         // associated with the alignment button doesn't render until the next render cycle
         // where the popup will be correctly positioned and the relative position of the tooltip