@atlaskit/editor-plugin-annotation 1.5.8 → 1.5.10

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.5.10
+
+### Patch Changes
+
+- [#91909](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/91909) [`188a4ee3607f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/188a4ee3607f) - Add decoration to annotation marks for block elements to help confluence edit mode identify comments
+
+## 1.5.9
+
+### Patch Changes
+
+- [#91106](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/91106) [`b6ffa30186b9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b6ffa30186b9) - Bump ADF-schema package to version 35.0.0
+- Updated dependencies
+
 ## 1.5.8
 
 ### Patch Changes

package/dist/cjs/commands/index.js

@@ -100,7 +100,7 @@ var removeInlineCommentNearSelection = exports.removeInlineCommentNearSelection
     return true;
   };
 };
-var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, isCommentOnMediaOn, supportedBlockNodes) {
+var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, targetNodeId, isCommentOnMediaOn, supportedBlockNodes) {
   return function (editorState) {
     // validate selection only when entering draft mode
     if (drafting && (0, _utils.isSelectionValid)(editorState, isCommentOnMediaOn) !== _types2.AnnotationSelectionType.VALID) {
@@ -113,7 +113,8 @@ var getDraftCommandAction = function getDraftCommandAction(drafting, targetType,
         editorState: editorState,
         targetType: targetType,
         isCommentOnMediaOn: isCommentOnMediaOn,
-        supportedBlockNodes: supportedBlockNodes
+        supportedBlockNodes: supportedBlockNodes,
+        targetNodeId: targetNodeId
       }
     };
   };
@@ -163,7 +164,8 @@ var setInlineCommentDraftState = exports.setInlineCommentDraftState = function s
     var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
     var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
     var isCommentOnMediaOn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    var commandAction = getDraftCommandAction(drafting, targetType, isCommentOnMediaOn, supportedBlockNodes);
+    var targetNodeId = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : undefined;
+    var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, isCommentOnMediaOn, supportedBlockNodes);
     return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
   };
 };

package/dist/cjs/nodeviews/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAnnotationViewClassname = exports.AnnotationNodeView = void 0;
+exports.getBlockAnnotationViewClassname = exports.getAnnotationViewClassname = exports.AnnotationNodeView = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
@@ -56,4 +56,10 @@ var getAnnotationViewClassname = exports.getAnnotationViewClassname = function g
     return;
   }
   return hasFocus ? _styles.AnnotationSharedClassNames.focus : _styles.AnnotationSharedClassNames.blur;
+};
+var getBlockAnnotationViewClassname = exports.getBlockAnnotationViewClassname = function getBlockAnnotationViewClassname(isUnresolved, hasFocus) {
+  if (!isUnresolved) {
+    return;
+  }
+  return hasFocus ? _styles.BlockAnnotationSharedClassNames.focus : _styles.BlockAnnotationSharedClassNames.blur;
 };

package/dist/cjs/pm-plugins/inline-comment.js

@@ -88,7 +88,8 @@ var initialState = function initialState() {
     isInlineCommentViewClosed: false,
     isVisible: true,
     skipSelectionHandling: false,
-    featureFlagsPluginState: featureFlagsPluginState
+    featureFlagsPluginState: featureFlagsPluginState,
+    isDrafting: false
   };
 };
 var hideToolbar = function hideToolbar(state, dispatch) {
@@ -223,6 +224,8 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : _view.DecorationSet.empty;
         var focusDecorations = [];
         state.doc.descendants(function (node, pos) {
+          var _provider$supportedBl;
+          var isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;
           }).forEach(function (mark) {
@@ -231,10 +234,18 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
               var isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
                 return selectedAnnotation.id === mark.attrs.id;
               }));
-              focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
-                class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
-                nodeName: 'span'
-              }));
+              if (isSupportedBlockNode) {
+                focusDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
+                  class: "".concat((0, _nodeviews.getBlockAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved)
+                }, {
+                  key: _utils.decorationKey.block
+                }));
+              } else {
+                focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
+                  class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
+                  nodeName: 'span'
+                }));
+              }
             }
           });
         });

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

@@ -24,7 +24,7 @@ var _default = exports.default = function _default(pluginState, action) {
         mouseData: mouseData
       });
     case _types.ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
-      return getNewDraftState(pluginState, action.data.drafting, action.data.editorState, action.data.targetType, action.data.isCommentOnMediaOn, action.data.supportedBlockNodes);
+      return getNewDraftState(pluginState, action.data.drafting, action.data.editorState, action.data.targetType, action.data.isCommentOnMediaOn, action.data.supportedBlockNodes, action.data.targetNodeId);
     case _types.ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         dirtyAnnotations: false,
@@ -32,7 +32,8 @@ var _default = exports.default = function _default(pluginState, action) {
       });
     case _types.ACTIONS.CLOSE_COMPONENT:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        isInlineCommentViewClosed: true
+        isInlineCommentViewClosed: true,
+        isDrafting: false
       });
     case _types.ACTIONS.ADD_INLINE_COMMENT:
       var updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -59,13 +60,15 @@ var _default = exports.default = function _default(pluginState, action) {
       return pluginState;
   }
 };
-function getNewDraftState(pluginState, drafting, editorState, targetType, isCommentOnMediaOn, supportedBlockNodes) {
+function getNewDraftState(pluginState, drafting, editorState, targetType, isCommentOnMediaOn, supportedBlockNodes, targetNodeId) {
   var draftDecorationSet = pluginState.draftDecorationSet;
   if (!draftDecorationSet || !drafting) {
     draftDecorationSet = _view.DecorationSet.empty;
   }
   var newState = _objectSpread(_objectSpread({}, pluginState), {}, {
-    draftDecorationSet: draftDecorationSet
+    draftDecorationSet: draftDecorationSet,
+    isDrafting: drafting,
+    targetNodeId: targetNodeId
   });
   newState.bookmark = undefined;
   if (drafting && editorState) {

package/dist/es2019/commands/index.js

@@ -86,7 +86,7 @@ export const removeInlineCommentNearSelection = (id, supportedNodes = []) => (st
   }
   return true;
 };
-const getDraftCommandAction = (drafting, targetType, isCommentOnMediaOn, supportedBlockNodes) => {
+const getDraftCommandAction = (drafting, targetType, targetNodeId, isCommentOnMediaOn, supportedBlockNodes) => {
   return editorState => {
     // validate selection only when entering draft mode
     if (drafting && isSelectionValid(editorState, isCommentOnMediaOn) !== AnnotationSelectionType.VALID) {
@@ -99,7 +99,8 @@ const getDraftCommandAction = (drafting, targetType, isCommentOnMediaOn, support
         editorState,
         targetType,
         isCommentOnMediaOn,
-        supportedBlockNodes
+        supportedBlockNodes,
+        targetNodeId
       }
     };
   };
@@ -136,8 +137,8 @@ export const showInlineCommentForBlockNode = (supportedBlockNodes = []) => node
   }
   return false;
 };
-export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNodes = []) => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', isCommentOnMediaOn = false) => {
-  const commandAction = getDraftCommandAction(drafting, targetType, isCommentOnMediaOn, supportedBlockNodes);
+export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNodes = []) => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', isCommentOnMediaOn = false, targetNodeId = undefined) => {
+  const commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, isCommentOnMediaOn, supportedBlockNodes);
   return createCommand(commandAction, transform.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
 };
 export const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supportedBlockNodes) => {

package/dist/es2019/nodeviews/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
-import { AnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
+import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
 export class AnnotationNodeView extends ReactNodeView {
   createDomRef() {
     return document.createElement('span');
@@ -28,4 +28,10 @@ export const getAnnotationViewClassname = (isUnresolved, hasFocus) => {
     return;
   }
   return hasFocus ? AnnotationSharedClassNames.focus : AnnotationSharedClassNames.blur;
+};
+export const getBlockAnnotationViewClassname = (isUnresolved, hasFocus) => {
+  if (!isUnresolved) {
+    return;
+  }
+  return hasFocus ? BlockAnnotationSharedClassNames.focus : BlockAnnotationSharedClassNames.blur;
 };

package/dist/es2019/pm-plugins/inline-comment.js

@@ -3,8 +3,8 @@ import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
-import { AnnotationNodeView, getAnnotationViewClassname } from '../nodeviews';
-import { getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
+import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
+import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
 import { createPluginState } from './plugin-factory';
 const fetchProviderStates = async (provider, annotationIds) => {
   const data = await provider.getState(annotationIds);
@@ -39,7 +39,8 @@ const initialState = (disallowOnWhitespace = false, featureFlagsPluginState) =>
     isInlineCommentViewClosed: false,
     isVisible: true,
     skipSelectionHandling: false,
-    featureFlagsPluginState
+    featureFlagsPluginState,
+    isDrafting: false
   };
 };
 const hideToolbar = (state, dispatch) => () => {
@@ -163,14 +164,24 @@ export const inlineCommentPlugin = options => {
         let decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         const focusDecorations = [];
         state.doc.descendants((node, pos) => {
+          var _provider$supportedBl;
+          const isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));
           node.marks.filter(mark => mark.type === state.schema.marks.annotation).forEach(mark => {
             if (isVisible) {
               const isUnresolved = !!annotations && annotations[mark.attrs.id] === false;
               const isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(selectedAnnotation => selectedAnnotation.id === mark.attrs.id));
-              focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
-                class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,
-                nodeName: 'span'
-              }));
+              if (isSupportedBlockNode) {
+                focusDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
+                  class: `${getBlockAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`
+                }, {
+                  key: decorationKey.block
+                }));
+              } else {
+                focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
+                  class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,
+                  nodeName: 'span'
+                }));
+              }
             }
           });
         });

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

@@ -18,7 +18,7 @@ export default ((pluginState, action) => {
         mouseData
       };
     case ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
-      return getNewDraftState(pluginState, action.data.drafting, action.data.editorState, action.data.targetType, action.data.isCommentOnMediaOn, action.data.supportedBlockNodes);
+      return getNewDraftState(pluginState, action.data.drafting, action.data.editorState, action.data.targetType, action.data.isCommentOnMediaOn, action.data.supportedBlockNodes, action.data.targetNodeId);
     case ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK:
       return {
         ...pluginState,
@@ -28,7 +28,8 @@ export default ((pluginState, action) => {
     case ACTIONS.CLOSE_COMPONENT:
       return {
         ...pluginState,
-        isInlineCommentViewClosed: true
+        isInlineCommentViewClosed: true,
+        isDrafting: false
       };
     case ACTIONS.ADD_INLINE_COMMENT:
       const updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -63,7 +64,7 @@ export default ((pluginState, action) => {
       return pluginState;
   }
 });
-function getNewDraftState(pluginState, drafting, editorState, targetType, isCommentOnMediaOn, supportedBlockNodes) {
+function getNewDraftState(pluginState, drafting, editorState, targetType, isCommentOnMediaOn, supportedBlockNodes, targetNodeId) {
   let {
     draftDecorationSet
   } = pluginState;
@@ -72,7 +73,9 @@ function getNewDraftState(pluginState, drafting, editorState, targetType, isComm
   }
   let newState = {
     ...pluginState,
-    draftDecorationSet
+    draftDecorationSet,
+    isDrafting: drafting,
+    targetNodeId
   };
   newState.bookmark = undefined;
   if (drafting && editorState) {

package/dist/esm/commands/index.js

@@ -93,7 +93,7 @@ export var removeInlineCommentNearSelection = function removeInlineCommentNearSe
     return true;
   };
 };
-var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, isCommentOnMediaOn, supportedBlockNodes) {
+var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, targetNodeId, isCommentOnMediaOn, supportedBlockNodes) {
   return function (editorState) {
     // validate selection only when entering draft mode
     if (drafting && isSelectionValid(editorState, isCommentOnMediaOn) !== AnnotationSelectionType.VALID) {
@@ -106,7 +106,8 @@ var getDraftCommandAction = function getDraftCommandAction(drafting, targetType,
         editorState: editorState,
         targetType: targetType,
         isCommentOnMediaOn: isCommentOnMediaOn,
-        supportedBlockNodes: supportedBlockNodes
+        supportedBlockNodes: supportedBlockNodes,
+        targetNodeId: targetNodeId
       }
     };
   };
@@ -156,7 +157,8 @@ export var setInlineCommentDraftState = function setInlineCommentDraftState(edit
     var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
     var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
     var isCommentOnMediaOn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    var commandAction = getDraftCommandAction(drafting, targetType, isCommentOnMediaOn, supportedBlockNodes);
+    var targetNodeId = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : undefined;
+    var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, isCommentOnMediaOn, supportedBlockNodes);
     return createCommand(commandAction, transform.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
   };
 };

package/dist/esm/nodeviews/index.js

@@ -7,7 +7,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
-import { AnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
+import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
 export var AnnotationNodeView = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(AnnotationNodeView, _ReactNodeView);
   var _super = _createSuper(AnnotationNodeView);
@@ -49,4 +49,10 @@ export var getAnnotationViewClassname = function getAnnotationViewClassname(isUn
     return;
   }
   return hasFocus ? AnnotationSharedClassNames.focus : AnnotationSharedClassNames.blur;
+};
+export var getBlockAnnotationViewClassname = function getBlockAnnotationViewClassname(isUnresolved, hasFocus) {
+  if (!isUnresolved) {
+    return;
+  }
+  return hasFocus ? BlockAnnotationSharedClassNames.focus : BlockAnnotationSharedClassNames.blur;
 };

package/dist/esm/pm-plugins/inline-comment.js

@@ -6,8 +6,8 @@ import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
-import { AnnotationNodeView, getAnnotationViewClassname } from '../nodeviews';
-import { getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
+import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
+import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
 import { createPluginState } from './plugin-factory';
 var fetchProviderStates = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(provider, annotationIds) {
@@ -81,7 +81,8 @@ var initialState = function initialState() {
     isInlineCommentViewClosed: false,
     isVisible: true,
     skipSelectionHandling: false,
-    featureFlagsPluginState: featureFlagsPluginState
+    featureFlagsPluginState: featureFlagsPluginState,
+    isDrafting: false
   };
 };
 var hideToolbar = function hideToolbar(state, dispatch) {
@@ -216,6 +217,8 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         var focusDecorations = [];
         state.doc.descendants(function (node, pos) {
+          var _provider$supportedBl;
+          var isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;
           }).forEach(function (mark) {
@@ -224,10 +227,18 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
               var isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
                 return selectedAnnotation.id === mark.attrs.id;
               }));
-              focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
-                class: "".concat(getAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved),
-                nodeName: 'span'
-              }));
+              if (isSupportedBlockNode) {
+                focusDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
+                  class: "".concat(getBlockAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved)
+                }, {
+                  key: decorationKey.block
+                }));
+              } else {
+                focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
+                  class: "".concat(getAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved),
+                  nodeName: 'span'
+                }));
+              }
             }
           });
         });

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

@@ -17,7 +17,7 @@ export default (function (pluginState, action) {
         mouseData: mouseData
       });
     case ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
-      return getNewDraftState(pluginState, action.data.drafting, action.data.editorState, action.data.targetType, action.data.isCommentOnMediaOn, action.data.supportedBlockNodes);
+      return getNewDraftState(pluginState, action.data.drafting, action.data.editorState, action.data.targetType, action.data.isCommentOnMediaOn, action.data.supportedBlockNodes, action.data.targetNodeId);
     case ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         dirtyAnnotations: false,
@@ -25,7 +25,8 @@ export default (function (pluginState, action) {
       });
     case ACTIONS.CLOSE_COMPONENT:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        isInlineCommentViewClosed: true
+        isInlineCommentViewClosed: true,
+        isDrafting: false
       });
     case ACTIONS.ADD_INLINE_COMMENT:
       var updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -52,13 +53,15 @@ export default (function (pluginState, action) {
       return pluginState;
   }
 });
-function getNewDraftState(pluginState, drafting, editorState, targetType, isCommentOnMediaOn, supportedBlockNodes) {
+function getNewDraftState(pluginState, drafting, editorState, targetType, isCommentOnMediaOn, supportedBlockNodes, targetNodeId) {
   var draftDecorationSet = pluginState.draftDecorationSet;
   if (!draftDecorationSet || !drafting) {
     draftDecorationSet = DecorationSet.empty;
   }
   var newState = _objectSpread(_objectSpread({}, pluginState), {}, {
-    draftDecorationSet: draftDecorationSet
+    draftDecorationSet: draftDecorationSet,
+    isDrafting: drafting,
+    targetNodeId: targetNodeId
   });
   newState.bookmark = undefined;
   if (drafting && editorState) {

package/dist/types/commands/index.d.ts

@@ -13,7 +13,7 @@ export declare const removeInlineCommentNearSelection: (id: string, supportedNod
  * return false if the node has no comments or no unresolved comments.
  */
 export declare const showInlineCommentForBlockNode: (supportedBlockNodes?: string[]) => (node: PMNode | null) => Command;
-export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[]) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, isCommentOnMediaOn?: boolean) => Command;
+export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[]) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, isCommentOnMediaOn?: boolean, targetNodeId?: string | undefined) => Command;
 export declare const addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, supportedBlockNodes?: string[]) => Command;
 export declare const updateMouseState: (mouseData: InlineCommentMouseData) => Command;
 export declare const setSelectedAnnotation: (id: string) => Command;

package/dist/types/commands/transform.d.ts

@@ -68,7 +68,7 @@ declare const _default: {
         }, import("@atlaskit/editor-common/types").FeatureFlags>>];
         actions: {
             stripNonExistingAnnotations: (slice: import("prosemirror-model").Slice, state: EditorState) => boolean | undefined;
-            setInlineCommentDraftState: (drafting: boolean, inputMethod: InlineCommentInputMethod, targetType?: import("../types").TargetType | undefined, isCommentOnMediaOn?: boolean | undefined) => import("@atlaskit/editor-common/types").Command;
+            setInlineCommentDraftState: (drafting: boolean, inputMethod: InlineCommentInputMethod, targetType?: import("../types").TargetType | undefined, isCommentOnMediaOn?: boolean | undefined, targetNodeId?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             showCommentForBlockNode: (node: import("prosemirror-model").Node | null) => import("@atlaskit/editor-common/types").Command;
         };
     }, import("../types").AnnotationProviders | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {

package/dist/types/nodeviews/index.d.ts

@@ -9,3 +9,4 @@ export declare class AnnotationNodeView extends ReactNodeView {
     render(_props: {}, forwardRef: ForwardRef): JSX.Element;
 }
 export declare const getAnnotationViewClassname: (isUnresolved: boolean, hasFocus: boolean) => string | undefined;
+export declare const getBlockAnnotationViewClassname: (isUnresolved: boolean, hasFocus: boolean) => string | undefined;

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

@@ -40,6 +40,7 @@ export type InlineCommentAction = {
         targetType?: TargetType;
         isCommentOnMediaOn?: boolean;
         supportedBlockNodes?: string[];
+        targetNodeId?: string;
     };
 } | {
     type: ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE;
@@ -81,4 +82,6 @@ export type InlineCommentPluginState = {
     isVisible: boolean;
     skipSelectionHandling: boolean;
     featureFlagsPluginState?: FeatureFlags;
+    isDrafting: boolean;
+    targetNodeId?: string;
 };

package/dist/types/types.d.ts

@@ -24,7 +24,7 @@ type SetInlineCommentDraftState = (drafting: boolean, inputMethod: InlineComment
 /** @default 'inline' */
 targetType?: TargetType, 
 /** check for confluence.frontend.fabric.editor.comments-on-media feature flag */
-isCommentOnMediaOn?: boolean) => Command;
+isCommentOnMediaOn?: boolean, targetNodeId?: string) => Command;
 export type AnnotationPlugin = NextEditorPlugin<'annotation', {
     pluginConfiguration: AnnotationProviders | undefined;
     sharedState: InlineCommentPluginState | undefined;

package/dist/types-ts4.5/commands/index.d.ts

@@ -13,7 +13,7 @@ export declare const removeInlineCommentNearSelection: (id: string, supportedNod
  * return false if the node has no comments or no unresolved comments.
  */
 export declare const showInlineCommentForBlockNode: (supportedBlockNodes?: string[]) => (node: PMNode | null) => Command;
-export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[]) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, isCommentOnMediaOn?: boolean) => Command;
+export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[]) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, isCommentOnMediaOn?: boolean, targetNodeId?: string | undefined) => Command;
 export declare const addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, supportedBlockNodes?: string[]) => Command;
 export declare const updateMouseState: (mouseData: InlineCommentMouseData) => Command;
 export declare const setSelectedAnnotation: (id: string) => Command;

package/dist/types-ts4.5/commands/transform.d.ts

@@ -82,7 +82,7 @@ declare const _default: {
             ];
             actions: {
                 stripNonExistingAnnotations: (slice: import("prosemirror-model").Slice, state: EditorState) => boolean | undefined;
-                setInlineCommentDraftState: (drafting: boolean, inputMethod: InlineCommentInputMethod, targetType?: import("../types").TargetType | undefined, isCommentOnMediaOn?: boolean | undefined) => import("@atlaskit/editor-common/types").Command;
+                setInlineCommentDraftState: (drafting: boolean, inputMethod: InlineCommentInputMethod, targetType?: import("../types").TargetType | undefined, isCommentOnMediaOn?: boolean | undefined, targetNodeId?: string | undefined) => import("@atlaskit/editor-common/types").Command;
                 showCommentForBlockNode: (node: import("prosemirror-model").Node | null) => import("@atlaskit/editor-common/types").Command;
             };
         }, import("../types").AnnotationProviders | undefined>,

package/dist/types-ts4.5/nodeviews/index.d.ts

@@ -9,3 +9,4 @@ export declare class AnnotationNodeView extends ReactNodeView {
     render(_props: {}, forwardRef: ForwardRef): JSX.Element;
 }
 export declare const getAnnotationViewClassname: (isUnresolved: boolean, hasFocus: boolean) => string | undefined;
+export declare const getBlockAnnotationViewClassname: (isUnresolved: boolean, hasFocus: boolean) => string | undefined;

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

@@ -40,6 +40,7 @@ export type InlineCommentAction = {
         targetType?: TargetType;
         isCommentOnMediaOn?: boolean;
         supportedBlockNodes?: string[];
+        targetNodeId?: string;
     };
 } | {
     type: ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE;
@@ -81,4 +82,6 @@ export type InlineCommentPluginState = {
     isVisible: boolean;
     skipSelectionHandling: boolean;
     featureFlagsPluginState?: FeatureFlags;
+    isDrafting: boolean;
+    targetNodeId?: string;
 };

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

@@ -24,7 +24,7 @@ type SetInlineCommentDraftState = (drafting: boolean, inputMethod: InlineComment
 /** @default 'inline' */
 targetType?: TargetType, 
 /** check for confluence.frontend.fabric.editor.comments-on-media feature flag */
-isCommentOnMediaOn?: boolean) => Command;
+isCommentOnMediaOn?: boolean, targetNodeId?: string) => Command;
 export type AnnotationPlugin = NextEditorPlugin<'annotation', {
     pluginConfiguration: AnnotationProviders | undefined;
     sharedState: InlineCommentPluginState | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-annotation",
-  "version": "1.5.8",
+  "version": "1.5.10",
   "description": "Annotation plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -32,8 +32,8 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.8.0",
-    "@atlaskit/editor-common": "^78.26.0",
+    "@atlaskit/adf-schema": "^35.9.0",
+    "@atlaskit/editor-common": "^78.29.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.0.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",