@atlaskit/editor-plugin-paste 7.4.4 → 7.4.6

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-paste
 
+## 7.4.6
+
+### Patch Changes
+
+- [`b14a5fc14cf22`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b14a5fc14cf22) -
+  [ux] EDITOR-2606 copy sync block from renderer should flatten out content instead of creating new
+  reference
+- Updated dependencies
+
+## 7.4.5
+
+### Patch Changes
+
+- [`4cab7924c4af0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4cab7924c4af0) -
+  [ux] Clean up editor_inline_comments_paste_insert_nodes
+- Updated dependencies
+
 ## 7.4.4
 
 ### Patch Changes

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

@@ -347,6 +347,9 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           event: event,
           text: text
         });
+        if ((0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true)) {
+          slice = (0, _transforms.transformSyncBlock)(slice, schema, (0, _util.getPasteSource)(event));
+        }
         var plainTextPasteSlice = (0, _utils.linkifyContent)(state.schema)(slice);
         if ((0, _analytics2.handlePasteAsPlainTextWithAnalytics)(editorAnalyticsAPI)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
@@ -585,9 +588,6 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           slice = (0, _transforms.transformSingleColumnLayout)(slice, schema);
         }
         slice = (0, _transforms.transformSliceToRemoveMacroId)(slice, schema);
-        if ((0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true)) {
-          slice = (0, _transforms.transformToNewReferenceSyncBlock)(slice, schema);
-        }
         return slice;
       },
       transformPastedHTML: function transformPastedHTML(html) {

package/dist/cjs/pm-plugins/util/index.js

@@ -218,13 +218,11 @@ 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;
-          })));
-        }
+      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;
     });

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

@@ -8,7 +8,7 @@ import { isNestedTablesSupported } from '@atlaskit/editor-common/nesting';
 import { isPastedFile as isPastedFileFromEvent, md } from '@atlaskit/editor-common/paste';
 import { measureRender } from '@atlaskit/editor-common/performance/measure-render';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { transformSingleColumnLayout, transformSingleLineCodeBlockToCodeMark, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId, transformToNewReferenceSyncBlock } from '@atlaskit/editor-common/transforms';
+import { transformSingleColumnLayout, transformSingleLineCodeBlockToCodeMark, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId, transformSyncBlock } from '@atlaskit/editor-common/transforms';
 import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren } from '@atlaskit/editor-common/utils';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
@@ -309,6 +309,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           event,
           text
         });
+        if (expValEquals('platform_synced_block', 'isEnabled', true)) {
+          slice = transformSyncBlock(slice, schema, getPasteSource(event));
+        }
         const plainTextPasteSlice = linkifyContent(state.schema)(slice);
         if (handlePasteAsPlainTextWithAnalytics(editorAnalyticsAPI)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
@@ -547,9 +550,6 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           slice = transformSingleColumnLayout(slice, schema);
         }
         slice = transformSliceToRemoveMacroId(slice, schema);
-        if (expValEquals('platform_synced_block', 'isEnabled', true)) {
-          slice = transformToNewReferenceSyncBlock(slice, schema);
-        }
         return slice;
       },
       transformPastedHTML(html) {

package/dist/es2019/pm-plugins/util/index.js

@@ -198,11 +198,9 @@ 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)];
-        }
+      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;
     });

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

@@ -13,7 +13,7 @@ import { isNestedTablesSupported } from '@atlaskit/editor-common/nesting';
 import { isPastedFile as isPastedFileFromEvent, md } from '@atlaskit/editor-common/paste';
 import { measureRender } from '@atlaskit/editor-common/performance/measure-render';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { transformSingleColumnLayout, transformSingleLineCodeBlockToCodeMark, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId, transformToNewReferenceSyncBlock } from '@atlaskit/editor-common/transforms';
+import { transformSingleColumnLayout, transformSingleLineCodeBlockToCodeMark, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId, transformSyncBlock } from '@atlaskit/editor-common/transforms';
 import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren } from '@atlaskit/editor-common/utils';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
@@ -339,6 +339,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           event: event,
           text: text
         });
+        if (expValEquals('platform_synced_block', 'isEnabled', true)) {
+          slice = transformSyncBlock(slice, schema, getPasteSource(event));
+        }
         var plainTextPasteSlice = linkifyContent(state.schema)(slice);
         if (handlePasteAsPlainTextWithAnalytics(editorAnalyticsAPI)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
@@ -577,9 +580,6 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           slice = transformSingleColumnLayout(slice, schema);
         }
         slice = transformSliceToRemoveMacroId(slice, schema);
-        if (expValEquals('platform_synced_block', 'isEnabled', true)) {
-          slice = transformToNewReferenceSyncBlock(slice, schema);
-        }
         return slice;
       },
       transformPastedHTML: function transformPastedHTML(html) {

package/dist/esm/pm-plugins/util/index.js

@@ -197,13 +197,11 @@ 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;
-          })));
-        }
+      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;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "7.4.4",
+	"version": "7.4.6",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,17 +41,17 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/insm": "^0.2.0",
-		"@atlaskit/media-client": "^35.5.0",
+		"@atlaskit/media-client": "^35.6.0",
 		"@atlaskit/media-common": "^12.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^13.31.0",
+		"@atlaskit/tmp-editor-statsig": "^13.38.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"react-intl-next": "npm:react-intl@^5.18.1",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.24.0",
+		"@atlaskit/editor-common": "^110.31.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -102,9 +102,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"editor_inline_comments_paste_insert_nodes": {
-			"type": "boolean"
-		},
 		"platform_editor_use_nested_table_pm_nodes": {
 			"type": "boolean"
 		},