@atlaskit/editor-plugin-table 10.9.8 → 10.9.10

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-table
 
+## 10.9.10
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.9.9
+
+### Patch Changes
+
+- [#144658](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/144658)
+  [`e59e7f0ae0803`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e59e7f0ae0803) -
+  Change to use getDomRefFromSelection utility from editor-common
+- Updated dependencies
+
 ## 10.9.8
 
 ### Patch Changes

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

@@ -201,36 +201,34 @@ 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 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
+  // 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
-    if (slice.openStart >= 7 && slice.openEnd >= 7) {
-      var cleaned = slice;
-      var descendedDepth = 0;
-      var tableDepthDecrement = 2;
+  // slice starts and ends inside a nested table at the same depth
+  if (slice.openStart >= 7 && slice.openEnd >= 7) {
+    var cleaned = slice;
+    var descendedDepth = 0;
+    var tableDepthDecrement = 2;
 
-      // 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) {
-          if (isNodeSingleCellTable(node, schema)) {
-            descendedDepth += tableDepthDecrement;
-          } else if (node.type === schema.nodes.table) {
-            return false;
-          } else if (containsNonTableBlockChildren(node.content, schema)) {
-            descendedDepth += tableDepthDecrement;
-            // create a new slice with the content of non-table block children and the depth of the nested tables subtracted
-            cleaned = new _model.Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
-            return false;
-          }
-        });
-      }
-      if (!cleaned.eq(slice)) {
-        return cleaned;
-      }
+    // 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) {
+        if (isNodeSingleCellTable(node, schema)) {
+          descendedDepth += tableDepthDecrement;
+        } else if (node.type === schema.nodes.table) {
+          return false;
+        } else if (containsNonTableBlockChildren(node.content, schema)) {
+          descendedDepth += tableDepthDecrement;
+          // create a new slice with the content of non-table block children and the depth of the nested tables subtracted
+          cleaned = new _model.Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
+          return false;
+        }
+      });
+    }
+    if (!cleaned.eq(slice)) {
+      return cleaned;
     }
   }
 

package/dist/cjs/tablePlugin.js

@@ -605,7 +605,7 @@ var tablePlugin = function tablePlugin(_ref) {
             api: api,
             isOpenedByKeyboard: false,
             popupsMountPoint: popupsMountPoint,
-            target: (_sizeSelectorPluginSt = sizeSelectorPluginState === null || sizeSelectorPluginState === void 0 ? void 0 : sizeSelectorPluginState.targetRef) !== null && _sizeSelectorPluginSt !== void 0 ? _sizeSelectorPluginSt : (0, _getDomRefFromSelection.getDomRefFromSelection)(editorView, _analytics.ACTION_SUBJECT_ID.PICKER_TABLE_SIZE, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.fireAnalyticsEvent),
+            target: (_sizeSelectorPluginSt = sizeSelectorPluginState === null || sizeSelectorPluginState === void 0 ? void 0 : sizeSelectorPluginState.targetRef) !== null && _sizeSelectorPluginSt !== void 0 ? _sizeSelectorPluginSt : (0, _getDomRefFromSelection.getDomRefFromSelection)(editorView, _analytics.ACTION_SUBJECT_ID.PICKER_TABLE_SIZE, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions),
             popupsBoundariesElement: popupsBoundariesElement,
             popupsScrollableElement: popupsScrollableElement
           }));

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

@@ -193,36 +193,34 @@ 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 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
+  // 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
-    if (slice.openStart >= 7 && slice.openEnd >= 7) {
-      let cleaned = slice;
-      let descendedDepth = 0;
-      const tableDepthDecrement = 2;
+  // slice starts and ends inside a nested table at the same depth
+  if (slice.openStart >= 7 && slice.openEnd >= 7) {
+    let cleaned = slice;
+    let descendedDepth = 0;
+    const tableDepthDecrement = 2;
 
-      // 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 => {
-          if (isNodeSingleCellTable(node, schema)) {
-            descendedDepth += tableDepthDecrement;
-          } else if (node.type === schema.nodes.table) {
-            return false;
-          } else if (containsNonTableBlockChildren(node.content, schema)) {
-            descendedDepth += tableDepthDecrement;
-            // create a new slice with the content of non-table block children and the depth of the nested tables subtracted
-            cleaned = new Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
-            return false;
-          }
-        });
-      }
-      if (!cleaned.eq(slice)) {
-        return cleaned;
-      }
+    // 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 => {
+        if (isNodeSingleCellTable(node, schema)) {
+          descendedDepth += tableDepthDecrement;
+        } else if (node.type === schema.nodes.table) {
+          return false;
+        } else if (containsNonTableBlockChildren(node.content, schema)) {
+          descendedDepth += tableDepthDecrement;
+          // create a new slice with the content of non-table block children and the depth of the nested tables subtracted
+          cleaned = new Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
+          return false;
+        }
+      });
+    }
+    if (!cleaned.eq(slice)) {
+      return cleaned;
     }
   }
 

package/dist/es2019/tablePlugin.js

@@ -599,7 +599,7 @@ const tablePlugin = ({
             api: api,
             isOpenedByKeyboard: false,
             popupsMountPoint: popupsMountPoint,
-            target: (_sizeSelectorPluginSt = sizeSelectorPluginState === null || sizeSelectorPluginState === void 0 ? void 0 : sizeSelectorPluginState.targetRef) !== null && _sizeSelectorPluginSt !== void 0 ? _sizeSelectorPluginSt : getDomRefFromSelection(editorView, ACTION_SUBJECT_ID.PICKER_TABLE_SIZE, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.fireAnalyticsEvent),
+            target: (_sizeSelectorPluginSt = sizeSelectorPluginState === null || sizeSelectorPluginState === void 0 ? void 0 : sizeSelectorPluginState.targetRef) !== null && _sizeSelectorPluginSt !== void 0 ? _sizeSelectorPluginSt : getDomRefFromSelection(editorView, ACTION_SUBJECT_ID.PICKER_TABLE_SIZE, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions),
             popupsBoundariesElement: popupsBoundariesElement,
             popupsScrollableElement: popupsScrollableElement
           }));

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

@@ -194,36 +194,34 @@ 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 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
+  // 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
-    if (slice.openStart >= 7 && slice.openEnd >= 7) {
-      var cleaned = slice;
-      var descendedDepth = 0;
-      var tableDepthDecrement = 2;
+  // slice starts and ends inside a nested table at the same depth
+  if (slice.openStart >= 7 && slice.openEnd >= 7) {
+    var cleaned = slice;
+    var descendedDepth = 0;
+    var tableDepthDecrement = 2;
 
-      // 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) {
-          if (isNodeSingleCellTable(node, schema)) {
-            descendedDepth += tableDepthDecrement;
-          } else if (node.type === schema.nodes.table) {
-            return false;
-          } else if (containsNonTableBlockChildren(node.content, schema)) {
-            descendedDepth += tableDepthDecrement;
-            // create a new slice with the content of non-table block children and the depth of the nested tables subtracted
-            cleaned = new Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
-            return false;
-          }
-        });
-      }
-      if (!cleaned.eq(slice)) {
-        return cleaned;
-      }
+    // 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) {
+        if (isNodeSingleCellTable(node, schema)) {
+          descendedDepth += tableDepthDecrement;
+        } else if (node.type === schema.nodes.table) {
+          return false;
+        } else if (containsNonTableBlockChildren(node.content, schema)) {
+          descendedDepth += tableDepthDecrement;
+          // create a new slice with the content of non-table block children and the depth of the nested tables subtracted
+          cleaned = new Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
+          return false;
+        }
+      });
+    }
+    if (!cleaned.eq(slice)) {
+      return cleaned;
     }
   }
 

package/dist/esm/tablePlugin.js

@@ -596,7 +596,7 @@ var tablePlugin = function tablePlugin(_ref) {
             api: api,
             isOpenedByKeyboard: false,
             popupsMountPoint: popupsMountPoint,
-            target: (_sizeSelectorPluginSt = sizeSelectorPluginState === null || sizeSelectorPluginState === void 0 ? void 0 : sizeSelectorPluginState.targetRef) !== null && _sizeSelectorPluginSt !== void 0 ? _sizeSelectorPluginSt : getDomRefFromSelection(editorView, ACTION_SUBJECT_ID.PICKER_TABLE_SIZE, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.fireAnalyticsEvent),
+            target: (_sizeSelectorPluginSt = sizeSelectorPluginState === null || sizeSelectorPluginState === void 0 ? void 0 : sizeSelectorPluginState.targetRef) !== null && _sizeSelectorPluginSt !== void 0 ? _sizeSelectorPluginSt : getDomRefFromSelection(editorView, ACTION_SUBJECT_ID.PICKER_TABLE_SIZE, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions),
             popupsBoundariesElement: popupsBoundariesElement,
             popupsScrollableElement: popupsScrollableElement
           }));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "10.9.8",
+	"version": "10.9.10",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,14 +32,14 @@
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^103.18.0",
+		"@atlaskit/editor-common": "^103.19.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-batch-attribute-updates": "^2.1.0",
 		"@atlaskit/editor-plugin-content-insertion": "^2.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
-		"@atlaskit/editor-plugin-extension": "5.3.0",
+		"@atlaskit/editor-plugin-extension": "5.3.1",
 		"@atlaskit/editor-plugin-guideline": "^2.0.0",
 		"@atlaskit/editor-plugin-selection": "^2.1.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
@@ -47,14 +47,14 @@
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/icon": "^25.6.0",
-		"@atlaskit/menu": "^3.2.0",
+		"@atlaskit/menu": "^4.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.6.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
 		"@atlaskit/primitives": "^14.4.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.14.0",
+		"@atlaskit/tmp-editor-statsig": "^4.15.0",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
@@ -138,9 +138,6 @@
 		"platform_editor_disable_table_lnv": {
 			"type": "boolean"
 		},
-		"platform_editor_nested_tables_paste_wrap_fix": {
-			"type": "boolean"
-		},
 		"nested_table_control_padding_with_css": {
 			"type": "boolean"
 		},

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

@@ -260,40 +260,38 @@ 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 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
-		if (slice.openStart >= 7 && slice.openEnd >= 7) {
-			let cleaned = slice;
-			let descendedDepth = 0;
-			const tableDepthDecrement = 2;
-
-			// 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) => {
-					if (isNodeSingleCellTable(node, schema)) {
-						descendedDepth += tableDepthDecrement;
-					} else if (node.type === schema.nodes.table) {
-						return false;
-					} else if (containsNonTableBlockChildren(node.content, schema)) {
-						descendedDepth += tableDepthDecrement;
-						// create a new slice with the content of non-table block children and the depth of the nested tables subtracted
-						cleaned = new Slice(
-							node.content,
-							slice.openStart - descendedDepth - tableDepthDecrement,
-							slice.openEnd - descendedDepth - tableDepthDecrement,
-						);
-						return false;
-					}
-				});
-			}
+	// 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
 
-			if (!cleaned.eq(slice)) {
-				return cleaned;
-			}
+	// slice starts and ends inside a nested table at the same depth
+	if (slice.openStart >= 7 && slice.openEnd >= 7) {
+		let cleaned = slice;
+		let descendedDepth = 0;
+		const tableDepthDecrement = 2;
+
+		// 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) => {
+				if (isNodeSingleCellTable(node, schema)) {
+					descendedDepth += tableDepthDecrement;
+				} else if (node.type === schema.nodes.table) {
+					return false;
+				} else if (containsNonTableBlockChildren(node.content, schema)) {
+					descendedDepth += tableDepthDecrement;
+					// create a new slice with the content of non-table block children and the depth of the nested tables subtracted
+					cleaned = new Slice(
+						node.content,
+						slice.openStart - descendedDepth - tableDepthDecrement,
+						slice.openEnd - descendedDepth - tableDepthDecrement,
+					);
+					return false;
+				}
+			});
+		}
+
+		if (!cleaned.eq(slice)) {
+			return cleaned;
 		}
 	}
 

package/src/tablePlugin.tsx

@@ -771,7 +771,7 @@ const tablePlugin: TablePlugin = ({ config: options, api }) => {
 												getDomRefFromSelection(
 													editorView,
 													ACTION_SUBJECT_ID.PICKER_TABLE_SIZE,
-													api?.analytics?.actions.fireAnalyticsEvent,
+													api?.analytics?.actions,
 												)
 											}
 											popupsBoundariesElement={popupsBoundariesElement}