@atlaskit/editor-tables 2.3.12 → 2.3.13

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-tables
 
+## 2.3.13
+
+### Patch Changes
+
+- [#42109](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42109) [`d25ae495fed`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d25ae495fed) - [ux] Adds a fix to keep selection on a dropped row or column.
+
 ## 2.3.12
 
 ### Patch Changes

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

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.moveColumn = void 0;
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _cloneTr = require("./clone-tr");
 var _find = require("./find");
 var _getSelectionRangeInColumn = require("./get-selection-range-in-column");
@@ -147,6 +149,7 @@ var moveColumn = exports.moveColumn = function moveColumn(originColumnIndex, tar
     if (!table) {
       return tr;
     }
+    var anchor = tr.selection.anchor;
     var originalColumnRanges = (0, _getSelectionRangeInColumn.getSelectionRangeInColumn)(originColumnIndex)(tr);
     var targetColumnRanges = (0, _getSelectionRangeInColumn.getSelectionRangeInColumn)(targetColumnIndex)(tr);
     var indexesOriginColumn = (_originalColumnRanges = originalColumnRanges === null || originalColumnRanges === void 0 ? void 0 : originalColumnRanges.indexes) !== null && _originalColumnRanges !== void 0 ? _originalColumnRanges : [];
@@ -158,6 +161,12 @@ var moveColumn = exports.moveColumn = function moveColumn(originColumnIndex, tar
       (0, _reorderUtils.isValidReorder)(originColumnIndex, targetColumnIndex, indexesTargetColumn, 'column');
     }
     var newTable = (0, _reorderUtils.moveTableColumn)(table, indexesOriginColumn, indexesTargetColumn, options.direction);
-    return (0, _cloneTr.cloneTr)(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+    var newTr = (0, _cloneTr.cloneTr)(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.drag-and-drop')) {
+      // Set selection inside a newly created table
+      return newTr.setSelection(_state.TextSelection.create(newTr.doc, anchor));
+    } else {
+      return newTr;
+    }
   };
 };

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

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.moveRow = void 0;
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _cloneTr = require("./clone-tr");
 var _find = require("./find");
 var _getSelectionRangeInRow = require("./get-selection-range-in-row");
@@ -161,6 +163,7 @@ var moveRow = exports.moveRow = function moveRow(originRowIndex, targetRowIndex)
     if (!table) {
       return tr;
     }
+    var anchor = tr.selection.anchor;
     var originalRowRanges = (0, _getSelectionRangeInRow.getSelectionRangeInRow)(originRowIndex)(tr);
     var targetRowRanges = (0, _getSelectionRangeInRow.getSelectionRangeInRow)(targetRowIndex)(tr);
     var indexesOriginRow = (originalRowRanges === null || originalRowRanges === void 0 ? void 0 : originalRowRanges.indexes) || [];
@@ -172,6 +175,12 @@ var moveRow = exports.moveRow = function moveRow(originRowIndex, targetRowIndex)
       (0, _reorderUtils.isValidReorder)(originRowIndex, targetRowIndex, indexesTargetRow, 'row');
     }
     var newTable = (0, _reorderUtils.moveTableRow)(table, indexesOriginRow, indexesTargetRow, options.direction);
-    return (0, _cloneTr.cloneTr)(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+    var newTr = (0, _cloneTr.cloneTr)(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.drag-and-drop')) {
+      // Set selection inside a newly created table
+      return newTr.setSelection(_state.TextSelection.create(newTr.doc, anchor));
+    } else {
+      return newTr;
+    }
   };
 };

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

@@ -1,3 +1,5 @@
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { cloneTr } from './clone-tr';
 import { findTable } from './find';
 import { getSelectionRangeInColumn } from './get-selection-range-in-column';
@@ -140,6 +142,7 @@ export const moveColumn = (originColumnIndex, targetColumnIndex, options = {
   if (!table) {
     return tr;
   }
+  const anchor = tr.selection.anchor;
   const originalColumnRanges = getSelectionRangeInColumn(originColumnIndex)(tr);
   const targetColumnRanges = getSelectionRangeInColumn(targetColumnIndex)(tr);
   const indexesOriginColumn = (_originalColumnRanges = originalColumnRanges === null || originalColumnRanges === void 0 ? void 0 : originalColumnRanges.indexes) !== null && _originalColumnRanges !== void 0 ? _originalColumnRanges : [];
@@ -151,5 +154,11 @@ export const moveColumn = (originColumnIndex, targetColumnIndex, options = {
     isValidReorder(originColumnIndex, targetColumnIndex, indexesTargetColumn, 'column');
   }
   const newTable = moveTableColumn(table, indexesOriginColumn, indexesTargetColumn, options.direction);
-  return cloneTr(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+  const newTr = cloneTr(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+  if (getBooleanFF('platform.editor.table.drag-and-drop')) {
+    // Set selection inside a newly created table
+    return newTr.setSelection(TextSelection.create(newTr.doc, anchor));
+  } else {
+    return newTr;
+  }
 };

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

@@ -1,3 +1,5 @@
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { cloneTr } from './clone-tr';
 import { findTable } from './find';
 import { getSelectionRangeInRow } from './get-selection-range-in-row';
@@ -154,6 +156,7 @@ export const moveRow = (originRowIndex, targetRowIndex, options = {
   if (!table) {
     return tr;
   }
+  const anchor = tr.selection.anchor;
   const originalRowRanges = getSelectionRangeInRow(originRowIndex)(tr);
   const targetRowRanges = getSelectionRangeInRow(targetRowIndex)(tr);
   const indexesOriginRow = (originalRowRanges === null || originalRowRanges === void 0 ? void 0 : originalRowRanges.indexes) || [];
@@ -165,5 +168,11 @@ export const moveRow = (originRowIndex, targetRowIndex, options = {
     isValidReorder(originRowIndex, targetRowIndex, indexesTargetRow, 'row');
   }
   const newTable = moveTableRow(table, indexesOriginRow, indexesTargetRow, options.direction);
-  return cloneTr(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+  const newTr = cloneTr(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+  if (getBooleanFF('platform.editor.table.drag-and-drop')) {
+    // Set selection inside a newly created table
+    return newTr.setSelection(TextSelection.create(newTr.doc, anchor));
+  } else {
+    return newTr;
+  }
 };

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

@@ -1,3 +1,5 @@
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { cloneTr } from './clone-tr';
 import { findTable } from './find';
 import { getSelectionRangeInColumn } from './get-selection-range-in-column';
@@ -142,6 +144,7 @@ export var moveColumn = function moveColumn(originColumnIndex, targetColumnIndex
     if (!table) {
       return tr;
     }
+    var anchor = tr.selection.anchor;
     var originalColumnRanges = getSelectionRangeInColumn(originColumnIndex)(tr);
     var targetColumnRanges = getSelectionRangeInColumn(targetColumnIndex)(tr);
     var indexesOriginColumn = (_originalColumnRanges = originalColumnRanges === null || originalColumnRanges === void 0 ? void 0 : originalColumnRanges.indexes) !== null && _originalColumnRanges !== void 0 ? _originalColumnRanges : [];
@@ -153,6 +156,12 @@ export var moveColumn = function moveColumn(originColumnIndex, targetColumnIndex
       isValidReorder(originColumnIndex, targetColumnIndex, indexesTargetColumn, 'column');
     }
     var newTable = moveTableColumn(table, indexesOriginColumn, indexesTargetColumn, options.direction);
-    return cloneTr(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+    var newTr = cloneTr(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+    if (getBooleanFF('platform.editor.table.drag-and-drop')) {
+      // Set selection inside a newly created table
+      return newTr.setSelection(TextSelection.create(newTr.doc, anchor));
+    } else {
+      return newTr;
+    }
   };
 };

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

@@ -1,3 +1,5 @@
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { cloneTr } from './clone-tr';
 import { findTable } from './find';
 import { getSelectionRangeInRow } from './get-selection-range-in-row';
@@ -156,6 +158,7 @@ export var moveRow = function moveRow(originRowIndex, targetRowIndex) {
     if (!table) {
       return tr;
     }
+    var anchor = tr.selection.anchor;
     var originalRowRanges = getSelectionRangeInRow(originRowIndex)(tr);
     var targetRowRanges = getSelectionRangeInRow(targetRowIndex)(tr);
     var indexesOriginRow = (originalRowRanges === null || originalRowRanges === void 0 ? void 0 : originalRowRanges.indexes) || [];
@@ -167,6 +170,12 @@ export var moveRow = function moveRow(originRowIndex, targetRowIndex) {
       isValidReorder(originRowIndex, targetRowIndex, indexesTargetRow, 'row');
     }
     var newTable = moveTableRow(table, indexesOriginRow, indexesTargetRow, options.direction);
-    return cloneTr(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+    var newTr = cloneTr(tr).replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
+    if (getBooleanFF('platform.editor.table.drag-and-drop')) {
+      // Set selection inside a newly created table
+      return newTr.setSelection(TextSelection.create(newTr.doc, anchor));
+    } else {
+      return newTr;
+    }
   };
 };

package/dist/types/utils/move-column.d.ts

@@ -1,4 +1,4 @@
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const moveColumn: (originColumnIndex: number, targetColumnIndex: number, options?: {
     tryToFit: boolean;
     direction: number;

package/dist/types/utils/move-row.d.ts

@@ -1,4 +1,4 @@
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const moveRow: (originRowIndex: number, targetRowIndex: number, options?: {
     tryToFit: boolean;
     direction: number;

package/dist/types-ts4.5/utils/move-column.d.ts

@@ -1,4 +1,4 @@
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const moveColumn: (originColumnIndex: number, targetColumnIndex: number, options?: {
     tryToFit: boolean;
     direction: number;

package/dist/types-ts4.5/utils/move-row.d.ts

@@ -1,4 +1,4 @@
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const moveRow: (originRowIndex: number, targetRowIndex: number, options?: {
     tryToFit: boolean;
     direction: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-tables",
-  "version": "2.3.12",
+  "version": "2.3.13",
   "description": "A package that contains common classes and utility functions for editor tables",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -59,8 +59,11 @@
     "platform.editor.custom-table-width": {
       "type": "boolean"
     },
+    "platform.editor.table.drag-and-drop": {
+      "type": "boolean"
+    },
     "platform.editor.table-shift-click-selection-backward": {
       "type": "boolean"
     }
   }
-}
+}