@atlaskit/editor-plugin-annotation 1.3.0 → 1.3.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.3.2
+
+### Patch Changes
+
+- [#79543](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79543) [`8b578f7427a2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8b578f7427a2) - ED-22502: updated range selection check to exempt inline card, to allow them to have annotation marks
+- [#80883](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/80883) [`5ecfa883d4ba`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5ecfa883d4ba) - React 18 types for alignment, annotation, avatar-group and blocktype plugins.
+
+## 1.3.1
+
+### Patch Changes
+
+- [#80679](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/80679) [`104eb9443b7e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/104eb9443b7e) - ED-22553 Updating adf-schema version to 35.6.0
+
 ## 1.3.0
 
 ### Minor Changes

package/dist/cjs/utils.js

@@ -33,6 +33,7 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("./types");
 function sum(arr, f) {
   return arr.reduce(function (val, x) {
@@ -353,6 +354,9 @@ function hasInvalidWhitespaceNode(selection, schema) {
   var foundInvalidWhitespace = false;
   var content = selection.content().content;
   content.descendants(function (node) {
+    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)) {
       return false;
     }

package/dist/es2019/utils.js

@@ -5,6 +5,7 @@ import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@at
 import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, hasAnnotationMark, 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { AnnotationSelectionType } from './types';
 export { hasAnnotationMark, containsAnyAnnotations };
 function sum(arr, f) {
@@ -319,6 +320,9 @@ export function hasInvalidWhitespaceNode(selection, schema) {
   let foundInvalidWhitespace = false;
   const content = selection.content().content;
   content.descendants(node => {
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
+      return false;
+    }
     if (isText(node, schema)) {
       return false;
     }

package/dist/esm/utils.js

@@ -5,6 +5,7 @@ import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@at
 import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, hasAnnotationMark, 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { AnnotationSelectionType } from './types';
 export { hasAnnotationMark, containsAnyAnnotations };
 function sum(arr, f) {
@@ -326,6 +327,9 @@ export function hasInvalidWhitespaceNode(selection, schema) {
   var foundInvalidWhitespace = false;
   var content = selection.content().content;
   content.descendants(function (node) {
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') && node.type === schema.nodes.inlineCard) {
+      return false;
+    }
     if (isText(node, schema)) {
       return false;
     }

package/dist/types/types.d.ts

@@ -94,8 +94,8 @@ export type InlineCommentState = {
     resolved: boolean;
 };
 export type InlineCommentAnnotationProvider = AnnotationTypeProvider<AnnotationTypes.INLINE_COMMENT, InlineCommentState> & {
-    createComponent?: React.ComponentType<InlineCommentCreateComponentProps>;
-    viewComponent?: React.ComponentType<InlineCommentViewComponentProps>;
+    createComponent?: React.ComponentType<React.PropsWithChildren<InlineCommentCreateComponentProps>>;
+    viewComponent?: React.ComponentType<React.PropsWithChildren<InlineCommentViewComponentProps>>;
     isToolbarAbove?: boolean;
     /**
      * @experimental Still under development. Do not use.

package/dist/types-ts4.5/types.d.ts

@@ -94,8 +94,8 @@ export type InlineCommentState = {
     resolved: boolean;
 };
 export type InlineCommentAnnotationProvider = AnnotationTypeProvider<AnnotationTypes.INLINE_COMMENT, InlineCommentState> & {
-    createComponent?: React.ComponentType<InlineCommentCreateComponentProps>;
-    viewComponent?: React.ComponentType<InlineCommentViewComponentProps>;
+    createComponent?: React.ComponentType<React.PropsWithChildren<InlineCommentCreateComponentProps>>;
+    viewComponent?: React.ComponentType<React.PropsWithChildren<InlineCommentViewComponentProps>>;
     isToolbarAbove?: boolean;
     /**
      * @experimental Still under development. Do not use.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-annotation",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Annotation plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.5.2",
+    "@atlaskit/adf-schema": "^35.6.0",
     "@atlaskit/editor-common": "^78.12.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.0.0",
@@ -96,6 +96,9 @@
   "platform-feature-flags": {
     "platform.editor.enable-selection-toolbar_ucdwd": {
       "type": "boolean"
+    },
+    "platform.editor.allow-inline-comments-for-inline-nodes": {
+      "type": "boolean"
     }
   }
 }