@atlaskit/editor-plugin-annotation 1.13.1 → 1.14.0

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.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#116062](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116062)
8
+ [`2662cb99be36f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2662cb99be36f) -
9
+ [ux] ED-23706 - change disabled comment action text
10
+
11
+ ### Patch Changes
12
+
13
+ - [#114548](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114548)
14
+ [`8b2d47bffb50e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8b2d47bffb50e) -
15
+ bump adf-schema version
16
+ - Updated dependencies
17
+
3
18
  ## 1.13.1
4
19
 
5
20
  ### Patch Changes
@@ -12,6 +12,7 @@ var _mediaSingle = require("@atlaskit/editor-common/media-single");
12
12
  var _messages = require("@atlaskit/editor-common/messages");
13
13
  var _utils = require("@atlaskit/editor-common/utils");
14
14
  var _comment = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
15
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
15
16
  var _commands = require("./commands");
16
17
  var _types = require("./types");
17
18
  var _utils2 = require("./utils");
@@ -29,7 +30,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
29
30
  return undefined;
30
31
  }
31
32
  var createCommentMessage = intl.formatMessage(_messages.annotationMessages.createComment);
32
- var commentDisabledMessage = intl.formatMessage(_messages.annotationMessages.createCommentInvalid);
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
34
  var createComment = {
34
35
  type: 'button',
35
36
  showTitle: true,
@@ -5,6 +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
9
  import { setInlineCommentDraftState } from './commands';
9
10
  import { AnnotationSelectionType, AnnotationTestIds } from './types';
10
11
  import { isSelectionValid } from './utils';
@@ -20,7 +21,7 @@ export const buildToolbar = editorAnalyticsAPI => (state, intl, isToolbarAbove =
20
21
  return undefined;
21
22
  }
22
23
  const createCommentMessage = intl.formatMessage(annotationMessages.createComment);
23
- const commentDisabledMessage = intl.formatMessage(annotationMessages.createCommentInvalid);
24
+ const commentDisabledMessage = intl.formatMessage(getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
24
25
  const createComment = {
25
26
  type: 'button',
26
27
  showTitle: true,
@@ -5,6 +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
9
  import { setInlineCommentDraftState } from './commands';
9
10
  import { AnnotationSelectionType, AnnotationTestIds } from './types';
10
11
  import { isSelectionValid } from './utils';
@@ -22,7 +23,7 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
22
23
  return undefined;
23
24
  }
24
25
  var createCommentMessage = intl.formatMessage(annotationMessages.createComment);
25
- var commentDisabledMessage = intl.formatMessage(annotationMessages.createCommentInvalid);
26
+ var commentDisabledMessage = intl.formatMessage(getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? annotationMessages.createCommentDisabled : annotationMessages.createCommentInvalid);
26
27
  var createComment = {
27
28
  type: 'button',
28
29
  showTitle: true,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-annotation",
3
- "version": "1.13.1",
3
+ "version": "1.14.0",
4
4
  "description": "Annotation plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -32,8 +32,8 @@
32
32
  ".": "./src/index.ts"
33
33
  },
34
34
  "dependencies": {
35
- "@atlaskit/adf-schema": "^38.0.0",
36
- "@atlaskit/editor-common": "^83.4.0",
35
+ "@atlaskit/adf-schema": "^39.0.3",
36
+ "@atlaskit/editor-common": "^83.5.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",