@atlaskit/editor-plugin-table 9.5.9 → 9.5.10

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-table
 
+## 9.5.10
+
+### Patch Changes
+
+- [#116555](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116555)
+  [`ee0cb1bc42e39`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ee0cb1bc42e39) -
+  [ux] ED-26663 Bugfix for a regression introduced by nested tables - when nested table nodes are
+  enabled but the nested table experiment is disabled, copying table content inside a bodied
+  extension and pasting it in the table results in the content being pasted under the table and
+  wrapped in a table
+
 ## 9.5.9
 
 ### Patch Changes

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

@@ -193,11 +193,21 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
         // This needs to go before `transformSliceToRemoveOpenTable`
         slice = (0, _transforms.transformSliceToRemoveOpenExpand)(slice, schema);
 
-        /** If a partial paste of table, paste only table's content */
-        slice = (0, _paste.transformSliceToRemoveOpenTable)(slice, schema);
+        // transformSliceToRemoveOpenTable() transforms based on the depth of the root node, assuming that the tables will be at the root
+        // Bodied extensions will contribute to the depth of the table selection so we need to remove them first
+        if ((0, _platformFeatureFlags.fg)('platform_editor_nested_tables_bodied_extension_fix')) {
+          /** If a partial paste of bodied extension, paste only text */
+          slice = (0, _transforms.transformSliceToRemoveOpenBodiedExtension)(slice, schema);
 
-        /** If a partial paste of bodied extension, paste only text */
-        slice = (0, _transforms.transformSliceToRemoveOpenBodiedExtension)(slice, schema);
+          /** If a partial paste of table, paste only table's content */
+          slice = (0, _paste.transformSliceToRemoveOpenTable)(slice, schema);
+        } else {
+          /** If a partial paste of table, paste only table's content */
+          slice = (0, _paste.transformSliceToRemoveOpenTable)(slice, schema);
+
+          /** If a partial paste of bodied extension, paste only text */
+          slice = (0, _transforms.transformSliceToRemoveOpenBodiedExtension)(slice, schema);
+        }
 
         /** If a partial paste of multi bodied extension, paste only children */
         slice = (0, _transforms.transformSliceToRemoveOpenMultiBodiedExtension)(slice, schema);

package/dist/cjs/pm-plugins/utils/paste.js

@@ -195,8 +195,8 @@ var containsNonTableBlockChildren = function containsNonTableBlockChildren(fragm
 var transformSliceToRemoveOpenTable = exports.transformSliceToRemoveOpenTable = function transformSliceToRemoveOpenTable(slice, schema) {
   var _slice$content$firstC4;
   if ((0, _platformFeatureFlags.fg)('platform_editor_nested_tables_paste_wrap_fix')) {
-    // Case 1: A slice of a textblock selection inside a nested table
-    // Prosemirror wraps nested textblock selections in their respective tables
+    // Case 1: A slice of a block selection inside a nested table
+    // Prosemirror wraps nested block selections in their respective tables
     // We are using `safeInsert` to paste nested tables, so we do not want to preserve this wrapping
 
     // slice starts and ends inside a nested table at the same depth
@@ -208,7 +208,7 @@ var transformSliceToRemoveOpenTable = exports.transformSliceToRemoveOpenTable =
       // if the slice is a single cell table and contains cells with single cell tables, descend into it until we find textblock children
       if (isFragmentSingleCellTable(slice.content, schema)) {
         var _slice$content$firstC2;
-        (_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 || _slice$content$firstC2.descendants(function (node, _pos, parent) {
+        (_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 || _slice$content$firstC2.descendants(function (node) {
           if (isNodeSingleCellTable(node, schema)) {
             descendedDepth += tableDepthDecrement;
           } else if (node.type === schema.nodes.table) {

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

@@ -185,11 +185,21 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
         // This needs to go before `transformSliceToRemoveOpenTable`
         slice = transformSliceToRemoveOpenExpand(slice, schema);
 
-        /** If a partial paste of table, paste only table's content */
-        slice = transformSliceToRemoveOpenTable(slice, schema);
+        // transformSliceToRemoveOpenTable() transforms based on the depth of the root node, assuming that the tables will be at the root
+        // Bodied extensions will contribute to the depth of the table selection so we need to remove them first
+        if (fg('platform_editor_nested_tables_bodied_extension_fix')) {
+          /** If a partial paste of bodied extension, paste only text */
+          slice = transformSliceToRemoveOpenBodiedExtension(slice, schema);
 
-        /** If a partial paste of bodied extension, paste only text */
-        slice = transformSliceToRemoveOpenBodiedExtension(slice, schema);
+          /** If a partial paste of table, paste only table's content */
+          slice = transformSliceToRemoveOpenTable(slice, schema);
+        } else {
+          /** If a partial paste of table, paste only table's content */
+          slice = transformSliceToRemoveOpenTable(slice, schema);
+
+          /** If a partial paste of bodied extension, paste only text */
+          slice = transformSliceToRemoveOpenBodiedExtension(slice, schema);
+        }
 
         /** If a partial paste of multi bodied extension, paste only children */
         slice = transformSliceToRemoveOpenMultiBodiedExtension(slice, schema);

package/dist/es2019/pm-plugins/utils/paste.js

@@ -187,8 +187,8 @@ const containsNonTableBlockChildren = (fragment, schema) => {
 export const transformSliceToRemoveOpenTable = (slice, schema) => {
   var _slice$content$firstC8;
   if (fg('platform_editor_nested_tables_paste_wrap_fix')) {
-    // Case 1: A slice of a textblock selection inside a nested table
-    // Prosemirror wraps nested textblock selections in their respective tables
+    // Case 1: A slice of a block selection inside a nested table
+    // Prosemirror wraps nested block selections in their respective tables
     // We are using `safeInsert` to paste nested tables, so we do not want to preserve this wrapping
 
     // slice starts and ends inside a nested table at the same depth
@@ -200,7 +200,7 @@ export const transformSliceToRemoveOpenTable = (slice, schema) => {
       // if the slice is a single cell table and contains cells with single cell tables, descend into it until we find textblock children
       if (isFragmentSingleCellTable(slice.content, schema)) {
         var _slice$content$firstC2;
-        (_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.descendants((node, _pos, parent) => {
+        (_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.descendants(node => {
           if (isNodeSingleCellTable(node, schema)) {
             descendedDepth += tableDepthDecrement;
           } else if (node.type === schema.nodes.table) {

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

@@ -186,11 +186,21 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
         // This needs to go before `transformSliceToRemoveOpenTable`
         slice = transformSliceToRemoveOpenExpand(slice, schema);
 
-        /** If a partial paste of table, paste only table's content */
-        slice = transformSliceToRemoveOpenTable(slice, schema);
+        // transformSliceToRemoveOpenTable() transforms based on the depth of the root node, assuming that the tables will be at the root
+        // Bodied extensions will contribute to the depth of the table selection so we need to remove them first
+        if (fg('platform_editor_nested_tables_bodied_extension_fix')) {
+          /** If a partial paste of bodied extension, paste only text */
+          slice = transformSliceToRemoveOpenBodiedExtension(slice, schema);
 
-        /** If a partial paste of bodied extension, paste only text */
-        slice = transformSliceToRemoveOpenBodiedExtension(slice, schema);
+          /** If a partial paste of table, paste only table's content */
+          slice = transformSliceToRemoveOpenTable(slice, schema);
+        } else {
+          /** If a partial paste of table, paste only table's content */
+          slice = transformSliceToRemoveOpenTable(slice, schema);
+
+          /** If a partial paste of bodied extension, paste only text */
+          slice = transformSliceToRemoveOpenBodiedExtension(slice, schema);
+        }
 
         /** If a partial paste of multi bodied extension, paste only children */
         slice = transformSliceToRemoveOpenMultiBodiedExtension(slice, schema);

package/dist/esm/pm-plugins/utils/paste.js

@@ -188,8 +188,8 @@ var containsNonTableBlockChildren = function containsNonTableBlockChildren(fragm
 export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpenTable(slice, schema) {
   var _slice$content$firstC4;
   if (fg('platform_editor_nested_tables_paste_wrap_fix')) {
-    // Case 1: A slice of a textblock selection inside a nested table
-    // Prosemirror wraps nested textblock selections in their respective tables
+    // Case 1: A slice of a block selection inside a nested table
+    // Prosemirror wraps nested block selections in their respective tables
     // We are using `safeInsert` to paste nested tables, so we do not want to preserve this wrapping
 
     // slice starts and ends inside a nested table at the same depth
@@ -201,7 +201,7 @@ export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpen
       // if the slice is a single cell table and contains cells with single cell tables, descend into it until we find textblock children
       if (isFragmentSingleCellTable(slice.content, schema)) {
         var _slice$content$firstC2;
-        (_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 || _slice$content$firstC2.descendants(function (node, _pos, parent) {
+        (_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 || _slice$content$firstC2.descendants(function (node) {
           if (isNodeSingleCellTable(node, schema)) {
             descendedDepth += tableDepthDecrement;
           } else if (node.type === schema.nodes.table) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "9.5.9",
+	"version": "9.5.10",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -164,6 +164,9 @@
 		},
 		"platform_editor_react18_stickyheaders_fix": {
 			"type": "boolean"
+		},
+		"platform_editor_nested_tables_bodied_extension_fix": {
+			"type": "boolean"
 		}
 	}
 }

package/src/pm-plugins/main.ts

@@ -287,11 +287,21 @@ export const createPlugin = (
 				// This needs to go before `transformSliceToRemoveOpenTable`
 				slice = transformSliceToRemoveOpenExpand(slice, schema);
 
-				/** If a partial paste of table, paste only table's content */
-				slice = transformSliceToRemoveOpenTable(slice, schema);
-
-				/** If a partial paste of bodied extension, paste only text */
-				slice = transformSliceToRemoveOpenBodiedExtension(slice, schema);
+				// transformSliceToRemoveOpenTable() transforms based on the depth of the root node, assuming that the tables will be at the root
+				// Bodied extensions will contribute to the depth of the table selection so we need to remove them first
+				if (fg('platform_editor_nested_tables_bodied_extension_fix')) {
+					/** If a partial paste of bodied extension, paste only text */
+					slice = transformSliceToRemoveOpenBodiedExtension(slice, schema);
+
+					/** If a partial paste of table, paste only table's content */
+					slice = transformSliceToRemoveOpenTable(slice, schema);
+				} else {
+					/** If a partial paste of table, paste only table's content */
+					slice = transformSliceToRemoveOpenTable(slice, schema);
+
+					/** If a partial paste of bodied extension, paste only text */
+					slice = transformSliceToRemoveOpenBodiedExtension(slice, schema);
+				}
 
 				/** If a partial paste of multi bodied extension, paste only children */
 				slice = transformSliceToRemoveOpenMultiBodiedExtension(slice, schema);

package/src/pm-plugins/utils/paste.ts

@@ -244,8 +244,8 @@ const containsNonTableBlockChildren = (fragment: Fragment, schema: Schema): bool
 
 export const transformSliceToRemoveOpenTable = (slice: Slice, schema: Schema): Slice => {
 	if (fg('platform_editor_nested_tables_paste_wrap_fix')) {
-		// Case 1: A slice of a textblock selection inside a nested table
-		// Prosemirror wraps nested textblock selections in their respective tables
+		// Case 1: A slice of a block selection inside a nested table
+		// Prosemirror wraps nested block selections in their respective tables
 		// We are using `safeInsert` to paste nested tables, so we do not want to preserve this wrapping
 
 		// slice starts and ends inside a nested table at the same depth
@@ -256,7 +256,7 @@ export const transformSliceToRemoveOpenTable = (slice: Slice, schema: Schema): S
 
 			// if the slice is a single cell table and contains cells with single cell tables, descend into it until we find textblock children
 			if (isFragmentSingleCellTable(slice.content, schema)) {
-				slice.content.firstChild?.descendants((node, _pos, parent) => {
+				slice.content.firstChild?.descendants((node) => {
 					if (isNodeSingleCellTable(node, schema)) {
 						descendedDepth += tableDepthDecrement;
 					} else if (node.type === schema.nodes.table) {