@atlaskit/editor-plugin-annotation 2.6.0 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-annotation
 
+## 2.7.0
+
+### Minor Changes
+
+- [#143244](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/143244)
+  [`569fc7473a725`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/569fc7473a725) -
+  adding event to platform to close inline comment in editor
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.6.0
 
 ### Minor Changes

package/dist/cjs/editor-commands/transform.js

@@ -40,13 +40,9 @@ var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
 
       // The mark may not be applied to the current "head" of the bookmark so determine what was applied
       // above and use that instead
-      if ((0, _platformFeatureFlags.fg)('platform_editor_fix_missing_selected_annotations')) {
-        var annotationMarkStep = _tr.steps.reverse().find(isAnnotationStep);
-        var headBasedOnMark = from === head ? annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.from : annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.to;
-        _tr.setSelection(_state.TextSelection.create(_tr.doc, headBasedOnMark !== null && headBasedOnMark !== void 0 ? headBasedOnMark : head));
-      } else {
-        _tr.setSelection(_state.TextSelection.create(_tr.doc, head));
-      }
+      var annotationMarkStep = _tr.steps.reverse().find(isAnnotationStep);
+      var headBasedOnMark = from === head ? annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.from : annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.to;
+      _tr.setSelection(_state.TextSelection.create(_tr.doc, headBasedOnMark !== null && headBasedOnMark !== void 0 ? headBasedOnMark : head));
     }
     return tr;
   };

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

@@ -216,9 +216,12 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       var removeHoveredannotationFn = function removeHoveredannotationFn() {
         (0, _editorCommands.setHoveredAnnotation)('')(editorView.state, editorView.dispatch);
       };
+      var closeInlineCommentFn = function closeInlineCommentFn() {
+        (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);
+      };
       var updateSubscriber = provider.updateSubscriber;
       if (updateSubscriber) {
-        updateSubscriber.on('resolve', resolve).on('delete', resolve).on('unresolve', unResolve).on('create', unResolve).on('setvisibility', setVisibility).on('setselectedannotation', setSelectedAnnotationFn).on('sethoveredannotation', setHoveredAnnotationFn).on('removehoveredannotation', removeHoveredannotationFn);
+        updateSubscriber.on('resolve', resolve).on('delete', resolve).on('unresolve', unResolve).on('create', unResolve).on('setvisibility', setVisibility).on('setselectedannotation', setSelectedAnnotationFn).on('sethoveredannotation', setHoveredAnnotationFn).on('removehoveredannotation', removeHoveredannotationFn).on('closeinlinecomment', closeInlineCommentFn);
       }
 
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -251,7 +254,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
           editorView.root.removeEventListener('mouseup', mouseUp);
           if (updateSubscriber) {
-            updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn).off('sethoveredannotation', setHoveredAnnotationFn).off('removehoveredannotation', removeHoveredannotationFn);
+            updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn).off('sethoveredannotation', setHoveredAnnotationFn).off('removehoveredannotation', removeHoveredannotationFn).off('closeinlinecomment', closeInlineCommentFn);
           }
         }
       };

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

@@ -189,25 +189,17 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
   var annotationMark = doc.type.schema.marks.annotation;
   var anchorAnnotationMarks = (node === null || node === void 0 ? void 0 : node.marks) || [];
   var marks = [];
-  if ((0, _platformFeatureFlags.fg)('platform_editor_fix_missing_selected_annotations')) {
-    if (annotationMark.isInSet(anchorAnnotationMarks)) {
-      marks = anchorAnnotationMarks;
-    }
-    if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
-      var _marks;
-      var existingMarkIds = marks.map(function (m) {
-        return m.attrs.id;
-      });
-      marks = (_marks = marks).concat.apply(_marks, (0, _toConsumableArray2.default)(nodeBefore.marks.filter(function (m) {
-        return !existingMarkIds.includes(m.attrs.id);
-      })));
-    }
-  } else {
-    if (annotationMark.isInSet(anchorAnnotationMarks)) {
-      marks = anchorAnnotationMarks;
-    } else if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
-      marks = nodeBefore.marks;
-    }
+  if (annotationMark.isInSet(anchorAnnotationMarks)) {
+    marks = anchorAnnotationMarks;
+  }
+  if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
+    var _marks;
+    var existingMarkIds = marks.map(function (m) {
+      return m.attrs.id;
+    });
+    marks = (_marks = marks).concat.apply(_marks, (0, _toConsumableArray2.default)(nodeBefore.marks.filter(function (m) {
+      return !existingMarkIds.includes(m.attrs.id);
+    })));
   }
   var annotations = marks.filter(function (mark) {
     return mark.type.name === 'annotation';

package/dist/cjs/ui/InlineCommentView.js

@@ -102,8 +102,11 @@ function InlineCommentView(_ref) {
       textSelection: textSelection,
       onCreate: function onCreate(id) {
         if (!(0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager')) {
-          (0, _editorCommands.createAnnotation)(editorAnalyticsAPI, editorAPI)(id, _adfSchema.AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+          var createAnnotationResult = (0, _editorCommands.createAnnotation)(editorAnalyticsAPI, editorAPI)(id, _adfSchema.AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
           !editorView.hasFocus() && editorView.focus();
+          if (!createAnnotationResult && (0, _platformFeatureFlags.fg)('confluence_frontend_handle_annotation_error')) {
+            throw new Error('Failed to create annotation');
+          }
         }
       },
       onClose: function onClose() {

package/dist/es2019/editor-commands/transform.js

@@ -33,13 +33,9 @@ const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {
 
     // The mark may not be applied to the current "head" of the bookmark so determine what was applied
     // above and use that instead
-    if (fg('platform_editor_fix_missing_selected_annotations')) {
-      const annotationMarkStep = tr.steps.reverse().find(isAnnotationStep);
-      const headBasedOnMark = from === head ? annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.from : annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.to;
-      tr.setSelection(TextSelection.create(tr.doc, headBasedOnMark !== null && headBasedOnMark !== void 0 ? headBasedOnMark : head));
-    } else {
-      tr.setSelection(TextSelection.create(tr.doc, head));
-    }
+    const annotationMarkStep = tr.steps.reverse().find(isAnnotationStep);
+    const headBasedOnMark = from === head ? annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.from : annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.to;
+    tr.setSelection(TextSelection.create(tr.doc, headBasedOnMark !== null && headBasedOnMark !== void 0 ? headBasedOnMark : head));
   }
   return tr;
 };

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

@@ -148,11 +148,14 @@ export const inlineCommentPlugin = options => {
       const removeHoveredannotationFn = () => {
         setHoveredAnnotation('')(editorView.state, editorView.dispatch);
       };
+      const closeInlineCommentFn = () => {
+        closeComponent()(editorView.state, editorView.dispatch);
+      };
       const {
         updateSubscriber
       } = provider;
       if (updateSubscriber) {
-        updateSubscriber.on('resolve', resolve).on('delete', resolve).on('unresolve', unResolve).on('create', unResolve).on('setvisibility', setVisibility).on('setselectedannotation', setSelectedAnnotationFn).on('sethoveredannotation', setHoveredAnnotationFn).on('removehoveredannotation', removeHoveredannotationFn);
+        updateSubscriber.on('resolve', resolve).on('delete', resolve).on('unresolve', unResolve).on('create', unResolve).on('setvisibility', setVisibility).on('setselectedannotation', setSelectedAnnotationFn).on('sethoveredannotation', setHoveredAnnotationFn).on('removehoveredannotation', removeHoveredannotationFn).on('closeinlinecomment', closeInlineCommentFn);
       }
 
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -188,7 +191,7 @@ export const inlineCommentPlugin = options => {
           // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
           editorView.root.removeEventListener('mouseup', mouseUp);
           if (updateSubscriber) {
-            updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn).off('sethoveredannotation', setHoveredAnnotationFn).off('removehoveredannotation', removeHoveredannotationFn);
+            updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn).off('sethoveredannotation', setHoveredAnnotationFn).off('removehoveredannotation', removeHoveredannotationFn).off('closeinlinecomment', closeInlineCommentFn);
           }
         }
       };

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

@@ -159,20 +159,12 @@ export const findAnnotationsInSelection = (selection, doc) => {
   const annotationMark = doc.type.schema.marks.annotation;
   const anchorAnnotationMarks = (node === null || node === void 0 ? void 0 : node.marks) || [];
   let marks = [];
-  if (fg('platform_editor_fix_missing_selected_annotations')) {
-    if (annotationMark.isInSet(anchorAnnotationMarks)) {
-      marks = anchorAnnotationMarks;
-    }
-    if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
-      const existingMarkIds = marks.map(m => m.attrs.id);
-      marks = marks.concat(...nodeBefore.marks.filter(m => !existingMarkIds.includes(m.attrs.id)));
-    }
-  } else {
-    if (annotationMark.isInSet(anchorAnnotationMarks)) {
-      marks = anchorAnnotationMarks;
-    } else if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
-      marks = nodeBefore.marks;
-    }
+  if (annotationMark.isInSet(anchorAnnotationMarks)) {
+    marks = anchorAnnotationMarks;
+  }
+  if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
+    const existingMarkIds = marks.map(m => m.attrs.id);
+    marks = marks.concat(...nodeBefore.marks.filter(m => !existingMarkIds.includes(m.attrs.id)));
   }
   const annotations = marks.filter(mark => mark.type.name === 'annotation').map(mark => ({
     id: mark.attrs.id,

package/dist/es2019/ui/InlineCommentView.js

@@ -102,8 +102,11 @@ export function InlineCommentView({
       textSelection: textSelection,
       onCreate: id => {
         if (!fg('platform_editor_comments_api_manager')) {
-          createAnnotation(editorAnalyticsAPI, editorAPI)(id, AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+          const createAnnotationResult = createAnnotation(editorAnalyticsAPI, editorAPI)(id, AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
           !editorView.hasFocus() && editorView.focus();
+          if (!createAnnotationResult && fg('confluence_frontend_handle_annotation_error')) {
+            throw new Error('Failed to create annotation');
+          }
         }
       },
       onClose: () => {

package/dist/esm/editor-commands/transform.js

@@ -34,13 +34,9 @@ var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
 
       // The mark may not be applied to the current "head" of the bookmark so determine what was applied
       // above and use that instead
-      if (fg('platform_editor_fix_missing_selected_annotations')) {
-        var annotationMarkStep = _tr.steps.reverse().find(isAnnotationStep);
-        var headBasedOnMark = from === head ? annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.from : annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.to;
-        _tr.setSelection(TextSelection.create(_tr.doc, headBasedOnMark !== null && headBasedOnMark !== void 0 ? headBasedOnMark : head));
-      } else {
-        _tr.setSelection(TextSelection.create(_tr.doc, head));
-      }
+      var annotationMarkStep = _tr.steps.reverse().find(isAnnotationStep);
+      var headBasedOnMark = from === head ? annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.from : annotationMarkStep === null || annotationMarkStep === void 0 ? void 0 : annotationMarkStep.to;
+      _tr.setSelection(TextSelection.create(_tr.doc, headBasedOnMark !== null && headBasedOnMark !== void 0 ? headBasedOnMark : head));
     }
     return tr;
   };

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

@@ -209,9 +209,12 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       var removeHoveredannotationFn = function removeHoveredannotationFn() {
         setHoveredAnnotation('')(editorView.state, editorView.dispatch);
       };
+      var closeInlineCommentFn = function closeInlineCommentFn() {
+        closeComponent()(editorView.state, editorView.dispatch);
+      };
       var updateSubscriber = provider.updateSubscriber;
       if (updateSubscriber) {
-        updateSubscriber.on('resolve', resolve).on('delete', resolve).on('unresolve', unResolve).on('create', unResolve).on('setvisibility', setVisibility).on('setselectedannotation', setSelectedAnnotationFn).on('sethoveredannotation', setHoveredAnnotationFn).on('removehoveredannotation', removeHoveredannotationFn);
+        updateSubscriber.on('resolve', resolve).on('delete', resolve).on('unresolve', unResolve).on('create', unResolve).on('setvisibility', setVisibility).on('setselectedannotation', setSelectedAnnotationFn).on('sethoveredannotation', setHoveredAnnotationFn).on('removehoveredannotation', removeHoveredannotationFn).on('closeinlinecomment', closeInlineCommentFn);
       }
 
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -244,7 +247,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
           editorView.root.removeEventListener('mouseup', mouseUp);
           if (updateSubscriber) {
-            updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn).off('sethoveredannotation', setHoveredAnnotationFn).off('removehoveredannotation', removeHoveredannotationFn);
+            updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn).off('sethoveredannotation', setHoveredAnnotationFn).off('removehoveredannotation', removeHoveredannotationFn).off('closeinlinecomment', closeInlineCommentFn);
           }
         }
       };

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

@@ -172,25 +172,17 @@ export var findAnnotationsInSelection = function findAnnotationsInSelection(sele
   var annotationMark = doc.type.schema.marks.annotation;
   var anchorAnnotationMarks = (node === null || node === void 0 ? void 0 : node.marks) || [];
   var marks = [];
-  if (fg('platform_editor_fix_missing_selected_annotations')) {
-    if (annotationMark.isInSet(anchorAnnotationMarks)) {
-      marks = anchorAnnotationMarks;
-    }
-    if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
-      var _marks;
-      var existingMarkIds = marks.map(function (m) {
-        return m.attrs.id;
-      });
-      marks = (_marks = marks).concat.apply(_marks, _toConsumableArray(nodeBefore.marks.filter(function (m) {
-        return !existingMarkIds.includes(m.attrs.id);
-      })));
-    }
-  } else {
-    if (annotationMark.isInSet(anchorAnnotationMarks)) {
-      marks = anchorAnnotationMarks;
-    } else if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
-      marks = nodeBefore.marks;
-    }
+  if (annotationMark.isInSet(anchorAnnotationMarks)) {
+    marks = anchorAnnotationMarks;
+  }
+  if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
+    var _marks;
+    var existingMarkIds = marks.map(function (m) {
+      return m.attrs.id;
+    });
+    marks = (_marks = marks).concat.apply(_marks, _toConsumableArray(nodeBefore.marks.filter(function (m) {
+      return !existingMarkIds.includes(m.attrs.id);
+    })));
   }
   var annotations = marks.filter(function (mark) {
     return mark.type.name === 'annotation';

package/dist/esm/ui/InlineCommentView.js

@@ -95,8 +95,11 @@ export function InlineCommentView(_ref) {
       textSelection: textSelection,
       onCreate: function onCreate(id) {
         if (!fg('platform_editor_comments_api_manager')) {
-          createAnnotation(editorAnalyticsAPI, editorAPI)(id, AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+          var createAnnotationResult = createAnnotation(editorAnalyticsAPI, editorAPI)(id, AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
           !editorView.hasFocus() && editorView.focus();
+          if (!createAnnotationResult && fg('confluence_frontend_handle_annotation_error')) {
+            throw new Error('Failed to create annotation');
+          }
         }
       },
       onClose: function onClose() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "2.6.0",
+	"version": "2.7.0",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^103.9.0",
+		"@atlaskit/editor-common": "^103.11.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^2.0.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/onboarding": "^14.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.11.0",
+		"@atlaskit/tmp-editor-statsig": "^4.12.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
@@ -99,9 +99,6 @@
 		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
 		},
-		"platform_editor_fix_missing_selected_annotations": {
-			"type": "boolean"
-		},
 		"use_comments_data_annotation_updater": {
 			"type": "boolean"
 		},
@@ -119,6 +116,9 @@
 		},
 		"confluence_comments_select_comment_experience": {
 			"type": "boolean"
+		},
+		"confluence_frontend_handle_annotation_error": {
+			"type": "boolean"
 		}
 	}
 }