@atlaskit/editor-tables 2.9.2 → 2.9.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-tables
 
+## 2.9.4
+
+### Patch Changes
+
+- [#155329](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/155329)
+  [`516452df3b2b5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/516452df3b2b5) -
+  clean up platform_editor_table_fix_move_column
+- Updated dependencies
+
+## 2.9.3
+
+### Patch Changes
+
+- [#148184](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/148184)
+  [`cf70e8acad123`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cf70e8acad123) -
+  EDITOR-321 Cleaned up feature gate `platform_editor_cell_selection_with_nested_tables`
+
 ## 2.9.2
 
 ### Patch Changes

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

@@ -9,7 +9,6 @@ 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");
@@ -212,14 +211,11 @@ function handleMouseDown(view, event, dragAndDropEnabled) {
     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
-    } else if (checkCellsAreDifferent) {
+    } else if (currDOMCell !== startDOMCell && isBothCellsInSameTable) {
       // Moving out of the initial cell -- start a new cell selection
       $moveAnchor = cellUnderMouse(view, startEvent);
       if (!$moveAnchor) {

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.handlePaste = handlePaste;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _cellSelection = require("../cell-selection");
 var _tableMap2 = require("../table-map");
@@ -16,21 +17,21 @@ var _copyPaste = require("./copy-paste");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 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 SKIP_NESTED_TABLE_PASTE_SOURCES = ['microsoft-excel', 'google-spreadsheets'];
+function handlePaste(view, event, slice, options) {
   var _slice$content$firstC;
   if (!(0, _tables.isInTable)(view.state)) {
     return false;
   }
   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 isPasteFullTableInsideEmptyCellEnabled = (0, _platformFeatureFlags.fg)('platform_editor_paste_full_table_inside_empty_cell');
   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 isCellSelection = sel instanceof _cellSelection.CellSelection;
+  if (isPasteFullTableInsideEmptyCellEnabled && isNestingAllowed && !isPartialTablePaste &&
+  // If the selection is not a cell selection, and the selection is empty then we can insert a nested table
+  !isCellSelection && sel.empty && !(options && SKIP_NESTED_TABLE_PASTE_SOURCES.includes(options.pasteSource))) {
     var cellRes = (0, _utils.findParentNode)(function (node) {
       return node.type === schema.nodes.tableCell || node.type === schema.nodes.tableHeader;
     })(sel);
@@ -43,7 +44,7 @@ function handlePaste(view, event, slice) {
     }
   }
   var cells = (0, _copyPaste.pastedCells)(slice);
-  if (sel instanceof _cellSelection.CellSelection) {
+  if (isCellSelection) {
     if (!cells) {
       cells = {
         width: 1,

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.moveColumn = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _cellSelection = require("../cell-selection");
 var _tableMap = require("../table-map");
 var _analyseTable = require("./analyse-table");
@@ -220,7 +219,7 @@ var moveColumn = exports.moveColumn = function moveColumn(state, originColumnInd
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       var node = table.node.nodeAt(rowTargetPosition);
       var pos = table.start + rowTargetPosition;
-      var insertPos = direction === 'end' || tableMap.isCellMergedTopLeft(y, actualTargetIndex) && (0, _platformFeatureFlags.fg)('platform_editor_table_fix_move_column') ? newTr.mapping.map(pos + node.nodeSize, 1) : newTr.mapping.map(pos, -1);
+      var insertPos = direction === 'end' || tableMap.isCellMergedTopLeft(y, actualTargetIndex) ? newTr.mapping.map(pos + node.nodeSize, 1) : newTr.mapping.map(pos, -1);
       newTr.insert(insertPos, row.map(function (_ref, x) {
         var node = _ref.node;
         return normalizeCellNode(node, rowHeaderEnabled && y === 0, columnHeaderEnabled && actualTargetIndex === 0 && x === 0, types);

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

@@ -4,7 +4,6 @@
 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 { findTableClosestToPos, tableNodeTypes } from '../utils';
 import { cellAround, nextCell } from '../utils/cells';
@@ -211,14 +210,11 @@ export function handleMouseDown(view, event, dragAndDropEnabled) {
     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
-    } else if (checkCellsAreDifferent) {
+    } else if (currDOMCell !== startDOMCell && isBothCellsInSameTable) {
       // Moving out of the initial cell -- start a new cell selection
       $moveAnchor = cellUnderMouse(view, startEvent);
       if (!$moveAnchor) {

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

@@ -1,5 +1,6 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
@@ -7,7 +8,8 @@ import { selectionCell } from '../utils/selection-cell';
 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) {
+const SKIP_NESTED_TABLE_PASTE_SOURCES = ['microsoft-excel', 'google-spreadsheets'];
+export function handlePaste(view, event, slice, options) {
   var _slice$content$firstC;
   if (!isInTable(view.state)) {
     return false;
@@ -16,14 +18,13 @@ export function handlePaste(view, event, slice) {
     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 isPasteFullTableInsideEmptyCellEnabled = fg('platform_editor_paste_full_table_inside_empty_cell');
   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 isCellSelection = sel instanceof CellSelection;
+  if (isPasteFullTableInsideEmptyCellEnabled && isNestingAllowed && !isPartialTablePaste &&
+  // If the selection is not a cell selection, and the selection is empty then we can insert a nested table
+  !isCellSelection && sel.empty && !(options && SKIP_NESTED_TABLE_PASTE_SOURCES.includes(options.pasteSource))) {
     const cellRes = findParentNode(node => node.type === schema.nodes.tableCell || node.type === schema.nodes.tableHeader)(sel);
     if (cellRes) {
       var _cellRes$node$content;
@@ -34,7 +35,7 @@ export function handlePaste(view, event, slice) {
     }
   }
   let cells = pastedCells(slice);
-  if (sel instanceof CellSelection) {
+  if (isCellSelection) {
     if (!cells) {
       cells = {
         width: 1,

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

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 import { determineTableHeaderStateFromTableNode } from './analyse-table';
@@ -212,7 +211,7 @@ export const moveColumn = (state, originColumnIndex, targetColumnIndex, options
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const node = table.node.nodeAt(rowTargetPosition);
     const pos = table.start + rowTargetPosition;
-    const insertPos = direction === 'end' || tableMap.isCellMergedTopLeft(y, actualTargetIndex) && fg('platform_editor_table_fix_move_column') ? newTr.mapping.map(pos + node.nodeSize, 1) : newTr.mapping.map(pos, -1);
+    const insertPos = direction === 'end' || tableMap.isCellMergedTopLeft(y, actualTargetIndex) ? newTr.mapping.map(pos + node.nodeSize, 1) : newTr.mapping.map(pos, -1);
     newTr.insert(insertPos, row.map(({
       node
     }, x) => normalizeCellNode(node, rowHeaderEnabled && y === 0, columnHeaderEnabled && actualTargetIndex === 0 && x === 0, types)));

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

@@ -4,7 +4,6 @@
 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 { findTableClosestToPos, tableNodeTypes } from '../utils';
 import { cellAround, nextCell } from '../utils/cells';
@@ -204,14 +203,11 @@ export function handleMouseDown(view, event, dragAndDropEnabled) {
     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
-    } else if (checkCellsAreDifferent) {
+    } else if (currDOMCell !== startDOMCell && isBothCellsInSameTable) {
       // Moving out of the initial cell -- start a new cell selection
       $moveAnchor = cellUnderMouse(view, startEvent);
       if (!$moveAnchor) {

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

@@ -3,6 +3,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 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 { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
@@ -10,21 +11,21 @@ import { selectionCell } from '../utils/selection-cell';
 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 SKIP_NESTED_TABLE_PASTE_SOURCES = ['microsoft-excel', 'google-spreadsheets'];
+export function handlePaste(view, event, slice, options) {
   var _slice$content$firstC;
   if (!isInTable(view.state)) {
     return false;
   }
   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 isPasteFullTableInsideEmptyCellEnabled = fg('platform_editor_paste_full_table_inside_empty_cell');
   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 isCellSelection = sel instanceof CellSelection;
+  if (isPasteFullTableInsideEmptyCellEnabled && isNestingAllowed && !isPartialTablePaste &&
+  // If the selection is not a cell selection, and the selection is empty then we can insert a nested table
+  !isCellSelection && sel.empty && !(options && SKIP_NESTED_TABLE_PASTE_SOURCES.includes(options.pasteSource))) {
     var cellRes = findParentNode(function (node) {
       return node.type === schema.nodes.tableCell || node.type === schema.nodes.tableHeader;
     })(sel);
@@ -37,7 +38,7 @@ export function handlePaste(view, event, slice) {
     }
   }
   var cells = pastedCells(slice);
-  if (sel instanceof CellSelection) {
+  if (isCellSelection) {
     if (!cells) {
       cells = {
         width: 1,

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

@@ -1,5 +1,4 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { fg } from '@atlaskit/platform-feature-flags';
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 import { determineTableHeaderStateFromTableNode } from './analyse-table';
@@ -213,7 +212,7 @@ export var moveColumn = function moveColumn(state, originColumnIndex, targetColu
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       var node = table.node.nodeAt(rowTargetPosition);
       var pos = table.start + rowTargetPosition;
-      var insertPos = direction === 'end' || tableMap.isCellMergedTopLeft(y, actualTargetIndex) && fg('platform_editor_table_fix_move_column') ? newTr.mapping.map(pos + node.nodeSize, 1) : newTr.mapping.map(pos, -1);
+      var insertPos = direction === 'end' || tableMap.isCellMergedTopLeft(y, actualTargetIndex) ? newTr.mapping.map(pos + node.nodeSize, 1) : newTr.mapping.map(pos, -1);
       newTr.insert(insertPos, row.map(function (_ref, x) {
         var node = _ref.node;
         return normalizeCellNode(node, rowHeaderEnabled && y === 0, columnHeaderEnabled && actualTargetIndex === 0 && x === 0, types);

package/dist/types/utils/handle-paste.d.ts

@@ -1,3 +1,7 @@
 import { type Slice } from '@atlaskit/editor-prosemirror/model';
 import { type EditorView } from '@atlaskit/editor-prosemirror/view';
-export declare function handlePaste(view: EditorView, event: Event | null, slice: Slice): boolean;
+type PasteOptions = {
+    pasteSource: string;
+};
+export declare function handlePaste(view: EditorView, event: ClipboardEvent, slice: Slice, options?: PasteOptions): boolean;
+export {};

package/dist/types-ts4.5/utils/handle-paste.d.ts

@@ -1,3 +1,7 @@
 import { type Slice } from '@atlaskit/editor-prosemirror/model';
 import { type EditorView } from '@atlaskit/editor-prosemirror/view';
-export declare function handlePaste(view: EditorView, event: Event | null, slice: Slice): boolean;
+type PasteOptions = {
+    pasteSource: string;
+};
+export declare function handlePaste(view: EditorView, event: ClipboardEvent, slice: Slice, options?: PasteOptions): boolean;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-tables",
-	"version": "2.9.2",
+	"version": "2.9.4",
 	"description": "A package that contains common classes and utility functions for editor tables",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
 	"dependencies": {
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.0.0",
+		"@atlaskit/tmp-editor-statsig": "^4.22.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"techstack": {
@@ -50,10 +50,7 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_table_fix_move_column": {
-			"type": "boolean"
-		},
-		"platform_editor_cell_selection_with_nested_tables": {
+		"platform_editor_paste_full_table_inside_empty_cell": {
 			"type": "boolean"
 		}
 	},