@atlaskit/editor-plugin-annotation 1.25.3 → 1.25.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.25.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.25.4
+
+### Patch Changes
+
+- [#169327](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169327)
+  [`d1439013677f3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d1439013677f3) -
+  [ED-25834] adding tests for allow comment on inline node selection
+- Updated dependencies
+
 ## 1.25.3
 
 ### Patch Changes

package/dist/cjs/pm-plugins/utils.js

@@ -322,12 +322,16 @@ var isSelectionValid = exports.isSelectionValid = function isSelectionValid(stat
   var _ref4 = getPluginState(state) || {},
     disallowOnWhitespace = _ref4.disallowOnWhitespace;
   var allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
+  var isSelectionEmpty = selection.empty;
+  var isTextOrAllSelection = selection instanceof _state.TextSelection || selection instanceof _state.AllSelection;
+  var isValidNodeSelection = selection instanceof _state.NodeSelection && allowedInlineNodes.includes(selection.node.type.name) && (0, _platformFeatureFlags.fg)('platform_inline_node_as_valid_annotation_selection');
+  var isValidSelection = isTextOrAllSelection || isValidNodeSelection;
 
   // Allow media so that it can enter draft mode
   if ((_currentMediaNodeWith = (0, _mediaSingle.currentMediaNodeWithPos)(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {
     return _types.AnnotationSelectionType.VALID;
   }
-  if (selection.empty || !(selection instanceof _state.TextSelection || selection instanceof _state.AllSelection || selection instanceof _state.NodeSelection && allowedInlineNodes.includes(selection.node.type.name) && (0, _platformFeatureFlags.fg)('platform_inline_node_as_valid_annotation_selection'))) {
+  if (isSelectionEmpty || !isValidSelection) {
     return _types.AnnotationSelectionType.INVALID;
   }
   var containsInvalidNodes = hasInvalidNodes(state);

package/dist/es2019/pm-plugins/utils.js

@@ -287,12 +287,16 @@ export const isSelectionValid = (state, _supportedNodes = []) => {
     disallowOnWhitespace
   } = getPluginState(state) || {};
   const allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
+  const isSelectionEmpty = selection.empty;
+  const isTextOrAllSelection = selection instanceof TextSelection || selection instanceof AllSelection;
+  const isValidNodeSelection = selection instanceof NodeSelection && allowedInlineNodes.includes(selection.node.type.name) && fg('platform_inline_node_as_valid_annotation_selection');
+  const isValidSelection = isTextOrAllSelection || isValidNodeSelection;
 
   // Allow media so that it can enter draft mode
   if ((_currentMediaNodeWith = currentMediaNodeWithPos(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {
     return AnnotationSelectionType.VALID;
   }
-  if (selection.empty || !(selection instanceof TextSelection || selection instanceof AllSelection || selection instanceof NodeSelection && allowedInlineNodes.includes(selection.node.type.name) && fg('platform_inline_node_as_valid_annotation_selection'))) {
+  if (isSelectionEmpty || !isValidSelection) {
     return AnnotationSelectionType.INVALID;
   }
   const containsInvalidNodes = hasInvalidNodes(state);

package/dist/esm/pm-plugins/utils.js

@@ -295,12 +295,16 @@ export var isSelectionValid = function isSelectionValid(state) {
   var _ref4 = getPluginState(state) || {},
     disallowOnWhitespace = _ref4.disallowOnWhitespace;
   var allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
+  var isSelectionEmpty = selection.empty;
+  var isTextOrAllSelection = selection instanceof TextSelection || selection instanceof AllSelection;
+  var isValidNodeSelection = selection instanceof NodeSelection && allowedInlineNodes.includes(selection.node.type.name) && fg('platform_inline_node_as_valid_annotation_selection');
+  var isValidSelection = isTextOrAllSelection || isValidNodeSelection;
 
   // Allow media so that it can enter draft mode
   if ((_currentMediaNodeWith = currentMediaNodeWithPos(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {
     return AnnotationSelectionType.VALID;
   }
-  if (selection.empty || !(selection instanceof TextSelection || selection instanceof AllSelection || selection instanceof NodeSelection && allowedInlineNodes.includes(selection.node.type.name) && fg('platform_inline_node_as_valid_annotation_selection'))) {
+  if (isSelectionEmpty || !isValidSelection) {
     return AnnotationSelectionType.INVALID;
   }
   var containsInvalidNodes = hasInvalidNodes(state);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.25.3",
+	"version": "1.25.5",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,16 +32,16 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^95.7.0",
+		"@atlaskit/editor-common": "^95.10.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^1.1.0",
 		"@atlaskit/editor-plugin-engagement-platform": "^2.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
-		"@atlaskit/editor-prosemirror": "6.0.0",
-		"@atlaskit/icon": "^22.26.0",
+		"@atlaskit/editor-prosemirror": "6.2.1",
+		"@atlaskit/icon": "^23.0.0",
 		"@atlaskit/onboarding": "^12.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.21.0",
+		"@atlaskit/tmp-editor-statsig": "^2.22.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {