@atlaskit/editor-plugin-annotation 1.9.5 → 1.10.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.10.0
+
+### Minor Changes
+
+- [#108623](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108623)
+  [`c01339668ebde`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c01339668ebde) -
+  [ux] ED-23617 Add support in editor for comments on status, emoji, date and mention nodes
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.9.5
 
 ### Patch Changes

package/dist/cjs/utils.js

@@ -375,30 +375,52 @@ var isSupportedBlockNode = exports.isSupportedBlockNode = function isSupportedBl
 function hasInvalidWhitespaceNode(selection, schema) {
   var foundInvalidWhitespace = false;
   var content = selection.content().content;
+  var hasCommentableInlineNodeDescendants = false;
+  var hasCommentableTextNodeDescendants = false;
   content.descendants(function (node) {
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+      if (isAllowedInlineNode) {
+        hasCommentableInlineNodeDescendants = true;
+        return false;
+      }
+    }
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
       return false;
     }
     if ((0, _utils.isText)(node, schema)) {
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+        if (node.textContent.trim() !== '') {
+          hasCommentableTextNodeDescendants = true;
+        }
+      }
       return false;
     }
-    if (node.textContent.trim() === '') {
-      // Trailing new lines do not result in the annotation spanning into
-      // the trailing new line so can be ignored when looking for invalid
-      // whitespace nodes.
-      var nodeIsTrailingNewLine =
-      // it is the final node
-      node.eq(content.lastChild) &&
-      // and there are multiple nodes
-      !node.eq(content.firstChild) &&
-      // and it is a paragraph node
-      (0, _utils.isParagraph)(node, schema);
-      if (!nodeIsTrailingNewLine) {
-        foundInvalidWhitespace = true;
+    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (node.textContent.trim() === '') {
+        // Trailing new lines do not result in the annotation spanning into
+        // the trailing new line so can be ignored when looking for invalid
+        // whitespace nodes.
+        var nodeIsTrailingNewLine =
+        // it is the final node
+        node.eq(content.lastChild) &&
+        // and there are multiple nodes
+        !node.eq(content.firstChild) &&
+        // and it is a paragraph node
+        (0, _utils.isParagraph)(node, schema);
+        if (!nodeIsTrailingNewLine) {
+          foundInvalidWhitespace = true;
+        }
       }
     }
     return !foundInvalidWhitespace;
   });
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (hasCommentableInlineNodeDescendants) {
+      return false;
+    }
+    return !hasCommentableTextNodeDescendants;
+  }
   return foundInvalidWhitespace;
 }
 

package/dist/es2019/utils.js

@@ -341,30 +341,52 @@ export const isSupportedBlockNode = (node, supportedBlockNodes = []) => {
 export function hasInvalidWhitespaceNode(selection, schema) {
   let foundInvalidWhitespace = false;
   const content = selection.content().content;
+  let hasCommentableInlineNodeDescendants = false;
+  let hasCommentableTextNodeDescendants = false;
   content.descendants(node => {
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      const isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+      if (isAllowedInlineNode) {
+        hasCommentableInlineNodeDescendants = true;
+        return false;
+      }
+    }
     if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
       return false;
     }
     if (isText(node, schema)) {
+      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+        if (node.textContent.trim() !== '') {
+          hasCommentableTextNodeDescendants = true;
+        }
+      }
       return false;
     }
-    if (node.textContent.trim() === '') {
-      // Trailing new lines do not result in the annotation spanning into
-      // the trailing new line so can be ignored when looking for invalid
-      // whitespace nodes.
-      const nodeIsTrailingNewLine =
-      // it is the final node
-      node.eq(content.lastChild) &&
-      // and there are multiple nodes
-      !node.eq(content.firstChild) &&
-      // and it is a paragraph node
-      isParagraph(node, schema);
-      if (!nodeIsTrailingNewLine) {
-        foundInvalidWhitespace = true;
+    if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (node.textContent.trim() === '') {
+        // Trailing new lines do not result in the annotation spanning into
+        // the trailing new line so can be ignored when looking for invalid
+        // whitespace nodes.
+        const nodeIsTrailingNewLine =
+        // it is the final node
+        node.eq(content.lastChild) &&
+        // and there are multiple nodes
+        !node.eq(content.firstChild) &&
+        // and it is a paragraph node
+        isParagraph(node, schema);
+        if (!nodeIsTrailingNewLine) {
+          foundInvalidWhitespace = true;
+        }
       }
     }
     return !foundInvalidWhitespace;
   });
+  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (hasCommentableInlineNodeDescendants) {
+      return false;
+    }
+    return !hasCommentableTextNodeDescendants;
+  }
   return foundInvalidWhitespace;
 }
 

package/dist/esm/utils.js

@@ -348,30 +348,52 @@ export var isSupportedBlockNode = function isSupportedBlockNode(node) {
 export function hasInvalidWhitespaceNode(selection, schema) {
   var foundInvalidWhitespace = false;
   var content = selection.content().content;
+  var hasCommentableInlineNodeDescendants = false;
+  var hasCommentableTextNodeDescendants = false;
   content.descendants(function (node) {
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+      if (isAllowedInlineNode) {
+        hasCommentableInlineNodeDescendants = true;
+        return false;
+      }
+    }
     if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
       return false;
     }
     if (isText(node, schema)) {
+      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+        if (node.textContent.trim() !== '') {
+          hasCommentableTextNodeDescendants = true;
+        }
+      }
       return false;
     }
-    if (node.textContent.trim() === '') {
-      // Trailing new lines do not result in the annotation spanning into
-      // the trailing new line so can be ignored when looking for invalid
-      // whitespace nodes.
-      var nodeIsTrailingNewLine =
-      // it is the final node
-      node.eq(content.lastChild) &&
-      // and there are multiple nodes
-      !node.eq(content.firstChild) &&
-      // and it is a paragraph node
-      isParagraph(node, schema);
-      if (!nodeIsTrailingNewLine) {
-        foundInvalidWhitespace = true;
+    if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (node.textContent.trim() === '') {
+        // Trailing new lines do not result in the annotation spanning into
+        // the trailing new line so can be ignored when looking for invalid
+        // whitespace nodes.
+        var nodeIsTrailingNewLine =
+        // it is the final node
+        node.eq(content.lastChild) &&
+        // and there are multiple nodes
+        !node.eq(content.firstChild) &&
+        // and it is a paragraph node
+        isParagraph(node, schema);
+        if (!nodeIsTrailingNewLine) {
+          foundInvalidWhitespace = true;
+        }
       }
     }
     return !foundInvalidWhitespace;
   });
+  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (hasCommentableInlineNodeDescendants) {
+      return false;
+    }
+    return !hasCommentableTextNodeDescendants;
+  }
   return foundInvalidWhitespace;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-annotation",
-  "version": "1.9.5",
+  "version": "1.10.0",
   "description": "Annotation plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^36.10.7",
-    "@atlaskit/editor-common": "^82.0.0",
+    "@atlaskit/editor-common": "^82.1.0",
     "@atlaskit/editor-plugin-analytics": "^1.2.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.1.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.1.0",
@@ -96,6 +96,9 @@
     "platform.editor.allow-inline-comments-for-inline-nodes": {
       "type": "boolean"
     },
+    "platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz": {
+      "type": "boolean"
+    },
     "platform.editor.comments-on-media.bug.preserve-draft_i3vqb": {
       "type": "boolean"
     }