@atlaskit/editor-plugin-paste 1.5.6 → 1.5.7

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.5.7
+
+### Patch Changes
+
+- [#122612](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/122612)
+  [`01a85ce0a88ec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/01a85ce0a88ec) -
+  [ux] ED-23705 Add logic to handle annotations on inline nodes when they are inserted or pasted.
+  Covers the following inline nodes: emoji, status, mention, date, inlineCard
+
 ## 1.5.6
 
 ### Patch Changes

package/dist/cjs/util/index.js

@@ -27,6 +27,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _mediaClient = require("@atlaskit/media-client");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function isPastedFromWord(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:word') >= 0;
 }
@@ -117,6 +118,14 @@ function applyTextMarksToSlice(schema, marks) {
         }))).sort((0, _legacyRankPlugins.sortByOrderWithTypeName)('marks'));
         return false;
       }
+      if ((0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes')) {
+        if (node.isInline && ['inlineCard', 'emoji', 'status', 'date', 'mention'].includes(node.type.name) && parent && parent.isBlock) {
+          // @ts-ignore - [unblock prosemirror bump] assigning to readonly prop
+          node.marks = [].concat((0, _toConsumableArray2.default)(node.marks), (0, _toConsumableArray2.default)(parent.type.allowedMarks(marks).filter(function (mark) {
+            return mark.type === schema.marks.annotation;
+          })));
+        }
+      }
       return true;
     });
     return sliceCopy;

package/dist/es2019/util/index.js

@@ -6,6 +6,7 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getSelectedTableInfo, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { isMediaBlobUrl } from '@atlaskit/media-client';
+import { fg } from '@atlaskit/platform-feature-flags';
 export function isPastedFromWord(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:word') >= 0;
 }
@@ -98,6 +99,12 @@ export function applyTextMarksToSlice(schema, marks) {
         ...parent.type.allowedMarks(marks).filter(mark => mark.type !== linkMark)].sort(sortByOrderWithTypeName('marks'));
         return false;
       }
+      if (fg('editor_inline_comments_paste_insert_nodes')) {
+        if (node.isInline && ['inlineCard', 'emoji', 'status', 'date', 'mention'].includes(node.type.name) && parent && parent.isBlock) {
+          // @ts-ignore - [unblock prosemirror bump] assigning to readonly prop
+          node.marks = [...node.marks, ...parent.type.allowedMarks(marks).filter(mark => mark.type === schema.marks.annotation)];
+        }
+      }
       return true;
     });
     return sliceCopy;

package/dist/esm/util/index.js

@@ -7,6 +7,7 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getSelectedTableInfo, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { isMediaBlobUrl } from '@atlaskit/media-client';
+import { fg } from '@atlaskit/platform-feature-flags';
 export function isPastedFromWord(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:word') >= 0;
 }
@@ -97,6 +98,14 @@ export function applyTextMarksToSlice(schema, marks) {
         }))).sort(sortByOrderWithTypeName('marks'));
         return false;
       }
+      if (fg('editor_inline_comments_paste_insert_nodes')) {
+        if (node.isInline && ['inlineCard', 'emoji', 'status', 'date', 'mention'].includes(node.type.name) && parent && parent.isBlock) {
+          // @ts-ignore - [unblock prosemirror bump] assigning to readonly prop
+          node.marks = [].concat(_toConsumableArray(node.marks), _toConsumableArray(parent.type.allowedMarks(marks).filter(function (mark) {
+            return mark.type === schema.marks.annotation;
+          })));
+        }
+      }
       return true;
     });
     return sliceCopy;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "1.5.6",
+	"version": "1.5.7",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^86.2.0",
+		"@atlaskit/editor-common": "^86.4.0",
 		"@atlaskit/editor-markdown-transformer": "^5.8.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-plugin-annotation": "^1.15.0",
@@ -130,6 +130,9 @@
 		},
 		"platform.editor.preserve-whitespace-clipboard-text-serialization": {
 			"type": "boolean"
+		},
+		"editor_inline_comments_paste_insert_nodes": {
+			"type": "boolean"
 		}
 	}
 }