@atlaskit/editor-tables 2.8.3 → 2.8.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-tables
 
+## 2.8.5
+
+### Patch Changes
+
+- [#109026](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109026)
+  [`05e5c3f595ae0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/05e5c3f595ae0) -
+  [ux] [ED-26076] Fixed bug where selecting from parent cell to nested table cell caused a cell
+  selection instead of a partial text selection.
+
+## 2.8.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.8.3
 
 ### Patch Changes

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

@@ -9,6 +9,7 @@ exports.handleTripleClick = handleTripleClick;
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _cellSelection = require("../cell-selection");
 var _utils = require("../utils");
 var _cells = require("../utils/cells");
@@ -205,13 +206,20 @@ function handleMouseDown(view, event, dragAndDropEnabled) {
   }
   function move(event) {
     var anchor = _pluginKey.tableEditingKey.getState(view.state);
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
+    var currDOMCell = domInCell(view, event.target);
+    var isCurrCellInsideNestedTable = isInsideNestedTable(view, event);
+    var isStartCellInsideNestedTable = isInsideNestedTable(view, startEvent);
+    var isBothCellsInSameTable = isCurrCellInsideNestedTable === isStartCellInsideNestedTable;
     var $moveAnchor;
+    var oldIfStatement = currDOMCell !== startDOMCell;
+    var newIfStatement = currDOMCell !== startDOMCell && isBothCellsInSameTable;
+    var checkCellsAreDifferent = (0, _platformFeatureFlags.fg)('platform_editor_cell_selection_with_nested_tables') ? newIfStatement : oldIfStatement;
     if (anchor != null) {
       // Continuing an existing cross-cell selection
       $moveAnchor = view.state.doc.resolve(anchor);
       // Ignored via go/ees005
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    } else if (domInCell(view, event.target) !== startDOMCell) {
+    } else if (checkCellsAreDifferent) {
       // Moving out of the initial cell -- start a new cell selection
       $moveAnchor = cellUnderMouse(view, startEvent);
       if (!$moveAnchor) {
@@ -275,4 +283,21 @@ function cellUnderMouse(view, event) {
     return null;
   }
   return (0, _cells.cellAround)(view.state.doc.resolve(mousePos.pos));
+}
+function isInsideNestedTable(view, event) {
+  var mousePos = view.posAtCoords({
+    left: event.clientX,
+    top: event.clientY
+  });
+  if (!mousePos) {
+    return false;
+  }
+  var pos = view.state.doc.resolve(mousePos.pos);
+  var table = (0, _utils.findTableClosestToPos)(pos);
+  if (!table) {
+    return false;
+  }
+  var parent = view.state.doc.resolve(table.pos).parent;
+  var nodeTypes = view.state.schema.nodes;
+  return [nodeTypes.tableHeader, nodeTypes.tableCell].includes(parent.type);
 }

package/dist/cjs/table-map.js

@@ -55,10 +55,7 @@ if (typeof WeakMap !== 'undefined') {
     return _cache[cachePos++] = value;
   };
 }
-var Rect = exports.Rect = /*#__PURE__*/(0, _createClass2.default)(
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-function Rect(left, top, right, bottom) {
+var Rect = exports.Rect = /*#__PURE__*/(0, _createClass2.default)(function Rect(left, top, right, bottom) {
   (0, _classCallCheck2.default)(this, Rect);
   this.left = left;
   this.top = top;
@@ -83,8 +80,6 @@ var tableNewColumnMinWidth = exports.tableNewColumnMinWidth = 140;
 // be able to do that, positions saved in the map are relative to the
 // start of the table, rather than the start of the document.
 var TableMap = exports.TableMap = /*#__PURE__*/function () {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   function TableMap(width, height, map, problems, mapByColumn, mapByRow) {
     (0, _classCallCheck2.default)(this, TableMap);
     // The width of the table

package/dist/cjs/utils/clone-column.js

@@ -108,9 +108,6 @@ var cloneColumn = exports.cloneColumn = function cloneColumn(state, originColumn
     return newTr;
   };
 };
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeCellNode(cellNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   var newTargetType = rowHeaderEnabled || columnHeaderEnabled ? types.header_cell : types.cell;
   return cellNode.type !== newTargetType ? newTargetType.create(cellNode.attrs, cellNode.content, cellNode.marks) : cellNode;

package/dist/cjs/utils/clone-row.js

@@ -116,8 +116,6 @@ var cloneRow = exports.cloneRow = function cloneRow(state, originRowIndex, targe
  * This ensures the row node cell type correctly reflect what they should be.
  * @returns A copy of the rowNode
  */
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeRowNode(rowNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   var content = [];
   rowNode.forEach(function (node, offset, index) {

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

@@ -208,8 +208,6 @@ function clipCells(_ref, newWidth, newHeight) {
 
 // Make sure a table has at least the given width and height. Return
 // true if something was changed.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function growTable(tr, map, table, start, width, height, mapFrom) {
   var schema = tr.doc.type.schema;
   var types = (0, _tableNodeTypes.tableNodeTypes)(schema);
@@ -271,8 +269,6 @@ function growTable(tr, map, table, start, width, height, mapFrom) {
 // Make sure the given line (left, top) to (right, top) doesn't cross
 // any rowspan cells by splitting cells that cross it. Return true if
 // something changed.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function isolateHorizontal(tr, map, table, start, left, right, top, mapFrom) {
   if (top === 0 || top === map.height) {
     return false;
@@ -309,8 +305,6 @@ function isolateHorizontal(tr, map, table, start, left, right, top, mapFrom) {
 // Make sure the given line (left, top) to (left, bottom) doesn't
 // cross any colspan cells by splitting cells that cross it. Return
 // true if something changed.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function isolateVertical(tr, map, table, start, top, bottom, left, mapFrom) {
   if (left === 0 || left === map.width) {
     return false;
@@ -338,14 +332,8 @@ function isolateVertical(tr, map, table, start, top, bottom, left, mapFrom) {
   }
   return found;
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function applyHeaderCells(tr, tableMap, state, tableStart, table, headerRowEnabled, headerColumnEnabled) {
   var schema = state.schema;
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   var setMarkup = function setMarkup(tr, row, col, headerEnabled) {
     var cellPos = tableStart + tableMap.positionAt(row, col, table);
     var cell = tr.doc.nodeAt(cellPos);
@@ -372,8 +360,6 @@ function applyHeaderCells(tr, tableMap, state, tableStart, table, headerRowEnabl
 
 // Insert the given set of cells (as returned by `pastedCells`) into a
 // table, at the position pointed at by rect.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function insertCells(state, dispatch, tableStart, rect, cells) {
   var table = state.doc;
   var newRect = (0, _selectionRect.selectedRect)(state);

package/dist/cjs/utils/fix-tables.js

@@ -16,8 +16,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 // Helper for iterating through the nodes in a document that changed
 // compared to the given previous document. Useful for avoiding
 // duplicate work on each transaction.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function changedDescendants(old, cur, offsetStart, f) {
   var offset = offsetStart;
   var oldSize = old.childCount;
@@ -67,8 +65,6 @@ function fixTables(state, oldState, reportFixedTable) {
 // : (EditorState, Node, number, ?Transaction) → ?Transaction
 // Fix the given table, if necessary. Will append to the transaction
 // it was given, if non-null, or create a new one if necessary.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function fixTable(state, table, tablePos, transaction, reportFixedTable) {
   var tr = transaction;
   var map = _tableMap.TableMap.get(table);

package/dist/cjs/utils/move-column.js

@@ -242,9 +242,6 @@ var moveColumn = exports.moveColumn = function moveColumn(state, originColumnInd
     return newTr;
   };
 };
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeCellNode(cellNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   var newTargetType = rowHeaderEnabled || columnHeaderEnabled ? types.header_cell : types.cell;
   return cellNode.type !== newTargetType ? newTargetType.create(cellNode.attrs, cellNode.content, cellNode.marks) : cellNode;

package/dist/cjs/utils/move-row.js

@@ -268,8 +268,6 @@ var moveRow = exports.moveRow = function moveRow(state, originRowIndex, targetRo
  * This ensures the row node cell type correctly reflect what they should be.
  * @returns A copy of the rowNode
  */
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeRowNode(rowNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   var content = [];
   rowNode.forEach(function (node, offset, index) {

package/dist/cjs/utils/reorder-utils.js

@@ -95,10 +95,7 @@ var convertArrayOfRowsToTableNode = exports.convertArrayOfRowsToTableNode = func
   var newTable = tableNode.type.createChecked(tableNode.attrs, rowsPM, tableNode.marks);
   return newTable;
 };
-var moveRowInArrayOfRows = function moveRowInArrayOfRows(arrayOfNodes, indexesOrigin, indexesTarget, directionOverride
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var moveRowInArrayOfRows = function moveRowInArrayOfRows(arrayOfNodes, indexesOrigin, indexesTarget, directionOverride) {
   var direction = indexesOrigin[0] > indexesTarget[0] ? -1 : 1;
   var rowsExtracted = arrayOfNodes.splice(indexesOrigin[0], indexesOrigin.length);
   var positionOffset = rowsExtracted.length % 2 === 0 ? 1 : 0;
@@ -163,27 +160,18 @@ var convertTableNodeToArrayOfRows = exports.convertTableNodeToArrayOfRows = func
   }
   return rows;
 };
-var moveTableRow = exports.moveTableRow = function moveTableRow(table, indexesOrigin, indexesTarget, direction
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var moveTableRow = exports.moveTableRow = function moveTableRow(table, indexesOrigin, indexesTarget, direction) {
   var rows = convertTableNodeToArrayOfRows(table.node);
   rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction);
   return convertArrayOfRowsToTableNode(table.node, rows);
 };
-var moveTableColumn = exports.moveTableColumn = function moveTableColumn(table, indexesOrigin, indexesTarget, direction
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var moveTableColumn = exports.moveTableColumn = function moveTableColumn(table, indexesOrigin, indexesTarget, direction) {
   var rows = transpose(convertTableNodeToArrayOfRows(table.node));
   rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction);
   rows = transpose(rows);
   return convertArrayOfRowsToTableNode(table.node, rows);
 };
-var isValidReorder = exports.isValidReorder = function isValidReorder(originIndex, targetIndex, targets, type
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var isValidReorder = exports.isValidReorder = function isValidReorder(originIndex, targetIndex, targets, type) {
   var direction = originIndex > targetIndex ? -1 : 1;
   var errorMessage = "Target position is invalid, you can't move the ".concat(type, " ").concat(originIndex, " to ").concat(targetIndex, ", the target can't be split. You could use tryToFit option.");
   if (direction === 1) {

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

@@ -4,8 +4,9 @@
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
 import { Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { CellSelection } from '../cell-selection';
-import { tableNodeTypes } from '../utils';
+import { findTableClosestToPos, tableNodeTypes } from '../utils';
 import { cellAround, nextCell } from '../utils/cells';
 import { inSameTable } from '../utils/tables';
 import { tableEditingKey } from './plugin-key';
@@ -204,13 +205,20 @@ export function handleMouseDown(view, event, dragAndDropEnabled) {
   }
   function move(event) {
     const anchor = tableEditingKey.getState(view.state);
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
+    const currDOMCell = domInCell(view, event.target);
+    const isCurrCellInsideNestedTable = isInsideNestedTable(view, event);
+    const isStartCellInsideNestedTable = isInsideNestedTable(view, startEvent);
+    const isBothCellsInSameTable = isCurrCellInsideNestedTable === isStartCellInsideNestedTable;
     let $moveAnchor;
+    const oldIfStatement = currDOMCell !== startDOMCell;
+    const newIfStatement = currDOMCell !== startDOMCell && isBothCellsInSameTable;
+    const checkCellsAreDifferent = fg('platform_editor_cell_selection_with_nested_tables') ? newIfStatement : oldIfStatement;
     if (anchor != null) {
       // Continuing an existing cross-cell selection
       $moveAnchor = view.state.doc.resolve(anchor);
       // Ignored via go/ees005
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    } else if (domInCell(view, event.target) !== startDOMCell) {
+    } else if (checkCellsAreDifferent) {
       // Moving out of the initial cell -- start a new cell selection
       $moveAnchor = cellUnderMouse(view, startEvent);
       if (!$moveAnchor) {
@@ -276,4 +284,21 @@ function cellUnderMouse(view, event) {
     return null;
   }
   return cellAround(view.state.doc.resolve(mousePos.pos));
+}
+function isInsideNestedTable(view, event) {
+  const mousePos = view.posAtCoords({
+    left: event.clientX,
+    top: event.clientY
+  });
+  if (!mousePos) {
+    return false;
+  }
+  const pos = view.state.doc.resolve(mousePos.pos);
+  const table = findTableClosestToPos(pos);
+  if (!table) {
+    return false;
+  }
+  const parent = view.state.doc.resolve(table.pos).parent;
+  const nodeTypes = view.state.schema.nodes;
+  return [nodeTypes.tableHeader, nodeTypes.tableCell].includes(parent.type);
 }

package/dist/es2019/table-map.js

@@ -45,8 +45,6 @@ if (typeof WeakMap !== 'undefined') {
   };
 }
 export class Rect {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   constructor(left, top, right, bottom) {
     this.left = left;
     this.top = top;
@@ -72,8 +70,6 @@ export const tableNewColumnMinWidth = 140;
 // be able to do that, positions saved in the map are relative to the
 // start of the table, rather than the start of the document.
 export class TableMap {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   constructor(width, height, map, problems, mapByColumn, mapByRow) {
     // The width of the table
     // The table's height

package/dist/es2019/utils/clone-column.js

@@ -15,10 +15,7 @@ export const cloneColumn = (state, originColumnIndex, targetColumnIndex, targetD
   tryToFit: false,
   direction: 0,
   selectAfterClone: false
-}
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => tr => {
+}) => tr => {
   var _originalColumnRanges, _targetColumnRanges$i;
   const table = findTable(tr.selection);
   if (!table) {
@@ -101,9 +98,6 @@ export const cloneColumn = (state, originColumnIndex, targetColumnIndex, targetD
   }
   return newTr;
 };
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeCellNode(cellNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   const newTargetType = rowHeaderEnabled || columnHeaderEnabled ? types.header_cell : types.cell;
   return cellNode.type !== newTargetType ? newTargetType.create(cellNode.attrs, cellNode.content, cellNode.marks) : cellNode;

package/dist/es2019/utils/clone-row.js

@@ -15,10 +15,7 @@ export const cloneRow = (state, originRowIndex, targetRowIndex, targetDirection,
   tryToFit: false,
   direction: 0,
   selectAfterClone: false
-}
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => tr => {
+}) => tr => {
   const table = findTable(tr.selection);
   if (!table) {
     return tr;
@@ -97,8 +94,6 @@ export const cloneRow = (state, originRowIndex, targetRowIndex, targetDirection,
  * This ensures the row node cell type correctly reflect what they should be.
  * @returns A copy of the rowNode
  */
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeRowNode(rowNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   const content = [];
   rowNode.forEach((node, offset, index) => {

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

@@ -203,8 +203,6 @@ export function clipCells({
 
 // Make sure a table has at least the given width and height. Return
 // true if something was changed.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function growTable(tr, map, table, start, width, height, mapFrom) {
   const {
     schema
@@ -268,8 +266,6 @@ function growTable(tr, map, table, start, width, height, mapFrom) {
 // Make sure the given line (left, top) to (right, top) doesn't cross
 // any rowspan cells by splitting cells that cross it. Return true if
 // something changed.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function isolateHorizontal(tr, map, table, start, left, right, top, mapFrom) {
   if (top === 0 || top === map.height) {
     return false;
@@ -309,8 +305,6 @@ function isolateHorizontal(tr, map, table, start, left, right, top, mapFrom) {
 // Make sure the given line (left, top) to (left, bottom) doesn't
 // cross any colspan cells by splitting cells that cross it. Return
 // true if something changed.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function isolateVertical(tr, map, table, start, top, bottom, left, mapFrom) {
   if (left === 0 || left === map.width) {
     return false;
@@ -338,16 +332,10 @@ function isolateVertical(tr, map, table, start, top, bottom, left, mapFrom) {
   }
   return found;
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function applyHeaderCells(tr, tableMap, state, tableStart, table, headerRowEnabled, headerColumnEnabled) {
   const {
     schema
   } = state;
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   const setMarkup = (tr, row, col, headerEnabled) => {
     const cellPos = tableStart + tableMap.positionAt(row, col, table);
     const cell = tr.doc.nodeAt(cellPos);
@@ -374,8 +362,6 @@ function applyHeaderCells(tr, tableMap, state, tableStart, table, headerRowEnabl
 
 // Insert the given set of cells (as returned by `pastedCells`) into a
 // table, at the position pointed at by rect.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 export function insertCells(state, dispatch, tableStart, rect, cells) {
   let table = state.doc;
   const newRect = selectedRect(state);

package/dist/es2019/utils/fix-tables.js

@@ -5,8 +5,6 @@ import { tableNodeTypes } from './table-node-types';
 // Helper for iterating through the nodes in a document that changed
 // compared to the given previous document. Useful for avoiding
 // duplicate work on each transaction.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function changedDescendants(old, cur, offsetStart, f) {
   let offset = offsetStart;
   const oldSize = old.childCount;
@@ -56,8 +54,6 @@ export function fixTables(state, oldState, reportFixedTable) {
 // : (EditorState, Node, number, ?Transaction) → ?Transaction
 // Fix the given table, if necessary. Will append to the transaction
 // it was given, if non-null, or create a new one if necessary.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 export function fixTable(state, table, tablePos, transaction, reportFixedTable) {
   let tr = transaction;
   const map = TableMap.get(table);

package/dist/es2019/utils/move-column.js

@@ -140,10 +140,7 @@ export const moveColumn = (state, originColumnIndex, targetColumnIndex, options
   tryToFit: false,
   direction: 0,
   selectAfterMove: false
-}
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => tr => {
+}) => tr => {
   var _originalColumnRanges, _targetColumnRanges$i;
   const table = findTable(tr.selection);
   if (!table) {
@@ -235,9 +232,6 @@ export const moveColumn = (state, originColumnIndex, targetColumnIndex, options
   }
   return newTr;
 };
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeCellNode(cellNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   const newTargetType = rowHeaderEnabled || columnHeaderEnabled ? types.header_cell : types.cell;
   return cellNode.type !== newTargetType ? newTargetType.create(cellNode.attrs, cellNode.content, cellNode.marks) : cellNode;

package/dist/es2019/utils/move-row.js

@@ -155,10 +155,7 @@ export const moveRow = (state, originRowIndex, targetRowIndex, options = {
   tryToFit: false,
   direction: 0,
   selectAfterMove: false
-}
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => tr => {
+}) => tr => {
   const table = findTable(tr.selection);
   if (!table) {
     return tr;
@@ -251,8 +248,6 @@ export const moveRow = (state, originRowIndex, targetRowIndex, options = {
  * This ensures the row node cell type correctly reflect what they should be.
  * @returns A copy of the rowNode
  */
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeRowNode(rowNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   const content = [];
   rowNode.forEach((node, offset, index) => {

package/dist/es2019/utils/reorder-utils.js

@@ -88,10 +88,7 @@ export const convertArrayOfRowsToTableNode = (tableNode, arrayOfNodes) => {
   const newTable = tableNode.type.createChecked(tableNode.attrs, rowsPM, tableNode.marks);
   return newTable;
 };
-const moveRowInArrayOfRows = (arrayOfNodes, indexesOrigin, indexesTarget, directionOverride
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => {
+const moveRowInArrayOfRows = (arrayOfNodes, indexesOrigin, indexesTarget, directionOverride) => {
   const direction = indexesOrigin[0] > indexesTarget[0] ? -1 : 1;
   const rowsExtracted = arrayOfNodes.splice(indexesOrigin[0], indexesOrigin.length);
   const positionOffset = rowsExtracted.length % 2 === 0 ? 1 : 0;
@@ -156,27 +153,18 @@ export const convertTableNodeToArrayOfRows = tableNode => {
   }
   return rows;
 };
-export const moveTableRow = (table, indexesOrigin, indexesTarget, direction
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => {
+export const moveTableRow = (table, indexesOrigin, indexesTarget, direction) => {
   let rows = convertTableNodeToArrayOfRows(table.node);
   rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction);
   return convertArrayOfRowsToTableNode(table.node, rows);
 };
-export const moveTableColumn = (table, indexesOrigin, indexesTarget, direction
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => {
+export const moveTableColumn = (table, indexesOrigin, indexesTarget, direction) => {
   let rows = transpose(convertTableNodeToArrayOfRows(table.node));
   rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction);
   rows = transpose(rows);
   return convertArrayOfRowsToTableNode(table.node, rows);
 };
-export const isValidReorder = (originIndex, targetIndex, targets, type
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => {
+export const isValidReorder = (originIndex, targetIndex, targets, type) => {
   const direction = originIndex > targetIndex ? -1 : 1;
   const errorMessage = `Target position is invalid, you can't move the ${type} ${originIndex} to ${targetIndex}, the target can't be split. You could use tryToFit option.`;
   if (direction === 1) {

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

@@ -4,8 +4,9 @@
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
 import { Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { CellSelection } from '../cell-selection';
-import { tableNodeTypes } from '../utils';
+import { findTableClosestToPos, tableNodeTypes } from '../utils';
 import { cellAround, nextCell } from '../utils/cells';
 import { inSameTable } from '../utils/tables';
 import { tableEditingKey } from './plugin-key';
@@ -197,13 +198,20 @@ export function handleMouseDown(view, event, dragAndDropEnabled) {
   }
   function move(event) {
     var anchor = tableEditingKey.getState(view.state);
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
+    var currDOMCell = domInCell(view, event.target);
+    var isCurrCellInsideNestedTable = isInsideNestedTable(view, event);
+    var isStartCellInsideNestedTable = isInsideNestedTable(view, startEvent);
+    var isBothCellsInSameTable = isCurrCellInsideNestedTable === isStartCellInsideNestedTable;
     var $moveAnchor;
+    var oldIfStatement = currDOMCell !== startDOMCell;
+    var newIfStatement = currDOMCell !== startDOMCell && isBothCellsInSameTable;
+    var checkCellsAreDifferent = fg('platform_editor_cell_selection_with_nested_tables') ? newIfStatement : oldIfStatement;
     if (anchor != null) {
       // Continuing an existing cross-cell selection
       $moveAnchor = view.state.doc.resolve(anchor);
       // Ignored via go/ees005
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    } else if (domInCell(view, event.target) !== startDOMCell) {
+    } else if (checkCellsAreDifferent) {
       // Moving out of the initial cell -- start a new cell selection
       $moveAnchor = cellUnderMouse(view, startEvent);
       if (!$moveAnchor) {
@@ -267,4 +275,21 @@ function cellUnderMouse(view, event) {
     return null;
   }
   return cellAround(view.state.doc.resolve(mousePos.pos));
+}
+function isInsideNestedTable(view, event) {
+  var mousePos = view.posAtCoords({
+    left: event.clientX,
+    top: event.clientY
+  });
+  if (!mousePos) {
+    return false;
+  }
+  var pos = view.state.doc.resolve(mousePos.pos);
+  var table = findTableClosestToPos(pos);
+  if (!table) {
+    return false;
+  }
+  var parent = view.state.doc.resolve(table.pos).parent;
+  var nodeTypes = view.state.schema.nodes;
+  return [nodeTypes.tableHeader, nodeTypes.tableCell].includes(parent.type);
 }

package/dist/esm/table-map.js

@@ -48,10 +48,7 @@ if (typeof WeakMap !== 'undefined') {
     return _cache[cachePos++] = value;
   };
 }
-export var Rect = /*#__PURE__*/_createClass(
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-function Rect(left, top, right, bottom) {
+export var Rect = /*#__PURE__*/_createClass(function Rect(left, top, right, bottom) {
   _classCallCheck(this, Rect);
   this.left = left;
   this.top = top;
@@ -76,8 +73,6 @@ export var tableNewColumnMinWidth = 140;
 // be able to do that, positions saved in the map are relative to the
 // start of the table, rather than the start of the document.
 export var TableMap = /*#__PURE__*/function () {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   function TableMap(width, height, map, problems, mapByColumn, mapByRow) {
     _classCallCheck(this, TableMap);
     // The width of the table

package/dist/esm/utils/clone-column.js

@@ -101,9 +101,6 @@ export var cloneColumn = function cloneColumn(state, originColumnIndex, targetCo
     return newTr;
   };
 };
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeCellNode(cellNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   var newTargetType = rowHeaderEnabled || columnHeaderEnabled ? types.header_cell : types.cell;
   return cellNode.type !== newTargetType ? newTargetType.create(cellNode.attrs, cellNode.content, cellNode.marks) : cellNode;

package/dist/esm/utils/clone-row.js

@@ -109,8 +109,6 @@ export var cloneRow = function cloneRow(state, originRowIndex, targetRowIndex, t
  * This ensures the row node cell type correctly reflect what they should be.
  * @returns A copy of the rowNode
  */
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeRowNode(rowNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   var content = [];
   rowNode.forEach(function (node, offset, index) {

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

@@ -201,8 +201,6 @@ export function clipCells(_ref, newWidth, newHeight) {
 
 // Make sure a table has at least the given width and height. Return
 // true if something was changed.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function growTable(tr, map, table, start, width, height, mapFrom) {
   var schema = tr.doc.type.schema;
   var types = tableNodeTypes(schema);
@@ -264,8 +262,6 @@ function growTable(tr, map, table, start, width, height, mapFrom) {
 // Make sure the given line (left, top) to (right, top) doesn't cross
 // any rowspan cells by splitting cells that cross it. Return true if
 // something changed.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function isolateHorizontal(tr, map, table, start, left, right, top, mapFrom) {
   if (top === 0 || top === map.height) {
     return false;
@@ -302,8 +298,6 @@ function isolateHorizontal(tr, map, table, start, left, right, top, mapFrom) {
 // Make sure the given line (left, top) to (left, bottom) doesn't
 // cross any colspan cells by splitting cells that cross it. Return
 // true if something changed.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function isolateVertical(tr, map, table, start, top, bottom, left, mapFrom) {
   if (left === 0 || left === map.width) {
     return false;
@@ -331,14 +325,8 @@ function isolateVertical(tr, map, table, start, top, bottom, left, mapFrom) {
   }
   return found;
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function applyHeaderCells(tr, tableMap, state, tableStart, table, headerRowEnabled, headerColumnEnabled) {
   var schema = state.schema;
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   var setMarkup = function setMarkup(tr, row, col, headerEnabled) {
     var cellPos = tableStart + tableMap.positionAt(row, col, table);
     var cell = tr.doc.nodeAt(cellPos);
@@ -365,8 +353,6 @@ function applyHeaderCells(tr, tableMap, state, tableStart, table, headerRowEnabl
 
 // Insert the given set of cells (as returned by `pastedCells`) into a
 // table, at the position pointed at by rect.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 export function insertCells(state, dispatch, tableStart, rect, cells) {
   var table = state.doc;
   var newRect = selectedRect(state);

package/dist/esm/utils/fix-tables.js

@@ -8,8 +8,6 @@ import { tableNodeTypes } from './table-node-types';
 // Helper for iterating through the nodes in a document that changed
 // compared to the given previous document. Useful for avoiding
 // duplicate work on each transaction.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function changedDescendants(old, cur, offsetStart, f) {
   var offset = offsetStart;
   var oldSize = old.childCount;
@@ -59,8 +57,6 @@ export function fixTables(state, oldState, reportFixedTable) {
 // : (EditorState, Node, number, ?Transaction) → ?Transaction
 // Fix the given table, if necessary. Will append to the transaction
 // it was given, if non-null, or create a new one if necessary.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 export function fixTable(state, table, tablePos, transaction, reportFixedTable) {
   var tr = transaction;
   var map = TableMap.get(table);

package/dist/esm/utils/move-column.js

@@ -235,9 +235,6 @@ export var moveColumn = function moveColumn(state, originColumnIndex, targetColu
     return newTr;
   };
 };
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeCellNode(cellNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   var newTargetType = rowHeaderEnabled || columnHeaderEnabled ? types.header_cell : types.cell;
   return cellNode.type !== newTargetType ? newTargetType.create(cellNode.attrs, cellNode.content, cellNode.marks) : cellNode;

package/dist/esm/utils/move-row.js

@@ -262,8 +262,6 @@ export var moveRow = function moveRow(state, originRowIndex, targetRowIndex) {
  * This ensures the row node cell type correctly reflect what they should be.
  * @returns A copy of the rowNode
  */
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function normalizeRowNode(rowNode, rowHeaderEnabled, columnHeaderEnabled, types) {
   var content = [];
   rowNode.forEach(function (node, offset, index) {

package/dist/esm/utils/reorder-utils.js

@@ -90,10 +90,7 @@ export var convertArrayOfRowsToTableNode = function convertArrayOfRowsToTableNod
   var newTable = tableNode.type.createChecked(tableNode.attrs, rowsPM, tableNode.marks);
   return newTable;
 };
-var moveRowInArrayOfRows = function moveRowInArrayOfRows(arrayOfNodes, indexesOrigin, indexesTarget, directionOverride
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var moveRowInArrayOfRows = function moveRowInArrayOfRows(arrayOfNodes, indexesOrigin, indexesTarget, directionOverride) {
   var direction = indexesOrigin[0] > indexesTarget[0] ? -1 : 1;
   var rowsExtracted = arrayOfNodes.splice(indexesOrigin[0], indexesOrigin.length);
   var positionOffset = rowsExtracted.length % 2 === 0 ? 1 : 0;
@@ -158,27 +155,18 @@ export var convertTableNodeToArrayOfRows = function convertTableNodeToArrayOfRow
   }
   return rows;
 };
-export var moveTableRow = function moveTableRow(table, indexesOrigin, indexesTarget, direction
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var moveTableRow = function moveTableRow(table, indexesOrigin, indexesTarget, direction) {
   var rows = convertTableNodeToArrayOfRows(table.node);
   rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction);
   return convertArrayOfRowsToTableNode(table.node, rows);
 };
-export var moveTableColumn = function moveTableColumn(table, indexesOrigin, indexesTarget, direction
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var moveTableColumn = function moveTableColumn(table, indexesOrigin, indexesTarget, direction) {
   var rows = transpose(convertTableNodeToArrayOfRows(table.node));
   rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction);
   rows = transpose(rows);
   return convertArrayOfRowsToTableNode(table.node, rows);
 };
-export var isValidReorder = function isValidReorder(originIndex, targetIndex, targets, type
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var isValidReorder = function isValidReorder(originIndex, targetIndex, targets, type) {
   var direction = originIndex > targetIndex ? -1 : 1;
   var errorMessage = "Target position is invalid, you can't move the ".concat(type, " ").concat(originIndex, " to ").concat(targetIndex, ", the target can't be split. You could use tryToFit option.");
   if (direction === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-tables",
-	"version": "2.8.3",
+	"version": "2.8.5",
 	"description": "A package that contains common classes and utility functions for editor tables",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -28,7 +28,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/editor-prosemirror": "6.2.1",
-		"@atlaskit/platform-feature-flags": "^0.3.0",
+		"@atlaskit/platform-feature-flags": "^1.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"techstack": {
@@ -51,6 +51,9 @@
 	"platform-feature-flags": {
 		"platform_editor_table_fix_move_column": {
 			"type": "boolean"
+		},
+		"platform_editor_cell_selection_with_nested_tables": {
+			"type": "boolean"
 		}
 	},
 	"af:exports": {