@atlaskit/editor-plugin-status 2.5.9 → 2.6.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-status
 
+## 2.6.0
+
+### Minor Changes
+
+- [#174097](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/174097)
+  [`b691b87e73dc2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b691b87e73dc2) -
+  [ux] ED-25902-add-floating-toolbar-in-view-mode
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.5.10
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.5.9
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -8,14 +8,24 @@ exports.statusPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _utils = require("@atlaskit/editor-common/utils");
+var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("./actions");
 var _keymap = require("./pm-plugins/keymap");
 var _plugin = _interopRequireDefault(require("./pm-plugins/plugin"));
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _ContentComponent = require("./ui/ContentComponent");
-var baseStatusPlugin = function baseStatusPlugin(_ref) {
+// This dummy type is to bypass the typescript compiler maximum length limit error
+// TODO: Fix the type definition of editor-core's createUniversalPreset
+
+// This dummy type is to bypass the typescript compiler maximum length limit error
+// TODO: Fix the type definition of editor-core's createUniversalPreset
+
+var statusPlugin = exports.statusPlugin = function statusPlugin(_ref) {
   var _api$analytics, _api$analytics2;
   var options = _ref.config,
     api = _ref.api;
@@ -57,11 +67,76 @@ var baseStatusPlugin = function baseStatusPlugin(_ref) {
         focusStatusInput: pluginState.focusStatusInput
       } : undefined;
     },
-    contentComponent: function contentComponent(_ref2) {
-      var editorView = _ref2.editorView,
-        popupsMountPoint = _ref2.popupsMountPoint,
-        popupsBoundariesElement = _ref2.popupsBoundariesElement,
-        popupsScrollableElement = _ref2.popupsScrollableElement;
+    pluginsOptions: {
+      quickInsert: function quickInsert(_ref2) {
+        var formatMessage = _ref2.formatMessage;
+        if ((options === null || options === void 0 ? void 0 : options.menuDisabled) === true) {
+          return [];
+        }
+        return [{
+          id: 'status',
+          title: formatMessage(_messages.toolbarInsertBlockMessages.status),
+          description: formatMessage(_messages.toolbarInsertBlockMessages.statusDescription),
+          priority: 700,
+          keywords: ['lozenge'],
+          icon: function icon() {
+            return /*#__PURE__*/_react.default.createElement(_quickInsert.IconStatus, null);
+          },
+          action: function action(_insert, state) {
+            var _insertStatus, _api$analytics3;
+            return (_insertStatus = (0, _actions.insertStatus)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(_analytics.INPUT_METHOD.QUICK_INSERT)({
+              tr: state.tr
+            })) !== null && _insertStatus !== void 0 ? _insertStatus : state.tr;
+          }
+        }];
+      },
+      floatingToolbar: function floatingToolbar(state, intl) {
+        var _api$editorViewMode;
+        var isViewMode = (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 || (_api$editorViewMode = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.mode) === 'view';
+        if (!(0, _platformFeatureFlags.fg)('platform_inline_node_as_valid_annotation_selection') || !isViewMode) {
+          return undefined;
+        }
+        return {
+          title: 'Status floating toolbar',
+          nodeType: state.schema.nodes.status,
+          onPositionCalculated: (0, _utils.calculateToolbarPositionAboveSelection)('Status floating toolbar'),
+          items: function items(node) {
+            var _api$annotation;
+            var annotationState = api === null || api === void 0 || (_api$annotation = api.annotation) === null || _api$annotation === void 0 ? void 0 : _api$annotation.sharedState.currentState();
+            var hasActiveMark = node.marks.some(function (mark) {
+              return mark.type.name === 'annotation' && (annotationState === null || annotationState === void 0 ? void 0 : annotationState.annotations[mark.attrs.id]) === false;
+            });
+            var showAnnotation = annotationState && isViewMode && annotationState.isVisible && !annotationState.bookmark && !annotationState.mouseData.isSelecting && !hasActiveMark;
+            var onCommentClick = function onCommentClick(stateFromClickEvent, dispatch) {
+              if (!(api !== null && api !== void 0 && api.annotation)) {
+                return true;
+              }
+              var command = api.annotation.actions.setInlineCommentDraftState(true, _analytics.INPUT_METHOD.TOOLBAR);
+              return command(stateFromClickEvent, dispatch);
+            };
+            var createCommentMessage = intl.formatMessage(_messages.annotationMessages.createComment);
+            var commentItems = showAnnotation ? [{
+              type: 'button',
+              title: createCommentMessage,
+              onClick: onCommentClick,
+              showTitle: true,
+              tooltipContent: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+                description: createCommentMessage,
+                keymap: _keymaps.addInlineComment
+              }),
+              icon: _comment.default,
+              supportsViewMode: true
+            }] : [];
+            return [].concat(commentItems);
+          }
+        };
+      }
+    },
+    contentComponent: function contentComponent(_ref3) {
+      var editorView = _ref3.editorView,
+        popupsMountPoint = _ref3.popupsMountPoint,
+        popupsBoundariesElement = _ref3.popupsBoundariesElement,
+        popupsScrollableElement = _ref3.popupsScrollableElement;
       var domAtPos = editorView.domAtPos.bind(editorView);
       return /*#__PURE__*/_react.default.createElement(_ContentComponent.ContentComponent, {
         domAtPos: domAtPos,
@@ -73,39 +148,4 @@ var baseStatusPlugin = function baseStatusPlugin(_ref) {
       });
     }
   };
-};
-var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, options, api) {
-  if ((options === null || options === void 0 ? void 0 : options.menuDisabled) === true) {
-    return plugin;
-  }
-  plugin.pluginsOptions = {
-    quickInsert: function quickInsert(_ref3) {
-      var formatMessage = _ref3.formatMessage;
-      return [{
-        id: 'status',
-        title: formatMessage(_messages.toolbarInsertBlockMessages.status),
-        description: formatMessage(_messages.toolbarInsertBlockMessages.statusDescription),
-        priority: 700,
-        keywords: ['lozenge'],
-        icon: function icon() {
-          return /*#__PURE__*/_react.default.createElement(_quickInsert.IconStatus, null);
-        },
-        action: function action(insert, state) {
-          var _insertStatus, _api$analytics3;
-          return (_insertStatus = (0, _actions.insertStatus)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(_analytics.INPUT_METHOD.QUICK_INSERT)({
-            tr: state.tr
-          })) !== null && _insertStatus !== void 0 ? _insertStatus : state.tr;
-        }
-      }];
-    }
-  };
-  return plugin;
-};
-var statusPlugin = exports.statusPlugin = function statusPlugin(_ref4) {
-  var options = _ref4.config,
-    api = _ref4.api;
-  return decorateWithPluginOptions(baseStatusPlugin({
-    config: options,
-    api: api
-  }), options, api);
 };

package/dist/cjs/ui/statusPicker.js

@@ -303,9 +303,7 @@ var StatusPickerWithoutAnalytcs = exports.StatusPickerWithoutAnalytcs = /*#__PUR
           ref: this.setRef(setOutsideClickTargetRef),
           onClick: this.handlePopupClick,
           onKeyDown: this.onKeyDown
-        }, (0, _react2.jsx)(_picker.StatusPicker
-        // eslint-disable-next-line jsx-a11y/no-autofocus
-        , {
+        }, (0, _react2.jsx)(_picker.StatusPicker, {
           autoFocus: isNew || focusStatusInput,
           selectedColor: color,
           text: text,
@@ -351,9 +349,7 @@ var StatusPickerWithoutAnalytcs = exports.StatusPickerWithoutAnalytcs = /*#__PUR
         tabIndex: -1,
         onClick: this.handlePopupClick,
         onKeyDown: this.onKeyDown
-      }, (0, _react2.jsx)(_picker.StatusPicker
-      // eslint-disable-next-line jsx-a11y/no-autofocus
-      , {
+      }, (0, _react2.jsx)(_picker.StatusPicker, {
         autoFocus: isNew || focusStatusInput,
         selectedColor: color,
         text: text,

package/dist/es2019/plugin.js

@@ -1,14 +1,25 @@
 import React from 'react';
 import { status } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { addInlineComment, ToolTipContent } from '@atlaskit/editor-common/keymaps';
+import { annotationMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconStatus } from '@atlaskit/editor-common/quick-insert';
+import { calculateToolbarPositionAboveSelection } from '@atlaskit/editor-common/utils';
+import CommentIcon from '@atlaskit/icon/core/comment';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { commitStatusPicker, insertStatus, removeStatus, updateStatusWithAnalytics } from './actions';
 import { keymapPlugin } from './pm-plugins/keymap';
 import createStatusPlugin from './pm-plugins/plugin';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { ContentComponent } from './ui/ContentComponent';
-const baseStatusPlugin = ({
+
+// This dummy type is to bypass the typescript compiler maximum length limit error
+// TODO: Fix the type definition of editor-core's createUniversalPreset
+
+// This dummy type is to bypass the typescript compiler maximum length limit error
+// TODO: Fix the type definition of editor-core's createUniversalPreset
+
+export const statusPlugin = ({
   config: options,
   api
 }) => {
@@ -49,6 +60,68 @@ const baseStatusPlugin = ({
         focusStatusInput: pluginState.focusStatusInput
       } : undefined;
     },
+    pluginsOptions: {
+      quickInsert: ({
+        formatMessage
+      }) => {
+        if ((options === null || options === void 0 ? void 0 : options.menuDisabled) === true) {
+          return [];
+        }
+        return [{
+          id: 'status',
+          title: formatMessage(messages.status),
+          description: formatMessage(messages.statusDescription),
+          priority: 700,
+          keywords: ['lozenge'],
+          icon: () => /*#__PURE__*/React.createElement(IconStatus, null),
+          action(_insert, state) {
+            var _insertStatus, _api$analytics3;
+            return (_insertStatus = insertStatus(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(INPUT_METHOD.QUICK_INSERT)({
+              tr: state.tr
+            })) !== null && _insertStatus !== void 0 ? _insertStatus : state.tr;
+          }
+        }];
+      },
+      floatingToolbar(state, intl) {
+        var _api$editorViewMode, _api$editorViewMode$s;
+        const isViewMode = (api === null || api === void 0 ? void 0 : (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : (_api$editorViewMode$s = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode$s === void 0 ? void 0 : _api$editorViewMode$s.mode) === 'view';
+        if (!fg('platform_inline_node_as_valid_annotation_selection') || !isViewMode) {
+          return undefined;
+        }
+        return {
+          title: 'Status floating toolbar',
+          nodeType: state.schema.nodes.status,
+          onPositionCalculated: calculateToolbarPositionAboveSelection('Status floating toolbar'),
+          items: node => {
+            var _api$annotation;
+            const annotationState = api === null || api === void 0 ? void 0 : (_api$annotation = api.annotation) === null || _api$annotation === void 0 ? void 0 : _api$annotation.sharedState.currentState();
+            const hasActiveMark = node.marks.some(mark => mark.type.name === 'annotation' && (annotationState === null || annotationState === void 0 ? void 0 : annotationState.annotations[mark.attrs.id]) === false);
+            const showAnnotation = annotationState && isViewMode && annotationState.isVisible && !annotationState.bookmark && !annotationState.mouseData.isSelecting && !hasActiveMark;
+            const onCommentClick = (stateFromClickEvent, dispatch) => {
+              if (!(api !== null && api !== void 0 && api.annotation)) {
+                return true;
+              }
+              const command = api.annotation.actions.setInlineCommentDraftState(true, INPUT_METHOD.TOOLBAR);
+              return command(stateFromClickEvent, dispatch);
+            };
+            const createCommentMessage = intl.formatMessage(annotationMessages.createComment);
+            const commentItems = showAnnotation ? [{
+              type: 'button',
+              title: createCommentMessage,
+              onClick: onCommentClick,
+              showTitle: true,
+              tooltipContent: /*#__PURE__*/React.createElement(ToolTipContent, {
+                description: createCommentMessage,
+                keymap: addInlineComment
+              }),
+              icon: CommentIcon,
+              supportsViewMode: true
+            }] : [];
+            return [...commentItems];
+          }
+        };
+      }
+    },
     contentComponent({
       editorView,
       popupsMountPoint,
@@ -66,35 +139,4 @@ const baseStatusPlugin = ({
       });
     }
   };
-};
-const decorateWithPluginOptions = (plugin, options, api) => {
-  if ((options === null || options === void 0 ? void 0 : options.menuDisabled) === true) {
-    return plugin;
-  }
-  plugin.pluginsOptions = {
-    quickInsert: ({
-      formatMessage
-    }) => [{
-      id: 'status',
-      title: formatMessage(messages.status),
-      description: formatMessage(messages.statusDescription),
-      priority: 700,
-      keywords: ['lozenge'],
-      icon: () => /*#__PURE__*/React.createElement(IconStatus, null),
-      action(insert, state) {
-        var _insertStatus, _api$analytics3;
-        return (_insertStatus = insertStatus(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(INPUT_METHOD.QUICK_INSERT)({
-          tr: state.tr
-        })) !== null && _insertStatus !== void 0 ? _insertStatus : state.tr;
-      }
-    }]
-  };
-  return plugin;
-};
-export const statusPlugin = ({
-  config: options,
-  api
-}) => decorateWithPluginOptions(baseStatusPlugin({
-  config: options,
-  api
-}), options, api);
+};

package/dist/es2019/ui/statusPicker.js

@@ -276,9 +276,7 @@ export class StatusPickerWithoutAnalytcs extends React.Component {
         ref: this.setRef(setOutsideClickTargetRef),
         onClick: this.handlePopupClick,
         onKeyDown: this.onKeyDown
-      }, jsx(AkStatusPicker
-      // eslint-disable-next-line jsx-a11y/no-autofocus
-      , {
+      }, jsx(AkStatusPicker, {
         autoFocus: isNew || focusStatusInput,
         selectedColor: color,
         text: text,
@@ -324,9 +322,7 @@ export class StatusPickerWithoutAnalytcs extends React.Component {
       tabIndex: -1,
       onClick: this.handlePopupClick,
       onKeyDown: this.onKeyDown
-    }, jsx(AkStatusPicker
-    // eslint-disable-next-line jsx-a11y/no-autofocus
-    , {
+    }, jsx(AkStatusPicker, {
       autoFocus: isNew || focusStatusInput,
       selectedColor: color,
       text: text,

package/dist/esm/plugin.js

@@ -1,14 +1,25 @@
 import React from 'react';
 import { status } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { addInlineComment, ToolTipContent } from '@atlaskit/editor-common/keymaps';
+import { annotationMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconStatus } from '@atlaskit/editor-common/quick-insert';
+import { calculateToolbarPositionAboveSelection } from '@atlaskit/editor-common/utils';
+import CommentIcon from '@atlaskit/icon/core/comment';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { commitStatusPicker, insertStatus, removeStatus, updateStatusWithAnalytics } from './actions';
 import { keymapPlugin } from './pm-plugins/keymap';
 import createStatusPlugin from './pm-plugins/plugin';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { ContentComponent } from './ui/ContentComponent';
-var baseStatusPlugin = function baseStatusPlugin(_ref) {
+
+// This dummy type is to bypass the typescript compiler maximum length limit error
+// TODO: Fix the type definition of editor-core's createUniversalPreset
+
+// This dummy type is to bypass the typescript compiler maximum length limit error
+// TODO: Fix the type definition of editor-core's createUniversalPreset
+
+export var statusPlugin = function statusPlugin(_ref) {
   var _api$analytics, _api$analytics2;
   var options = _ref.config,
     api = _ref.api;
@@ -50,11 +61,76 @@ var baseStatusPlugin = function baseStatusPlugin(_ref) {
         focusStatusInput: pluginState.focusStatusInput
       } : undefined;
     },
-    contentComponent: function contentComponent(_ref2) {
-      var editorView = _ref2.editorView,
-        popupsMountPoint = _ref2.popupsMountPoint,
-        popupsBoundariesElement = _ref2.popupsBoundariesElement,
-        popupsScrollableElement = _ref2.popupsScrollableElement;
+    pluginsOptions: {
+      quickInsert: function quickInsert(_ref2) {
+        var formatMessage = _ref2.formatMessage;
+        if ((options === null || options === void 0 ? void 0 : options.menuDisabled) === true) {
+          return [];
+        }
+        return [{
+          id: 'status',
+          title: formatMessage(messages.status),
+          description: formatMessage(messages.statusDescription),
+          priority: 700,
+          keywords: ['lozenge'],
+          icon: function icon() {
+            return /*#__PURE__*/React.createElement(IconStatus, null);
+          },
+          action: function action(_insert, state) {
+            var _insertStatus, _api$analytics3;
+            return (_insertStatus = insertStatus(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(INPUT_METHOD.QUICK_INSERT)({
+              tr: state.tr
+            })) !== null && _insertStatus !== void 0 ? _insertStatus : state.tr;
+          }
+        }];
+      },
+      floatingToolbar: function floatingToolbar(state, intl) {
+        var _api$editorViewMode;
+        var isViewMode = (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 || (_api$editorViewMode = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.mode) === 'view';
+        if (!fg('platform_inline_node_as_valid_annotation_selection') || !isViewMode) {
+          return undefined;
+        }
+        return {
+          title: 'Status floating toolbar',
+          nodeType: state.schema.nodes.status,
+          onPositionCalculated: calculateToolbarPositionAboveSelection('Status floating toolbar'),
+          items: function items(node) {
+            var _api$annotation;
+            var annotationState = api === null || api === void 0 || (_api$annotation = api.annotation) === null || _api$annotation === void 0 ? void 0 : _api$annotation.sharedState.currentState();
+            var hasActiveMark = node.marks.some(function (mark) {
+              return mark.type.name === 'annotation' && (annotationState === null || annotationState === void 0 ? void 0 : annotationState.annotations[mark.attrs.id]) === false;
+            });
+            var showAnnotation = annotationState && isViewMode && annotationState.isVisible && !annotationState.bookmark && !annotationState.mouseData.isSelecting && !hasActiveMark;
+            var onCommentClick = function onCommentClick(stateFromClickEvent, dispatch) {
+              if (!(api !== null && api !== void 0 && api.annotation)) {
+                return true;
+              }
+              var command = api.annotation.actions.setInlineCommentDraftState(true, INPUT_METHOD.TOOLBAR);
+              return command(stateFromClickEvent, dispatch);
+            };
+            var createCommentMessage = intl.formatMessage(annotationMessages.createComment);
+            var commentItems = showAnnotation ? [{
+              type: 'button',
+              title: createCommentMessage,
+              onClick: onCommentClick,
+              showTitle: true,
+              tooltipContent: /*#__PURE__*/React.createElement(ToolTipContent, {
+                description: createCommentMessage,
+                keymap: addInlineComment
+              }),
+              icon: CommentIcon,
+              supportsViewMode: true
+            }] : [];
+            return [].concat(commentItems);
+          }
+        };
+      }
+    },
+    contentComponent: function contentComponent(_ref3) {
+      var editorView = _ref3.editorView,
+        popupsMountPoint = _ref3.popupsMountPoint,
+        popupsBoundariesElement = _ref3.popupsBoundariesElement,
+        popupsScrollableElement = _ref3.popupsScrollableElement;
       var domAtPos = editorView.domAtPos.bind(editorView);
       return /*#__PURE__*/React.createElement(ContentComponent, {
         domAtPos: domAtPos,
@@ -66,39 +142,4 @@ var baseStatusPlugin = function baseStatusPlugin(_ref) {
       });
     }
   };
-};
-var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, options, api) {
-  if ((options === null || options === void 0 ? void 0 : options.menuDisabled) === true) {
-    return plugin;
-  }
-  plugin.pluginsOptions = {
-    quickInsert: function quickInsert(_ref3) {
-      var formatMessage = _ref3.formatMessage;
-      return [{
-        id: 'status',
-        title: formatMessage(messages.status),
-        description: formatMessage(messages.statusDescription),
-        priority: 700,
-        keywords: ['lozenge'],
-        icon: function icon() {
-          return /*#__PURE__*/React.createElement(IconStatus, null);
-        },
-        action: function action(insert, state) {
-          var _insertStatus, _api$analytics3;
-          return (_insertStatus = insertStatus(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(INPUT_METHOD.QUICK_INSERT)({
-            tr: state.tr
-          })) !== null && _insertStatus !== void 0 ? _insertStatus : state.tr;
-        }
-      }];
-    }
-  };
-  return plugin;
-};
-export var statusPlugin = function statusPlugin(_ref4) {
-  var options = _ref4.config,
-    api = _ref4.api;
-  return decorateWithPluginOptions(baseStatusPlugin({
-    config: options,
-    api: api
-  }), options, api);
 };

package/dist/esm/ui/statusPicker.js

@@ -300,9 +300,7 @@ export var StatusPickerWithoutAnalytcs = /*#__PURE__*/function (_React$Component
           ref: this.setRef(setOutsideClickTargetRef),
           onClick: this.handlePopupClick,
           onKeyDown: this.onKeyDown
-        }, jsx(AkStatusPicker
-        // eslint-disable-next-line jsx-a11y/no-autofocus
-        , {
+        }, jsx(AkStatusPicker, {
           autoFocus: isNew || focusStatusInput,
           selectedColor: color,
           text: text,
@@ -348,9 +346,7 @@ export var StatusPickerWithoutAnalytcs = /*#__PURE__*/function (_React$Component
         tabIndex: -1,
         onClick: this.handlePopupClick,
         onKeyDown: this.onKeyDown
-      }, jsx(AkStatusPicker
-      // eslint-disable-next-line jsx-a11y/no-autofocus
-      , {
+      }, jsx(AkStatusPicker, {
         autoFocus: isNew || focusStatusInput,
         selectedColor: color,
         text: text,

package/dist/types/plugin.d.ts

@@ -1,10 +1,33 @@
-import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import type { NextEditorPlugin, OptionalPlugin, Command } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { UpdateStatus } from './actions';
 import { commitStatusPicker, insertStatus, removeStatus } from './actions';
 import type { StatusPluginOptions, StatusState } from './types';
+type DummyAnnotationPlugin = NextEditorPlugin<'annotation', {
+    actions: {
+        setInlineCommentDraftState: (isDraft: boolean, inputMethod: INPUT_METHOD) => Command;
+    };
+    sharedState: {
+        annotations: Record<string, boolean>;
+        isVisible: boolean;
+        bookmark: boolean;
+        mouseData: {
+            isSelecting: boolean;
+        };
+    };
+}>;
+type DummyEditorViewModePlugin = NextEditorPlugin<'editorViewMode', {
+    sharedState: {
+        mode: 'view' | 'edit';
+    };
+}>;
 export type StatusPlugin = NextEditorPlugin<'status', {
-    dependencies: [OptionalPlugin<AnalyticsPlugin>];
+    dependencies: [
+        OptionalPlugin<AnalyticsPlugin>,
+        OptionalPlugin<DummyAnnotationPlugin>,
+        OptionalPlugin<DummyEditorViewModePlugin>
+    ];
     pluginConfiguration: StatusPluginOptions | undefined;
     actions: {
         commitStatusPicker: typeof commitStatusPicker;
@@ -17,3 +40,4 @@ export type StatusPlugin = NextEditorPlugin<'status', {
     sharedState: StatusState | undefined;
 }>;
 export declare const statusPlugin: StatusPlugin;
+export {};

package/dist/types-ts4.5/plugin.d.ts

@@ -1,11 +1,32 @@
-import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import type { NextEditorPlugin, OptionalPlugin, Command } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { UpdateStatus } from './actions';
 import { commitStatusPicker, insertStatus, removeStatus } from './actions';
 import type { StatusPluginOptions, StatusState } from './types';
+type DummyAnnotationPlugin = NextEditorPlugin<'annotation', {
+    actions: {
+        setInlineCommentDraftState: (isDraft: boolean, inputMethod: INPUT_METHOD) => Command;
+    };
+    sharedState: {
+        annotations: Record<string, boolean>;
+        isVisible: boolean;
+        bookmark: boolean;
+        mouseData: {
+            isSelecting: boolean;
+        };
+    };
+}>;
+type DummyEditorViewModePlugin = NextEditorPlugin<'editorViewMode', {
+    sharedState: {
+        mode: 'view' | 'edit';
+    };
+}>;
 export type StatusPlugin = NextEditorPlugin<'status', {
     dependencies: [
-        OptionalPlugin<AnalyticsPlugin>
+        OptionalPlugin<AnalyticsPlugin>,
+        OptionalPlugin<DummyAnnotationPlugin>,
+        OptionalPlugin<DummyEditorViewModePlugin>
     ];
     pluginConfiguration: StatusPluginOptions | undefined;
     actions: {
@@ -19,3 +40,4 @@ export type StatusPlugin = NextEditorPlugin<'status', {
     sharedState: StatusState | undefined;
 }>;
 export declare const statusPlugin: StatusPlugin;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-status",
-	"version": "2.5.9",
+	"version": "2.6.0",
 	"description": "Status plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,14 +33,15 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/analytics-next": "^10.1.0",
-		"@atlaskit/editor-common": "^95.7.0",
+		"@atlaskit/editor-common": "^96.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
-		"@atlaskit/editor-prosemirror": "6.0.0",
+		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
+		"@atlaskit/icon": "^23.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/status": "^1.8.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tokens": "^2.3.0",
+		"@atlaskit/tokens": "^2.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
@@ -99,6 +100,9 @@
 		},
 		"platform_editor_replace_finddomnode_in_common": {
 			"type": "boolean"
+		},
+		"platform_inline_node_as_valid_annotation_selection": {
+			"type": "boolean"
 		}
 	}
 }