@atlaskit/editor-plugin-annotation 1.25.1 → 1.25.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.25.3
+
+### Patch Changes
+
+- [#165765](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/165765)
+  [`3f441f30e6507`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f441f30e6507) -
+  Bump adf-schema to 46.0.0
+- Updated dependencies
+
+## 1.25.2
+
+### Patch Changes
+
+- [#168832](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/168832)
+  [`6a5261e14e959`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6a5261e14e959) -
+  [ux] ED-25834 allow comment on inline node selection
+
 ## 1.25.1
 
 ### Patch Changes

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

@@ -321,12 +321,13 @@ var isSelectionValid = exports.isSelectionValid = function isSelectionValid(stat
   var selection = state.selection;
   var _ref4 = getPluginState(state) || {},
     disallowOnWhitespace = _ref4.disallowOnWhitespace;
+  var allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
 
   // 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)) {
+  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'))) {
     return _types.AnnotationSelectionType.INVALID;
   }
   var containsInvalidNodes = hasInvalidNodes(state);
@@ -342,7 +343,7 @@ var isSelectionValid = exports.isSelectionValid = function isSelectionValid(stat
   if (disallowOnWhitespace && hasInvalidWhitespaceNode(selection, state.schema)) {
     return _types.AnnotationSelectionType.INVALID;
   }
-  if ((0, _utils.isEmptyTextSelection)(selection, state.schema)) {
+  if (!(selection instanceof _state.NodeSelection) && (0, _utils.isEmptyTextSelection)(selection, state.schema)) {
     return _types.AnnotationSelectionType.INVALID;
   }
   return _types.AnnotationSelectionType.VALID;

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

@@ -286,12 +286,13 @@ export const isSelectionValid = (state, _supportedNodes = []) => {
   const {
     disallowOnWhitespace
   } = getPluginState(state) || {};
+  const allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
 
   // 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)) {
+  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'))) {
     return AnnotationSelectionType.INVALID;
   }
   const containsInvalidNodes = hasInvalidNodes(state);
@@ -307,7 +308,7 @@ export const isSelectionValid = (state, _supportedNodes = []) => {
   if (disallowOnWhitespace && hasInvalidWhitespaceNode(selection, state.schema)) {
     return AnnotationSelectionType.INVALID;
   }
-  if (isEmptyTextSelection(selection, state.schema)) {
+  if (!(selection instanceof NodeSelection) && isEmptyTextSelection(selection, state.schema)) {
     return AnnotationSelectionType.INVALID;
   }
   return AnnotationSelectionType.VALID;

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

@@ -294,12 +294,13 @@ export var isSelectionValid = function isSelectionValid(state) {
   var selection = state.selection;
   var _ref4 = getPluginState(state) || {},
     disallowOnWhitespace = _ref4.disallowOnWhitespace;
+  var allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
 
   // 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)) {
+  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'))) {
     return AnnotationSelectionType.INVALID;
   }
   var containsInvalidNodes = hasInvalidNodes(state);
@@ -315,7 +316,7 @@ export var isSelectionValid = function isSelectionValid(state) {
   if (disallowOnWhitespace && hasInvalidWhitespaceNode(selection, state.schema)) {
     return AnnotationSelectionType.INVALID;
   }
-  if (isEmptyTextSelection(selection, state.schema)) {
+  if (!(selection instanceof NodeSelection) && isEmptyTextSelection(selection, state.schema)) {
     return AnnotationSelectionType.INVALID;
   }
   return AnnotationSelectionType.VALID;

package/dist/types/pm-plugins/utils.d.ts

@@ -2,7 +2,7 @@ import type { AnalyticsEventPayloadCallback } from '@atlaskit/editor-common/anal
 import { containsAnyAnnotations, hasAnnotationMark } from '@atlaskit/editor-common/utils';
 import type { Mark, Node, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
-import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { AnnotationInfo, DraftBookmark, InlineCommentInputMethod, TargetType } from '../types';
 import { AnnotationSelectionType } from '../types';
@@ -41,7 +41,7 @@ export declare const isSupportedBlockNode: (node: Node, supportedBlockNodes?: st
  * Checks if any of the nodes in a given selection are completely whitespace
  * This is to conform to Confluence annotation specifications
  */
-export declare function hasInvalidWhitespaceNode(selection: TextSelection | AllSelection, schema: Schema): boolean;
+export declare function hasInvalidWhitespaceNode(selection: TextSelection | AllSelection | NodeSelection, schema: Schema): boolean;
 export declare function annotationExists(annotationId: string, state: EditorState): boolean;
 export declare function stripNonExistingAnnotations(slice: Slice, state: EditorState): false | undefined;
 /**

package/dist/types-ts4.5/pm-plugins/utils.d.ts

@@ -2,7 +2,7 @@ import type { AnalyticsEventPayloadCallback } from '@atlaskit/editor-common/anal
 import { containsAnyAnnotations, hasAnnotationMark } from '@atlaskit/editor-common/utils';
 import type { Mark, Node, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
-import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { AnnotationInfo, DraftBookmark, InlineCommentInputMethod, TargetType } from '../types';
 import { AnnotationSelectionType } from '../types';
@@ -41,7 +41,7 @@ export declare const isSupportedBlockNode: (node: Node, supportedBlockNodes?: st
  * Checks if any of the nodes in a given selection are completely whitespace
  * This is to conform to Confluence annotation specifications
  */
-export declare function hasInvalidWhitespaceNode(selection: TextSelection | AllSelection, schema: Schema): boolean;
+export declare function hasInvalidWhitespaceNode(selection: TextSelection | AllSelection | NodeSelection, schema: Schema): boolean;
 export declare function annotationExists(annotationId: string, state: EditorState): boolean;
 export declare function stripNonExistingAnnotations(slice: Slice, state: EditorState): false | undefined;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.25.1",
+	"version": "1.25.3",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,8 +31,8 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^44.2.0",
-		"@atlaskit/editor-common": "^95.6.0",
+		"@atlaskit/adf-schema": "^46.1.0",
+		"@atlaskit/editor-common": "^95.7.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",
@@ -41,7 +41,7 @@
 		"@atlaskit/icon": "^22.26.0",
 		"@atlaskit/onboarding": "^12.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.20.0",
+		"@atlaskit/tmp-editor-statsig": "^2.21.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
@@ -99,6 +99,9 @@
 		},
 		"editor_inline_comments_on_inline_nodes_spotlight": {
 			"type": "boolean"
+		},
+		"platform_inline_node_as_valid_annotation_selection": {
+			"type": "boolean"
 		}
 	}
 }