@atlaskit/editor-core 188.5.2 → 188.7.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-core
 
+## 188.7.0
+
+### Minor Changes
+
+- [#41355](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41355) [`150c2a815ac`](https://bitbucket.org/atlassian/atlassian-frontend/commits/150c2a815ac) - Editor now forcibly sets position static on its dropdown menu items.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 188.6.0
+
+### Minor Changes
+
+- [#41341](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41341) [`bd128fb1cfb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/bd128fb1cfb) - Decouple status plugin from editor-core. Add new actions for updating status.
+
 ## 188.5.2
 
 ### Patch Changes

package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -26,7 +26,6 @@ var _actions = require("../../../placeholder-text/actions");
 var _actions2 = require("../../../layout/actions");
 var _commands = require("../../../tasks-and-decisions/commands");
 var _commands2 = require("../../../expand/commands");
-var _actions3 = require("../../../status/actions");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("./messages");
 var _createItems3 = require("./create-items");
@@ -220,14 +219,16 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       return true;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createStatus", function (inputMethod) {
-      var editorView = _this.props.editorView;
-      (0, _actions3.updateStatusWithAnalytics)(inputMethod)(editorView.state, editorView.dispatch);
-      return true;
+      var _pluginInjectionApi$s, _pluginInjectionApi$s2;
+      var _this$props4 = _this.props,
+        pluginInjectionApi = _this$props4.pluginInjectionApi,
+        editorView = _this$props4.editorView;
+      return (_pluginInjectionApi$s = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$s2 = pluginInjectionApi.status) === null || _pluginInjectionApi$s2 === void 0 || (_pluginInjectionApi$s2 = _pluginInjectionApi$s2.actions) === null || _pluginInjectionApi$s2 === void 0 ? void 0 : _pluginInjectionApi$s2.updateStatus(inputMethod)(editorView.state, editorView.dispatch)) !== null && _pluginInjectionApi$s !== void 0 ? _pluginInjectionApi$s : false;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "openMediaPicker", function (inputMethod) {
-      var _this$props4 = _this.props,
-        onShowMediaPicker = _this$props4.onShowMediaPicker,
-        dispatchAnalyticsEvent = _this$props4.dispatchAnalyticsEvent;
+      var _this$props5 = _this.props,
+        onShowMediaPicker = _this$props5.onShowMediaPicker,
+        dispatchAnalyticsEvent = _this$props5.dispatchAnalyticsEvent;
       if (onShowMediaPicker) {
         onShowMediaPicker();
         if (dispatchAnalyticsEvent) {
@@ -255,11 +256,11 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertHorizontalRule", function (inputMethod) {
       var _pluginInjectionApi$r, _pluginInjectionApi$r2;
-      var _this$props5 = _this.props,
-        _this$props5$editorVi = _this$props5.editorView,
-        state = _this$props5$editorVi.state,
-        dispatch = _this$props5$editorVi.dispatch,
-        pluginInjectionApi = _this$props5.pluginInjectionApi;
+      var _this$props6 = _this.props,
+        _this$props6$editorVi = _this$props6.editorView,
+        state = _this$props6$editorVi.state,
+        dispatch = _this$props6$editorVi.dispatch,
+        pluginInjectionApi = _this$props6.pluginInjectionApi;
       return (_pluginInjectionApi$r = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$r2 = pluginInjectionApi.rule) === null || _pluginInjectionApi$r2 === void 0 ? void 0 : _pluginInjectionApi$r2.actions.insertHorizontalRule(inputMethod)(state, dispatch)) !== null && _pluginInjectionApi$r !== void 0 ? _pluginInjectionApi$r : false;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertExpand", function () {
@@ -270,9 +271,9 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertBlockType", function (itemName) {
       return function () {
-        var _this$props6 = _this.props,
-          editorView = _this$props6.editorView,
-          onInsertBlockType = _this$props6.onInsertBlockType;
+        var _this$props7 = _this.props,
+          editorView = _this$props7.editorView,
+          onInsertBlockType = _this$props7.onInsertBlockType;
         var state = editorView.state,
           dispatch = editorView.dispatch;
         onInsertBlockType(itemName)(state, dispatch);
@@ -295,11 +296,11 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onItemActivated", function (_ref2) {
       var item = _ref2.item,
         inputMethod = _ref2.inputMethod;
-      var _this$props7 = _this.props,
-        editorView = _this$props7.editorView,
-        editorActions = _this$props7.editorActions,
-        handleImageUpload = _this$props7.handleImageUpload,
-        expandEnabled = _this$props7.expandEnabled;
+      var _this$props8 = _this.props,
+        editorView = _this$props8.editorView,
+        editorActions = _this$props8.editorActions,
+        handleImageUpload = _this$props8.handleImageUpload,
+        expandEnabled = _this$props8.expandEnabled;
 
       // need to do this before inserting nodes so scrollIntoView works properly
       if (!editorView.hasFocus()) {
@@ -415,12 +416,12 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     key: "renderPopup",
     value: function renderPopup() {
       var emojiPickerOpen = this.state.emojiPickerOpen;
-      var _this$props8 = this.props,
-        popupsMountPoint = _this$props8.popupsMountPoint,
-        popupsBoundariesElement = _this$props8.popupsBoundariesElement,
-        popupsScrollableElement = _this$props8.popupsScrollableElement,
-        emojiProvider = _this$props8.emojiProvider,
-        replacePlusMenuWithElementBrowser = _this$props8.replacePlusMenuWithElementBrowser;
+      var _this$props9 = this.props,
+        popupsMountPoint = _this$props9.popupsMountPoint,
+        popupsBoundariesElement = _this$props9.popupsBoundariesElement,
+        popupsScrollableElement = _this$props9.popupsScrollableElement,
+        emojiProvider = _this$props9.emojiProvider,
+        replacePlusMenuWithElementBrowser = _this$props9.replacePlusMenuWithElementBrowser;
       var dropdownEmoji = this.state.dropdownItems.some(function (_ref4) {
         var name = _ref4.value.name;
         return name === 'emoji';
@@ -457,9 +458,9 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         buttons = _this$state.buttons,
         dropdownItems = _this$state.dropdownItems,
         emojiPickerOpen = _this$state.emojiPickerOpen;
-      var _this$props9 = this.props,
-        isDisabled = _this$props9.isDisabled,
-        isReducedSpacing = _this$props9.isReducedSpacing;
+      var _this$props10 = this.props,
+        isDisabled = _this$props10.isDisabled,
+        isReducedSpacing = _this$props10.isReducedSpacing;
       if (buttons.length === 0 && dropdownItems.length === 0) {
         return null;
       }

package/dist/cjs/plugins/status/actions.js

@@ -9,7 +9,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _adfSchema = require("@atlaskit/adf-schema");
-var _analytics = require("../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _pluginKey = require("./plugin-key");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 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; }
@@ -78,16 +79,18 @@ var updateStatus = exports.updateStatus = function updateStatus(status) {
     return false;
   };
 };
-var updateStatusWithAnalytics = exports.updateStatusWithAnalytics = function updateStatusWithAnalytics(inputMethod, status) {
-  return (0, _analytics.withAnalytics)({
-    action: _analytics.ACTION.INSERTED,
-    actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.STATUS,
-    attributes: {
-      inputMethod: inputMethod
-    },
-    eventType: _analytics.EVENT_TYPE.TRACK
-  })(updateStatus(status));
+var updateStatusWithAnalytics = exports.updateStatusWithAnalytics = function updateStatusWithAnalytics(editorAnalyticsAPI) {
+  return function (inputMethod, status) {
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: _analytics.ACTION.INSERTED,
+      actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.STATUS,
+      attributes: {
+        inputMethod: inputMethod
+      },
+      eventType: _analytics.EVENT_TYPE.TRACK
+    })(updateStatus(status));
+  };
 };
 var setStatusPickerAt = exports.setStatusPickerAt = function setStatusPickerAt(showStatusPickerAt) {
   return function (state, dispatch) {

package/dist/cjs/plugins/status/index.js

@@ -8,8 +8,8 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _adfSchema = require("@atlaskit/adf-schema");
-var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
-var _analytics = require("../analytics");
+var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _actions = require("./actions");
@@ -18,7 +18,9 @@ var _plugin = _interopRequireDefault(require("./plugin"));
 var _pluginKey = require("./plugin-key");
 var _statusPicker = _interopRequireDefault(require("./ui/statusPicker"));
 var baseStatusPlugin = function baseStatusPlugin(_ref) {
-  var options = _ref.config;
+  var _api$analytics;
+  var options = _ref.config,
+    api = _ref.api;
   return {
     name: 'status',
     nodes: function nodes() {
@@ -38,13 +40,17 @@ var baseStatusPlugin = function baseStatusPlugin(_ref) {
         plugin: _keymap.keymapPlugin
       }];
     },
+    actions: {
+      commitStatusPicker: _actions.commitStatusPicker,
+      updateStatus: (0, _actions.updateStatusWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+    },
     contentComponent: function contentComponent(_ref2) {
       var editorView = _ref2.editorView,
         popupsMountPoint = _ref2.popupsMountPoint,
         popupsBoundariesElement = _ref2.popupsBoundariesElement,
         popupsScrollableElement = _ref2.popupsScrollableElement;
       var domAtPos = editorView.domAtPos.bind(editorView);
-      return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
+      return /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
         plugins: {
           statusState: _pluginKey.pluginKey
         },
@@ -91,7 +97,7 @@ var baseStatusPlugin = function baseStatusPlugin(_ref) {
     }
   };
 };
-var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, options) {
+var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, options, api) {
   if ((options === null || options === void 0 ? void 0 : options.menuDisabled) === true) {
     return plugin;
   }
@@ -108,7 +114,9 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
           return /*#__PURE__*/_react.default.createElement(_quickInsert.IconStatus, null);
         },
         action: function action(insert, state) {
-          return (0, _analytics.addAnalytics)(state, (0, _actions.createStatus)()(insert, state), {
+          var _api$analytics2;
+          var tr = (0, _actions.createStatus)()(insert, state);
+          api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
             action: _analytics.ACTION.INSERTED,
             actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
             actionSubjectId: _analytics.ACTION_SUBJECT_ID.STATUS,
@@ -116,7 +124,8 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
               inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
             },
             eventType: _analytics.EVENT_TYPE.TRACK
-          });
+          })(tr);
+          return tr;
         }
       }];
     }
@@ -129,6 +138,6 @@ var statusPlugin = function statusPlugin(_ref5) {
   return decorateWithPluginOptions(baseStatusPlugin({
     config: options,
     api: api
-  }), options);
+  }), options, api);
 };
 var _default = exports.default = statusPlugin;

package/dist/cjs/plugins/status/keymap.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.keymapPlugin = keymapPlugin;
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _keymaps = require("../../keymaps");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _utils = require("./utils");
 function keymapPlugin() {
   var list = {};

package/dist/cjs/plugins/status/ui/statusPicker.js

@@ -21,14 +21,14 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _picker = require("@atlaskit/status/picker");
 var _constants = require("@atlaskit/theme/constants");
 var _colors = require("@atlaskit/theme/colors");
-var _withOuterListeners = _interopRequireDefault(require("../../../ui/with-outer-listeners"));
+var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _actions = require("../actions");
 var _analytics = require("../analytics");
 var _templateObject;
 /** @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 PopupWithListeners = (0, _withOuterListeners.default)(_ui.Popup);
+var PopupWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_ui.Popup);
 var InputMethod = exports.InputMethod = /*#__PURE__*/function (InputMethod) {
   InputMethod["blur"] = "blur";
   InputMethod["escKey"] = "escKey";

package/dist/cjs/version-wrapper.js

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

package/dist/es2019/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -13,7 +13,6 @@ import { showPlaceholderFloatingToolbar } from '../../../placeholder-text/action
 import { insertLayoutColumnsWithAnalytics } from '../../../layout/actions';
 import { insertTaskDecisionCommand } from '../../../tasks-and-decisions/commands';
 import { insertExpand } from '../../../expand/commands';
-import { updateStatusWithAnalytics } from '../../../status/actions';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from './messages';
 import { createItems } from './create-items';
@@ -212,11 +211,12 @@ export class ToolbarInsertBlock extends React.PureComponent {
       return true;
     });
     _defineProperty(this, "createStatus", inputMethod => {
+      var _pluginInjectionApi$s, _pluginInjectionApi$s2, _pluginInjectionApi$s3;
       const {
+        pluginInjectionApi,
         editorView
       } = this.props;
-      updateStatusWithAnalytics(inputMethod)(editorView.state, editorView.dispatch);
-      return true;
+      return (_pluginInjectionApi$s = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$s2 = pluginInjectionApi.status) === null || _pluginInjectionApi$s2 === void 0 ? void 0 : (_pluginInjectionApi$s3 = _pluginInjectionApi$s2.actions) === null || _pluginInjectionApi$s3 === void 0 ? void 0 : _pluginInjectionApi$s3.updateStatus(inputMethod)(editorView.state, editorView.dispatch)) !== null && _pluginInjectionApi$s !== void 0 ? _pluginInjectionApi$s : false;
     });
     _defineProperty(this, "openMediaPicker", inputMethod => {
       const {

package/dist/es2019/plugins/status/actions.js

@@ -1,7 +1,8 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { uuid } from '@atlaskit/adf-schema';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, withAnalytics } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { pluginKey } from './plugin-key';
 import { canInsert } from '@atlaskit/editor-prosemirror/utils';
 export const DEFAULT_STATUS = {
@@ -70,7 +71,7 @@ export const updateStatus = status => (state, dispatch) => {
   }
   return false;
 };
-export const updateStatusWithAnalytics = (inputMethod, status) => withAnalytics({
+export const updateStatusWithAnalytics = editorAnalyticsAPI => (inputMethod, status) => withAnalytics(editorAnalyticsAPI, {
   action: ACTION.INSERTED,
   actionSubject: ACTION_SUBJECT.DOCUMENT,
   actionSubjectId: ACTION_SUBJECT_ID.STATUS,

package/dist/es2019/plugins/status/index.js

@@ -1,91 +1,99 @@
 import React from 'react';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { status } from '@atlaskit/adf-schema';
-import WithPluginState from '../../ui/WithPluginState';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
+import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { IconStatus } from '@atlaskit/editor-common/quick-insert';
-import { commitStatusPicker, createStatus, updateStatus } from './actions';
+import { updateStatusWithAnalytics, commitStatusPicker, createStatus, updateStatus } from './actions';
 import { keymapPlugin } from './keymap';
 import createStatusPlugin from './plugin';
 import { pluginKey } from './plugin-key';
 import StatusPicker from './ui/statusPicker';
 const baseStatusPlugin = ({
-  config: options
-}) => ({
-  name: 'status',
-  nodes() {
-    return [{
-      name: 'status',
-      node: status
-    }];
-  },
-  pmPlugins() {
-    return [{
-      name: 'status',
-      plugin: pmPluginFactoryParams => createStatusPlugin(pmPluginFactoryParams, options)
-    }, {
-      name: 'statusKeymap',
-      plugin: keymapPlugin
-    }];
-  },
-  contentComponent({
-    editorView,
-    popupsMountPoint,
-    popupsBoundariesElement,
-    popupsScrollableElement
-  }) {
-    const domAtPos = editorView.domAtPos.bind(editorView);
-    return /*#__PURE__*/React.createElement(WithPluginState, {
-      plugins: {
-        statusState: pluginKey
-      },
-      render: ({
-        statusState = {}
-      }) => {
-        const {
-          showStatusPickerAt
-        } = statusState;
-        if (typeof showStatusPickerAt !== 'number') {
-          return null;
-        }
-        const target = findDomRefAtPos(showStatusPickerAt, domAtPos);
-        const statusNode = editorView.state.doc.nodeAt(showStatusPickerAt);
-        if (!statusNode || statusNode.type.name !== 'status') {
-          return null;
-        }
-        const {
-          text,
-          color,
-          localId
-        } = statusNode.attrs;
-        return /*#__PURE__*/React.createElement(StatusPicker, {
-          isNew: statusState.isNew,
-          target: target,
-          defaultText: text,
-          defaultColor: color,
-          defaultLocalId: localId,
-          mountTo: popupsMountPoint,
-          boundariesElement: popupsBoundariesElement,
-          scrollableElement: popupsScrollableElement,
-          onSelect: status => {
-            updateStatus(status)(editorView.state, editorView.dispatch);
-          },
-          onTextChanged: status => {
-            updateStatus(status)(editorView.state, editorView.dispatch);
-          },
-          closeStatusPicker: closingPayload => {
-            commitStatusPicker(closingPayload)(editorView);
-          },
-          onEnter: () => {
-            commitStatusPicker()(editorView);
+  config: options,
+  api
+}) => {
+  var _api$analytics;
+  return {
+    name: 'status',
+    nodes() {
+      return [{
+        name: 'status',
+        node: status
+      }];
+    },
+    pmPlugins() {
+      return [{
+        name: 'status',
+        plugin: pmPluginFactoryParams => createStatusPlugin(pmPluginFactoryParams, options)
+      }, {
+        name: 'statusKeymap',
+        plugin: keymapPlugin
+      }];
+    },
+    actions: {
+      commitStatusPicker,
+      updateStatus: updateStatusWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+    },
+    contentComponent({
+      editorView,
+      popupsMountPoint,
+      popupsBoundariesElement,
+      popupsScrollableElement
+    }) {
+      const domAtPos = editorView.domAtPos.bind(editorView);
+      return /*#__PURE__*/React.createElement(WithPluginState, {
+        plugins: {
+          statusState: pluginKey
+        },
+        render: ({
+          statusState = {}
+        }) => {
+          const {
+            showStatusPickerAt
+          } = statusState;
+          if (typeof showStatusPickerAt !== 'number') {
+            return null;
           }
-        });
-      }
-    });
-  }
-});
-const decorateWithPluginOptions = (plugin, options) => {
+          const target = findDomRefAtPos(showStatusPickerAt, domAtPos);
+          const statusNode = editorView.state.doc.nodeAt(showStatusPickerAt);
+          if (!statusNode || statusNode.type.name !== 'status') {
+            return null;
+          }
+          const {
+            text,
+            color,
+            localId
+          } = statusNode.attrs;
+          return /*#__PURE__*/React.createElement(StatusPicker, {
+            isNew: statusState.isNew,
+            target: target,
+            defaultText: text,
+            defaultColor: color,
+            defaultLocalId: localId,
+            mountTo: popupsMountPoint,
+            boundariesElement: popupsBoundariesElement,
+            scrollableElement: popupsScrollableElement,
+            onSelect: status => {
+              updateStatus(status)(editorView.state, editorView.dispatch);
+            },
+            onTextChanged: status => {
+              updateStatus(status)(editorView.state, editorView.dispatch);
+            },
+            closeStatusPicker: closingPayload => {
+              commitStatusPicker(closingPayload)(editorView);
+            },
+            onEnter: () => {
+              commitStatusPicker()(editorView);
+            }
+          });
+        }
+      });
+    }
+  };
+};
+const decorateWithPluginOptions = (plugin, options, api) => {
   if ((options === null || options === void 0 ? void 0 : options.menuDisabled) === true) {
     return plugin;
   }
@@ -100,7 +108,9 @@ const decorateWithPluginOptions = (plugin, options) => {
       keywords: ['lozenge'],
       icon: () => /*#__PURE__*/React.createElement(IconStatus, null),
       action(insert, state) {
-        return addAnalytics(state, createStatus()(insert, state), {
+        var _api$analytics2;
+        const tr = createStatus()(insert, state);
+        api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
           action: ACTION.INSERTED,
           actionSubject: ACTION_SUBJECT.DOCUMENT,
           actionSubjectId: ACTION_SUBJECT_ID.STATUS,
@@ -108,7 +118,8 @@ const decorateWithPluginOptions = (plugin, options) => {
             inputMethod: INPUT_METHOD.QUICK_INSERT
           },
           eventType: EVENT_TYPE.TRACK
-        });
+        })(tr);
+        return tr;
       }
     }]
   };
@@ -120,5 +131,5 @@ const statusPlugin = ({
 }) => decorateWithPluginOptions(baseStatusPlugin({
   config: options,
   api
-}), options);
+}), options, api);
 export default statusPlugin;

package/dist/es2019/plugins/status/keymap.js

@@ -1,5 +1,5 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { bindKeymapWithCommand, enter, tab } from '../../keymaps';
+import { bindKeymapWithCommand, enter, tab } from '@atlaskit/editor-common/keymaps';
 import { mayGetStatusAtSelection } from './utils';
 export function keymapPlugin() {
   const list = {};

package/dist/es2019/plugins/status/ui/statusPicker.js

@@ -9,7 +9,7 @@ import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
 import { StatusPicker as AkStatusPicker } from '@atlaskit/status/picker';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N0 } from '@atlaskit/theme/colors';
-import withOuterListeners from '../../../ui/with-outer-listeners';
+import { withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { DEFAULT_STATUS } from '../actions';
 import { analyticsState, createStatusAnalyticsAndFire } from '../analytics';
 const PopupWithListeners = withOuterListeners(Popup);

package/dist/es2019/version-wrapper.js

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

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

@@ -24,7 +24,6 @@ import { showPlaceholderFloatingToolbar } from '../../../placeholder-text/action
 import { insertLayoutColumnsWithAnalytics } from '../../../layout/actions';
 import { insertTaskDecisionCommand } from '../../../tasks-and-decisions/commands';
 import { insertExpand } from '../../../expand/commands';
-import { updateStatusWithAnalytics } from '../../../status/actions';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from './messages';
 import { createItems } from './create-items';
@@ -215,14 +214,16 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       return true;
     });
     _defineProperty(_assertThisInitialized(_this), "createStatus", function (inputMethod) {
-      var editorView = _this.props.editorView;
-      updateStatusWithAnalytics(inputMethod)(editorView.state, editorView.dispatch);
-      return true;
+      var _pluginInjectionApi$s, _pluginInjectionApi$s2;
+      var _this$props4 = _this.props,
+        pluginInjectionApi = _this$props4.pluginInjectionApi,
+        editorView = _this$props4.editorView;
+      return (_pluginInjectionApi$s = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$s2 = pluginInjectionApi.status) === null || _pluginInjectionApi$s2 === void 0 || (_pluginInjectionApi$s2 = _pluginInjectionApi$s2.actions) === null || _pluginInjectionApi$s2 === void 0 ? void 0 : _pluginInjectionApi$s2.updateStatus(inputMethod)(editorView.state, editorView.dispatch)) !== null && _pluginInjectionApi$s !== void 0 ? _pluginInjectionApi$s : false;
     });
     _defineProperty(_assertThisInitialized(_this), "openMediaPicker", function (inputMethod) {
-      var _this$props4 = _this.props,
-        onShowMediaPicker = _this$props4.onShowMediaPicker,
-        dispatchAnalyticsEvent = _this$props4.dispatchAnalyticsEvent;
+      var _this$props5 = _this.props,
+        onShowMediaPicker = _this$props5.onShowMediaPicker,
+        dispatchAnalyticsEvent = _this$props5.dispatchAnalyticsEvent;
       if (onShowMediaPicker) {
         onShowMediaPicker();
         if (dispatchAnalyticsEvent) {
@@ -250,11 +251,11 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     });
     _defineProperty(_assertThisInitialized(_this), "insertHorizontalRule", function (inputMethod) {
       var _pluginInjectionApi$r, _pluginInjectionApi$r2;
-      var _this$props5 = _this.props,
-        _this$props5$editorVi = _this$props5.editorView,
-        state = _this$props5$editorVi.state,
-        dispatch = _this$props5$editorVi.dispatch,
-        pluginInjectionApi = _this$props5.pluginInjectionApi;
+      var _this$props6 = _this.props,
+        _this$props6$editorVi = _this$props6.editorView,
+        state = _this$props6$editorVi.state,
+        dispatch = _this$props6$editorVi.dispatch,
+        pluginInjectionApi = _this$props6.pluginInjectionApi;
       return (_pluginInjectionApi$r = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$r2 = pluginInjectionApi.rule) === null || _pluginInjectionApi$r2 === void 0 ? void 0 : _pluginInjectionApi$r2.actions.insertHorizontalRule(inputMethod)(state, dispatch)) !== null && _pluginInjectionApi$r !== void 0 ? _pluginInjectionApi$r : false;
     });
     _defineProperty(_assertThisInitialized(_this), "insertExpand", function () {
@@ -265,9 +266,9 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     });
     _defineProperty(_assertThisInitialized(_this), "insertBlockType", function (itemName) {
       return function () {
-        var _this$props6 = _this.props,
-          editorView = _this$props6.editorView,
-          onInsertBlockType = _this$props6.onInsertBlockType;
+        var _this$props7 = _this.props,
+          editorView = _this$props7.editorView,
+          onInsertBlockType = _this$props7.onInsertBlockType;
         var state = editorView.state,
           dispatch = editorView.dispatch;
         onInsertBlockType(itemName)(state, dispatch);
@@ -290,11 +291,11 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     _defineProperty(_assertThisInitialized(_this), "onItemActivated", function (_ref2) {
       var item = _ref2.item,
         inputMethod = _ref2.inputMethod;
-      var _this$props7 = _this.props,
-        editorView = _this$props7.editorView,
-        editorActions = _this$props7.editorActions,
-        handleImageUpload = _this$props7.handleImageUpload,
-        expandEnabled = _this$props7.expandEnabled;
+      var _this$props8 = _this.props,
+        editorView = _this$props8.editorView,
+        editorActions = _this$props8.editorActions,
+        handleImageUpload = _this$props8.handleImageUpload,
+        expandEnabled = _this$props8.expandEnabled;
 
       // need to do this before inserting nodes so scrollIntoView works properly
       if (!editorView.hasFocus()) {
@@ -410,12 +411,12 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     key: "renderPopup",
     value: function renderPopup() {
       var emojiPickerOpen = this.state.emojiPickerOpen;
-      var _this$props8 = this.props,
-        popupsMountPoint = _this$props8.popupsMountPoint,
-        popupsBoundariesElement = _this$props8.popupsBoundariesElement,
-        popupsScrollableElement = _this$props8.popupsScrollableElement,
-        emojiProvider = _this$props8.emojiProvider,
-        replacePlusMenuWithElementBrowser = _this$props8.replacePlusMenuWithElementBrowser;
+      var _this$props9 = this.props,
+        popupsMountPoint = _this$props9.popupsMountPoint,
+        popupsBoundariesElement = _this$props9.popupsBoundariesElement,
+        popupsScrollableElement = _this$props9.popupsScrollableElement,
+        emojiProvider = _this$props9.emojiProvider,
+        replacePlusMenuWithElementBrowser = _this$props9.replacePlusMenuWithElementBrowser;
       var dropdownEmoji = this.state.dropdownItems.some(function (_ref4) {
         var name = _ref4.value.name;
         return name === 'emoji';
@@ -452,9 +453,9 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         buttons = _this$state.buttons,
         dropdownItems = _this$state.dropdownItems,
         emojiPickerOpen = _this$state.emojiPickerOpen;
-      var _this$props9 = this.props,
-        isDisabled = _this$props9.isDisabled,
-        isReducedSpacing = _this$props9.isReducedSpacing;
+      var _this$props10 = this.props,
+        isDisabled = _this$props10.isDisabled,
+        isReducedSpacing = _this$props10.isReducedSpacing;
       if (buttons.length === 0 && dropdownItems.length === 0) {
         return null;
       }

package/dist/esm/plugins/status/actions.js

@@ -4,7 +4,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { uuid } from '@atlaskit/adf-schema';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, withAnalytics } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { pluginKey } from './plugin-key';
 import { canInsert } from '@atlaskit/editor-prosemirror/utils';
 export var DEFAULT_STATUS = {
@@ -71,16 +72,18 @@ export var updateStatus = function updateStatus(status) {
     return false;
   };
 };
-export var updateStatusWithAnalytics = function updateStatusWithAnalytics(inputMethod, status) {
-  return withAnalytics({
-    action: ACTION.INSERTED,
-    actionSubject: ACTION_SUBJECT.DOCUMENT,
-    actionSubjectId: ACTION_SUBJECT_ID.STATUS,
-    attributes: {
-      inputMethod: inputMethod
-    },
-    eventType: EVENT_TYPE.TRACK
-  })(updateStatus(status));
+export var updateStatusWithAnalytics = function updateStatusWithAnalytics(editorAnalyticsAPI) {
+  return function (inputMethod, status) {
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.INSERTED,
+      actionSubject: ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: ACTION_SUBJECT_ID.STATUS,
+      attributes: {
+        inputMethod: inputMethod
+      },
+      eventType: EVENT_TYPE.TRACK
+    })(updateStatus(status));
+  };
 };
 export var setStatusPickerAt = function setStatusPickerAt(showStatusPickerAt) {
   return function (state, dispatch) {

package/dist/esm/plugins/status/index.js

@@ -1,17 +1,19 @@
 import React from 'react';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { status } from '@atlaskit/adf-schema';
-import WithPluginState from '../../ui/WithPluginState';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
+import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { IconStatus } from '@atlaskit/editor-common/quick-insert';
-import { commitStatusPicker, createStatus, updateStatus } from './actions';
+import { updateStatusWithAnalytics, commitStatusPicker, createStatus, updateStatus } from './actions';
 import { keymapPlugin } from './keymap';
 import createStatusPlugin from './plugin';
 import { pluginKey } from './plugin-key';
 import StatusPicker from './ui/statusPicker';
 var baseStatusPlugin = function baseStatusPlugin(_ref) {
-  var options = _ref.config;
+  var _api$analytics;
+  var options = _ref.config,
+    api = _ref.api;
   return {
     name: 'status',
     nodes: function nodes() {
@@ -31,6 +33,10 @@ var baseStatusPlugin = function baseStatusPlugin(_ref) {
         plugin: keymapPlugin
       }];
     },
+    actions: {
+      commitStatusPicker: commitStatusPicker,
+      updateStatus: updateStatusWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+    },
     contentComponent: function contentComponent(_ref2) {
       var editorView = _ref2.editorView,
         popupsMountPoint = _ref2.popupsMountPoint,
@@ -84,7 +90,7 @@ var baseStatusPlugin = function baseStatusPlugin(_ref) {
     }
   };
 };
-var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, options) {
+var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, options, api) {
   if ((options === null || options === void 0 ? void 0 : options.menuDisabled) === true) {
     return plugin;
   }
@@ -101,7 +107,9 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
           return /*#__PURE__*/React.createElement(IconStatus, null);
         },
         action: function action(insert, state) {
-          return addAnalytics(state, createStatus()(insert, state), {
+          var _api$analytics2;
+          var tr = createStatus()(insert, state);
+          api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
             action: ACTION.INSERTED,
             actionSubject: ACTION_SUBJECT.DOCUMENT,
             actionSubjectId: ACTION_SUBJECT_ID.STATUS,
@@ -109,7 +117,8 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
               inputMethod: INPUT_METHOD.QUICK_INSERT
             },
             eventType: EVENT_TYPE.TRACK
-          });
+          })(tr);
+          return tr;
         }
       }];
     }
@@ -122,6 +131,6 @@ var statusPlugin = function statusPlugin(_ref5) {
   return decorateWithPluginOptions(baseStatusPlugin({
     config: options,
     api: api
-  }), options);
+  }), options, api);
 };
 export default statusPlugin;

package/dist/esm/plugins/status/keymap.js

@@ -1,5 +1,5 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { bindKeymapWithCommand, enter, tab } from '../../keymaps';
+import { bindKeymapWithCommand, enter, tab } from '@atlaskit/editor-common/keymaps';
 import { mayGetStatusAtSelection } from './utils';
 export function keymapPlugin() {
   var list = {};

package/dist/esm/plugins/status/ui/statusPicker.js

@@ -19,7 +19,7 @@ import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
 import { StatusPicker as AkStatusPicker } from '@atlaskit/status/picker';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N0 } from '@atlaskit/theme/colors';
-import withOuterListeners from '../../../ui/with-outer-listeners';
+import { withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { DEFAULT_STATUS } from '../actions';
 import { analyticsState, createStatusAnalyticsAndFire } from '../analytics';
 var PopupWithListeners = withOuterListeners(Popup);

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "188.5.2";
+export var version = "188.7.0";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/plugins/insert-block/types.d.ts

@@ -14,6 +14,7 @@ import type panelPlugin from '../panel';
 import type { RulePlugin } from '@atlaskit/editor-plugin-rule';
 import type { MediaPlugin } from '@atlaskit/editor-plugin-media';
 import type { MentionPlugin } from '../mentions';
+import type { StatusPlugin } from '../status';
 export type InsertBlockPluginDependencies = [
     FeatureFlagsPlugin,
     OptionalPlugin<typeof tablesPlugin>,
@@ -29,5 +30,6 @@ export type InsertBlockPluginDependencies = [
     OptionalPlugin<typeof codeBlockPlugin>,
     OptionalPlugin<typeof panelPlugin>,
     OptionalPlugin<MediaPlugin>,
-    OptionalPlugin<MentionPlugin>
+    OptionalPlugin<MentionPlugin>,
+    OptionalPlugin<StatusPlugin>
 ];

package/dist/types/plugins/status/actions.d.ts

@@ -1,6 +1,7 @@
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { Command } from '../../types';
+import type { Command } from '@atlaskit/editor-common/types';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
 import type { StatusType, ClosingPayload } from './types';
 export declare const DEFAULT_STATUS: StatusType;
@@ -8,7 +9,8 @@ export declare const createStatus: (showStatusPickerAtOffset?: number) => (inser
     selectInlineNode: boolean;
 }) => Transaction, state: EditorState) => Transaction;
 export declare const updateStatus: (status?: StatusType) => Command;
-export declare const updateStatusWithAnalytics: (inputMethod: TOOLBAR_MENU_TYPE, status?: StatusType) => Command;
+export type UpdateStatus = (inputMethod: TOOLBAR_MENU_TYPE, status?: StatusType) => Command;
+export declare const updateStatusWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: TOOLBAR_MENU_TYPE, status?: StatusType) => Command;
 export declare const setStatusPickerAt: (showStatusPickerAt: number | null) => (state: EditorState, dispatch: (tr: Transaction) => void) => boolean;
 export declare const removeStatus: (showStatusPickerAt: number) => Command;
 export declare const commitStatusPicker: (closingPayload?: ClosingPayload) => (editorView: EditorView) => void;

package/dist/types/plugins/status/index.d.ts

@@ -1,6 +1,15 @@
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { UpdateStatus } from './actions';
+import { commitStatusPicker } from './actions';
 import type { StatusPluginOptions } from './types';
-declare const statusPlugin: NextEditorPlugin<'status', {
-    pluginConfiguration: StatusPluginOptions;
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+export type StatusPlugin = NextEditorPlugin<'status', {
+    dependencies: [OptionalPlugin<AnalyticsPlugin>];
+    pluginConfiguration: StatusPluginOptions | undefined;
+    actions: {
+        commitStatusPicker: typeof commitStatusPicker;
+        updateStatus: UpdateStatus;
+    };
 }>;
+declare const statusPlugin: StatusPlugin;
 export default statusPlugin;

package/dist/types/plugins/status/nodeviews/status.d.ts

@@ -3,7 +3,7 @@ import React from 'react';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { IntlShape } from 'react-intl-next';
 import type { Color, StatusStyle } from '@atlaskit/status/element';
-import type { EventDispatcher } from '../../../event-dispatcher';
+import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { InlineNodeViewComponentProps } from '@atlaskit/editor-common/react-node-view';
 import type { StatusPluginOptions } from '../types';
 export interface ContainerProps {

package/dist/types/plugins/status/plugin.d.ts

@@ -1,5 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { PMPluginFactoryParams } from '../../types';
+import type { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import type { StatusPluginOptions } from './types';
 export { pluginKey, pluginKeyName } from './plugin-key';
 export type { StatusState, StatusType, ClosingPayload } from './types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "188.5.2",
+  "version": "188.7.0",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -55,7 +55,7 @@
     "@atlaskit/code": "^14.6.0",
     "@atlaskit/date": "^0.10.0",
     "@atlaskit/datetime-picker": "^12.10.0",
-    "@atlaskit/editor-common": "^76.8.0",
+    "@atlaskit/editor-common": "^76.9.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-markdown-transformer": "^5.2.5",
     "@atlaskit/editor-palette": "1.5.1",
@@ -106,7 +106,7 @@
     "@atlaskit/media-client": "^24.0.0",
     "@atlaskit/media-common": "^9.0.0",
     "@atlaskit/mention": "^22.1.0",
-    "@atlaskit/menu": "^1.11.0",
+    "@atlaskit/menu": "^2.0.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/prosemirror-collab": "^0.2.0",
     "@atlaskit/prosemirror-input-rules": "^2.4.0",
@@ -155,7 +155,7 @@
     "@af/integration-testing": "*",
     "@af/visual-regression": "*",
     "@atlaskit/collab-provider": "9.15.1",
-    "@atlaskit/dropdown-menu": "^11.14.0",
+    "@atlaskit/dropdown-menu": "^12.0.0",
     "@atlaskit/editor-extension-dropbox": "^0.4.0",
     "@atlaskit/flag": "^15.2.0",
     "@atlaskit/icon-object": "^6.3.0",
@@ -240,10 +240,6 @@
     "platform.linking-platform.editor.fix-link-insert-analytics": {
       "type": "boolean"
     },
-    "platform.design-system-team.menu-selected-state-change_0see9": {
-      "type": "boolean",
-      "referenceOnly": "true"
-    },
     "platform.editor.table-sticky-scrollbar": {
       "type": "boolean"
     },