@atlaskit/editor-plugin-paste 1.0.14 → 1.0.16

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.0.16
+
+### Patch Changes
+
+- [#91106](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/91106) [`b6ffa30186b9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b6ffa30186b9) - Bump ADF-schema package to version 35.0.0
+- Updated dependencies
+
+## 1.0.15
+
+### Patch Changes
+
+- [#89978](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89978) [`6e7143622425`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6e7143622425) - fix paste markdown table into a table issue
+
 ## 1.0.14
 
 ### Patch Changes

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

@@ -335,9 +335,16 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         if ((0, _analytics2.handleSelectedTableWithAnalytics)(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
           return true;
         }
+        var isNestedMarkdownTable = false;
+        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.paste-markdown-table-in-a-table')) {
+          // if paste a markdown table inside a table cell, we should treat it as a table slice
+          var isParentNodeTdOrTh = selectionParentType === schema.nodes.tableCell || selectionParentType === schema.nodes.tableHeader;
+          isNestedMarkdownTable = !!(markdownSlice && isPlainText && isParentNodeTdOrTh && (0, _analytics2.getContentNodeTypes)(markdownSlice.content).includes(schema.nodes.table.name));
+          slice = isNestedMarkdownTable ? markdownSlice : slice;
+        }
 
         // If the clipboard only contains plain text, attempt to parse it as Markdown
-        if (isPlainText && markdownSlice) {
+        if (isPlainText && markdownSlice && !isNestedMarkdownTable) {
           if ((0, _analytics2.handlePastePreservingMarksWithAnalytics)(view, event, markdownSlice, _analytics.PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
             return true;
           }
@@ -362,7 +369,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         }
 
         // finally, handle rich-text copy-paste
-        if (isRichText) {
+        if (isRichText || isNestedMarkdownTable) {
           var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = (0, _utils.linkifyContent)(state.schema)(slice);

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

@@ -304,9 +304,16 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (handleSelectedTableWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
           return true;
         }
+        let isNestedMarkdownTable = false;
+        if (getBooleanFF('platform.editor.paste-markdown-table-in-a-table')) {
+          // if paste a markdown table inside a table cell, we should treat it as a table slice
+          const isParentNodeTdOrTh = selectionParentType === schema.nodes.tableCell || selectionParentType === schema.nodes.tableHeader;
+          isNestedMarkdownTable = !!(markdownSlice && isPlainText && isParentNodeTdOrTh && getContentNodeTypes(markdownSlice.content).includes(schema.nodes.table.name));
+          slice = isNestedMarkdownTable ? markdownSlice : slice;
+        }
 
         // If the clipboard only contains plain text, attempt to parse it as Markdown
-        if (isPlainText && markdownSlice) {
+        if (isPlainText && markdownSlice && !isNestedMarkdownTable) {
           if (handlePastePreservingMarksWithAnalytics(view, event, markdownSlice, PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
             return true;
           }
@@ -333,7 +340,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
 
         // finally, handle rich-text copy-paste
-        if (isRichText) {
+        if (isRichText || isNestedMarkdownTable) {
           var _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginInjectionApi$e3, _pluginInjectionApi$e4, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);

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

@@ -322,9 +322,16 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (handleSelectedTableWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
           return true;
         }
+        var isNestedMarkdownTable = false;
+        if (getBooleanFF('platform.editor.paste-markdown-table-in-a-table')) {
+          // if paste a markdown table inside a table cell, we should treat it as a table slice
+          var isParentNodeTdOrTh = selectionParentType === schema.nodes.tableCell || selectionParentType === schema.nodes.tableHeader;
+          isNestedMarkdownTable = !!(markdownSlice && isPlainText && isParentNodeTdOrTh && getContentNodeTypes(markdownSlice.content).includes(schema.nodes.table.name));
+          slice = isNestedMarkdownTable ? markdownSlice : slice;
+        }
 
         // If the clipboard only contains plain text, attempt to parse it as Markdown
-        if (isPlainText && markdownSlice) {
+        if (isPlainText && markdownSlice && !isNestedMarkdownTable) {
           if (handlePastePreservingMarksWithAnalytics(view, event, markdownSlice, PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
             return true;
           }
@@ -349,7 +356,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
 
         // finally, handle rich-text copy-paste
-        if (isRichText) {
+        if (isRichText || isNestedMarkdownTable) {
           var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Paste plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,15 +33,15 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^78.25.0",
+    "@atlaskit/editor-common": "^78.28.0",
     "@atlaskit/editor-markdown-transformer": "^5.4.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-annotation": "^1.5.0",
     "@atlaskit/editor-plugin-better-type-history": "^1.0.0",
-    "@atlaskit/editor-plugin-card": "^1.5.0",
+    "@atlaskit/editor-plugin-card": "^1.8.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-plugin-list": "^3.1.0",
-    "@atlaskit/editor-plugin-media": "^1.14.0",
+    "@atlaskit/editor-plugin-media": "^1.15.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-tables": "^2.6.0",
     "@atlaskit/media-client": "^26.3.0",
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@af/visual-regression": "*",
-    "@atlaskit/adf-schema": "^35.8.0",
+    "@atlaskit/adf-schema": "^35.9.0",
     "@atlaskit/editor-plugin-block-type": "^3.0.0",
     "@atlaskit/editor-plugin-history": "^1.0.0",
     "@atlaskit/editor-plugin-type-ahead": "^1.0.0",
@@ -136,6 +136,9 @@
     "platform.editor.table.copy-paste-in-bodied-extension": {
       "type": "boolean"
     },
+    "platform.editor.paste-markdown-table-in-a-table": {
+      "type": "boolean"
+    },
     "platform.editor.extractlistfromparagraphv2": {
       "type": "boolean"
     }