@atlaskit/editor-plugin-annotation 26.0.1 → 26.0.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-annotation
 
+## 26.0.2
+
+### Patch Changes
+
+- [`0b815dd6718ea`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0b815dd6718ea) -
+  When cc_maui_annotations_on_extensions is off, prevent saved Remix chart comments from showing
+  yellow text highlights or opening automatically when editor selection moves beside the chart. Keep
+  annotation marks in the document and preserve explicit comment navigation. Creation-experiment
+  behavior, media comments, and other extensions are unchanged.
+- Updated dependencies
+
 ## 26.0.1
 
 ### Patch Changes

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

@@ -467,6 +467,10 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
         // everytime we need to update the decorations. This handler will be called alot. We should be caching
         // the decorations in plugin state and only updating them when required.
         state.doc.descendants(function (node, pos) {
+          // Do not render saved chart marks as text highlights when annotation support is off.
+          if ((0, _utils3.shouldHideRemixAnnotation)(node)) {
+            return false;
+          }
           // Inline comment on mediaInline is not supported as part of comments on media project
           // Thus, we skip the decoration for mediaInline node
           if (node.type.name === 'mediaInline') {

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

@@ -12,7 +12,7 @@ exports.hasInvalidNodes = exports.hasAnyUnResolvedAnnotationInPage = void 0;
 exports.hasInvalidWhitespaceNode = hasInvalidWhitespaceNode;
 exports.isBlockNodeAnnotationsSelected = exports.inlineCommentPluginKey = void 0;
 exports.isSelectedAnnotationsChanged = isSelectedAnnotationsChanged;
-exports.resolveDraftBookmark = exports.isSupportedBlockNode = exports.isSelectionValid = void 0;
+exports.shouldHideRemixAnnotation = exports.resolveDraftBookmark = exports.isSupportedBlockNode = exports.isSelectionValid = void 0;
 exports.stripNonExistingAnnotations = stripNonExistingAnnotations;
 exports.surroundingMarks = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -145,6 +145,11 @@ var getAnnotationViewKey = exports.getAnnotationViewKey = function getAnnotation
   }).join('_');
   return "view-annotation-wrapper_".concat(keys);
 };
+
+// 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');
+};
 var findAnnotationsInSelection = exports.findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
   var empty = selection.empty,
     $anchor = selection.$anchor,
@@ -175,12 +180,12 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
     return [];
   }
   var annotationMark = doc.type.schema.marks.annotation;
-  var anchorAnnotationMarks = (node === null || node === void 0 ? void 0 : node.marks) || [];
+  var anchorAnnotationMarks = node && !shouldHideRemixAnnotation(node) ? node.marks : [];
   var marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {
     marks = anchorAnnotationMarks;
   }
-  if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
+  if (nodeBefore && !shouldHideRemixAnnotation(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
     var _marks;
     var existingMarkIds = marks.map(function (m) {
       return m.attrs.id;
@@ -478,6 +483,9 @@ function isSelectedAnnotationsChanged(oldSelectedAnnotations, newSelectedAnnotat
 var isBlockNodeAnnotationsSelected = exports.isBlockNodeAnnotationsSelected = function isBlockNodeAnnotationsSelected(selection) {
   var selectedAnnotations = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   if (selectedAnnotations.length && selection instanceof _state.NodeSelection) {
+    if (shouldHideRemixAnnotation(selection.node)) {
+      return false;
+    }
     var node = selection.node.type.name === 'mediaSingle' ? selection.node.firstChild : selection.node;
     var annotationMarks = (node === null || node === void 0 ? void 0 : node.marks.filter(function (mark) {
       return mark.type.name === 'annotation';

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

@@ -10,7 +10,7 @@ import { getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../
 import { allowAnnotation, applyDraft, clearDraft, clearAnnotation, getDraft, setIsAnnotationHovered, setIsAnnotationSelected, startDraft } from './annotation-manager-hooks';
 import { createPluginState } from './plugin-factory';
 import { shouldSuppressFloatingToolbar } from './toolbar';
-import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey, isSupportedBlockNode } from './utils';
+import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey, isSupportedBlockNode, shouldHideRemixAnnotation } from './utils';
 const fetchProviderStates = async (provider, annotationIds) => {
   if (!provider || !provider.getState) {
     return {};
@@ -409,6 +409,10 @@ export const inlineCommentPlugin = options => {
         // everytime we need to update the decorations. This handler will be called alot. We should be caching
         // the decorations in plugin state and only updating them when required.
         state.doc.descendants((node, pos) => {
+          // Do not render saved chart marks as text highlights when annotation support is off.
+          if (shouldHideRemixAnnotation(node)) {
+            return false;
+          }
           // Inline comment on mediaInline is not supported as part of comments on media project
           // Thus, we skip the decoration for mediaInline node
           if (node.type.name === 'mediaInline') {

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

@@ -113,6 +113,9 @@ export const getAnnotationViewKey = annotations => {
   const keys = annotations.map(mark => mark.id).join('_');
   return `view-annotation-wrapper_${keys}`;
 };
+
+// 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 findAnnotationsInSelection = (selection, doc) => {
   const {
     empty,
@@ -143,12 +146,12 @@ export const findAnnotationsInSelection = (selection, doc) => {
     return [];
   }
   const annotationMark = doc.type.schema.marks.annotation;
-  const anchorAnnotationMarks = (node === null || node === void 0 ? void 0 : node.marks) || [];
+  const anchorAnnotationMarks = node && !shouldHideRemixAnnotation(node) ? node.marks : [];
   let marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {
     marks = anchorAnnotationMarks;
   }
-  if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
+  if (nodeBefore && !shouldHideRemixAnnotation(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)));
   }
@@ -437,6 +440,9 @@ export function isSelectedAnnotationsChanged(oldSelectedAnnotations, newSelected
  */
 export const isBlockNodeAnnotationsSelected = (selection, selectedAnnotations = []) => {
   if (selectedAnnotations.length && selection instanceof NodeSelection) {
+    if (shouldHideRemixAnnotation(selection.node)) {
+      return false;
+    }
     const node = selection.node.type.name === 'mediaSingle' ? selection.node.firstChild : selection.node;
     const annotationMarks = (node === null || node === void 0 ? void 0 : node.marks.filter(mark => mark.type.name === 'annotation').map(mark => ({
       id: mark.attrs.id,

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

@@ -13,7 +13,7 @@ import { getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../
 import { allowAnnotation, applyDraft, clearDraft, clearAnnotation, getDraft, setIsAnnotationHovered, setIsAnnotationSelected, startDraft } from './annotation-manager-hooks';
 import { createPluginState } from './plugin-factory';
 import { shouldSuppressFloatingToolbar } from './toolbar';
-import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey, isSupportedBlockNode } from './utils';
+import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey, isSupportedBlockNode, shouldHideRemixAnnotation } from './utils';
 var fetchProviderStates = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(provider, annotationIds) {
     var data, result;
@@ -460,6 +460,10 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
         // everytime we need to update the decorations. This handler will be called alot. We should be caching
         // the decorations in plugin state and only updating them when required.
         state.doc.descendants(function (node, pos) {
+          // Do not render saved chart marks as text highlights when annotation support is off.
+          if (shouldHideRemixAnnotation(node)) {
+            return false;
+          }
           // Inline comment on mediaInline is not supported as part of comments on media project
           // Thus, we skip the decoration for mediaInline node
           if (node.type.name === 'mediaInline') {

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

@@ -128,6 +128,11 @@ export var getAnnotationViewKey = function getAnnotationViewKey(annotations) {
   }).join('_');
   return "view-annotation-wrapper_".concat(keys);
 };
+
+// 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');
+};
 export var findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
   var empty = selection.empty,
     $anchor = selection.$anchor,
@@ -158,12 +163,12 @@ export var findAnnotationsInSelection = function findAnnotationsInSelection(sele
     return [];
   }
   var annotationMark = doc.type.schema.marks.annotation;
-  var anchorAnnotationMarks = (node === null || node === void 0 ? void 0 : node.marks) || [];
+  var anchorAnnotationMarks = node && !shouldHideRemixAnnotation(node) ? node.marks : [];
   var marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {
     marks = anchorAnnotationMarks;
   }
-  if (nodeBefore && annotationMark.isInSet(nodeBefore.marks)) {
+  if (nodeBefore && !shouldHideRemixAnnotation(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
     var _marks;
     var existingMarkIds = marks.map(function (m) {
       return m.attrs.id;
@@ -461,6 +466,9 @@ export function isSelectedAnnotationsChanged(oldSelectedAnnotations, newSelected
 export var isBlockNodeAnnotationsSelected = function isBlockNodeAnnotationsSelected(selection) {
   var selectedAnnotations = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   if (selectedAnnotations.length && selection instanceof NodeSelection) {
+    if (shouldHideRemixAnnotation(selection.node)) {
+      return false;
+    }
     var node = selection.node.type.name === 'mediaSingle' ? selection.node.firstChild : selection.node;
     var annotationMarks = (node === null || node === void 0 ? void 0 : node.marks.filter(function (mark) {
       return mark.type.name === 'annotation';

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

@@ -18,6 +18,7 @@ export declare const decorationKey: {
 };
 export declare const addDraftDecoration: (start: number, end: number, targetType?: TargetType) => Decoration;
 export declare const getAnnotationViewKey: (annotations: AnnotationInfo[]) => string;
+export declare const shouldHideRemixAnnotation: (node: Node) => boolean;
 export declare const findAnnotationsInSelection: (selection: Selection, doc: Node) => AnnotationInfo[];
 export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => DraftBookmark;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "26.0.1",
+	"version": "26.0.2",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,11 +31,11 @@
 		"@atlaskit/editor-toolbar-model": "^1.2.0",
 		"@atlaskit/icon": "^38.0.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^228.0.0",
+		"@atlaskit/tmp-editor-statsig": "^229.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^130.1.0",
+		"@atlaskit/editor-common": "^130.3.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"