@atlaskit/editor-plugin-paste 2.0.19 → 2.0.20

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-paste
 
+## 2.0.20
+
+### Patch Changes
+
+- [#104508](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/104508)
+  [`8fb009b2b619c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8fb009b2b619c) -
+  [ux] [ED-26221] Fix pasting order for tables, nested tables and tasks and decisions (panels). This
+  ensures when pasting a table inside a panel inside a table replaces the panel with the table.
+- Updated dependencies
+
 ## 2.0.19
 
 ### Patch Changes

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

@@ -340,9 +340,6 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           // @ts-ignore - [unblock prosemirror bump] assigning to readonly prop
           slice.openStart = 1;
         }
-        if ((0, _analytics2.handlePasteIntoTaskAndDecisionWithAnalytics)(view, event, slice, isPlainText ? _analytics.PasteTypes.plain : _analytics.PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
-          return true;
-        }
 
         // If we're in a code block, append the text contents of clipboard inside it
         if ((0, _analytics2.handleCodeBlockWithAnalytics)(editorAnalyticsAPI)(view, event, slice, text)(state, dispatch)) {
@@ -361,6 +358,23 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         isNestedMarkdownTable = !!(markdownSlice && isPlainText && isParentNodeTdOrTh && (0, _analytics2.getContentNodeTypes)(markdownSlice.content).includes((_schema$nodes$table = schema.nodes.table) === null || _schema$nodes$table === void 0 ? void 0 : _schema$nodes$table.name));
         slice = isNestedMarkdownTable ? markdownSlice : slice;
 
+        // get editor-tables to handle pasting tables if it can
+        // otherwise, just the replace the selection with the content
+        if ((0, _utils3.handlePaste)(view, null, slice)) {
+          (0, _analytics2.sendPasteAnalyticsEvent)(editorAnalyticsAPI)(view, event, slice, {
+            type: _analytics.PasteTypes.richText
+          });
+          return true;
+        }
+
+        // handle paste of nested tables to ensure nesting limits are respected
+        if ((0, _analytics2.handleNestedTablePasteWithAnalytics)(editorAnalyticsAPI, (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
+          return true;
+        }
+        if ((0, _analytics2.handlePasteIntoTaskAndDecisionWithAnalytics)(view, event, slice, isPlainText ? _analytics.PasteTypes.plain : _analytics.PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
+          return true;
+        }
+
         // If the clipboard only contains plain text, attempt to parse it as Markdown
         if (isPlainText && markdownSlice && !isNestedMarkdownTable) {
           if ((0, _analytics2.handlePastePreservingMarksWithAnalytics)(view, event, markdownSlice, _analytics.PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
@@ -404,20 +418,6 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
             return true;
           }
 
-          // get editor-tables to handle pasting tables if it can
-          // otherwise, just the replace the selection with the content
-          if ((0, _utils3.handlePaste)(view, null, slice)) {
-            (0, _analytics2.sendPasteAnalyticsEvent)(editorAnalyticsAPI)(view, event, slice, {
-              type: _analytics.PasteTypes.richText
-            });
-            return true;
-          }
-
-          // handle paste of nested tables to ensure nesting limits are respected
-          if ((0, _analytics2.handleNestedTablePasteWithAnalytics)(editorAnalyticsAPI, (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
-            return true;
-          }
-
           // handle the case when copy content from a table cell inside bodied extension
           if ((0, _handlers.handleTableContentPasteInBodiedExtension)(slice)(state, dispatch)) {
             return true;

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

@@ -314,9 +314,6 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // @ts-ignore - [unblock prosemirror bump] assigning to readonly prop
           slice.openStart = 1;
         }
-        if (handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, isPlainText ? PasteTypes.plain : PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
-          return true;
-        }
 
         // If we're in a code block, append the text contents of clipboard inside it
         if (handleCodeBlockWithAnalytics(editorAnalyticsAPI)(view, event, slice, text)(state, dispatch)) {
@@ -335,6 +332,23 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         isNestedMarkdownTable = !!(markdownSlice && isPlainText && isParentNodeTdOrTh && getContentNodeTypes(markdownSlice.content).includes((_schema$nodes$table = schema.nodes.table) === null || _schema$nodes$table === void 0 ? void 0 : _schema$nodes$table.name));
         slice = isNestedMarkdownTable ? markdownSlice : slice;
 
+        // get editor-tables to handle pasting tables if it can
+        // otherwise, just the replace the selection with the content
+        if (handlePasteTable(view, null, slice)) {
+          sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, slice, {
+            type: PasteTypes.richText
+          });
+          return true;
+        }
+
+        // handle paste of nested tables to ensure nesting limits are respected
+        if (handleNestedTablePasteWithAnalytics(editorAnalyticsAPI, fg('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
+          return true;
+        }
+        if (handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, isPlainText ? PasteTypes.plain : PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
+          return true;
+        }
+
         // If the clipboard only contains plain text, attempt to parse it as Markdown
         if (isPlainText && markdownSlice && !isNestedMarkdownTable) {
           if (handlePastePreservingMarksWithAnalytics(view, event, markdownSlice, PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
@@ -380,20 +394,6 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             return true;
           }
 
-          // get editor-tables to handle pasting tables if it can
-          // otherwise, just the replace the selection with the content
-          if (handlePasteTable(view, null, slice)) {
-            sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, slice, {
-              type: PasteTypes.richText
-            });
-            return true;
-          }
-
-          // handle paste of nested tables to ensure nesting limits are respected
-          if (handleNestedTablePasteWithAnalytics(editorAnalyticsAPI, fg('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
-            return true;
-          }
-
           // handle the case when copy content from a table cell inside bodied extension
           if (handleTableContentPasteInBodiedExtension(slice)(state, dispatch)) {
             return true;

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

@@ -332,9 +332,6 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // @ts-ignore - [unblock prosemirror bump] assigning to readonly prop
           slice.openStart = 1;
         }
-        if (handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, isPlainText ? PasteTypes.plain : PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
-          return true;
-        }
 
         // If we're in a code block, append the text contents of clipboard inside it
         if (handleCodeBlockWithAnalytics(editorAnalyticsAPI)(view, event, slice, text)(state, dispatch)) {
@@ -353,6 +350,23 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         isNestedMarkdownTable = !!(markdownSlice && isPlainText && isParentNodeTdOrTh && getContentNodeTypes(markdownSlice.content).includes((_schema$nodes$table = schema.nodes.table) === null || _schema$nodes$table === void 0 ? void 0 : _schema$nodes$table.name));
         slice = isNestedMarkdownTable ? markdownSlice : slice;
 
+        // get editor-tables to handle pasting tables if it can
+        // otherwise, just the replace the selection with the content
+        if (handlePasteTable(view, null, slice)) {
+          sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, slice, {
+            type: PasteTypes.richText
+          });
+          return true;
+        }
+
+        // handle paste of nested tables to ensure nesting limits are respected
+        if (handleNestedTablePasteWithAnalytics(editorAnalyticsAPI, fg('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
+          return true;
+        }
+        if (handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, isPlainText ? PasteTypes.plain : PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
+          return true;
+        }
+
         // If the clipboard only contains plain text, attempt to parse it as Markdown
         if (isPlainText && markdownSlice && !isNestedMarkdownTable) {
           if (handlePastePreservingMarksWithAnalytics(view, event, markdownSlice, PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
@@ -396,20 +410,6 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             return true;
           }
 
-          // get editor-tables to handle pasting tables if it can
-          // otherwise, just the replace the selection with the content
-          if (handlePasteTable(view, null, slice)) {
-            sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, slice, {
-              type: PasteTypes.richText
-            });
-            return true;
-          }
-
-          // handle paste of nested tables to ensure nesting limits are respected
-          if (handleNestedTablePasteWithAnalytics(editorAnalyticsAPI, fg('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
-            return true;
-          }
-
           // handle the case when copy content from a table cell inside bodied extension
           if (handleTableContentPasteInBodiedExtension(slice)(state, dispatch)) {
             return true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "2.0.19",
+	"version": "2.0.20",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,9 +32,9 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.4.0",
+		"@atlaskit/editor-common": "^99.5.0",
 		"@atlaskit/editor-markdown-transformer": "^5.13.0",
-		"@atlaskit/editor-plugin-analytics": "^1.10.0",
+		"@atlaskit/editor-plugin-analytics": "^1.11.0",
 		"@atlaskit/editor-plugin-annotation": "^1.26.0",
 		"@atlaskit/editor-plugin-better-type-history": "^1.9.0",
 		"@atlaskit/editor-plugin-card": "^4.5.0",
@@ -44,10 +44,10 @@
 		"@atlaskit/editor-plugin-mentions": "^2.13.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/media-client": "^30.0.0",
+		"@atlaskit/media-client": "^31.0.0",
 		"@atlaskit/media-common": "^11.7.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.38.0",
+		"@atlaskit/tmp-editor-statsig": "^2.39.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^3.1.0"