@atlaskit/editor-plugin-annotation 1.19.8 → 1.19.10

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.19.10
+
+### Patch Changes
+
+- [#147094](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/147094)
+  [`9e12a8f47cfef`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9e12a8f47cfef) -
+  [ED-24721] Clean up FF `confluence.frontend.fabric.editor.comments-on-media-analytics`
+- Updated dependencies
+
+## 1.19.9
+
+### Patch Changes
+
+- [#146981](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/146981)
+  [`1bb47674cd3df`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1bb47674cd3df) -
+  [ED-24683] clean up `confluence.frontend.fabric.editor.comments-on-media-media-inline-bug-fix`
+
 ## 1.19.8
 
 ### Patch Changes

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

@@ -228,16 +228,14 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           annotations = _ref5.annotations,
           selectedAnnotations = _ref5.selectedAnnotations,
           isVisible = _ref5.isVisible,
-          isInlineCommentViewClosed = _ref5.isInlineCommentViewClosed,
-          featureFlagsPluginState = _ref5.featureFlagsPluginState;
+          isInlineCommentViewClosed = _ref5.isInlineCommentViewClosed;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : _view.DecorationSet.empty;
         var focusDecorations = [];
-        var isCommentsOnMediaMediaInlineBugFixEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaMediaInlineBugFix;
         state.doc.descendants(function (node, pos) {
           var _provider$supportedBl;
           // Inline comment on mediaInline is not supported as part of comments on media project
           // Thus, we skip the decoration for mediaInline node
-          if (isCommentsOnMediaMediaInlineBugFixEnabled && node.type.name === 'mediaInline') {
+          if (node.type.name === 'mediaInline') {
             return false;
           }
           var isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));

package/dist/cjs/pm-plugins/plugin-factory.js

@@ -55,7 +55,7 @@ var shouldClearBookMarkCheck = exports.shouldClearBookMarkCheck = function shoul
 };
 var getSelectionChangedHandler = function getSelectionChangedHandler(reopenCommentView) {
   return function (tr, pluginState) {
-    var _pluginState$featureF, _pluginState$featureF2;
+    var _pluginState$featureF;
     if (pluginState.skipSelectionHandling) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         skipSelectionHandling: false
@@ -71,7 +71,7 @@ var getSelectionChangedHandler = function getSelectionChangedHandler(reopenComme
         isInlineCommentViewClosed: false
       });
     }
-    var selectedAnnotations = (0, _utils2.findAnnotationsInSelection)(tr.selection, tr.doc, (_pluginState$featureF2 = pluginState.featureFlagsPluginState) === null || _pluginState$featureF2 === void 0 ? void 0 : _pluginState$featureF2.commentsOnMediaMediaInlineBugFix);
+    var selectedAnnotations = (0, _utils2.findAnnotationsInSelection)(tr.selection, tr.doc);
     if (selectedAnnotations.length === 0) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         selectedAnnotations: selectedAnnotations,

package/dist/cjs/ui/InlineCommentView.js

@@ -15,8 +15,6 @@ var _commands = require("../commands");
 var _types = require("../types");
 var _utils3 = require("../utils");
 var _AnnotationViewWrapper = require("./AnnotationViewWrapper");
-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) { (0, _defineProperty2.default)(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; }
 var findPosForDOM = function findPosForDOM(sel) {
   var $from = sel.$from,
     from = sel.from;
@@ -123,9 +121,7 @@ function InlineCommentView(_ref) {
       return;
     }
     var _ref3 = inlineCommentState || {},
-      selectAnnotationMethod = _ref3.selectAnnotationMethod,
-      featureFlagsPluginState = _ref3.featureFlagsPluginState;
-    var isCommentsOnMediaAnalyticsEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaAnalytics;
+      selectAnnotationMethod = _ref3.selectAnnotationMethod;
 
     // fire analytics
     var payload = {
@@ -133,12 +129,11 @@ function InlineCommentView(_ref) {
       actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
       actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
       eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: _objectSpread({
-        overlap: activeAnnotations.length ? activeAnnotations.length - 1 : 0
-      }, isCommentsOnMediaAnalyticsEnabled && {
+      attributes: {
+        overlap: activeAnnotations.length ? activeAnnotations.length - 1 : 0,
         targetNodeType: (_editorView$state$doc = editorView.state.doc.nodeAt(position)) === null || _editorView$state$doc === void 0 ? void 0 : _editorView$state$doc.type.name,
         method: selectAnnotationMethod
-      })
+      }
     };
     dispatchAnalyticsEvent(payload);
   };

package/dist/cjs/utils.js

@@ -167,7 +167,7 @@ var isCurrentBlockNodeSelected = exports.isCurrentBlockNodeSelected = function i
   }
   return false;
 };
-var findAnnotationsInSelection = exports.findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc, isCommentsOnMediaMediaInlineBugFixEnabled) {
+var findAnnotationsInSelection = exports.findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
   var empty = selection.empty,
     $anchor = selection.$anchor,
     anchor = selection.anchor;
@@ -191,7 +191,7 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
 
   // Inline comment on mediaInline is not supported as part of comments on media project
   // Hence, we ignore annotations associated with the node when the cursor is right after/before the node
-  if (isCommentsOnMediaMediaInlineBugFixEnabled && [nodeBefore, node].some(function (node) {
+  if ([nodeBefore, node].some(function (node) {
     return (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaInline';
   })) {
     return [];

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

@@ -167,17 +167,15 @@ export const inlineCommentPlugin = options => {
           annotations,
           selectedAnnotations,
           isVisible,
-          isInlineCommentViewClosed,
-          featureFlagsPluginState
+          isInlineCommentViewClosed
         } = getPluginState(state) || {};
         let decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         const focusDecorations = [];
-        const isCommentsOnMediaMediaInlineBugFixEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaMediaInlineBugFix;
         state.doc.descendants((node, pos) => {
           var _provider$supportedBl;
           // Inline comment on mediaInline is not supported as part of comments on media project
           // Thus, we skip the decoration for mediaInline node
-          if (isCommentsOnMediaMediaInlineBugFixEnabled && node.type.name === 'mediaInline') {
+          if (node.type.name === 'mediaInline') {
             return false;
           }
           const isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));

package/dist/es2019/pm-plugins/plugin-factory.js

@@ -45,7 +45,7 @@ export const shouldClearBookMarkCheck = (tr, editorState, bookmark) => {
   return true;
 };
 const getSelectionChangedHandler = reopenCommentView => (tr, pluginState) => {
-  var _pluginState$featureF, _pluginState$featureF2;
+  var _pluginState$featureF;
   if (pluginState.skipSelectionHandling) {
     return {
       ...pluginState,
@@ -66,7 +66,7 @@ const getSelectionChangedHandler = reopenCommentView => (tr, pluginState) => {
       })
     };
   }
-  const selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc, (_pluginState$featureF2 = pluginState.featureFlagsPluginState) === null || _pluginState$featureF2 === void 0 ? void 0 : _pluginState$featureF2.commentsOnMediaMediaInlineBugFix);
+  const selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc);
   if (selectedAnnotations.length === 0) {
     return {
       ...pluginState,

package/dist/es2019/ui/InlineCommentView.js

@@ -119,10 +119,8 @@ export function InlineCommentView({
       return;
     }
     const {
-      selectAnnotationMethod,
-      featureFlagsPluginState
+      selectAnnotationMethod
     } = inlineCommentState || {};
-    const isCommentsOnMediaAnalyticsEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaAnalytics;
 
     // fire analytics
     const payload = {
@@ -132,10 +130,8 @@ export function InlineCommentView({
       eventType: EVENT_TYPE.TRACK,
       attributes: {
         overlap: activeAnnotations.length ? activeAnnotations.length - 1 : 0,
-        ...(isCommentsOnMediaAnalyticsEnabled && {
-          targetNodeType: (_editorView$state$doc = editorView.state.doc.nodeAt(position)) === null || _editorView$state$doc === void 0 ? void 0 : _editorView$state$doc.type.name,
-          method: selectAnnotationMethod
-        })
+        targetNodeType: (_editorView$state$doc = editorView.state.doc.nodeAt(position)) === null || _editorView$state$doc === void 0 ? void 0 : _editorView$state$doc.type.name,
+        method: selectAnnotationMethod
       }
     };
     dispatchAnalyticsEvent(payload);

package/dist/es2019/utils.js

@@ -128,7 +128,7 @@ export const isCurrentBlockNodeSelected = (state, node) => {
   }
   return false;
 };
-export const findAnnotationsInSelection = (selection, doc, isCommentsOnMediaMediaInlineBugFixEnabled) => {
+export const findAnnotationsInSelection = (selection, doc) => {
   const {
     empty,
     $anchor,
@@ -154,7 +154,7 @@ export const findAnnotationsInSelection = (selection, doc, isCommentsOnMediaMedi
 
   // Inline comment on mediaInline is not supported as part of comments on media project
   // Hence, we ignore annotations associated with the node when the cursor is right after/before the node
-  if (isCommentsOnMediaMediaInlineBugFixEnabled && [nodeBefore, node].some(node => (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaInline')) {
+  if ([nodeBefore, node].some(node => (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaInline')) {
     return [];
   }
   const annotationMark = doc.type.schema.marks.annotation;

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

@@ -221,16 +221,14 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           annotations = _ref5.annotations,
           selectedAnnotations = _ref5.selectedAnnotations,
           isVisible = _ref5.isVisible,
-          isInlineCommentViewClosed = _ref5.isInlineCommentViewClosed,
-          featureFlagsPluginState = _ref5.featureFlagsPluginState;
+          isInlineCommentViewClosed = _ref5.isInlineCommentViewClosed;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         var focusDecorations = [];
-        var isCommentsOnMediaMediaInlineBugFixEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaMediaInlineBugFix;
         state.doc.descendants(function (node, pos) {
           var _provider$supportedBl;
           // Inline comment on mediaInline is not supported as part of comments on media project
           // Thus, we skip the decoration for mediaInline node
-          if (isCommentsOnMediaMediaInlineBugFixEnabled && node.type.name === 'mediaInline') {
+          if (node.type.name === 'mediaInline') {
             return false;
           }
           var isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));

package/dist/esm/pm-plugins/plugin-factory.js

@@ -48,7 +48,7 @@ export var shouldClearBookMarkCheck = function shouldClearBookMarkCheck(tr, edit
 };
 var getSelectionChangedHandler = function getSelectionChangedHandler(reopenCommentView) {
   return function (tr, pluginState) {
-    var _pluginState$featureF, _pluginState$featureF2;
+    var _pluginState$featureF;
     if (pluginState.skipSelectionHandling) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         skipSelectionHandling: false
@@ -64,7 +64,7 @@ var getSelectionChangedHandler = function getSelectionChangedHandler(reopenComme
         isInlineCommentViewClosed: false
       });
     }
-    var selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc, (_pluginState$featureF2 = pluginState.featureFlagsPluginState) === null || _pluginState$featureF2 === void 0 ? void 0 : _pluginState$featureF2.commentsOnMediaMediaInlineBugFix);
+    var selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc);
     if (selectedAnnotations.length === 0) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         selectedAnnotations: selectedAnnotations,

package/dist/esm/ui/InlineCommentView.js

@@ -1,6 +1,4 @@
 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 { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
@@ -116,9 +114,7 @@ export function InlineCommentView(_ref) {
       return;
     }
     var _ref3 = inlineCommentState || {},
-      selectAnnotationMethod = _ref3.selectAnnotationMethod,
-      featureFlagsPluginState = _ref3.featureFlagsPluginState;
-    var isCommentsOnMediaAnalyticsEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaAnalytics;
+      selectAnnotationMethod = _ref3.selectAnnotationMethod;
 
     // fire analytics
     var payload = {
@@ -126,12 +122,11 @@ export function InlineCommentView(_ref) {
       actionSubject: ACTION_SUBJECT.ANNOTATION,
       actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
       eventType: EVENT_TYPE.TRACK,
-      attributes: _objectSpread({
-        overlap: activeAnnotations.length ? activeAnnotations.length - 1 : 0
-      }, isCommentsOnMediaAnalyticsEnabled && {
+      attributes: {
+        overlap: activeAnnotations.length ? activeAnnotations.length - 1 : 0,
         targetNodeType: (_editorView$state$doc = editorView.state.doc.nodeAt(position)) === null || _editorView$state$doc === void 0 ? void 0 : _editorView$state$doc.type.name,
         method: selectAnnotationMethod
-      })
+      }
     };
     dispatchAnalyticsEvent(payload);
   };

package/dist/esm/utils.js

@@ -140,7 +140,7 @@ export var isCurrentBlockNodeSelected = function isCurrentBlockNodeSelected(stat
   }
   return false;
 };
-export var findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc, isCommentsOnMediaMediaInlineBugFixEnabled) {
+export var findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
   var empty = selection.empty,
     $anchor = selection.$anchor,
     anchor = selection.anchor;
@@ -164,7 +164,7 @@ export var findAnnotationsInSelection = function findAnnotationsInSelection(sele
 
   // Inline comment on mediaInline is not supported as part of comments on media project
   // Hence, we ignore annotations associated with the node when the cursor is right after/before the node
-  if (isCommentsOnMediaMediaInlineBugFixEnabled && [nodeBefore, node].some(function (node) {
+  if ([nodeBefore, node].some(function (node) {
     return (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaInline';
   })) {
     return [];

package/dist/types/utils.d.ts

@@ -21,7 +21,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 isCurrentBlockNodeSelected: (state: EditorState, node: Node) => boolean;
-export declare const findAnnotationsInSelection: (selection: Selection, doc: Node, isCommentsOnMediaMediaInlineBugFixEnabled?: boolean) => AnnotationInfo[];
+export declare const findAnnotationsInSelection: (selection: Selection, doc: Node) => AnnotationInfo[];
 export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[]) => DraftBookmark;
 /**
  * get selection from position to apply new comment for

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

@@ -21,7 +21,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 isCurrentBlockNodeSelected: (state: EditorState, node: Node) => boolean;
-export declare const findAnnotationsInSelection: (selection: Selection, doc: Node, isCommentsOnMediaMediaInlineBugFixEnabled?: boolean) => AnnotationInfo[];
+export declare const findAnnotationsInSelection: (selection: Selection, doc: Node) => AnnotationInfo[];
 export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[]) => DraftBookmark;
 /**
  * get selection from position to apply new comment for

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.19.8",
+	"version": "1.19.10",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,12 +32,12 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/editor-common": "^91.0.0",
+		"@atlaskit/editor-common": "^92.0.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^1.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
-		"@atlaskit/icon": "^22.18.0",
+		"@atlaskit/icon": "^22.19.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@babel/runtime": "^7.0.0"
 	},