@atlaskit/editor-plugin-annotation 1.21.0 → 1.21.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,22 @@
1
1
  # @atlaskit/editor-plugin-annotation
2
2
 
3
+ ## 1.21.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#154186](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/154186)
8
+ [`5c316170d29dd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5c316170d29dd) -
9
+ Bump @atlaskit/adf-schema to 42.3.1
10
+ - Updated dependencies
11
+
12
+ ## 1.21.1
13
+
14
+ ### Patch Changes
15
+
16
+ - [#152823](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152823)
17
+ [`0ec705650807f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0ec705650807f) -
18
+ [ux] Migrated comment icon from annotation package
19
+
3
20
  ## 1.21.0
4
21
 
5
22
  ### Minor Changes
@@ -11,7 +11,8 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
11
11
  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
- var _comment = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
14
+ var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
15
+ var _comment2 = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
15
16
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
16
17
  var _commands = require("./commands");
17
18
  var _types = require("./types");
@@ -37,6 +38,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
37
38
  disabled: selectionValid === _types.AnnotationSelectionType.DISABLED,
38
39
  testId: _types.AnnotationTestIds.floatingToolbarCreateButton,
39
40
  icon: _comment.default,
41
+ iconFallback: _comment2.default,
40
42
  tooltipContent: selectionValid === _types.AnnotationSelectionType.DISABLED ? commentDisabledMessage : /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
41
43
  description: createCommentMessage,
42
44
  keymap: _keymaps.addInlineComment
@@ -4,7 +4,8 @@ import { addInlineComment, ToolTipContent } from '@atlaskit/editor-common/keymap
4
4
  import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
5
5
  import { annotationMessages } from '@atlaskit/editor-common/messages';
6
6
  import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
7
- import CommentIcon from '@atlaskit/icon/glyph/comment';
7
+ import CommentIcon from '@atlaskit/icon/core/comment';
8
+ import LegacyCommentIcon from '@atlaskit/icon/glyph/comment';
8
9
  import { fg } from '@atlaskit/platform-feature-flags';
9
10
  import { setInlineCommentDraftState } from './commands';
10
11
  import { AnnotationSelectionType, AnnotationTestIds } from './types';
@@ -28,6 +29,7 @@ export const buildToolbar = editorAnalyticsAPI => (state, intl, isToolbarAbove =
28
29
  disabled: selectionValid === AnnotationSelectionType.DISABLED,
29
30
  testId: AnnotationTestIds.floatingToolbarCreateButton,
30
31
  icon: CommentIcon,
32
+ iconFallback: LegacyCommentIcon,
31
33
  tooltipContent: selectionValid === AnnotationSelectionType.DISABLED ? commentDisabledMessage : /*#__PURE__*/React.createElement(ToolTipContent, {
32
34
  description: createCommentMessage,
33
35
  keymap: addInlineComment
@@ -4,7 +4,8 @@ import { addInlineComment, ToolTipContent } from '@atlaskit/editor-common/keymap
4
4
  import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
5
5
  import { annotationMessages } from '@atlaskit/editor-common/messages';
6
6
  import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
7
- import CommentIcon from '@atlaskit/icon/glyph/comment';
7
+ import CommentIcon from '@atlaskit/icon/core/comment';
8
+ import LegacyCommentIcon from '@atlaskit/icon/glyph/comment';
8
9
  import { fg } from '@atlaskit/platform-feature-flags';
9
10
  import { setInlineCommentDraftState } from './commands';
10
11
  import { AnnotationSelectionType, AnnotationTestIds } from './types';
@@ -30,6 +31,7 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
30
31
  disabled: selectionValid === AnnotationSelectionType.DISABLED,
31
32
  testId: AnnotationTestIds.floatingToolbarCreateButton,
32
33
  icon: CommentIcon,
34
+ iconFallback: LegacyCommentIcon,
33
35
  tooltipContent: selectionValid === AnnotationSelectionType.DISABLED ? commentDisabledMessage : /*#__PURE__*/React.createElement(ToolTipContent, {
34
36
  description: createCommentMessage,
35
37
  keymap: addInlineComment
@@ -64,6 +64,12 @@ declare const _default: {
64
64
  mark: import("prosemirror-model").Mark;
65
65
  }) => boolean;
66
66
  isRemoteReplaceDocumentTransaction: (tr: Transaction) => boolean;
67
+ getCurrentCollabState: () => {
68
+ version: number | undefined;
69
+ sendableSteps: import("@atlaskit/editor-plugin-collab-edit").CollabSendableSteps | null | undefined;
70
+ content: import("@atlaskit/editor-json-transformer").JSONNode | undefined;
71
+ };
72
+ validatePMJSONDocument: (doc: any) => boolean;
67
73
  };
68
74
  }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewMode", {
69
75
  sharedState: import("@atlaskit/editor-plugin-editor-viewmode").EditorViewModePluginState | null;
@@ -76,6 +76,12 @@ declare const _default: {
76
76
  mark: import("prosemirror-model").Mark;
77
77
  }) => boolean;
78
78
  isRemoteReplaceDocumentTransaction: (tr: Transaction) => boolean;
79
+ getCurrentCollabState: () => {
80
+ version: number | undefined;
81
+ sendableSteps: import("@atlaskit/editor-plugin-collab-edit").CollabSendableSteps | null | undefined;
82
+ content: import("@atlaskit/editor-json-transformer").JSONNode | undefined;
83
+ };
84
+ validatePMJSONDocument: (doc: any) => boolean;
79
85
  };
80
86
  }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>,
81
87
  import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewMode", {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-annotation",
3
- "version": "1.21.0",
3
+ "version": "1.21.2",
4
4
  "description": "Annotation plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -31,13 +31,13 @@
31
31
  ".": "./src/index.ts"
32
32
  },
33
33
  "dependencies": {
34
- "@atlaskit/adf-schema": "^42.0.2",
35
- "@atlaskit/editor-common": "^93.5.0",
34
+ "@atlaskit/adf-schema": "^42.3.1",
35
+ "@atlaskit/editor-common": "^94.0.0",
36
36
  "@atlaskit/editor-plugin-analytics": "^1.10.0",
37
37
  "@atlaskit/editor-plugin-editor-viewmode-effects": "^1.1.0",
38
38
  "@atlaskit/editor-plugin-feature-flags": "^1.2.0",
39
39
  "@atlaskit/editor-prosemirror": "6.0.0",
40
- "@atlaskit/icon": "^22.22.0",
40
+ "@atlaskit/icon": "^22.23.0",
41
41
  "@atlaskit/platform-feature-flags": "^0.3.0",
42
42
  "@babel/runtime": "^7.0.0"
43
43
  },