@atlaskit/editor-plugin-annotation 1.14.1 → 1.14.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.14.2
+
+### Patch Changes
+
+- [#113218](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113218)
+  [`d1b428ec29d68`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d1b428ec29d68) -
+  [ED-23765] migrate inline node commenting feature flags to statsig feature gate
+- Updated dependencies
+
 ## 1.14.1
 
 ### Patch Changes

package/dist/cjs/commands/transform.js

@@ -95,7 +95,7 @@ var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
       actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
       attributes: {}
     };
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       var _ref2 = (0, _utils2.getPluginState)(state) || {},
         bookmark = _ref2.bookmark;
 

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

@@ -249,7 +249,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                   key: _utils.decorationKey.block
                 }));
               } else {
-                if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+                if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
                   if (node.isText) {
                     focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
                       class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),

package/dist/cjs/toolbar.js

@@ -30,7 +30,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
       return undefined;
     }
     var createCommentMessage = intl.formatMessage(_messages.annotationMessages.createComment);
-    var commentDisabledMessage = intl.formatMessage((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
+    var commentDisabledMessage = intl.formatMessage((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
     var createComment = {
       type: 'button',
       showTitle: true,

package/dist/cjs/utils.js

@@ -173,7 +173,7 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
     anchor = selection.anchor;
   // Only detect annotations on caret selection
   if (!empty || !doc) {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       if (selection instanceof _state.NodeSelection && ['inlineCard', 'emoji', 'date', 'mention', 'status'].includes(selection.node.type.name)) {
         // Inline comments on these nodes are supported -- so we continue to find annotations
       } else {
@@ -297,7 +297,7 @@ var getDraftCommandAnalyticsPayload = exports.getDraftCommandAnalyticsPayload =
         overlap: getAnnotationsInSelectionCount(state)
       };
     }
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       var _ref3 = getPluginState(state) || {},
         bookmark = _ref3.bookmark;
       attributes.inlineNodeNames = (0, _utils.getRangeInlineNodeNames)({
@@ -394,25 +394,25 @@ function hasInvalidWhitespaceNode(selection, schema) {
   var hasCommentableInlineNodeDescendants = false;
   var hasCommentableTextNodeDescendants = false;
   content.descendants(function (node) {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
       if (isAllowedInlineNode) {
         hasCommentableInlineNodeDescendants = true;
         return false;
       }
     }
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
+    if (node.type === schema.nodes.inlineCard && (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       return false;
     }
     if ((0, _utils.isText)(node, schema)) {
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
         if (node.textContent.trim() !== '') {
           hasCommentableTextNodeDescendants = true;
         }
       }
       return false;
     }
-    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       if (node.textContent.trim() === '') {
         // Trailing new lines do not result in the annotation spanning into
         // the trailing new line so can be ignored when looking for invalid
@@ -431,7 +431,7 @@ function hasInvalidWhitespaceNode(selection, schema) {
     }
     return !foundInvalidWhitespace;
   });
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     if (hasCommentableInlineNodeDescendants) {
       return false;
     }

package/dist/es2019/commands/transform.js

@@ -3,7 +3,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../utils';
 const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {
   const inlineCommentState = getPluginState(state);
@@ -74,7 +74,7 @@ const addInsertAnalytics = editorAnalyticsAPI => (transaction, state) => {
     actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
     attributes: {}
   };
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     const {
       bookmark
     } = getPluginState(state) || {};

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

@@ -2,7 +2,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
 import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
 import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
@@ -185,7 +185,7 @@ export const inlineCommentPlugin = options => {
                   key: decorationKey.block
                 }));
               } else {
-                if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+                if (fg('editor_inline_comments_on_inline_nodes')) {
                   if (node.isText) {
                     focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
                       class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,

package/dist/es2019/toolbar.js

@@ -5,7 +5,7 @@ import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
 import CommentIcon from '@atlaskit/icon/glyph/comment';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { setInlineCommentDraftState } from './commands';
 import { AnnotationSelectionType, AnnotationTestIds } from './types';
 import { isSelectionValid } from './utils';
@@ -21,7 +21,7 @@ export const buildToolbar = editorAnalyticsAPI => (state, intl, isToolbarAbove =
     return undefined;
   }
   const createCommentMessage = intl.formatMessage(annotationMessages.createComment);
-  const commentDisabledMessage = intl.formatMessage(getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
+  const commentDisabledMessage = intl.formatMessage(fg('editor_inline_comments_on_inline_nodes') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
   const createComment = {
     type: 'button',
     showTitle: true,

package/dist/es2019/utils.js

@@ -5,7 +5,7 @@ import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@at
 import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { AnnotationSelectionType } from './types';
 export { hasAnnotationMark, containsAnyAnnotations };
 function sum(arr, f) {
@@ -136,7 +136,7 @@ export const findAnnotationsInSelection = (selection, doc, isCommentsOnMediaMedi
   } = selection;
   // Only detect annotations on caret selection
   if (!empty || !doc) {
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       if (selection instanceof NodeSelection && ['inlineCard', 'emoji', 'date', 'mention', 'status'].includes(selection.node.type.name)) {
         // Inline comments on these nodes are supported -- so we continue to find annotations
       } else {
@@ -259,7 +259,7 @@ export const getDraftCommandAnalyticsPayload = (drafting, inputMethod) => {
         overlap: getAnnotationsInSelectionCount(state)
       };
     }
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       const {
         bookmark
       } = getPluginState(state) || {};
@@ -361,25 +361,25 @@ export function hasInvalidWhitespaceNode(selection, schema) {
   let hasCommentableInlineNodeDescendants = false;
   let hasCommentableTextNodeDescendants = false;
   content.descendants(node => {
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       const isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
       if (isAllowedInlineNode) {
         hasCommentableInlineNodeDescendants = true;
         return false;
       }
     }
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
+    if (node.type === schema.nodes.inlineCard && fg('editor_inline_comments_on_inline_nodes')) {
       return false;
     }
     if (isText(node, schema)) {
-      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (fg('editor_inline_comments_on_inline_nodes')) {
         if (node.textContent.trim() !== '') {
           hasCommentableTextNodeDescendants = true;
         }
       }
       return false;
     }
-    if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (!fg('editor_inline_comments_on_inline_nodes')) {
       if (node.textContent.trim() === '') {
         // Trailing new lines do not result in the annotation spanning into
         // the trailing new line so can be ignored when looking for invalid
@@ -398,7 +398,7 @@ export function hasInvalidWhitespaceNode(selection, schema) {
     }
     return !foundInvalidWhitespace;
   });
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     if (hasCommentableInlineNodeDescendants) {
       return false;
     }

package/dist/esm/commands/transform.js

@@ -3,7 +3,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../utils';
 var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
   return function (transaction, state) {
@@ -89,7 +89,7 @@ var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
       actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
       attributes: {}
     };
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       var _ref2 = getPluginState(state) || {},
         bookmark = _ref2.bookmark;
 

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

@@ -5,7 +5,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
 import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
 import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
@@ -242,7 +242,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
                   key: decorationKey.block
                 }));
               } else {
-                if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+                if (fg('editor_inline_comments_on_inline_nodes')) {
                   if (node.isText) {
                     focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
                       class: "".concat(getAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved),

package/dist/esm/toolbar.js

@@ -5,7 +5,7 @@ import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
 import CommentIcon from '@atlaskit/icon/glyph/comment';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { setInlineCommentDraftState } from './commands';
 import { AnnotationSelectionType, AnnotationTestIds } from './types';
 import { isSelectionValid } from './utils';
@@ -23,7 +23,7 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
       return undefined;
     }
     var createCommentMessage = intl.formatMessage(annotationMessages.createComment);
-    var commentDisabledMessage = intl.formatMessage(getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
+    var commentDisabledMessage = intl.formatMessage(fg('editor_inline_comments_on_inline_nodes') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
     var createComment = {
       type: 'button',
       showTitle: true,

package/dist/esm/utils.js

@@ -5,7 +5,7 @@ import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@at
 import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { AnnotationSelectionType } from './types';
 export { hasAnnotationMark, containsAnyAnnotations };
 function sum(arr, f) {
@@ -146,7 +146,7 @@ export var findAnnotationsInSelection = function findAnnotationsInSelection(sele
     anchor = selection.anchor;
   // Only detect annotations on caret selection
   if (!empty || !doc) {
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       if (selection instanceof NodeSelection && ['inlineCard', 'emoji', 'date', 'mention', 'status'].includes(selection.node.type.name)) {
         // Inline comments on these nodes are supported -- so we continue to find annotations
       } else {
@@ -270,7 +270,7 @@ export var getDraftCommandAnalyticsPayload = function getDraftCommandAnalyticsPa
         overlap: getAnnotationsInSelectionCount(state)
       };
     }
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       var _ref3 = getPluginState(state) || {},
         bookmark = _ref3.bookmark;
       attributes.inlineNodeNames = getRangeInlineNodeNames({
@@ -367,25 +367,25 @@ export function hasInvalidWhitespaceNode(selection, schema) {
   var hasCommentableInlineNodeDescendants = false;
   var hasCommentableTextNodeDescendants = false;
   content.descendants(function (node) {
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
       if (isAllowedInlineNode) {
         hasCommentableInlineNodeDescendants = true;
         return false;
       }
     }
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
+    if (node.type === schema.nodes.inlineCard && fg('editor_inline_comments_on_inline_nodes')) {
       return false;
     }
     if (isText(node, schema)) {
-      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (fg('editor_inline_comments_on_inline_nodes')) {
         if (node.textContent.trim() !== '') {
           hasCommentableTextNodeDescendants = true;
         }
       }
       return false;
     }
-    if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (!fg('editor_inline_comments_on_inline_nodes')) {
       if (node.textContent.trim() === '') {
         // Trailing new lines do not result in the annotation spanning into
         // the trailing new line so can be ignored when looking for invalid
@@ -404,7 +404,7 @@ export function hasInvalidWhitespaceNode(selection, schema) {
     }
     return !foundInvalidWhitespace;
   });
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     if (hasCommentableInlineNodeDescendants) {
       return false;
     }

package/dist/types/types.d.ts

@@ -92,10 +92,10 @@ export type InlineCommentViewComponentProps = AnnotationComponentProps & {
      * Return a list of inline node types, which are wrapped by the annotation,
      * for annotation with given ID.
      *
-     * The `undefined` will be returned if `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is off.
+     * The `undefined` will be returned if `editor_inline_comments_on_inline_nodes` is off.
      *
      * @todo: Do not forget to remove `undefined` when the
-     *        `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is removed.
+     *        `editor_inline_comments_on_inline_nodes` is removed.
      */
     getInlineNodeTypes: (annotationId: string) => string[] | undefined;
 };

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

@@ -92,10 +92,10 @@ export type InlineCommentViewComponentProps = AnnotationComponentProps & {
      * Return a list of inline node types, which are wrapped by the annotation,
      * for annotation with given ID.
      *
-     * The `undefined` will be returned if `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is off.
+     * The `undefined` will be returned if `editor_inline_comments_on_inline_nodes` is off.
      *
      * @todo: Do not forget to remove `undefined` when the
-     *        `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is removed.
+     *        `editor_inline_comments_on_inline_nodes` is removed.
      */
     getInlineNodeTypes: (annotationId: string) => string[] | undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.14.1",
+	"version": "1.14.2",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,12 +33,12 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^39.0.3",
-		"@atlaskit/editor-common": "^84.0.0",
+		"@atlaskit/editor-common": "^84.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^1.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.1.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
-		"@atlaskit/icon": "^22.5.0",
+		"@atlaskit/icon": "^22.6.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@babel/runtime": "^7.0.0"
 	},
@@ -93,10 +93,7 @@
 		"platform.editor.enable-selection-toolbar_ucdwd": {
 			"type": "boolean"
 		},
-		"platform.editor.allow-inline-comments-for-inline-nodes": {
-			"type": "boolean"
-		},
-		"platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz": {
+		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
 		},
 		"platform.editor.comments-on-media.bug.preserve-draft_i3vqb": {