@atlaskit/editor-tables 2.5.0 → 2.5.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-tables
 
+## 2.5.2
+
+### Patch Changes
+
+- [#69650](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/69650) [`91a5b96796cb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/91a5b96796cb) - Migrate @atlaskit/editor-tables to use declarative entry points
+
+## 2.5.1
+
+### Patch Changes
+
+- [#69625](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/69625) [`67d7971c6ddf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/67d7971c6ddf) - [ux] Tables DnD now supports dragging multiple rows/columns in a single drag using multi-select
+
 ## 2.5.0
 
 ### Minor Changes

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.moveColumn = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _cellSelection = require("../cell-selection");
 var _tableMap = require("../table-map");
 var _analyseTable = require("./analyse-table");
 var _cloneTr = require("./clone-tr");
@@ -145,7 +146,8 @@ var _tableNodeTypes = require("./table-node-types");
 var moveColumn = exports.moveColumn = function moveColumn(state, originColumnIndex, targetColumnIndex) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
     tryToFit: false,
-    direction: 0
+    direction: 0,
+    selectAfterMove: false
   };
   return function (tr) {
     var _originalColumnRanges, _targetColumnRanges$i;
@@ -227,6 +229,13 @@ var moveColumn = exports.moveColumn = function moveColumn(state, originColumnInd
       var last = row[row.length - 1];
       return newTr.delete(newTr.mapping.map(first.pos, 1), newTr.mapping.map(last.pos + last.node.nodeSize, -1));
     });
+    if (options.selectAfterMove) {
+      var n = indexesOriginColumn.length - 1;
+      var selectionRange = (0, _getSelectionRangeInColumn.getSelectionRangeInColumn)(actualTargetIndex - (direction === 'end' ? n : 0), actualTargetIndex + (direction === 'start' ? n : 0))(newTr);
+      if (selectionRange) {
+        newTr.setSelection(new _cellSelection.CellSelection(selectionRange.$anchor, selectionRange.$head));
+      }
+    }
     return newTr;
   };
 };

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.moveRow = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _cellSelection = require("../cell-selection");
 var _tableMap = require("../table-map");
 var _analyseTable = require("./analyse-table");
 var _cloneTr = require("./clone-tr");
@@ -161,7 +162,8 @@ var _tableNodeTypes = require("./table-node-types");
 var moveRow = exports.moveRow = function moveRow(state, originRowIndex, targetRowIndex) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
     tryToFit: false,
-    direction: 0
+    direction: 0,
+    selectAfterMove: false
   };
   return function (tr) {
     var table = (0, _find.findTable)(tr.selection);
@@ -241,6 +243,16 @@ var moveRow = exports.moveRow = function moveRow(state, originRowIndex, targetRo
         var node = _ref3.node;
         return normalizeRowNode(node, rowHeaderEnabled && actualTargetIndex === 0 && index === 0, columnHeaderEnabled, types);
       }));
+
+      // IMPORTANT: We need to perform the selection between the insert/delete. This is because the delete could cause
+      // the current selection to be pushed out of the table resulting in an invalid selection range outside of the table
+      if (options.selectAfterMove) {
+        var offset = direction === 'end' ? 1 : 0;
+        var selectionRange = (0, _getSelectionRangeInRow.getSelectionRangeInRow)(actualTargetIndex + offset, actualTargetIndex + offset + originNodes.length - 1)(newTr);
+        if (selectionRange) {
+          newTr.setSelection(new _cellSelection.CellSelection(selectionRange.$anchor, selectionRange.$head));
+        }
+      }
       originNodes.forEach(function (_ref4) {
         var pos = _ref4.pos,
           node = _ref4.node;

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

@@ -4,12 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.normalizeDirection = normalizeDirection;
-function normalizeDirection(origin, target) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
-    tryToFit: false,
-    direction: 0
-  };
+function normalizeDirection(origin, target, options) {
+  var _options$direction;
   var dir = origin < target ? 'end' : 'start';
-  var override = options.direction < 0 ? 'start' : 'end';
-  return options.tryToFit && !!options.direction ? override : dir;
+  var override = ((_options$direction = options === null || options === void 0 ? void 0 : options.direction) !== null && _options$direction !== void 0 ? _options$direction : 0) < 0 ? 'start' : 'end';
+  return options !== null && options !== void 0 && options.tryToFit && !!(options !== null && options !== void 0 && options.direction) ? override : dir;
 }

package/dist/cjs/utils.js

@@ -357,6 +357,12 @@ Object.defineProperty(exports, "selectTable", {
     return _selectNodes.selectTable;
   }
 });
+Object.defineProperty(exports, "selectTableClosestToPos", {
+  enumerable: true,
+  get: function get() {
+    return _selectNodes.selectTableClosestToPos;
+  }
+});
 Object.defineProperty(exports, "selectedRect", {
   enumerable: true,
   get: function get() {

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

@@ -1,3 +1,4 @@
+import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 import { determineTableHeaderStateFromTableNode } from './analyse-table';
 import { cloneTr } from './clone-tr';
@@ -136,7 +137,8 @@ import { tableNodeTypes } from './table-node-types';
 // ```
 export const moveColumn = (state, originColumnIndex, targetColumnIndex, options = {
   tryToFit: false,
-  direction: 0
+  direction: 0,
+  selectAfterMove: false
 }) => tr => {
   var _originalColumnRanges, _targetColumnRanges$i;
   const table = findTable(tr.selection);
@@ -218,6 +220,13 @@ export const moveColumn = (state, originColumnIndex, targetColumnIndex, options
     const last = row[row.length - 1];
     return newTr.delete(newTr.mapping.map(first.pos, 1), newTr.mapping.map(last.pos + last.node.nodeSize, -1));
   });
+  if (options.selectAfterMove) {
+    const n = indexesOriginColumn.length - 1;
+    const selectionRange = getSelectionRangeInColumn(actualTargetIndex - (direction === 'end' ? n : 0), actualTargetIndex + (direction === 'start' ? n : 0))(newTr);
+    if (selectionRange) {
+      newTr.setSelection(new CellSelection(selectionRange.$anchor, selectionRange.$head));
+    }
+  }
   return newTr;
 };
 function normalizeCellNode(cellNode, rowHeaderEnabled, columnHeaderEnabled, types) {

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

@@ -1,3 +1,4 @@
+import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 import { determineTableHeaderStateFromTableNode } from './analyse-table';
 import { cloneTr } from './clone-tr';
@@ -152,7 +153,8 @@ import { tableNodeTypes } from './table-node-types';
 // ```
 export const moveRow = (state, originRowIndex, targetRowIndex, options = {
   tryToFit: false,
-  direction: 0
+  direction: 0,
+  selectAfterMove: false
 }) => tr => {
   const table = findTable(tr.selection);
   if (!table) {
@@ -221,6 +223,16 @@ export const moveRow = (state, originRowIndex, targetRowIndex, options = {
     newTr.insert(insertPos, originNodes.map(({
       node
     }, index) => normalizeRowNode(node, rowHeaderEnabled && actualTargetIndex === 0 && index === 0, columnHeaderEnabled, types)));
+
+    // IMPORTANT: We need to perform the selection between the insert/delete. This is because the delete could cause
+    // the current selection to be pushed out of the table resulting in an invalid selection range outside of the table
+    if (options.selectAfterMove) {
+      const offset = direction === 'end' ? 1 : 0;
+      const selectionRange = getSelectionRangeInRow(actualTargetIndex + offset, actualTargetIndex + offset + originNodes.length - 1)(newTr);
+      if (selectionRange) {
+        newTr.setSelection(new CellSelection(selectionRange.$anchor, selectionRange.$head));
+      }
+    }
     originNodes.forEach(({
       pos,
       node

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

@@ -1,8 +1,6 @@
-export function normalizeDirection(origin, target, options = {
-  tryToFit: false,
-  direction: 0
-}) {
+export function normalizeDirection(origin, target, options) {
+  var _options$direction;
   const dir = origin < target ? 'end' : 'start';
-  const override = options.direction < 0 ? 'start' : 'end';
-  return options.tryToFit && !!options.direction ? override : dir;
+  const override = ((_options$direction = options === null || options === void 0 ? void 0 : options.direction) !== null && _options$direction !== void 0 ? _options$direction : 0) < 0 ? 'start' : 'end';
+  return options !== null && options !== void 0 && options.tryToFit && !!(options !== null && options !== void 0 && options.direction) ? override : dir;
 }

package/dist/es2019/utils.js

@@ -27,7 +27,7 @@ export { normalizeSelection } from './utils/normalize-selection';
 export { removeColumnAt, removeSelectedColumns, removeColumnClosestToPos } from './utils/remove-column';
 export { removeRowAt, removeSelectedRows, removeRowClosestToPos } from './utils/remove-row';
 export { removeTable } from './utils/remove-table';
-export { selectColumn, selectColumns, selectRow, selectRows, selectTable } from './utils/select-nodes';
+export { selectColumn, selectColumns, selectRow, selectRows, selectTable, selectTableClosestToPos } from './utils/select-nodes';
 export { selectionCell } from './utils/selection-cell';
 export { selectedRect } from './utils/selection-rect';
 export { setCellAttrs } from './utils/set-cell-attrs';

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

@@ -1,4 +1,5 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 import { determineTableHeaderStateFromTableNode } from './analyse-table';
 import { cloneTr } from './clone-tr';
@@ -138,7 +139,8 @@ import { tableNodeTypes } from './table-node-types';
 export var moveColumn = function moveColumn(state, originColumnIndex, targetColumnIndex) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
     tryToFit: false,
-    direction: 0
+    direction: 0,
+    selectAfterMove: false
   };
   return function (tr) {
     var _originalColumnRanges, _targetColumnRanges$i;
@@ -220,6 +222,13 @@ export var moveColumn = function moveColumn(state, originColumnIndex, targetColu
       var last = row[row.length - 1];
       return newTr.delete(newTr.mapping.map(first.pos, 1), newTr.mapping.map(last.pos + last.node.nodeSize, -1));
     });
+    if (options.selectAfterMove) {
+      var n = indexesOriginColumn.length - 1;
+      var selectionRange = getSelectionRangeInColumn(actualTargetIndex - (direction === 'end' ? n : 0), actualTargetIndex + (direction === 'start' ? n : 0))(newTr);
+      if (selectionRange) {
+        newTr.setSelection(new CellSelection(selectionRange.$anchor, selectionRange.$head));
+      }
+    }
     return newTr;
   };
 };

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

@@ -1,5 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 import { determineTableHeaderStateFromTableNode } from './analyse-table';
 import { cloneTr } from './clone-tr';
@@ -155,7 +156,8 @@ import { tableNodeTypes } from './table-node-types';
 export var moveRow = function moveRow(state, originRowIndex, targetRowIndex) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
     tryToFit: false,
-    direction: 0
+    direction: 0,
+    selectAfterMove: false
   };
   return function (tr) {
     var table = findTable(tr.selection);
@@ -235,6 +237,16 @@ export var moveRow = function moveRow(state, originRowIndex, targetRowIndex) {
         var node = _ref3.node;
         return normalizeRowNode(node, rowHeaderEnabled && actualTargetIndex === 0 && index === 0, columnHeaderEnabled, types);
       }));
+
+      // IMPORTANT: We need to perform the selection between the insert/delete. This is because the delete could cause
+      // the current selection to be pushed out of the table resulting in an invalid selection range outside of the table
+      if (options.selectAfterMove) {
+        var offset = direction === 'end' ? 1 : 0;
+        var selectionRange = getSelectionRangeInRow(actualTargetIndex + offset, actualTargetIndex + offset + originNodes.length - 1)(newTr);
+        if (selectionRange) {
+          newTr.setSelection(new CellSelection(selectionRange.$anchor, selectionRange.$head));
+        }
+      }
       originNodes.forEach(function (_ref4) {
         var pos = _ref4.pos,
           node = _ref4.node;

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

@@ -1,9 +1,6 @@
-export function normalizeDirection(origin, target) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
-    tryToFit: false,
-    direction: 0
-  };
+export function normalizeDirection(origin, target, options) {
+  var _options$direction;
   var dir = origin < target ? 'end' : 'start';
-  var override = options.direction < 0 ? 'start' : 'end';
-  return options.tryToFit && !!options.direction ? override : dir;
+  var override = ((_options$direction = options === null || options === void 0 ? void 0 : options.direction) !== null && _options$direction !== void 0 ? _options$direction : 0) < 0 ? 'start' : 'end';
+  return options !== null && options !== void 0 && options.tryToFit && !!(options !== null && options !== void 0 && options.direction) ? override : dir;
 }

package/dist/esm/utils.js

@@ -27,7 +27,7 @@ export { normalizeSelection } from './utils/normalize-selection';
 export { removeColumnAt, removeSelectedColumns, removeColumnClosestToPos } from './utils/remove-column';
 export { removeRowAt, removeSelectedRows, removeRowClosestToPos } from './utils/remove-row';
 export { removeTable } from './utils/remove-table';
-export { selectColumn, selectColumns, selectRow, selectRows, selectTable } from './utils/select-nodes';
+export { selectColumn, selectColumns, selectRow, selectRows, selectTable, selectTableClosestToPos } from './utils/select-nodes';
 export { selectionCell } from './utils/selection-cell';
 export { selectedRect } from './utils/selection-rect';
 export { setCellAttrs } from './utils/set-cell-attrs';

package/dist/types/types.d.ts

@@ -1,6 +1,6 @@
-import { Fragment, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
-import { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { Fragment, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export interface CellAttributes {
     colspan?: number;
     rowspan?: number;
@@ -37,3 +37,8 @@ export type CellAttributesWithColSpan = CellAttributes & {
 export type Writeable<T> = {
     -readonly [P in keyof T]: T[P];
 };
+export interface MoveOptions {
+    tryToFit?: boolean;
+    direction?: number;
+    selectAfterMove?: boolean;
+}

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

@@ -1,5 +1,3 @@
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const moveColumn: (state: EditorState, originColumnIndex: number | number[], targetColumnIndex: number, options?: {
-    tryToFit: boolean;
-    direction: number;
-}) => (tr: Transaction) => Transaction;
+import type { MoveOptions } from '../types';
+export declare const moveColumn: (state: EditorState, originColumnIndex: number | number[], targetColumnIndex: number, options?: MoveOptions) => (tr: Transaction) => Transaction;

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

@@ -1,5 +1,3 @@
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const moveRow: (state: EditorState, originRowIndex: number | number[], targetRowIndex: number, options?: {
-    tryToFit: boolean;
-    direction: number;
-}) => (tr: Transaction) => Transaction;
+import type { MoveOptions } from '../types';
+export declare const moveRow: (state: EditorState, originRowIndex: number | number[], targetRowIndex: number, options?: MoveOptions) => (tr: Transaction) => Transaction;

package/dist/types/utils/normalize-direction.d.ts

@@ -1,4 +1,2 @@
-export declare function normalizeDirection(origin: number, target: number, options?: {
-    tryToFit: boolean;
-    direction: number;
-}): 'start' | 'end';
+import type { MoveOptions } from '../types';
+export declare function normalizeDirection(origin: number, target: number, options?: MoveOptions): 'start' | 'end';

package/dist/types/utils.d.ts

@@ -27,7 +27,7 @@ export { normalizeSelection } from './utils/normalize-selection';
 export { removeColumnAt, removeSelectedColumns, removeColumnClosestToPos, } from './utils/remove-column';
 export { removeRowAt, removeSelectedRows, removeRowClosestToPos, } from './utils/remove-row';
 export { removeTable } from './utils/remove-table';
-export { selectColumn, selectColumns, selectRow, selectRows, selectTable, } from './utils/select-nodes';
+export { selectColumn, selectColumns, selectRow, selectRows, selectTable, selectTableClosestToPos, } from './utils/select-nodes';
 export { selectionCell } from './utils/selection-cell';
 export { selectedRect } from './utils/selection-rect';
 export type { SelectionRect } from './utils/selection-rect';

package/dist/types-ts4.5/types.d.ts

@@ -1,6 +1,6 @@
-import { Fragment, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
-import { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { Fragment, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export interface CellAttributes {
     colspan?: number;
     rowspan?: number;
@@ -37,3 +37,8 @@ export type CellAttributesWithColSpan = CellAttributes & {
 export type Writeable<T> = {
     -readonly [P in keyof T]: T[P];
 };
+export interface MoveOptions {
+    tryToFit?: boolean;
+    direction?: number;
+    selectAfterMove?: boolean;
+}

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

@@ -1,5 +1,3 @@
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const moveColumn: (state: EditorState, originColumnIndex: number | number[], targetColumnIndex: number, options?: {
-    tryToFit: boolean;
-    direction: number;
-}) => (tr: Transaction) => Transaction;
+import type { MoveOptions } from '../types';
+export declare const moveColumn: (state: EditorState, originColumnIndex: number | number[], targetColumnIndex: number, options?: MoveOptions) => (tr: Transaction) => Transaction;

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

@@ -1,5 +1,3 @@
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const moveRow: (state: EditorState, originRowIndex: number | number[], targetRowIndex: number, options?: {
-    tryToFit: boolean;
-    direction: number;
-}) => (tr: Transaction) => Transaction;
+import type { MoveOptions } from '../types';
+export declare const moveRow: (state: EditorState, originRowIndex: number | number[], targetRowIndex: number, options?: MoveOptions) => (tr: Transaction) => Transaction;

package/dist/types-ts4.5/utils/normalize-direction.d.ts

@@ -1,4 +1,2 @@
-export declare function normalizeDirection(origin: number, target: number, options?: {
-    tryToFit: boolean;
-    direction: number;
-}): 'start' | 'end';
+import type { MoveOptions } from '../types';
+export declare function normalizeDirection(origin: number, target: number, options?: MoveOptions): 'start' | 'end';

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

@@ -27,7 +27,7 @@ export { normalizeSelection } from './utils/normalize-selection';
 export { removeColumnAt, removeSelectedColumns, removeColumnClosestToPos, } from './utils/remove-column';
 export { removeRowAt, removeSelectedRows, removeRowClosestToPos, } from './utils/remove-row';
 export { removeTable } from './utils/remove-table';
-export { selectColumn, selectColumns, selectRow, selectRows, selectTable, } from './utils/select-nodes';
+export { selectColumn, selectColumns, selectRow, selectRows, selectTable, selectTableClosestToPos, } from './utils/select-nodes';
 export { selectionCell } from './utils/selection-cell';
 export { selectedRect } from './utils/selection-rect';
 export type { SelectionRect } from './utils/selection-rect';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-tables",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "A package that contains common classes and utility functions for editor tables",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -24,7 +24,6 @@
   "atlaskit:src": "src/index.ts",
   "atlassian": {
     "team": "Editor: Jenga",
-    "deprecatedAutoEntryPoints": true,
     "singleton": true,
     "releaseModel": "continuous"
   },
@@ -62,5 +61,14 @@
     "platform.editor.table-shift-click-selection-backward": {
       "type": "boolean"
     }
+  },
+  "af:exports": {
+    ".": "./src/index.ts",
+    "./cell-bookmark": "./src/cell-bookmark.ts",
+    "./cell-selection": "./src/cell-selection.ts",
+    "./pm-plugins": "./src/pm-plugins.ts",
+    "./table-map": "./src/table-map.ts",
+    "./types": "./src/types.ts",
+    "./utils": "./src/utils.ts"
   }
 }