@atlaskit/editor-plugin-annotation 1.22.0 → 1.23.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.23.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.23.0
+
+### Minor Changes
+
+- [#152319](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152319)
+  [`bfa9c49e1928b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bfa9c49e1928b) -
+  [ux] Added a check to handle the case where a single non-breaking space is selected and the user
+  attempts to leave a comment on it.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.22.0
 
 ### Minor Changes

package/dist/cjs/utils.js

@@ -342,7 +342,7 @@ var isSelectionValid = exports.isSelectionValid = function isSelectionValid(stat
   if (disallowOnWhitespace && hasInvalidWhitespaceNode(selection, state.schema)) {
     return _types.AnnotationSelectionType.INVALID;
   }
-  if (isEmptyTextSelection(selection, state.schema)) {
+  if ((0, _utils.isEmptyTextSelection)(selection, state.schema)) {
     return _types.AnnotationSelectionType.INVALID;
   }
   return _types.AnnotationSelectionType.VALID;
@@ -356,29 +356,6 @@ var hasInvalidNodes = exports.hasInvalidNodes = function hasInvalidNodes(state)
     to: selection.to
   }, doc, schema);
 };
-
-/**
- * Checks if selection contains only empty text
- * e.g. when you select across multiple empty paragraphs
- */
-function isEmptyTextSelection(selection, schema) {
-  var _schema$nodes = schema.nodes,
-    text = _schema$nodes.text,
-    paragraph = _schema$nodes.paragraph;
-  var hasContent = false;
-  selection.content().content.descendants(function (node) {
-    // for empty paragraph - consider empty (nothing to comment on)
-    if (node.type === paragraph && !node.content.size) {
-      return false;
-    }
-    // for not a text or nonempty text - consider nonempty (can comment if the node is supported for annotations)
-    if (node.type !== text || !node.textContent) {
-      hasContent = true;
-    }
-    return !hasContent;
-  });
-  return !hasContent;
-}
 var isSupportedBlockNode = exports.isSupportedBlockNode = function isSupportedBlockNode(node) {
   var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   return supportedBlockNodes.indexOf(node.type.name) >= 0 || node.type.name === 'mediaSingle' && supportedBlockNodes.indexOf('media') >= 0;

package/dist/es2019/utils.js

@@ -2,7 +2,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
-import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
+import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isEmptyTextSelection, isParagraph, isText } from '@atlaskit/editor-common/utils';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -323,30 +323,6 @@ export const hasInvalidNodes = state => {
     to: selection.to
   }, doc, schema);
 };
-
-/**
- * Checks if selection contains only empty text
- * e.g. when you select across multiple empty paragraphs
- */
-function isEmptyTextSelection(selection, schema) {
-  const {
-    text,
-    paragraph
-  } = schema.nodes;
-  let hasContent = false;
-  selection.content().content.descendants(node => {
-    // for empty paragraph - consider empty (nothing to comment on)
-    if (node.type === paragraph && !node.content.size) {
-      return false;
-    }
-    // for not a text or nonempty text - consider nonempty (can comment if the node is supported for annotations)
-    if (node.type !== text || !node.textContent) {
-      hasContent = true;
-    }
-    return !hasContent;
-  });
-  return !hasContent;
-}
 export const isSupportedBlockNode = (node, supportedBlockNodes = []) => {
   return supportedBlockNodes.indexOf(node.type.name) >= 0 || node.type.name === 'mediaSingle' && supportedBlockNodes.indexOf('media') >= 0;
 };

package/dist/esm/utils.js

@@ -2,7 +2,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
-import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
+import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isEmptyTextSelection, isParagraph, isText } from '@atlaskit/editor-common/utils';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -329,29 +329,6 @@ export var hasInvalidNodes = function hasInvalidNodes(state) {
     to: selection.to
   }, doc, schema);
 };
-
-/**
- * Checks if selection contains only empty text
- * e.g. when you select across multiple empty paragraphs
- */
-function isEmptyTextSelection(selection, schema) {
-  var _schema$nodes = schema.nodes,
-    text = _schema$nodes.text,
-    paragraph = _schema$nodes.paragraph;
-  var hasContent = false;
-  selection.content().content.descendants(function (node) {
-    // for empty paragraph - consider empty (nothing to comment on)
-    if (node.type === paragraph && !node.content.size) {
-      return false;
-    }
-    // for not a text or nonempty text - consider nonempty (can comment if the node is supported for annotations)
-    if (node.type !== text || !node.textContent) {
-      hasContent = true;
-    }
-    return !hasContent;
-  });
-  return !hasContent;
-}
 export var isSupportedBlockNode = function isSupportedBlockNode(node) {
   var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   return supportedBlockNodes.indexOf(node.type.name) >= 0 || node.type.name === 'mediaSingle' && supportedBlockNodes.indexOf('media') >= 0;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.22.0",
+	"version": "1.23.1",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,14 +32,14 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^42.3.1",
-		"@atlaskit/editor-common": "^94.8.0",
+		"@atlaskit/editor-common": "^94.9.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.24.0",
-		"@atlaskit/onboarding": "^11.2.0",
+		"@atlaskit/onboarding": "^12.0.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/tmp-editor-statsig": "^2.10.0",
 		"@babel/runtime": "^7.0.0"