@atlaskit/editor-plugin-annotation 1.5.6 → 1.5.8

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.5.8
+
+### Patch Changes
+
+- [#88763](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88763) [`9fcd30347b0c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9fcd30347b0c) - [ux] Removed annotation styling for media in editor and renderer
+- Updated dependencies
+
+## 1.5.7
+
+### Patch Changes
+
+- [#87596](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/87596) [`e0b95c3a4fba`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e0b95c3a4fba) - Add new UI badge for media node to trigger comments
+
 ## 1.5.6
 
 ### Patch Changes

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

@@ -11,7 +11,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _styles = require("@atlaskit/editor-common/styles");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _commands = require("../commands");
 var _nodeviews = require("../nodeviews");
@@ -224,8 +223,6 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : _view.DecorationSet.empty;
         var focusDecorations = [];
         state.doc.descendants(function (node, pos) {
-          var _provider$supportedBl;
-          var isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;
           }).forEach(function (mark) {
@@ -234,19 +231,10 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
               var isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
                 return selectedAnnotation.id === mark.attrs.id;
               }));
-              if (isSupportedBlockNode) {
-                var attrs = isUnresolved ? {
-                  class: isSelected ? "".concat(_styles.BlockAnnotationSharedClassNames.focus) : "".concat(_styles.BlockAnnotationSharedClassNames.blur)
-                } : {};
-                focusDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, attrs, {
-                  key: _utils.decorationKey.block
-                }));
-              } else {
-                focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
-                  class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
-                  nodeName: 'span'
-                }));
-              }
+              focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
+                class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
+                nodeName: 'span'
+              }));
             }
           });
         });

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

@@ -1,11 +1,10 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
 import { AnnotationNodeView, getAnnotationViewClassname } from '../nodeviews';
-import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
+import { getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
 import { createPluginState } from './plugin-factory';
 const fetchProviderStates = async (provider, annotationIds) => {
   const data = await provider.getState(annotationIds);
@@ -164,25 +163,14 @@ export const inlineCommentPlugin = options => {
         let decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         const focusDecorations = [];
         state.doc.descendants((node, pos) => {
-          var _provider$supportedBl;
-          const isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));
           node.marks.filter(mark => mark.type === state.schema.marks.annotation).forEach(mark => {
             if (isVisible) {
               const isUnresolved = !!annotations && annotations[mark.attrs.id] === false;
               const isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(selectedAnnotation => selectedAnnotation.id === mark.attrs.id));
-              if (isSupportedBlockNode) {
-                const attrs = isUnresolved ? {
-                  class: isSelected ? `${BlockAnnotationSharedClassNames.focus}` : `${BlockAnnotationSharedClassNames.blur}`
-                } : {};
-                focusDecorations.push(Decoration.node(pos, pos + node.nodeSize, attrs, {
-                  key: decorationKey.block
-                }));
-              } else {
-                focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
-                  class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,
-                  nodeName: 'span'
-                }));
-              }
+              focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
+                class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,
+                nodeName: 'span'
+              }));
             }
           });
         });

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

@@ -4,11 +4,10 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
 import { AnnotationNodeView, getAnnotationViewClassname } from '../nodeviews';
-import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
+import { getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
 import { createPluginState } from './plugin-factory';
 var fetchProviderStates = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(provider, annotationIds) {
@@ -217,8 +216,6 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         var focusDecorations = [];
         state.doc.descendants(function (node, pos) {
-          var _provider$supportedBl;
-          var isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;
           }).forEach(function (mark) {
@@ -227,19 +224,10 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
               var isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
                 return selectedAnnotation.id === mark.attrs.id;
               }));
-              if (isSupportedBlockNode) {
-                var attrs = isUnresolved ? {
-                  class: isSelected ? "".concat(BlockAnnotationSharedClassNames.focus) : "".concat(BlockAnnotationSharedClassNames.blur)
-                } : {};
-                focusDecorations.push(Decoration.node(pos, pos + node.nodeSize, attrs, {
-                  key: decorationKey.block
-                }));
-              } else {
-                focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
-                  class: "".concat(getAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved),
-                  nodeName: 'span'
-                }));
-              }
+              focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
+                class: "".concat(getAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved),
+                nodeName: 'span'
+              }));
             }
           });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-annotation",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "description": "Annotation plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^35.8.0",
-    "@atlaskit/editor-common": "^78.23.0",
+    "@atlaskit/editor-common": "^78.26.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.0.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",