@atlaskit/editor-plugin-annotation 27.0.5 → 27.0.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-annotation
 
+## 27.0.6
+
+### Patch Changes
+
+- [`38bcbb3966a67`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/38bcbb3966a67) -
+  Prevent Remix Edit from opening inline comments when it collapses the chart selection. Explicit
+  comment actions remain supported with cc_maui_annotations_on_extensions enabled; rollback behavior
+  is unchanged.
+
 ## 27.0.5
 
 ### Patch Changes

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

@@ -146,10 +146,13 @@ var getAnnotationViewKey = exports.getAnnotationViewKey = function getAnnotation
   }).join('_');
   return "view-annotation-wrapper_".concat(keys);
 };
+var isRemixExtension = function isRemixExtension(node) {
+  return node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui';
+};
 
 // During rollback, hide chart highlights and automatic comment opening, not saved marks.
 var shouldHideRemixAnnotation = exports.shouldHideRemixAnnotation = function shouldHideRemixAnnotation(node) {
-  return node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui' && !(0, _fg.fg)('cc_maui_annotations_on_extensions');
+  return isRemixExtension(node) && !(0, _fg.fg)('cc_maui_annotations_on_extensions');
 };
 var findAnnotationsInSelection = exports.findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
   var empty = selection.empty,
@@ -181,12 +184,14 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
     return [];
   }
   var annotationMark = doc.type.schema.marks.annotation;
-  var anchorAnnotationMarks = node && !shouldHideRemixAnnotation(node) ? node.marks : [];
+  // Opening Remix Edit moves the selection beside the chart. Only explicit comment
+  // actions should open its threads; a nearby caret must not select its annotations.
+  var anchorAnnotationMarks = node && !isRemixExtension(node) ? node.marks : [];
   var marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {
     marks = anchorAnnotationMarks;
   }
-  if (nodeBefore && !shouldHideRemixAnnotation(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
+  if (nodeBefore && !isRemixExtension(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
     var _marks;
     var existingMarkIds = marks.map(function (m) {
       return m.attrs.id;

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

@@ -114,9 +114,10 @@ export const getAnnotationViewKey = annotations => {
   const keys = annotations.map(mark => mark.id).join('_');
   return `view-annotation-wrapper_${keys}`;
 };
+const isRemixExtension = node => node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui';
 
 // During rollback, hide chart highlights and automatic comment opening, not saved marks.
-export const shouldHideRemixAnnotation = node => node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui' && !fg('cc_maui_annotations_on_extensions');
+export const shouldHideRemixAnnotation = node => isRemixExtension(node) && !fg('cc_maui_annotations_on_extensions');
 export const findAnnotationsInSelection = (selection, doc) => {
   const {
     empty,
@@ -147,12 +148,14 @@ export const findAnnotationsInSelection = (selection, doc) => {
     return [];
   }
   const annotationMark = doc.type.schema.marks.annotation;
-  const anchorAnnotationMarks = node && !shouldHideRemixAnnotation(node) ? node.marks : [];
+  // Opening Remix Edit moves the selection beside the chart. Only explicit comment
+  // actions should open its threads; a nearby caret must not select its annotations.
+  const anchorAnnotationMarks = node && !isRemixExtension(node) ? node.marks : [];
   let marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {
     marks = anchorAnnotationMarks;
   }
-  if (nodeBefore && !shouldHideRemixAnnotation(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
+  if (nodeBefore && !isRemixExtension(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)));
   }

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

@@ -129,10 +129,13 @@ export var getAnnotationViewKey = function getAnnotationViewKey(annotations) {
   }).join('_');
   return "view-annotation-wrapper_".concat(keys);
 };
+var isRemixExtension = function isRemixExtension(node) {
+  return node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui';
+};
 
 // During rollback, hide chart highlights and automatic comment opening, not saved marks.
 export var shouldHideRemixAnnotation = function shouldHideRemixAnnotation(node) {
-  return node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui' && !fg('cc_maui_annotations_on_extensions');
+  return isRemixExtension(node) && !fg('cc_maui_annotations_on_extensions');
 };
 export var findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
   var empty = selection.empty,
@@ -164,12 +167,14 @@ export var findAnnotationsInSelection = function findAnnotationsInSelection(sele
     return [];
   }
   var annotationMark = doc.type.schema.marks.annotation;
-  var anchorAnnotationMarks = node && !shouldHideRemixAnnotation(node) ? node.marks : [];
+  // Opening Remix Edit moves the selection beside the chart. Only explicit comment
+  // actions should open its threads; a nearby caret must not select its annotations.
+  var anchorAnnotationMarks = node && !isRemixExtension(node) ? node.marks : [];
   var marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {
     marks = anchorAnnotationMarks;
   }
-  if (nodeBefore && !shouldHideRemixAnnotation(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
+  if (nodeBefore && !isRemixExtension(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
     var _marks;
     var existingMarkIds = marks.map(function (m) {
       return m.attrs.id;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "27.0.5",
+	"version": "27.0.6",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^131.2.0",
+		"@atlaskit/editor-common": "^131.4.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"