@atlaskit/editor-plugin-annotation 1.14.0 → 1.14.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/editor-plugin-annotation
2
2
 
3
+ ## 1.14.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#113218](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113218)
8
+ [`d1b428ec29d68`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d1b428ec29d68) -
9
+ [ED-23765] migrate inline node commenting feature flags to statsig feature gate
10
+ - Updated dependencies
11
+
12
+ ## 1.14.1
13
+
14
+ ### Patch Changes
15
+
16
+ - Updated dependencies
17
+
3
18
  ## 1.14.0
4
19
 
5
20
  ### Minor Changes
@@ -95,7 +95,7 @@ var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
95
95
  actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
96
96
  attributes: {}
97
97
  };
98
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
98
+ if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
99
99
  var _ref2 = (0, _utils2.getPluginState)(state) || {},
100
100
  bookmark = _ref2.bookmark;
101
101
 
@@ -249,7 +249,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
249
249
  key: _utils.decorationKey.block
250
250
  }));
251
251
  } else {
252
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
252
+ if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
253
253
  if (node.isText) {
254
254
  focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
255
255
  class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
@@ -30,7 +30,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
30
30
  return undefined;
31
31
  }
32
32
  var createCommentMessage = intl.formatMessage(_messages.annotationMessages.createComment);
33
- var commentDisabledMessage = intl.formatMessage((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
33
+ var commentDisabledMessage = intl.formatMessage((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
34
34
  var createComment = {
35
35
  type: 'button',
36
36
  showTitle: true,
package/dist/cjs/utils.js CHANGED
@@ -173,7 +173,7 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
173
173
  anchor = selection.anchor;
174
174
  // Only detect annotations on caret selection
175
175
  if (!empty || !doc) {
176
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
176
+ if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
177
177
  if (selection instanceof _state.NodeSelection && ['inlineCard', 'emoji', 'date', 'mention', 'status'].includes(selection.node.type.name)) {
178
178
  // Inline comments on these nodes are supported -- so we continue to find annotations
179
179
  } else {
@@ -297,7 +297,7 @@ var getDraftCommandAnalyticsPayload = exports.getDraftCommandAnalyticsPayload =
297
297
  overlap: getAnnotationsInSelectionCount(state)
298
298
  };
299
299
  }
300
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
300
+ if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
301
301
  var _ref3 = getPluginState(state) || {},
302
302
  bookmark = _ref3.bookmark;
303
303
  attributes.inlineNodeNames = (0, _utils.getRangeInlineNodeNames)({
@@ -394,25 +394,25 @@ function hasInvalidWhitespaceNode(selection, schema) {
394
394
  var hasCommentableInlineNodeDescendants = false;
395
395
  var hasCommentableTextNodeDescendants = false;
396
396
  content.descendants(function (node) {
397
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
397
+ if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
398
398
  var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
399
399
  if (isAllowedInlineNode) {
400
400
  hasCommentableInlineNodeDescendants = true;
401
401
  return false;
402
402
  }
403
403
  }
404
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
404
+ if (node.type === schema.nodes.inlineCard && (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
405
405
  return false;
406
406
  }
407
407
  if ((0, _utils.isText)(node, schema)) {
408
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
408
+ if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
409
409
  if (node.textContent.trim() !== '') {
410
410
  hasCommentableTextNodeDescendants = true;
411
411
  }
412
412
  }
413
413
  return false;
414
414
  }
415
- if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
415
+ if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
416
416
  if (node.textContent.trim() === '') {
417
417
  // Trailing new lines do not result in the annotation spanning into
418
418
  // the trailing new line so can be ignored when looking for invalid
@@ -431,7 +431,7 @@ function hasInvalidWhitespaceNode(selection, schema) {
431
431
  }
432
432
  return !foundInvalidWhitespace;
433
433
  });
434
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
434
+ if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
435
435
  if (hasCommentableInlineNodeDescendants) {
436
436
  return false;
437
437
  }
@@ -3,7 +3,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
3
3
  import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
4
4
  import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
5
5
  import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
6
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
6
+ import { fg } from '@atlaskit/platform-feature-flags';
7
7
  import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../utils';
8
8
  const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {
9
9
  const inlineCommentState = getPluginState(state);
@@ -74,7 +74,7 @@ const addInsertAnalytics = editorAnalyticsAPI => (transaction, state) => {
74
74
  actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
75
75
  attributes: {}
76
76
  };
77
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
77
+ if (fg('editor_inline_comments_on_inline_nodes')) {
78
78
  const {
79
79
  bookmark
80
80
  } = getPluginState(state) || {};
@@ -2,7 +2,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
2
2
  import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
3
3
  import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
4
4
  import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
5
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
5
+ import { fg } from '@atlaskit/platform-feature-flags';
6
6
  import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
7
7
  import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
8
8
  import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
@@ -185,7 +185,7 @@ export const inlineCommentPlugin = options => {
185
185
  key: decorationKey.block
186
186
  }));
187
187
  } else {
188
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
188
+ if (fg('editor_inline_comments_on_inline_nodes')) {
189
189
  if (node.isText) {
190
190
  focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
191
191
  class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,
@@ -5,7 +5,7 @@ import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
5
5
  import { annotationMessages } from '@atlaskit/editor-common/messages';
6
6
  import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
7
7
  import CommentIcon from '@atlaskit/icon/glyph/comment';
8
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
8
+ import { fg } from '@atlaskit/platform-feature-flags';
9
9
  import { setInlineCommentDraftState } from './commands';
10
10
  import { AnnotationSelectionType, AnnotationTestIds } from './types';
11
11
  import { isSelectionValid } from './utils';
@@ -21,7 +21,7 @@ export const buildToolbar = editorAnalyticsAPI => (state, intl, isToolbarAbove =
21
21
  return undefined;
22
22
  }
23
23
  const createCommentMessage = intl.formatMessage(annotationMessages.createComment);
24
- const commentDisabledMessage = intl.formatMessage(getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
24
+ const commentDisabledMessage = intl.formatMessage(fg('editor_inline_comments_on_inline_nodes') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
25
25
  const createComment = {
26
26
  type: 'button',
27
27
  showTitle: true,
@@ -5,7 +5,7 @@ import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@at
5
5
  import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
6
6
  import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
7
7
  import { Decoration } from '@atlaskit/editor-prosemirror/view';
8
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
8
+ import { fg } from '@atlaskit/platform-feature-flags';
9
9
  import { AnnotationSelectionType } from './types';
10
10
  export { hasAnnotationMark, containsAnyAnnotations };
11
11
  function sum(arr, f) {
@@ -136,7 +136,7 @@ export const findAnnotationsInSelection = (selection, doc, isCommentsOnMediaMedi
136
136
  } = selection;
137
137
  // Only detect annotations on caret selection
138
138
  if (!empty || !doc) {
139
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
139
+ if (fg('editor_inline_comments_on_inline_nodes')) {
140
140
  if (selection instanceof NodeSelection && ['inlineCard', 'emoji', 'date', 'mention', 'status'].includes(selection.node.type.name)) {
141
141
  // Inline comments on these nodes are supported -- so we continue to find annotations
142
142
  } else {
@@ -259,7 +259,7 @@ export const getDraftCommandAnalyticsPayload = (drafting, inputMethod) => {
259
259
  overlap: getAnnotationsInSelectionCount(state)
260
260
  };
261
261
  }
262
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
262
+ if (fg('editor_inline_comments_on_inline_nodes')) {
263
263
  const {
264
264
  bookmark
265
265
  } = getPluginState(state) || {};
@@ -361,25 +361,25 @@ export function hasInvalidWhitespaceNode(selection, schema) {
361
361
  let hasCommentableInlineNodeDescendants = false;
362
362
  let hasCommentableTextNodeDescendants = false;
363
363
  content.descendants(node => {
364
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
364
+ if (fg('editor_inline_comments_on_inline_nodes')) {
365
365
  const isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
366
366
  if (isAllowedInlineNode) {
367
367
  hasCommentableInlineNodeDescendants = true;
368
368
  return false;
369
369
  }
370
370
  }
371
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
371
+ if (node.type === schema.nodes.inlineCard && fg('editor_inline_comments_on_inline_nodes')) {
372
372
  return false;
373
373
  }
374
374
  if (isText(node, schema)) {
375
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
375
+ if (fg('editor_inline_comments_on_inline_nodes')) {
376
376
  if (node.textContent.trim() !== '') {
377
377
  hasCommentableTextNodeDescendants = true;
378
378
  }
379
379
  }
380
380
  return false;
381
381
  }
382
- if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
382
+ if (!fg('editor_inline_comments_on_inline_nodes')) {
383
383
  if (node.textContent.trim() === '') {
384
384
  // Trailing new lines do not result in the annotation spanning into
385
385
  // the trailing new line so can be ignored when looking for invalid
@@ -398,7 +398,7 @@ export function hasInvalidWhitespaceNode(selection, schema) {
398
398
  }
399
399
  return !foundInvalidWhitespace;
400
400
  });
401
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
401
+ if (fg('editor_inline_comments_on_inline_nodes')) {
402
402
  if (hasCommentableInlineNodeDescendants) {
403
403
  return false;
404
404
  }
@@ -3,7 +3,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
3
3
  import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
4
4
  import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
5
5
  import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
6
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
6
+ import { fg } from '@atlaskit/platform-feature-flags';
7
7
  import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../utils';
8
8
  var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
9
9
  return function (transaction, state) {
@@ -89,7 +89,7 @@ var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
89
89
  actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
90
90
  attributes: {}
91
91
  };
92
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
92
+ if (fg('editor_inline_comments_on_inline_nodes')) {
93
93
  var _ref2 = getPluginState(state) || {},
94
94
  bookmark = _ref2.bookmark;
95
95
 
@@ -5,7 +5,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
5
5
  import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
6
6
  import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
7
7
  import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
8
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
8
+ import { fg } from '@atlaskit/platform-feature-flags';
9
9
  import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
10
10
  import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
11
11
  import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
@@ -242,7 +242,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
242
242
  key: decorationKey.block
243
243
  }));
244
244
  } else {
245
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
245
+ if (fg('editor_inline_comments_on_inline_nodes')) {
246
246
  if (node.isText) {
247
247
  focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
248
248
  class: "".concat(getAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved),
@@ -5,7 +5,7 @@ import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
5
5
  import { annotationMessages } from '@atlaskit/editor-common/messages';
6
6
  import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
7
7
  import CommentIcon from '@atlaskit/icon/glyph/comment';
8
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
8
+ import { fg } from '@atlaskit/platform-feature-flags';
9
9
  import { setInlineCommentDraftState } from './commands';
10
10
  import { AnnotationSelectionType, AnnotationTestIds } from './types';
11
11
  import { isSelectionValid } from './utils';
@@ -23,7 +23,7 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
23
23
  return undefined;
24
24
  }
25
25
  var createCommentMessage = intl.formatMessage(annotationMessages.createComment);
26
- var commentDisabledMessage = intl.formatMessage(getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
26
+ var commentDisabledMessage = intl.formatMessage(fg('editor_inline_comments_on_inline_nodes') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
27
27
  var createComment = {
28
28
  type: 'button',
29
29
  showTitle: true,
package/dist/esm/utils.js CHANGED
@@ -5,7 +5,7 @@ import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@at
5
5
  import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
6
6
  import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
7
7
  import { Decoration } from '@atlaskit/editor-prosemirror/view';
8
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
8
+ import { fg } from '@atlaskit/platform-feature-flags';
9
9
  import { AnnotationSelectionType } from './types';
10
10
  export { hasAnnotationMark, containsAnyAnnotations };
11
11
  function sum(arr, f) {
@@ -146,7 +146,7 @@ export var findAnnotationsInSelection = function findAnnotationsInSelection(sele
146
146
  anchor = selection.anchor;
147
147
  // Only detect annotations on caret selection
148
148
  if (!empty || !doc) {
149
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
149
+ if (fg('editor_inline_comments_on_inline_nodes')) {
150
150
  if (selection instanceof NodeSelection && ['inlineCard', 'emoji', 'date', 'mention', 'status'].includes(selection.node.type.name)) {
151
151
  // Inline comments on these nodes are supported -- so we continue to find annotations
152
152
  } else {
@@ -270,7 +270,7 @@ export var getDraftCommandAnalyticsPayload = function getDraftCommandAnalyticsPa
270
270
  overlap: getAnnotationsInSelectionCount(state)
271
271
  };
272
272
  }
273
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
273
+ if (fg('editor_inline_comments_on_inline_nodes')) {
274
274
  var _ref3 = getPluginState(state) || {},
275
275
  bookmark = _ref3.bookmark;
276
276
  attributes.inlineNodeNames = getRangeInlineNodeNames({
@@ -367,25 +367,25 @@ export function hasInvalidWhitespaceNode(selection, schema) {
367
367
  var hasCommentableInlineNodeDescendants = false;
368
368
  var hasCommentableTextNodeDescendants = false;
369
369
  content.descendants(function (node) {
370
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
370
+ if (fg('editor_inline_comments_on_inline_nodes')) {
371
371
  var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
372
372
  if (isAllowedInlineNode) {
373
373
  hasCommentableInlineNodeDescendants = true;
374
374
  return false;
375
375
  }
376
376
  }
377
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
377
+ if (node.type === schema.nodes.inlineCard && fg('editor_inline_comments_on_inline_nodes')) {
378
378
  return false;
379
379
  }
380
380
  if (isText(node, schema)) {
381
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
381
+ if (fg('editor_inline_comments_on_inline_nodes')) {
382
382
  if (node.textContent.trim() !== '') {
383
383
  hasCommentableTextNodeDescendants = true;
384
384
  }
385
385
  }
386
386
  return false;
387
387
  }
388
- if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
388
+ if (!fg('editor_inline_comments_on_inline_nodes')) {
389
389
  if (node.textContent.trim() === '') {
390
390
  // Trailing new lines do not result in the annotation spanning into
391
391
  // the trailing new line so can be ignored when looking for invalid
@@ -404,7 +404,7 @@ export function hasInvalidWhitespaceNode(selection, schema) {
404
404
  }
405
405
  return !foundInvalidWhitespace;
406
406
  });
407
- if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
407
+ if (fg('editor_inline_comments_on_inline_nodes')) {
408
408
  if (hasCommentableInlineNodeDescendants) {
409
409
  return false;
410
410
  }
@@ -92,10 +92,10 @@ export type InlineCommentViewComponentProps = AnnotationComponentProps & {
92
92
  * Return a list of inline node types, which are wrapped by the annotation,
93
93
  * for annotation with given ID.
94
94
  *
95
- * The `undefined` will be returned if `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is off.
95
+ * The `undefined` will be returned if `editor_inline_comments_on_inline_nodes` is off.
96
96
  *
97
97
  * @todo: Do not forget to remove `undefined` when the
98
- * `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is removed.
98
+ * `editor_inline_comments_on_inline_nodes` is removed.
99
99
  */
100
100
  getInlineNodeTypes: (annotationId: string) => string[] | undefined;
101
101
  };
@@ -92,10 +92,10 @@ export type InlineCommentViewComponentProps = AnnotationComponentProps & {
92
92
  * Return a list of inline node types, which are wrapped by the annotation,
93
93
  * for annotation with given ID.
94
94
  *
95
- * The `undefined` will be returned if `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is off.
95
+ * The `undefined` will be returned if `editor_inline_comments_on_inline_nodes` is off.
96
96
  *
97
97
  * @todo: Do not forget to remove `undefined` when the
98
- * `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is removed.
98
+ * `editor_inline_comments_on_inline_nodes` is removed.
99
99
  */
100
100
  getInlineNodeTypes: (annotationId: string) => string[] | undefined;
101
101
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-annotation",
3
- "version": "1.14.0",
3
+ "version": "1.14.2",
4
4
  "description": "Annotation plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -33,12 +33,12 @@
33
33
  },
34
34
  "dependencies": {
35
35
  "@atlaskit/adf-schema": "^39.0.3",
36
- "@atlaskit/editor-common": "^83.5.0",
36
+ "@atlaskit/editor-common": "^84.3.0",
37
37
  "@atlaskit/editor-plugin-analytics": "^1.4.0",
38
38
  "@atlaskit/editor-plugin-editor-viewmode-effects": "^1.0.0",
39
39
  "@atlaskit/editor-plugin-feature-flags": "^1.1.0",
40
40
  "@atlaskit/editor-prosemirror": "4.0.1",
41
- "@atlaskit/icon": "^22.5.0",
41
+ "@atlaskit/icon": "^22.6.0",
42
42
  "@atlaskit/platform-feature-flags": "^0.3.0",
43
43
  "@babel/runtime": "^7.0.0"
44
44
  },
@@ -93,10 +93,7 @@
93
93
  "platform.editor.enable-selection-toolbar_ucdwd": {
94
94
  "type": "boolean"
95
95
  },
96
- "platform.editor.allow-inline-comments-for-inline-nodes": {
97
- "type": "boolean"
98
- },
99
- "platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz": {
96
+ "editor_inline_comments_on_inline_nodes": {
100
97
  "type": "boolean"
101
98
  },
102
99
  "platform.editor.comments-on-media.bug.preserve-draft_i3vqb": {