@atlaskit/editor-plugin-annotation 4.0.0 → 4.0.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-annotation
 
+## 4.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.0.1
+
+### Patch Changes
+
+- [`b344c1b873169`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b344c1b873169) -
+  ED-29098: clean up sharedPluginStateHookMigratorFactory in annotation plugin
+- Updated dependencies
+
 ## 4.0.0
 
 ### Patch Changes

package/dist/cjs/annotationPlugin.js

@@ -153,21 +153,13 @@ var selector = function selector(states) {
     annotations: (_states$annotationSta3 = states.annotationState) === null || _states$annotationSta3 === void 0 ? void 0 : _states$annotationSta3.annotations
   };
 };
-var useAnnotationContentComponentPluginState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
-  var annotationState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector);
-  return annotationState;
-}, function (api) {
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['annotation']),
-    annotationState = _useSharedPluginState.annotationState;
-  return annotationState;
-});
 function AnnotationContentComponent(_ref4) {
   var _api$analytics5;
   var api = _ref4.api,
     editorView = _ref4.editorView,
     annotationProviders = _ref4.annotationProviders,
     dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent;
-  var annotationState = useAnnotationContentComponentPluginState(api);
+  var annotationState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector);
   if (annotationState && !annotationState.isVisible && (0, _expValEquals.expValEquals)('platform_editor_usesharedpluginstatewithselector', 'isEnabled', false)) {
     return null;
   }

package/dist/cjs/pm-plugins/utils.js

@@ -239,13 +239,9 @@ var resolveDraftBookmark = exports.resolveDraftBookmark = function resolveDraftB
 };
 /**
  * get selection from position to apply new comment for
- * @return bookmarked positions if they exists, otherwise current selection positions
+ * @returns bookmarked positions if they exists, otherwise current selection positions
  */
-function getSelectionPositions(editorState,
-// when cleaning up platform_editor_usesharedpluginstatewithselector, can change this prop to bookmark
-inlineCommentState) {
-  var _ref2 = inlineCommentState || {},
-    bookmark = _ref2.bookmark;
+function getSelectionPositions(editorState, bookmark) {
   // get positions via saved bookmark if it is available
   // this is to make comments box positioned relative to temporary highlight rather then current selection
   if (bookmark) {
@@ -285,8 +281,8 @@ var getDraftCommandAnalyticsPayload = exports.getDraftCommandAnalyticsPayload =
       };
     }
     if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
-      var _ref3 = getPluginState(state) || {},
-        bookmark = _ref3.bookmark;
+      var _ref2 = getPluginState(state) || {},
+        bookmark = _ref2.bookmark;
       attributes.inlineNodeNames = (0, _utils.getRangeInlineNodeNames)({
         doc: state.doc,
         pos: resolveDraftBookmark(state, bookmark)
@@ -306,8 +302,8 @@ var isSelectionValid = exports.isSelectionValid = function isSelectionValid(stat
   var _currentMediaNodeWith;
   var _supportedNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var selection = state.selection;
-  var _ref4 = getPluginState(state) || {},
-    disallowOnWhitespace = _ref4.disallowOnWhitespace;
+  var _ref3 = getPluginState(state) || {},
+    disallowOnWhitespace = _ref3.disallowOnWhitespace;
   var allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
   var isSelectionEmpty = selection.empty;
   var isTextOrAllSelection = selection instanceof _state.TextSelection || selection instanceof _state.AllSelection;

package/dist/cjs/ui/InlineCommentView.js

@@ -48,37 +48,12 @@ var selector = function selector(states) {
     isAnnotationManagerEnabled: (_states$annotationSta7 = states.annotationState) === null || _states$annotationSta7 === void 0 ? void 0 : _states$annotationSta7.isAnnotationManagerEnabled
   };
 };
-var useAnnotationContentComponentPluginState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (_ref) {
-  var api = _ref.api;
-  var annotationState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector);
-  return annotationState;
-}, function (_ref2) {
-  var _getPluginState;
-  var state = _ref2.state;
-  var _ref3 = (_getPluginState = (0, _utils3.getPluginState)(state)) !== null && _getPluginState !== void 0 ? _getPluginState : {},
-    annotations = _ref3.annotations,
-    bookmark = _ref3.bookmark,
-    isInlineCommentViewClosed = _ref3.isInlineCommentViewClosed,
-    isOpeningMediaCommentFromToolbar = _ref3.isOpeningMediaCommentFromToolbar,
-    selectAnnotationMethod = _ref3.selectAnnotationMethod,
-    selectedAnnotations = _ref3.selectedAnnotations,
-    isAnnotationManagerEnabled = _ref3.isAnnotationManagerEnabled;
-  return {
-    annotations: annotations,
-    bookmark: bookmark,
-    isInlineCommentViewClosed: isInlineCommentViewClosed,
-    isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar,
-    selectAnnotationMethod: selectAnnotationMethod,
-    selectedAnnotations: selectedAnnotations,
-    isAnnotationManagerEnabled: isAnnotationManagerEnabled
-  };
-});
-function InlineCommentView(_ref4) {
-  var providers = _ref4.providers,
-    editorView = _ref4.editorView,
-    editorAnalyticsAPI = _ref4.editorAnalyticsAPI,
-    editorAPI = _ref4.editorAPI,
-    dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent;
+function InlineCommentView(_ref) {
+  var providers = _ref.providers,
+    editorView = _ref.editorView,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI,
+    editorAPI = _ref.editorAPI,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
   // As inlineComment is the only annotation present, this function is not generic
   var inlineCommentProvider = providers.inlineComment;
   var state = editorView.state,
@@ -86,21 +61,16 @@ function InlineCommentView(_ref4) {
   var lastSelectedAnnotationId = (0, _react.useRef)();
   var CreateComponent = inlineCommentProvider.createComponent,
     ViewComponent = inlineCommentProvider.viewComponent;
-  var _useAnnotationContent = useAnnotationContentComponentPluginState({
-      api: editorAPI,
-      state: state
-    }),
-    annotations = _useAnnotationContent.annotations,
-    bookmark = _useAnnotationContent.bookmark,
-    isInlineCommentViewClosed = _useAnnotationContent.isInlineCommentViewClosed,
-    isOpeningMediaCommentFromToolbar = _useAnnotationContent.isOpeningMediaCommentFromToolbar,
-    selectAnnotationMethod = _useAnnotationContent.selectAnnotationMethod,
-    selectedAnnotations = _useAnnotationContent.selectedAnnotations,
-    isAnnotationManagerEnabled = _useAnnotationContent.isAnnotationManagerEnabled;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(editorAPI, ['annotation'], selector),
+    annotations = _useSharedPluginState.annotations,
+    bookmark = _useSharedPluginState.bookmark,
+    isInlineCommentViewClosed = _useSharedPluginState.isInlineCommentViewClosed,
+    isOpeningMediaCommentFromToolbar = _useSharedPluginState.isOpeningMediaCommentFromToolbar,
+    selectAnnotationMethod = _useSharedPluginState.selectAnnotationMethod,
+    selectedAnnotations = _useSharedPluginState.selectedAnnotations,
+    isAnnotationManagerEnabled = _useSharedPluginState.isAnnotationManagerEnabled;
   var annotationsList = (0, _utils3.getAllAnnotations)(editorView.state.doc);
-  var selection = (0, _utils3.getSelectionPositions)(state, {
-    bookmark: bookmark
-  });
+  var selection = (0, _utils3.getSelectionPositions)(state, bookmark);
   var position = findPosForDOM(selection);
   var dom;
   try {

package/dist/es2019/annotationPlugin.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
@@ -146,15 +146,6 @@ const selector = states => {
     annotations: (_states$annotationSta3 = states.annotationState) === null || _states$annotationSta3 === void 0 ? void 0 : _states$annotationSta3.annotations
   };
 };
-const useAnnotationContentComponentPluginState = sharedPluginStateHookMigratorFactory(api => {
-  const annotationState = useSharedPluginStateWithSelector(api, ['annotation'], selector);
-  return annotationState;
-}, api => {
-  const {
-    annotationState
-  } = useSharedPluginState(api, ['annotation']);
-  return annotationState;
-});
 function AnnotationContentComponent({
   api,
   editorView,
@@ -162,7 +153,7 @@ function AnnotationContentComponent({
   dispatchAnalyticsEvent
 }) {
   var _api$analytics5;
-  const annotationState = useAnnotationContentComponentPluginState(api);
+  const annotationState = useSharedPluginStateWithSelector(api, ['annotation'], selector);
   if (annotationState && !annotationState.isVisible && expValEquals('platform_editor_usesharedpluginstatewithselector', 'isEnabled', false)) {
     return null;
   }

package/dist/es2019/pm-plugins/utils.js

@@ -201,14 +201,9 @@ export const resolveDraftBookmark = (editorState, bookmark, supportedBlockNodes
 };
 /**
  * get selection from position to apply new comment for
- * @return bookmarked positions if they exists, otherwise current selection positions
+ * @returns bookmarked positions if they exists, otherwise current selection positions
  */
-export function getSelectionPositions(editorState,
-// when cleaning up platform_editor_usesharedpluginstatewithselector, can change this prop to bookmark
-inlineCommentState) {
-  const {
-    bookmark
-  } = inlineCommentState || {};
+export function getSelectionPositions(editorState, bookmark) {
   // get positions via saved bookmark if it is available
   // this is to make comments box positioned relative to temporary highlight rather then current selection
   if (bookmark) {

package/dist/es2019/ui/InlineCommentView.js

@@ -1,13 +1,13 @@
 import React, { useRef } from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../editor-commands';
-import { getAllAnnotations, getAnnotationViewKey, getPluginState, getSelectionPositions } from '../pm-plugins/utils';
+import { getAllAnnotations, getAnnotationViewKey, getSelectionPositions } from '../pm-plugins/utils';
 import { AnnotationTestIds } from '../types';
 import { AnnotationViewWrapper } from './AnnotationViewWrapper';
 const findPosForDOM = sel => {
@@ -38,34 +38,6 @@ const selector = states => {
     isAnnotationManagerEnabled: (_states$annotationSta7 = states.annotationState) === null || _states$annotationSta7 === void 0 ? void 0 : _states$annotationSta7.isAnnotationManagerEnabled
   };
 };
-const useAnnotationContentComponentPluginState = sharedPluginStateHookMigratorFactory(({
-  api
-}) => {
-  const annotationState = useSharedPluginStateWithSelector(api, ['annotation'], selector);
-  return annotationState;
-}, ({
-  state
-}) => {
-  var _getPluginState;
-  const {
-    annotations,
-    bookmark,
-    isInlineCommentViewClosed,
-    isOpeningMediaCommentFromToolbar,
-    selectAnnotationMethod,
-    selectedAnnotations,
-    isAnnotationManagerEnabled
-  } = (_getPluginState = getPluginState(state)) !== null && _getPluginState !== void 0 ? _getPluginState : {};
-  return {
-    annotations,
-    bookmark,
-    isInlineCommentViewClosed,
-    isOpeningMediaCommentFromToolbar,
-    selectAnnotationMethod,
-    selectedAnnotations,
-    isAnnotationManagerEnabled
-  };
-});
 export function InlineCommentView({
   providers,
   editorView,
@@ -94,14 +66,9 @@ export function InlineCommentView({
     selectAnnotationMethod,
     selectedAnnotations,
     isAnnotationManagerEnabled
-  } = useAnnotationContentComponentPluginState({
-    api: editorAPI,
-    state
-  });
+  } = useSharedPluginStateWithSelector(editorAPI, ['annotation'], selector);
   const annotationsList = getAllAnnotations(editorView.state.doc);
-  const selection = getSelectionPositions(state, {
-    bookmark
-  });
+  const selection = getSelectionPositions(state, bookmark);
   const position = findPosForDOM(selection);
   let dom;
   try {

package/dist/esm/annotationPlugin.js

@@ -2,7 +2,7 @@ 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; }
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
@@ -146,21 +146,13 @@ var selector = function selector(states) {
     annotations: (_states$annotationSta3 = states.annotationState) === null || _states$annotationSta3 === void 0 ? void 0 : _states$annotationSta3.annotations
   };
 };
-var useAnnotationContentComponentPluginState = sharedPluginStateHookMigratorFactory(function (api) {
-  var annotationState = useSharedPluginStateWithSelector(api, ['annotation'], selector);
-  return annotationState;
-}, function (api) {
-  var _useSharedPluginState = useSharedPluginState(api, ['annotation']),
-    annotationState = _useSharedPluginState.annotationState;
-  return annotationState;
-});
 function AnnotationContentComponent(_ref4) {
   var _api$analytics5;
   var api = _ref4.api,
     editorView = _ref4.editorView,
     annotationProviders = _ref4.annotationProviders,
     dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent;
-  var annotationState = useAnnotationContentComponentPluginState(api);
+  var annotationState = useSharedPluginStateWithSelector(api, ['annotation'], selector);
   if (annotationState && !annotationState.isVisible && expValEquals('platform_editor_usesharedpluginstatewithselector', 'isEnabled', false)) {
     return null;
   }

package/dist/esm/pm-plugins/utils.js

@@ -222,13 +222,9 @@ export var resolveDraftBookmark = function resolveDraftBookmark(editorState, boo
 };
 /**
  * get selection from position to apply new comment for
- * @return bookmarked positions if they exists, otherwise current selection positions
+ * @returns bookmarked positions if they exists, otherwise current selection positions
  */
-export function getSelectionPositions(editorState,
-// when cleaning up platform_editor_usesharedpluginstatewithselector, can change this prop to bookmark
-inlineCommentState) {
-  var _ref2 = inlineCommentState || {},
-    bookmark = _ref2.bookmark;
+export function getSelectionPositions(editorState, bookmark) {
   // get positions via saved bookmark if it is available
   // this is to make comments box positioned relative to temporary highlight rather then current selection
   if (bookmark) {
@@ -268,8 +264,8 @@ export var getDraftCommandAnalyticsPayload = function getDraftCommandAnalyticsPa
       };
     }
     if (fg('editor_inline_comments_on_inline_nodes')) {
-      var _ref3 = getPluginState(state) || {},
-        bookmark = _ref3.bookmark;
+      var _ref2 = getPluginState(state) || {},
+        bookmark = _ref2.bookmark;
       attributes.inlineNodeNames = getRangeInlineNodeNames({
         doc: state.doc,
         pos: resolveDraftBookmark(state, bookmark)
@@ -289,8 +285,8 @@ export var isSelectionValid = function isSelectionValid(state) {
   var _currentMediaNodeWith;
   var _supportedNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var selection = state.selection;
-  var _ref4 = getPluginState(state) || {},
-    disallowOnWhitespace = _ref4.disallowOnWhitespace;
+  var _ref3 = getPluginState(state) || {},
+    disallowOnWhitespace = _ref3.disallowOnWhitespace;
   var allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
   var isSelectionEmpty = selection.empty;
   var isTextOrAllSelection = selection instanceof TextSelection || selection instanceof AllSelection;

package/dist/esm/ui/InlineCommentView.js

@@ -2,13 +2,13 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { useRef } from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../editor-commands';
-import { getAllAnnotations, getAnnotationViewKey, getPluginState, getSelectionPositions } from '../pm-plugins/utils';
+import { getAllAnnotations, getAnnotationViewKey, getSelectionPositions } from '../pm-plugins/utils';
 import { AnnotationTestIds } from '../types';
 import { AnnotationViewWrapper } from './AnnotationViewWrapper';
 var findPosForDOM = function findPosForDOM(sel) {
@@ -39,37 +39,12 @@ var selector = function selector(states) {
     isAnnotationManagerEnabled: (_states$annotationSta7 = states.annotationState) === null || _states$annotationSta7 === void 0 ? void 0 : _states$annotationSta7.isAnnotationManagerEnabled
   };
 };
-var useAnnotationContentComponentPluginState = sharedPluginStateHookMigratorFactory(function (_ref) {
-  var api = _ref.api;
-  var annotationState = useSharedPluginStateWithSelector(api, ['annotation'], selector);
-  return annotationState;
-}, function (_ref2) {
-  var _getPluginState;
-  var state = _ref2.state;
-  var _ref3 = (_getPluginState = getPluginState(state)) !== null && _getPluginState !== void 0 ? _getPluginState : {},
-    annotations = _ref3.annotations,
-    bookmark = _ref3.bookmark,
-    isInlineCommentViewClosed = _ref3.isInlineCommentViewClosed,
-    isOpeningMediaCommentFromToolbar = _ref3.isOpeningMediaCommentFromToolbar,
-    selectAnnotationMethod = _ref3.selectAnnotationMethod,
-    selectedAnnotations = _ref3.selectedAnnotations,
-    isAnnotationManagerEnabled = _ref3.isAnnotationManagerEnabled;
-  return {
-    annotations: annotations,
-    bookmark: bookmark,
-    isInlineCommentViewClosed: isInlineCommentViewClosed,
-    isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar,
-    selectAnnotationMethod: selectAnnotationMethod,
-    selectedAnnotations: selectedAnnotations,
-    isAnnotationManagerEnabled: isAnnotationManagerEnabled
-  };
-});
-export function InlineCommentView(_ref4) {
-  var providers = _ref4.providers,
-    editorView = _ref4.editorView,
-    editorAnalyticsAPI = _ref4.editorAnalyticsAPI,
-    editorAPI = _ref4.editorAPI,
-    dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent;
+export function InlineCommentView(_ref) {
+  var providers = _ref.providers,
+    editorView = _ref.editorView,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI,
+    editorAPI = _ref.editorAPI,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
   // As inlineComment is the only annotation present, this function is not generic
   var inlineCommentProvider = providers.inlineComment;
   var state = editorView.state,
@@ -77,21 +52,16 @@ export function InlineCommentView(_ref4) {
   var lastSelectedAnnotationId = useRef();
   var CreateComponent = inlineCommentProvider.createComponent,
     ViewComponent = inlineCommentProvider.viewComponent;
-  var _useAnnotationContent = useAnnotationContentComponentPluginState({
-      api: editorAPI,
-      state: state
-    }),
-    annotations = _useAnnotationContent.annotations,
-    bookmark = _useAnnotationContent.bookmark,
-    isInlineCommentViewClosed = _useAnnotationContent.isInlineCommentViewClosed,
-    isOpeningMediaCommentFromToolbar = _useAnnotationContent.isOpeningMediaCommentFromToolbar,
-    selectAnnotationMethod = _useAnnotationContent.selectAnnotationMethod,
-    selectedAnnotations = _useAnnotationContent.selectedAnnotations,
-    isAnnotationManagerEnabled = _useAnnotationContent.isAnnotationManagerEnabled;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(editorAPI, ['annotation'], selector),
+    annotations = _useSharedPluginState.annotations,
+    bookmark = _useSharedPluginState.bookmark,
+    isInlineCommentViewClosed = _useSharedPluginState.isInlineCommentViewClosed,
+    isOpeningMediaCommentFromToolbar = _useSharedPluginState.isOpeningMediaCommentFromToolbar,
+    selectAnnotationMethod = _useSharedPluginState.selectAnnotationMethod,
+    selectedAnnotations = _useSharedPluginState.selectedAnnotations,
+    isAnnotationManagerEnabled = _useSharedPluginState.isAnnotationManagerEnabled;
   var annotationsList = getAllAnnotations(editorView.state.doc);
-  var selection = getSelectionPositions(state, {
-    bookmark: bookmark
-  });
+  var selection = getSelectionPositions(state, bookmark);
   var position = findPosForDOM(selection);
   var dom;
   try {

package/dist/types/pm-plugins/utils.d.ts

@@ -22,9 +22,9 @@ export declare const findAnnotationsInSelection: (selection: Selection, doc: Nod
 export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[]) => DraftBookmark;
 /**
  * get selection from position to apply new comment for
- * @return bookmarked positions if they exists, otherwise current selection positions
+ * @returns bookmarked positions if they exists, otherwise current selection positions
  */
-export declare function getSelectionPositions(editorState: EditorState, inlineCommentState?: Partial<InlineCommentPluginState> | null | undefined): Selection;
+export declare function getSelectionPositions(editorState: EditorState, bookmark: SelectionBookmark | undefined): Selection;
 export declare const inlineCommentPluginKey: PluginKey<InlineCommentPluginState>;
 export declare const getPluginState: (state: EditorState) => InlineCommentPluginState | undefined;
 /**

package/dist/types-ts4.5/pm-plugins/utils.d.ts

@@ -22,9 +22,9 @@ export declare const findAnnotationsInSelection: (selection: Selection, doc: Nod
 export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[]) => DraftBookmark;
 /**
  * get selection from position to apply new comment for
- * @return bookmarked positions if they exists, otherwise current selection positions
+ * @returns bookmarked positions if they exists, otherwise current selection positions
  */
-export declare function getSelectionPositions(editorState: EditorState, inlineCommentState?: Partial<InlineCommentPluginState> | null | undefined): Selection;
+export declare function getSelectionPositions(editorState: EditorState, bookmark: SelectionBookmark | undefined): Selection;
 export declare const inlineCommentPluginKey: PluginKey<InlineCommentPluginState>;
 export declare const getPluginState: (state: EditorState) => InlineCommentPluginState | undefined;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "4.0.0",
+	"version": "4.0.2",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,19 +33,19 @@
 		"@atlaskit/editor-plugin-connectivity": "^4.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^4.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^3.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^1.0.0",
+		"@atlaskit/editor-plugin-toolbar": "^1.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/editor-toolbar": "^0.6.0",
+		"@atlaskit/editor-toolbar": "^0.7.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/icon": "^28.1.0",
 		"@atlaskit/onboarding": "^14.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^12.0.0",
+		"@atlaskit/tmp-editor-statsig": "^12.2.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^108.0.0",
+		"@atlaskit/editor-common": "^108.1.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},