@atlaskit/editor-tables 2.9.0 → 2.9.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-tables
 
+## 2.9.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.9.1
+
+### Patch Changes
+
+- [#117917](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/117917)
+  [`feeb187f3871c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/feeb187f3871c) -
+  Fix selections between cells across tables, and cells to content outside tables
+- Updated dependencies
+
 ## 2.9.0
 
 ### Minor Changes

package/afm-cc/tsconfig.json

@@ -19,6 +19,9 @@
     "references": [
         {
             "path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
+        },
+        {
+            "path": "../../tmp-editor-statsig/afm-cc/tsconfig.json"
         }
     ]
 }

package/afm-jira/tsconfig.json

@@ -19,6 +19,9 @@
 	"references": [
 		{
 			"path": "../../../platform/feature-flags/afm-jira/tsconfig.json"
+		},
+		{
+			"path": "../../tmp-editor-statsig/afm-jira/tsconfig.json"
 		}
 	]
 }

package/afm-post-office/tsconfig.json

@@ -19,6 +19,9 @@
 	"references": [
 		{
 			"path": "../../../platform/feature-flags/afm-post-office/tsconfig.json"
+		},
+		{
+			"path": "../../tmp-editor-statsig/afm-post-office/tsconfig.json"
 		}
 	]
 }

package/dist/cjs/utils/colspan.js

@@ -38,7 +38,7 @@ function assertColspan(attrs) {
   }
 }
 
-// TODO: replace "addColSpan" from table plugin with this function
+// TODO: ED-26961 - replace "addColSpan" from table plugin with this function
 function addColSpan(attrs, pos) {
   var n = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
   assertColspan(attrs);

package/dist/cjs/utils/handle-paste.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handlePaste = handlePaste;
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _cellSelection = require("../cell-selection");
 var _tableMap2 = require("../table-map");
 var _selectionCell = require("../utils/selection-cell");
@@ -15,11 +17,32 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function handlePaste(view, event, slice) {
+  var _slice$content$firstC;
   if (!(0, _tables.isInTable)(view.state)) {
     return false;
   }
-  var cells = (0, _copyPaste.pastedCells)(slice);
+  var schema = view.state.schema;
+  var isNestingAllowed = (0, _experiments.editorExperiment)('nested-tables-in-tables', true);
+  /**
+   * TODO: There can be multiple variations.
+   * 1. The last cell is selected with content outside of the table
+   * 2. The first cell is selected with content outside of the table
+   */
+  var isPartialTablePaste = slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === schema.nodes.table && slice.openStart !== 0 && slice.openEnd !== 0;
   var sel = view.state.selection;
+  if (isNestingAllowed && !isPartialTablePaste) {
+    var cellRes = (0, _utils.findParentNode)(function (node) {
+      return node.type === schema.nodes.tableCell || node.type === schema.nodes.tableHeader;
+    })(sel);
+    if (cellRes) {
+      var _cellRes$node$content;
+      var canInsertNestedTable = (_cellRes$node$content = cellRes.node.contentMatchAt(0).matchType(schema.nodes.table)) === null || _cellRes$node$content === void 0 ? void 0 : _cellRes$node$content.validEnd;
+      if (canInsertNestedTable) {
+        return false;
+      }
+    }
+  }
+  var cells = (0, _copyPaste.pastedCells)(slice);
   if (sel instanceof _cellSelection.CellSelection) {
     if (!cells) {
       cells = {
@@ -80,7 +103,7 @@ var clearColumnWidthOfCells = function clearColumnWidthOfCells(cells, rect, tabl
   }
   for (var _i = 0, _overlappingCells = overlappingCells; _i < _overlappingCells.length; _i++) {
     var cell = _overlappingCells[_i];
-    // TODO: ED-13910 unblock Prosemirror bump
+    // TODO: ED-13910 - unblock Prosemirror bump
     // @ts-ignore
     cell.attrs.colwidth = null;
   }

package/dist/cjs/utils/normalize-selection.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.normalizeSelection = normalizeSelection;
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _cellSelection = require("../cell-selection");
 var _tableMap = require("../table-map");
 function normalizeSelection(state, transaction, allowTableNodeSelection) {
@@ -17,6 +18,7 @@ function normalizeSelection(state, transaction, allowTableNodeSelection) {
   if (sel instanceof _state.NodeSelection) {
     role = sel.node.type.spec.tableRole;
   }
+  var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true);
   if (sel instanceof _state.NodeSelection && role) {
     if (role === 'cell' || role === 'header_cell') {
       normalize = _cellSelection.CellSelection.create(doc, sel.from);
@@ -31,7 +33,7 @@ function normalizeSelection(state, transaction, allowTableNodeSelection) {
     }
   } else if (sel instanceof _state.TextSelection && isCellBoundarySelection(sel)) {
     normalize = _state.TextSelection.create(doc, sel.from);
-  } else if (sel instanceof _state.TextSelection && isTextSelectionAcrossCells(sel)) {
+  } else if (sel instanceof _state.TextSelection && (isMultiSelect ? isTextSelectionAcrossSameTableCells(sel) : isTextSelectionAcrossCells(sel))) {
     normalize = _state.TextSelection.create(doc, sel.$from.start(), sel.$from.end());
   }
   if (normalize) {
@@ -82,4 +84,33 @@ function isTextSelectionAcrossCells(_ref3) {
     }
   }
   return fromCellBoundaryNode !== toCellBoundaryNode && $to.parentOffset === 0;
+}
+function isTextSelectionAcrossSameTableCells(_ref4) {
+  var $from = _ref4.$from,
+    $to = _ref4.$to;
+  var fromCellBoundaryNode;
+  var toCellBoundaryNode;
+  var fromCellTableNode;
+  var toCellTableNode;
+  for (var i = $from.depth; i > 0; i--) {
+    var node = $from.node(i);
+    if (node.type.spec.tableRole === 'cell' || node.type.spec.tableRole === 'header_cell') {
+      fromCellBoundaryNode = node;
+    }
+    if (node.type.name === 'table') {
+      fromCellTableNode = node;
+      break;
+    }
+  }
+  for (var _i2 = $to.depth; _i2 > 0; _i2--) {
+    var _node2 = $to.node(_i2);
+    if (_node2.type.spec.tableRole === 'cell' || _node2.type.spec.tableRole === 'header_cell') {
+      toCellBoundaryNode = _node2;
+    }
+    if (_node2.type.name === 'table') {
+      toCellTableNode = _node2;
+      break;
+    }
+  }
+  return fromCellBoundaryNode !== undefined && toCellBoundaryNode !== undefined && fromCellBoundaryNode !== toCellBoundaryNode && toCellTableNode === fromCellTableNode && $to.parentOffset === 0;
 }

package/dist/es2019/utils/colspan.js

@@ -24,7 +24,7 @@ export function assertColspan(attrs) {
   }
 }
 
-// TODO: replace "addColSpan" from table plugin with this function
+// TODO: ED-26961 - replace "addColSpan" from table plugin with this function
 export function addColSpan(attrs, pos, n = 1) {
   assertColspan(attrs);
   const result = {

package/dist/es2019/utils/handle-paste.js

@@ -1,4 +1,6 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 import { selectionCell } from '../utils/selection-cell';
@@ -6,11 +8,32 @@ import { tableNodeTypes } from '../utils/table-node-types';
 import { isInTable } from '../utils/tables';
 import { clipCells, fitSlice, insertCells, pastedCells } from './copy-paste';
 export function handlePaste(view, event, slice) {
+  var _slice$content$firstC;
   if (!isInTable(view.state)) {
     return false;
   }
-  let cells = pastedCells(slice);
+  const {
+    schema
+  } = view.state;
+  const isNestingAllowed = editorExperiment('nested-tables-in-tables', true);
+  /**
+   * TODO: There can be multiple variations.
+   * 1. The last cell is selected with content outside of the table
+   * 2. The first cell is selected with content outside of the table
+   */
+  const isPartialTablePaste = slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === schema.nodes.table && slice.openStart !== 0 && slice.openEnd !== 0;
   const sel = view.state.selection;
+  if (isNestingAllowed && !isPartialTablePaste) {
+    const cellRes = findParentNode(node => node.type === schema.nodes.tableCell || node.type === schema.nodes.tableHeader)(sel);
+    if (cellRes) {
+      var _cellRes$node$content;
+      const canInsertNestedTable = (_cellRes$node$content = cellRes.node.contentMatchAt(0).matchType(schema.nodes.table)) === null || _cellRes$node$content === void 0 ? void 0 : _cellRes$node$content.validEnd;
+      if (canInsertNestedTable) {
+        return false;
+      }
+    }
+  }
+  let cells = pastedCells(slice);
   if (sel instanceof CellSelection) {
     if (!cells) {
       cells = {
@@ -61,7 +84,7 @@ const clearColumnWidthOfCells = (cells, rect, table) => {
     }
   }
   for (const cell of overlappingCells) {
-    // TODO: ED-13910 unblock Prosemirror bump
+    // TODO: ED-13910 - unblock Prosemirror bump
     // @ts-ignore
     cell.attrs.colwidth = null;
   }

package/dist/es2019/utils/normalize-selection.js

@@ -1,4 +1,5 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 export function normalizeSelection(state, transaction, allowTableNodeSelection) {
@@ -12,6 +13,7 @@ export function normalizeSelection(state, transaction, allowTableNodeSelection)
   if (sel instanceof NodeSelection) {
     role = sel.node.type.spec.tableRole;
   }
+  const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
   if (sel instanceof NodeSelection && role) {
     if (role === 'cell' || role === 'header_cell') {
       normalize = CellSelection.create(doc, sel.from);
@@ -26,7 +28,7 @@ export function normalizeSelection(state, transaction, allowTableNodeSelection)
     }
   } else if (sel instanceof TextSelection && isCellBoundarySelection(sel)) {
     normalize = TextSelection.create(doc, sel.from);
-  } else if (sel instanceof TextSelection && isTextSelectionAcrossCells(sel)) {
+  } else if (sel instanceof TextSelection && (isMultiSelect ? isTextSelectionAcrossSameTableCells(sel) : isTextSelectionAcrossCells(sel))) {
     normalize = TextSelection.create(doc, sel.$from.start(), sel.$from.end());
   }
   if (normalize) {
@@ -81,4 +83,34 @@ function isTextSelectionAcrossCells({
     }
   }
   return fromCellBoundaryNode !== toCellBoundaryNode && $to.parentOffset === 0;
+}
+function isTextSelectionAcrossSameTableCells({
+  $from,
+  $to
+}) {
+  let fromCellBoundaryNode;
+  let toCellBoundaryNode;
+  let fromCellTableNode;
+  let toCellTableNode;
+  for (let i = $from.depth; i > 0; i--) {
+    const node = $from.node(i);
+    if (node.type.spec.tableRole === 'cell' || node.type.spec.tableRole === 'header_cell') {
+      fromCellBoundaryNode = node;
+    }
+    if (node.type.name === 'table') {
+      fromCellTableNode = node;
+      break;
+    }
+  }
+  for (let i = $to.depth; i > 0; i--) {
+    const node = $to.node(i);
+    if (node.type.spec.tableRole === 'cell' || node.type.spec.tableRole === 'header_cell') {
+      toCellBoundaryNode = node;
+    }
+    if (node.type.name === 'table') {
+      toCellTableNode = node;
+      break;
+    }
+  }
+  return fromCellBoundaryNode !== undefined && toCellBoundaryNode !== undefined && fromCellBoundaryNode !== toCellBoundaryNode && toCellTableNode === fromCellTableNode && $to.parentOffset === 0;
 }

package/dist/esm/utils/colspan.js

@@ -29,7 +29,7 @@ export function assertColspan(attrs) {
   }
 }
 
-// TODO: replace "addColSpan" from table plugin with this function
+// TODO: ED-26961 - replace "addColSpan" from table plugin with this function
 export function addColSpan(attrs, pos) {
   var n = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
   assertColspan(attrs);

package/dist/esm/utils/handle-paste.js

@@ -2,6 +2,8 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 import { selectionCell } from '../utils/selection-cell';
@@ -9,11 +11,32 @@ import { tableNodeTypes } from '../utils/table-node-types';
 import { isInTable } from '../utils/tables';
 import { clipCells, fitSlice, insertCells, pastedCells } from './copy-paste';
 export function handlePaste(view, event, slice) {
+  var _slice$content$firstC;
   if (!isInTable(view.state)) {
     return false;
   }
-  var cells = pastedCells(slice);
+  var schema = view.state.schema;
+  var isNestingAllowed = editorExperiment('nested-tables-in-tables', true);
+  /**
+   * TODO: There can be multiple variations.
+   * 1. The last cell is selected with content outside of the table
+   * 2. The first cell is selected with content outside of the table
+   */
+  var isPartialTablePaste = slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === schema.nodes.table && slice.openStart !== 0 && slice.openEnd !== 0;
   var sel = view.state.selection;
+  if (isNestingAllowed && !isPartialTablePaste) {
+    var cellRes = findParentNode(function (node) {
+      return node.type === schema.nodes.tableCell || node.type === schema.nodes.tableHeader;
+    })(sel);
+    if (cellRes) {
+      var _cellRes$node$content;
+      var canInsertNestedTable = (_cellRes$node$content = cellRes.node.contentMatchAt(0).matchType(schema.nodes.table)) === null || _cellRes$node$content === void 0 ? void 0 : _cellRes$node$content.validEnd;
+      if (canInsertNestedTable) {
+        return false;
+      }
+    }
+  }
+  var cells = pastedCells(slice);
   if (sel instanceof CellSelection) {
     if (!cells) {
       cells = {
@@ -74,7 +97,7 @@ var clearColumnWidthOfCells = function clearColumnWidthOfCells(cells, rect, tabl
   }
   for (var _i = 0, _overlappingCells = overlappingCells; _i < _overlappingCells.length; _i++) {
     var cell = _overlappingCells[_i];
-    // TODO: ED-13910 unblock Prosemirror bump
+    // TODO: ED-13910 - unblock Prosemirror bump
     // @ts-ignore
     cell.attrs.colwidth = null;
   }

package/dist/esm/utils/normalize-selection.js

@@ -1,4 +1,5 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 export function normalizeSelection(state, transaction, allowTableNodeSelection) {
@@ -11,6 +12,7 @@ export function normalizeSelection(state, transaction, allowTableNodeSelection)
   if (sel instanceof NodeSelection) {
     role = sel.node.type.spec.tableRole;
   }
+  var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
   if (sel instanceof NodeSelection && role) {
     if (role === 'cell' || role === 'header_cell') {
       normalize = CellSelection.create(doc, sel.from);
@@ -25,7 +27,7 @@ export function normalizeSelection(state, transaction, allowTableNodeSelection)
     }
   } else if (sel instanceof TextSelection && isCellBoundarySelection(sel)) {
     normalize = TextSelection.create(doc, sel.from);
-  } else if (sel instanceof TextSelection && isTextSelectionAcrossCells(sel)) {
+  } else if (sel instanceof TextSelection && (isMultiSelect ? isTextSelectionAcrossSameTableCells(sel) : isTextSelectionAcrossCells(sel))) {
     normalize = TextSelection.create(doc, sel.$from.start(), sel.$from.end());
   }
   if (normalize) {
@@ -76,4 +78,33 @@ function isTextSelectionAcrossCells(_ref3) {
     }
   }
   return fromCellBoundaryNode !== toCellBoundaryNode && $to.parentOffset === 0;
+}
+function isTextSelectionAcrossSameTableCells(_ref4) {
+  var $from = _ref4.$from,
+    $to = _ref4.$to;
+  var fromCellBoundaryNode;
+  var toCellBoundaryNode;
+  var fromCellTableNode;
+  var toCellTableNode;
+  for (var i = $from.depth; i > 0; i--) {
+    var node = $from.node(i);
+    if (node.type.spec.tableRole === 'cell' || node.type.spec.tableRole === 'header_cell') {
+      fromCellBoundaryNode = node;
+    }
+    if (node.type.name === 'table') {
+      fromCellTableNode = node;
+      break;
+    }
+  }
+  for (var _i2 = $to.depth; _i2 > 0; _i2--) {
+    var _node2 = $to.node(_i2);
+    if (_node2.type.spec.tableRole === 'cell' || _node2.type.spec.tableRole === 'header_cell') {
+      toCellBoundaryNode = _node2;
+    }
+    if (_node2.type.name === 'table') {
+      toCellTableNode = _node2;
+      break;
+    }
+  }
+  return fromCellBoundaryNode !== undefined && toCellBoundaryNode !== undefined && fromCellBoundaryNode !== toCellBoundaryNode && toCellTableNode === fromCellTableNode && $to.parentOffset === 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-tables",
-	"version": "2.9.0",
+	"version": "2.9.2",
 	"description": "A package that contains common classes and utility functions for editor tables",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -28,7 +28,8 @@
 	},
 	"dependencies": {
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/platform-feature-flags": "^1.0.0",
+		"@atlaskit/platform-feature-flags": "^1.1.0",
+		"@atlaskit/tmp-editor-statsig": "^4.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"techstack": {